bashly 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90e3d5380ed91982c50ec46ff37c490e6b00785b80b75c60c4ddbb163902099
-  data.tar.gz: b1777dac4776226205c27781cf86af045deed8f25a282e0e2a1a8fd3848e0115
+  metadata.gz: 8d7c552cf8d73f90e7dbeb030acef7a6b329db3b0cd48e9436845c900aa26c03
+  data.tar.gz: 5bfb9b67eab6bec13a43b97967822eee9fa6f24c0faf013d36e4670ab747f48a
 SHA512:
-  metadata.gz: 24c19fb49d0cfe9a1ed96bfd0fa3d77973136ed2dfda747c11aa54244c30d2af17384f6aa4f7604c1a41562e41ffe9e5c1ad2a204a7dd85ac6e2d797c588d65b
-  data.tar.gz: b2020a3dcf36073049511f4484d32542a5e54037a464c9e838c7a3ffb2fb48141223ea96ecf334aeb8b4609bedaeca3491d23901d02a481c5fb621354e695936
+  metadata.gz: 6b00ae3f396edb6550a49d950cbb18c3a02ea7c972dcb3e3be9fe964c9185c53ae33924870f27a3f12b235dc7390d0b95f1ef66036f7ed2e1cb34d6796091937
+  data.tar.gz: d12b41db4937a0267615a54cfe8c7b6062c798e83c48261a74cc3d88678e7046d81fd35ae0f0c1e5481f9754347dce9f95871bb37f61b379d8da022f572c5227

data/lib/bashly/commands/completions.rb

@@ -1,3 +1,5 @@
+require 'completely'
+
 module Bashly
   module Commands
     class Completions < Base

data/lib/bashly/config_validator.rb

@@ -95,12 +95,17 @@ module Bashly
       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
     end
 
     def assert_flag(key, value)
@@ -118,6 +123,7 @@ module Bashly
 
       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 +146,10 @@ 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
     end
 
     def assert_env_var(key, value)
@@ -201,6 +211,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/script/argument.rb

@@ -4,7 +4,7 @@ module Bashly
       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

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

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '1.1.2'
+  VERSION = '1.1.4'
 end

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/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

metadata

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