- Update dependencies option to support 'any' (e.g. wget or curl)

Author: DannyBen

lib/bashly/config_validator.rb

@@ -50,13 +50,30 @@ def assert_dependencies(key, value)
       when Array
         assert_array key, value, of: :string
       when Hash
-        assert_hash key, value, of: :string
+        assert_dependencies_hash key, value
       else
         assert [Array, Hash].include?(value.class),
           "#{key} must be an array or a hash"
       end
     end
 
+    def assert_dependencies_hash(key, value)
+      value.each do |k, v|
+        assert_dependency "#{key}.#{k}", v
+      end
+    end
+
+    def assert_dependency(key, value)
+      assert [String, Hash].include?(value.class),
+        "#{key} must be a string or a hash"
+      
+      return if value.is_a? String
+
+      assert_hash key, value, keys: Script::Dependency.option_keys
+      assert_string_or_array "#{key}.command", value['command']
+      assert_optional_string "#{key}.help", value['help']
+    end
+
     def assert_extensible(key, value)
       return unless value
 

lib/bashly/script/command.rb

@@ -53,6 +53,7 @@ def caption_string
         help.empty? ? full_name : "#{full_name} - #{summary}"
       end
 
+      # Returns an object representing the catch_all configuration
       def catch_all
         @catch_all ||= CatchAll.from_config options['catch_all']
       end
@@ -133,7 +134,16 @@ def default_flags
         flags.select(&:default)
       end
 
-      # Returns an array of EnvironmentVariables
+      # Returns an array of Dependency objects
+      def dependencies
+        return [] unless options['dependencies']
+
+        @dependencies ||= options['dependencies'].map do |key, value|
+          Dependency.from_config key, value
+        end
+      end
+
+      # Returns an array of EnvironmentVariable objects
       def environment_variables
         return [] unless options['environment_variables']
 

lib/bashly/script/dependency.rb

@@ -0,0 +1,42 @@
+module Bashly
+  module Script
+    class Dependency
+      attr_reader :label, :commands, :help
+
+      class << self
+        def option_keys
+          @option_keys ||= %i[command help]
+        end
+
+        def from_config(key, value)
+          options = case value
+          when nil
+            { label: key, commands: key }
+          when String
+            { label: key, commands: key, help: value }
+          when Hash
+            { label: key, commands: value['command'], help: value['help'] }
+          else
+            {}
+          end
+
+          new(**options)
+        end
+      end
+
+      def initialize(label: nil, commands: nil, help: nil)
+        @label = label
+        @commands = commands.is_a?(String) ? [commands] : commands
+        @help = help&.empty? ? nil : help
+      end
+
+      def name
+        @name ||= if commands.size == 1
+          commands.first
+        else
+          "#{label} (#{commands.join '/'})"
+        end
+      end
+    end
+  end
+end

lib/bashly/views/command/dependencies_filter.gtx

@@ -1,11 +1,11 @@
 if dependencies
   = view_marker
 
-  dependencies.each do |dependency, message|
-    > if ! command -v {{ dependency }} >/dev/null 2>&1; then
-    >   printf "{{ strings[:missing_dependency] % { dependency: dependency } }}\n" >&2
-    if message and !message.empty?
-      >   printf "%s\n" "{{ message }}" >&2
+  dependencies.each do |dependency|
+    > if ! command -v {{ dependency.commands.join(' ') }} >/dev/null 2>&1; then
+    >   printf "{{ strings[:missing_dependency] % { dependency: dependency.name } }}\n" >&2
+    if dependency.help
+      >   printf "%s\n" "{{ dependency.help }}" >&2
     end
     >   exit 1
     > fi

spec/approvals/validations/command_dependencies_invalid_hash

@@ -1 +1 @@
-#<Bashly::ConfigurationError: root.dependencies.docker must be a string>
+#<Bashly::ConfigurationError: root.dependencies.docker must be a string or a hash>

spec/bashly/settings_spec.rb

@@ -57,7 +57,7 @@
   end
 
   describe 'strict_string' do
-    original_value = Settings.strict
+    original_value = described_class.strict
 
     after { subject.strict = original_value }
 

support/runfile/debug.runfile

@@ -1,7 +1,5 @@
 action do
-  uri = "git:https://github.com/DannyBen/bashly.git//spec/fixtures/libraries@master"
-
-  matches = uri.match(%r{git:(?<url>.*\.git)//?(?<path>[^@]+)?@?(?<ref>.*)})
+  
 
   p matches[:url]
   p matches[:path]