bashly 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44036d2bc4aabc216e7d60a788bfce201f71ad8230f4b44df5cb9d201500a0a5
-  data.tar.gz: 30a1fb4efdafb7c305f0b1f1dcb38eaf8e05ed4a613b73c2ebd501cfe319bde7
+  metadata.gz: 17cea196efbe1bc65a6639258fe902503b75656c6a759ea5434a12d6a53d4529
+  data.tar.gz: 5e86d08e594250889bc351d5d6113bcfc40f8ec04ba39f72a7f19eec8329c7af
 SHA512:
-  metadata.gz: 78109f5a7b1273746d0db4dfcce037862ee9964333c001b4db5bec3997074ec70aab849e7783c12cf1337b4c5086747e8591c94ed9d52e612bf1e281cdfff772
-  data.tar.gz: 141f6ad7bf8a1a932f8d76774737dde4ef61f7222adc48c3932eba460d187dde4a194e9ee5771b3136bd699410e50874ecaa2f668a51684662c506f33013820c
+  metadata.gz: ade5312408fc08533dc6992673744920e941e142c09c9f05e58e66a08a6dfccfab100707cee319cb2ec388e60f9a73ae8ff735e8217c8f91820fc5e2e22af886
+  data.tar.gz: cf7f6da0438551ba2a10ed5c224d7ad6ac6b02d8675dca57c8ac01eb465e705a19bd2c3d1812b61b54ab52a433b5ce228b7f3b579e9de24f71c6f512caad1202

data/lib/bashly/commands/render.rb

@@ -4,7 +4,7 @@ require 'tty-markdown'
 module Bashly
   module Commands
     class Render < Base
-      help 'Render the bashly data structure using cutsom templates'
+      help 'Render the bashly data structure using custom templates'
 
       usage 'bashly render SOURCE TARGET [--watch --show PATH]'
       usage 'bashly render SOURCE --about'

data/lib/bashly/concerns/validation_helpers.rb

@@ -31,7 +31,7 @@ module Bashly
       return unless of
 
       value.each_with_index do |val, i|
-        send "assert_#{of}".to_sym, "#{key}[#{i}]", val
+        send :"assert_#{of}", "#{key}[#{i}]", val
       end
     end
 

data/lib/bashly/config_validator.rb

@@ -91,16 +91,25 @@ module Bashly
       assert_hash key, value, keys: Script::Argument.option_keys
       assert_string "#{key}.name", value['name']
       assert_optional_string "#{key}.help", value['help']
-      assert_optional_string "#{key}.default", value['default']
+      assert_string_or_array "#{key}.default", value['default']
       assert_optional_string "#{key}.validate", value['validate']
       assert_boolean "#{key}.required", value['required']
       assert_boolean "#{key}.repeatable", value['repeatable']
+      assert_boolean "#{key}.unique", value['unique']
 
       assert_array "#{key}.allowed", value['allowed'], of: :string
 
       refute value['name'].match(/^-/), "#{key}.name must not start with '-'"
 
       refute value['required'] && value['default'], "#{key} cannot have both nub`required` and nub`default`"
+
+      if value['unique']
+        assert value['repeatable'], "#{key}.unique does not make sense without nub`repeatable`"
+      end
+
+      if value['default'].is_a? Array
+        assert value['repeatable'], "#{key}.default array does not make sense without nub`repeatable`"
+      end
     end
 
     def assert_flag(key, value)
@@ -113,11 +122,12 @@ module Bashly
       assert_optional_string "#{key}.short", value['short']
       assert_optional_string "#{key}.help", value['help']
       assert_optional_string "#{key}.arg", value['arg']
-      assert_optional_string "#{key}.default", value['default']
+      assert_string_or_array "#{key}.default", value['default']
       assert_optional_string "#{key}.validate", value['validate']
 
       assert_boolean "#{key}.private", value['private']
       assert_boolean "#{key}.repeatable", value['repeatable']
+      assert_boolean "#{key}.unique", value['unique']
       assert_boolean "#{key}.required", value['required']
       assert_array "#{key}.allowed", value['allowed'], of: :string
       assert_array "#{key}.conflicts", value['conflicts'], of: :string
@@ -140,6 +150,15 @@ module Bashly
       if value['completions']
         assert value['arg'], "#{key}.completions does not make sense without nub`arg`"
       end
+
+      if value['unique']
+        assert value['arg'] && value['repeatable'],
+          "#{key}.unique does not make sense without nub`arg` and nub`repeatable`"
+      end
+
+      if value['default'].is_a? Array
+        assert value['repeatable'], "#{key}.default array does not make sense without nub`repeatable`"
+      end
     end
 
     def assert_env_var(key, value)
@@ -149,6 +168,9 @@ module Bashly
       assert_optional_string "#{key}.default", value['default']
       assert_boolean "#{key}.required", value['required']
       assert_boolean "#{key}.private", value['private']
+      assert_array "#{key}.allowed", value['allowed'], of: :string
+
+      refute value['required'] && value['default'], "#{key} cannot have both nub`required` and nub`default`"
     end
 
     def assert_command(key, value)
@@ -201,6 +223,16 @@ module Bashly
         refute repeatable_arg, "#{key}.catch_all makes no sense with repeatable arg (#{repeatable_arg})"
       end
 
+      if value['args']
+        repeatable_args = value['args'].count { |a| a['repeatable'] }
+        assert repeatable_args < 2, "#{key}.args cannot have more than one repeatable args"
+
+        if repeatable_args == 1
+          assert value['args'].last['repeatable'],
+            "#{key}.args cannot contain a repeatable arg unless it is the last one"
+        end
+      end
+
       if value['expose']
         assert value['commands'], "#{key}.expose makes no sense without nub`commands`"
       end

data/lib/bashly/docs/flag.yml

@@ -41,9 +41,10 @@ flag.arg:
   url: https://bashly.dannyb.co/configuration/flag/#arg
   example: |-
     flags:
-    - long: --ssh
-      short: -s
-      help: Clone using SSH
+    - long: --user
+      short: -u
+      arg: name
+      help: Specify the user name
 
 flag.completions:
   help: Specify a list of additional completion suggestions when used in conjunction with `bashly add completions`. Must be accompanied by `arg`.
@@ -161,6 +162,17 @@ flag.short:
       arg: name
       help: Repository user name
 
+flag.unique:
+  help: Specify that the arguments provided by this repeatable flag must be unique. When this is set to `true`, non-unique values will be ignored.
+  url: https://bashly.dannyb.co/configuration/flag/#unique
+  example: |-
+    flags:
+    - long: --path
+      arg: location
+      help: Set one or more paths
+      repeatable: true
+      unique: true
+
 flag.validate:
   help: Apply custom validation functions. Must be accompanied by `arg`.
 

data/lib/bashly/libraries/strings/strings.yml

@@ -34,5 +34,6 @@ missing_required_environment_variable: "missing required environment variable: %
 missing_dependency: "missing dependency: %{dependency}"
 disallowed_flag: "%{name} must be one of: %{allowed}"
 disallowed_argument: "%{name} must be one of: %{allowed}"
+disallowed_environment_variable: "%{name} environment variable must be one of: %{allowed}"
 unsupported_bash_version: "bash version 4 or higher is required"
 validation_error: "validation error in %s:\\n%s"

data/lib/bashly/render_context.rb

@@ -1,4 +1,4 @@
-require 'date'    # for use by template render scripts
+require 'date' # for use by template render scripts
 require 'colsole'
 
 module Bashly

data/lib/bashly/script/argument.rb

@@ -1,14 +1,26 @@
+require 'shellwords'
+
 module Bashly
   module Script
     class Argument < Base
       class << self
         def option_keys
           @option_keys ||= %i[
-            allowed default help name repeatable required validate
+            allowed default help name repeatable required unique validate
           ]
         end
       end
 
+      def default_string
+        if default.is_a?(Array)
+          Shellwords.shelljoin default
+        elsif default.is_a?(String) && repeatable
+          Shellwords.shellescape default
+        else
+          default
+        end
+      end
+
       def usage_string
         required ? label : "[#{label}]"
       end

data/lib/bashly/script/command.rb

@@ -327,6 +327,11 @@ module Bashly
         args.select(&:allowed)
       end
 
+      # Returns an array of all the environemnt_variables with a whitelist arg
+      def whitelisted_environment_variables
+        environment_variables.select(&:allowed)
+      end
+
       # Returns an array of all the flags with a whitelist arg
       def whitelisted_flags
         flags.select(&:allowed)

data/lib/bashly/script/environment_variable.rb

@@ -3,7 +3,7 @@ module Bashly
     class EnvironmentVariable < Base
       class << self
         def option_keys
-          @option_keys ||= %i[default help name required private]
+          @option_keys ||= %i[allowed default help name required private]
         end
       end
 

data/lib/bashly/script/flag.rb

@@ -7,7 +7,7 @@ module Bashly
         def option_keys
           @option_keys ||= %i[
             allowed arg completions conflicts default help long repeatable
-            required short validate private
+            required short unique validate private
           ]
         end
       end
@@ -22,6 +22,16 @@ module Bashly
         end
       end
 
+      def default_string
+        if default.is_a?(Array)
+          Shellwords.shelljoin default
+        elsif default.is_a?(String) && repeatable
+          Shellwords.shellescape default
+        else
+          default
+        end
+      end
+
       def name
         long || short
       end

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '1.1.3'
+  VERSION = '1.1.5'
 end

data/lib/bashly/views/argument/usage.gtx

@@ -8,7 +8,11 @@ if allowed
 end
 
 if default
-  > printf "    {{ strings[:default] % { value: default } }}\n"
+  if default.is_a? Array
+    > printf "    {{ strings[:default] % { value: default.join(', ') } }}\n"
+  else
+    > printf "    {{ strings[:default] % { value: default } }}\n"
+  end
 end
 
 > echo

data/lib/bashly/views/command/default_assignments.gtx

@@ -2,11 +2,11 @@ if default_args.any? or default_flags.any?
   = view_marker
 
   default_args.each do |arg|
-    > [[ -n ${args['{{ arg.name }}']:-} ]] || args['{{ arg.name }}']="{{ arg.default }}"
+    > [[ -n ${args['{{ arg.name }}']:-} ]] || args['{{ arg.name }}']="{{ arg.default_string }}"
   end
 
   default_flags.each do |flag|
-    > [[ -n ${args['{{ flag.name }}']:-} ]] || args['{{ flag.name }}']="{{ flag.default }}"
+    > [[ -n ${args['{{ flag.name }}']:-} ]] || args['{{ flag.name }}']="{{ flag.default_string }}"
   end
 
   >

data/lib/bashly/views/command/environment_variables_filter.gtx

@@ -1,13 +1,26 @@
-if default_environment_variables.any? or required_environment_variables.any?
-  = view_marker 
+if environment_variables.any?
+  = view_marker
   = render(:environment_variables_default)
 
-  if required_environment_variables.any?
-    required_environment_variables.each do |env_var|
-      > if [[ -z "${<%= env_var.name.upcase %>:-}" ]]; then
-      >   printf "{{ strings[:missing_required_environment_variable] % { var: env_var.name.upcase } }}\n" >&2
-      >   exit 1
-      > fi
-    end
+  environment_variables.each do |env_var|
+    > env_var_names+=("{{ env_var.name.upcase }}")
   end
-end
+end
+
+if required_environment_variables.any?
+  required_environment_variables.each do |env_var|
+    > if [[ -z "${<%= env_var.name.upcase %>:-}" ]]; then
+    >   printf "{{ strings[:missing_required_environment_variable] % { var: env_var.name.upcase } }}\n" >&2
+    >   exit 1
+    > fi
+  end
+end
+
+if whitelisted_environment_variables.any?
+  whitelisted_environment_variables.each do |env_var|
+    > if [[ -n "${<%= env_var.name.upcase %>:-}" ]] && [[ ! ${<%= env_var.name.upcase %>:-} =~ ^({{ env_var.allowed.join '|' }})$ ]]; then
+    >   printf "%s\n" "{{ strings[:disallowed_environment_variable] % { name: env_var.name.upcase, allowed: env_var.allowed.join(', ') } }}" >&2
+    >   exit 1
+    > fi
+  end
+end

data/lib/bashly/views/command/inspect_args.gtx

@@ -4,7 +4,9 @@
 >   if ((${#args[@]})); then
 >     readarray -t sorted_keys < <(printf '%s\n' "${!args[@]}" | sort)
 >     echo args:
->     for k in "${sorted_keys[@]}"; do echo "- \${args[$k]} = ${args[$k]}"; done
+>     for k in "${sorted_keys[@]}"; do
+>       echo "- \${args[$k]} = ${args[$k]}"
+>     done
 >   else
 >     echo args: none
 >   fi
@@ -22,8 +24,18 @@
 >     readarray -t sorted_keys < <(printf '%s\n' "${!deps[@]}" | sort)
 >     echo
 >     echo deps:
->     for k in "${sorted_keys[@]}"; do echo "- \${deps[$k]} = ${deps[$k]}"; done
+>     for k in "${sorted_keys[@]}"; do
+>       echo "- \${deps[$k]} = ${deps[$k]}"
+>     done
 >   fi
 >
+>   if ((${#env_var_names[@]})); then
+>     readarray -t sorted_names < <(printf '%s\n' "${env_var_names[@]}" | sort)
+>     echo
+>     echo "environment variables:"
+>     for k in "${sorted_names[@]}"; do
+>       echo "- \$$k = ${!k:-}"
+>     done
+>   fi
 > }
 > 

data/lib/bashly/views/command/parse_requirements_case_repeatable.gtx

@@ -7,9 +7,17 @@ args.each do |arg|
   if arg.repeatable
     >   args['{{ arg.name }}']="\"$1\""
     >   shift
-    > else
-    >   args['{{ arg.name }}']="${args[{{ arg.name }}]} \"$1\""
-    >   shift
+    if arg.unique
+      > elif [[ ! "${args['{{ arg.name }}']}" =~ \"$1\" ]]; then
+      >   args['{{ arg.name }}']="${args[{{ arg.name }}]} \"$1\""
+      >   shift
+      > else
+      >   shift
+    else
+      > else
+      >   args['{{ arg.name }}']="${args[{{ arg.name }}]} \"$1\""
+      >   shift
+    end
 
   else
     >   args['{{ arg.name }}']=$1

data/lib/bashly/views/command/run.gtx

@@ -4,6 +4,7 @@
 >   declare -A args=()
 >   declare -A deps=()
 >   declare -a other_args=()
+>   declare -a env_var_names=()
 >   declare -a input=()
 >   normalize_input "$@"
 >   parse_requirements "${input[@]}"

data/lib/bashly/views/environment_variable/usage.gtx

@@ -3,6 +3,10 @@
 > printf "  %s\n" "{{ usage_string(extended: true).color(:environment_variable) }}"
 > printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
 
+if allowed
+  > printf "    {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
+end
+
 if default
   > printf "    {{ strings[:default] % { value: default } }}\n"
 end

data/lib/bashly/views/flag/case_arg.gtx

@@ -6,8 +6,12 @@
 if repeatable
   >   if [[ -z ${args['{{ name }}']+x} ]]; then
   >     args['{{ name }}']="\"$2\""
-  >   else
-  >     args['{{ name }}']="${args[{{ name }}]} \"$2\""
+  if unique
+    >   elif [[ ! "${args['{{ name }}']}" =~ \"$2\" ]]; then
+  else
+    >   else
+  end
+  >     args['{{ name }}']="${args['{{ name }}']} \"$2\""
   >   fi
 
 else

data/lib/bashly/views/flag/usage.gtx

@@ -4,11 +4,15 @@
 > printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
 
 if allowed
-> printf "    {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
+  > printf "    {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
 end
 
 if default
-> printf "    {{ strings[:default] % { value: default } }}\n"
+  if default.is_a? Array
+    > printf "    {{ strings[:default] % { value: default.join(', ') } }}\n"
+  else
+    > printf "    {{ strings[:default] % { value: default } }}\n"
+  end
 end
 
 > echo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-25 00:00:00.000000000 Z
+date: 2023-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole