Merge pull request #144 from DannyBen/add/lib-auto-upgrade

Auto upgrade libraries

Author: DannyBen

examples/colors/src/lib/colors.sh

@@ -1,5 +1,5 @@
 # ---
-# Color functions
+# Color functions [@bashly-upgrade colors]
 # This file is a part of Bashly standard library
 #
 # Usage:

examples/completions/src/lib/send_completions.sh

@@ -1,3 +1,4 @@
+# [@bashly-upgrade completions send_completions]
 send_completions() {
   echo $'#!/usr/bin/env bash'
   echo $''

examples/validations/src/lib/validations/validate_dir_exists.sh

@@ -1,3 +1,4 @@
+# [@bashly-upgrade validations]
 validate_dir_exists() {
   [[ -d "$1" ]] || echo "must be an existing directory"
 }

examples/validations/src/lib/validations/validate_file_exists.sh

@@ -1,3 +1,4 @@
+# [@bashly-upgrade validations]
 validate_file_exists() {
   [[ -f "$1" ]] || echo "must be an existing file"
 }

examples/validations/src/lib/validations/validate_integer.sh

@@ -1,3 +1,4 @@
+# [@bashly-upgrade validations]
 validate_integer() {
   [[ "$1" =~ ^[0-9]+$ ]] || echo "must be an integer"
 }

examples/validations/src/lib/validations/validate_not_empty.sh

@@ -1,3 +1,4 @@
+# [@bashly-upgrade validations]
 validate_not_empty() {
   [[ -z "$1" ]] && echo "must not be empty"
 }

lib/bashly/commands/add.rb

@@ -98,12 +98,12 @@ def safe_write(path, content)
         end
 
         if File.exist? path and !args['--force']
-          say "skipped !txtgrn!#{path}!txtrst! (exists)"
+          say "!txtblu!skipped!txtrst! #{path} (exists)"
           false
 
         else
           File.deep_write path, content
-          say "created !txtgrn!#{path}"
+          say "!txtgrn!created!txtrst! #{path}"
           true
 
         end

lib/bashly/commands/generate.rb

@@ -3,12 +3,13 @@ module Commands
     class Generate < Base
       help "Generate the bash script and required files"
 
-      usage "bashly generate [--force --quiet --wrap FUNCTION]"
+      usage "bashly generate [--force --quiet --upgrade --wrap FUNCTION]"
       usage "bashly generate (-h|--help)"
 
       option "-f --force", "Overwrite existing files"
-      option "-w --wrap FUNCTION", "Wrap the entire script in a function so it can also be sourced"
       option "-q --quiet", "Disable on-screen progress report"
+      option "-u --upgrade", "Upgrade all added library functions"
+      option "-w --wrap FUNCTION", "Wrap the entire script in a function so it can also be sourced"
 
       environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
       environment "BASHLY_TARGET_DIR", "The path to use for creating the bash script [default: .]"
@@ -18,6 +19,7 @@ class Generate < Base
 
       def run
         create_user_files
+        upgrade_libs if args['--upgrade']
         create_master_script
         quiet_say "run !txtpur!#{master_script_path} --help!txtrst! to test your bash script"
       end
@@ -28,6 +30,44 @@ def quiet_say(message)
         say message unless args['--quiet']
       end
 
+      def upgrade_libs
+        generated_files.each do |file|
+          content = File.read file
+          
+          if content =~ /\[@bashly-upgrade (.+)\]/
+            lib = $1
+            
+            case lib
+            when "colors"
+              upgrade file, Library::Colors.new
+            when "config"
+              upgrade file, Library::Config.new
+            when "yaml"
+              upgrade file, Library::YAML.new
+            when "validations"
+              upgrade file, Library::Validations.new
+            when /completions (.+)/
+              upgrade file, Library::CompletionsFunction.new(file, function: $1)
+            end
+          end
+        end
+      end
+
+      def generated_files
+        Dir["#{Settings.source_dir}/**/*.*"].sort
+      end
+
+      def upgrade(existing_file, handler)
+        file = handler.files.select { |f| f[:path] == existing_file }.first
+
+        if file
+          File.deep_write file[:path], file[:content]
+          quiet_say "!txtcyn!updated!txtrst! #{file[:path]}"
+        else
+          quiet_say "!txtred!warning!txtrst! not upgrading !txtcyn!#{existing_file}!txtrst!, path mismatch"
+        end
+      end
+
       def create_user_files
         quiet_say "creating user files in !txtgrn!#{Settings.source_dir}"
 
@@ -55,17 +95,17 @@ def create_all_command_files
 
       def create_file(file, content)
         if File.exist? file and !args['--force']
-          quiet_say "skipped !txtgrn!#{file}!txtrst! (exists)"
+          quiet_say "!txtblu!skipped!txtrst! #{file} (exists)"
         else
           File.write file, content
-          quiet_say "created !txtgrn!#{file}"
+          quiet_say "!txtgrn!created!txtrst! #{file}"
         end
       end
 
       def create_master_script
         File.write master_script_path, script.code
         FileUtils.chmod "+x", master_script_path
-        quiet_say "created !txtgrn!#{master_script_path}"
+        quiet_say "!txtgrn!created!txtrst! #{master_script_path}"
       end
 
       def script

lib/bashly/commands/init.rb

@@ -17,7 +17,7 @@ def run
         end
         Dir.mkdir target_dir unless Dir.exist? target_dir
         File.write "#{target_dir}/bashly.yml", yaml_content
-        say "created !txtgrn!#{target_dir}/bashly.yml"
+        say "!txtgrn!created!txtrst! #{target_dir}/bashly.yml"
         say "run !txtpur!bashly generate!txtrst! to create the bash script"
       end
 

lib/bashly/extensions/file.rb

@@ -6,4 +6,8 @@ def self.deep_write(file, content)
     FileUtils.mkdir_p dir unless Dir.exist? dir
     File.write file, content
   end
+
+  def self.append(path, content)
+    File.open(path, "a") { |f| f << content }
+  end
 end