- Add auto upgrade support to custom library sources

Author: DannyBen

lib/bashly/commands/generate.rb

@@ -82,6 +82,7 @@ def upgrade_libs
           next unless content =~ /\[@bashly-upgrade (.+)\]/
 
           args = $1.split
+
           library_name = args.shift
           upgrade file, library_name, *args
         end
@@ -92,7 +93,13 @@ def generated_files
       end
 
       def upgrade(existing_file, library_name, *args)
-        source = Bashly::LibrarySource.new
+        if library_name.include? ';'
+          source_name, library_name = library_name.split(';')
+          source = Bashly::LibrarySource.new source_name
+        else
+          source = Bashly::LibrarySource.new
+        end
+
         library = source.libraries[library_name.to_sym]
 
         if library

lib/bashly/library.rb

@@ -1,11 +1,12 @@
 module Bashly
   class Library
-    attr_reader :path, :config
+    attr_reader :path, :config, :upgrade_string
     attr_accessor :args
 
-    def initialize(path, config)
+    def initialize(path, config, upgrade_string: nil)
       @path = path.to_s
       @config = config
+      @upgrade_string = upgrade_string
     end
 
     def files
@@ -16,7 +17,7 @@ def files
         config['files'].map do |file|
           {
             path:    file['target'] % target_file_args,
-            content: File.read("#{path}/#{file['source']}"),
+            content: file_contents("#{path}/#{file['source']}"),
           }
         end
       end
@@ -42,6 +43,10 @@ def custom_handler
       @custom_handler ||= Module.const_get(config['handler']).new(*args)
     end
 
+    def file_contents(path)
+      File.read(path).sub('[@bashly-upgrade]', "[@bashly-upgrade #{upgrade_string}]")
+    end
+
     def target_file_args
       {
         user_source_dir: Settings.source_dir,

lib/bashly/library_source.rb

@@ -19,7 +19,8 @@ def config
 
     def libraries
       config.to_h do |name, spec|
-        [name.to_sym, Library.new(path, spec)]
+        upgrade_string = "#{uri};#{name}"
+        [name.to_sym, Library.new(path, spec, upgrade_string: upgrade_string)]
       end
     end
 

spec/approvals/cli/generate/upgrade-custom-source

@@ -0,0 +1,6 @@
+creating user files in spec/tmp/src
+skipped spec/tmp/src/initialize.sh (exists)
+skipped spec/tmp/src/root_command.sh (exists)
+updated spec/tmp/src/lib/database.sh
+created spec/tmp/cli
+run spec/tmp/cli --help to test your bash script

…ec/approvals/fixtures/partials_extension …ec/approvals/fixtures/partials-extensionspec/approvals/fixtures/partials_extension renamed to spec/approvals/fixtures/partials-extension spec/approvals/fixtures/partials_extension renamed to spec/approvals/fixtures/partials-extension

@@ -200,6 +200,19 @@
         expect { subject.execute %w[generate -u] }.to output_approval('cli/generate/upgrade-unknown-lib')
       end
     end
+
+    context 'when upgrading a library from an external source' do
+      before do
+        reset_tmp_dir
+        cp 'spec/fixtures/workspaces/lib-custom-source/*'
+        system "ln -fs #{Dir.pwd}/spec/fixtures/libraries /tmp/bashly-tmp-source"
+      end
+
+      it 'upgrades the library' do
+        expect { subject.execute %w[generate -u] }.to output_approval('cli/generate/upgrade-custom-source')
+        expect(File.read 'spec/tmp/src/lib/database.sh').to include('dummy')
+      end
+    end
   end
 
   context 'with --watch' do

spec/bashly/commands/generate_spec.rb

@@ -110,6 +110,15 @@
     it 'returns Library objects as values' do
       expect(subject.libraries.values.map(&:class).uniq).to eq [Library]
     end
+
+    context 'with a custom source' do
+      let(:uri) { 'spec/fixtures/libraries' }
+
+      it 'replaces [@bashly-upgrade] marker with a proper upgrade string' do
+        expect(subject.libraries[:database].files.first[:content])
+          .to start_with '## [@bashly-upgrade spec/fixtures/libraries;database]'
+      end
+    end
   end
 
   describe '#cleanup' do

spec/bashly/library_source_spec.rb

@@ -1 +1,2 @@
-# dummy
+## [@bashly-upgrade]
+# dummy 

spec/fixtures/libraries/database/database.sh

@@ -0,0 +1 @@
+../../../../../../../../../..//vagrant/gems/bashly/spec/fixtures/libraries

spec/fixtures/libraries/libraries

@@ -0,0 +1,2 @@
+cli
+