- Add support for git-sourced libraries

Author: DannyBen

lib/bashly/commands/add.rb

@@ -25,6 +25,8 @@ def run
         else
           add_lib args['LIBRARY']
         end
+
+        lib_source.cleanup if lib_source.git?
       end
 
     private
@@ -41,8 +43,7 @@ def show_list
         lib_source.config.each do |key, config|
           usage = key
           usage += " #{config['usage']}" if config['usage']
-          usage = "--source #{source} #{usage}" if source
-          say "g`bashly add #{usage}`"
+          say "g`#{usage}`"
           say word_wrap("  #{config['help']}")
           say ''
         end

lib/bashly/library_source.rb

@@ -1,24 +1,81 @@
 module Bashly
   class LibrarySource
-    attr_reader :path
+    attr_reader :uri
 
-    def initialize(path = nil)
-      @path = path || File.expand_path('libraries', __dir__)
-      raise "Cannot find #{config_path}" unless File.exist? config_path
+    def initialize(uri = nil)
+      @uri = uri || File.expand_path('libraries', __dir__)
+      transform_github_uri if /^github(:|-)/.match? @uri
     end
 
-    def config
-      @config ||= YAML.properly_load_file config_path
+    def git?
+      /^(git|github|github-ssh):/.match? uri
     end
 
-    def config_path
-      @config_path ||= "#{path}/libraries.yml"
+    def config
+      @config ||= YAML.properly_load_file config_path
     end
 
     def libraries
       config.to_h do |name, spec|
         [name.to_sym, Library.new(path, spec)]
       end
     end
+
+    def config_path
+      @config_path ||= if File.exist?("#{path}/libraries.yml")
+        "#{path}/libraries.yml"
+      else
+        raise "Cannot find #{path}/libraries.yml"
+      end
+    end
+
+    def cleanup
+      FileUtils.rm_rf(File.join(Dir.tmpdir, 'bashly-libs-*'))
+    end
+
+  private
+
+    def path
+      @path ||= if uri.start_with? 'git:'
+        git_clone
+      else
+        uri
+      end
+    end
+
+    def git_clone
+      dir = Dir.mktmpdir 'bashly-libs-'
+      safe_run "git clone --depth 1 #{git_specs[:url]} #{dir}"
+      safe_run "git checkout #{git_specs[:ref]}" if git_specs[:ref]
+
+      "#{dir}#{git_specs[:path]}"
+    end
+
+    def git_specs
+      @git_specs ||= begin
+        parts = uri.match(%r{git:(?<url>.*\.git)(?:/)?(?<path>/[^@]+)?@?(?<ref>.*)})
+        raise 'Invalid source' unless parts
+
+        url = parts[:url]
+        raise 'Invalid git URL' unless url
+
+        path = parts[:path]
+        ref = parts[:ref].empty? ? nil : parts[:ref]
+
+        { url: url, path: path, ref: ref }
+      end
+    end
+
+    def safe_run(cmd)
+      raise "Failed running command:\nm`#{cmd}`" unless system cmd
+    end
+
+    def transform_github_uri
+      if (matches = uri.match(%r{github-ssh:(?<user>[^/]+)/(?<repo>[^/]+)(?<rest>.*)}))
+        @uri = "git:git@github.com:#{matches[:user]}/#{matches[:repo]}.git#{matches[:rest]}"
+      elsif (matches = uri.match(%r{github:(?<user>[^/]+)/(?<repo>[^/]+)(?<rest>.*)}))
+        @uri = "git:https://github.com/#{matches[:user]}/#{matches[:repo]}.git#{matches[:rest]}"
+      end
+    end
   end
 end

spec/approvals/cli/add/list

@@ -1,42 +1,42 @@
-bashly add colors
+colors
   Add standard functions for printing colorful and formatted text to the lib
   directory.
 
-bashly add completions [PATH]
+completions [PATH]
   Generate a bash completions function.
 
-bashly add completions_script [PATH]
+completions_script [PATH]
   Generate a standalone bash completions script.
 
-bashly add completions_yaml [PATH]
+completions_yaml [PATH]
   Generate a completions YAML configuration for Completely.
 
-bashly add config
+config
   Add standard functions for handling INI files to the lib directory.
 
-bashly add help
+help
   Add a help command, in addition to the standard --help flag.
 
-bashly add lib
+lib
   Create the lib directory for any additional user scripts.
   All *.sh scripts in this directory will be included in the final bash script.
   Note that if you configured a different partials_extension, then the
   extensions of the files in this directory need to match.
 
-bashly add settings
+settings
   Copy a sample settings.yml file to your project, allowing you to customize
   some bashly options.
 
-bashly add strings
+strings
   Copy an additional configuration file to your project, allowing you to
   customize all the tips and error strings.
 
-bashly add test
+test
   Add approval testing.
 
-bashly add validations
+validations
   Add argument validation functions to the lib directory.
 
-bashly add yaml
+yaml
   Add standard functions for reading YAML files.
 

spec/approvals/cli/add/list-path

@@ -1,3 +1,3 @@
-bashly add --source spec/fixtures/libraries database
+database
   Add database utilities