Merge pull request #317 from DannyBen/add/double-dash-support

Add support for double dash as an argument parsing terminator

Author: DannyBen

edge/Dockerfile

@@ -3,8 +3,10 @@ FROM dannyben/alpine-ruby
 ENV PS1 "\n\n>> bashly \W \$ "
 RUN apk add --no-cache git
 
+ARG branch=master
+
 WORKDIR /bashly
-RUN git clone --depth 1 https://github.com/DannyBen/bashly.git .
+RUN git clone --branch $branch --depth 1 https://github.com/DannyBen/bashly.git .
 RUN gem build bashly.gemspec
 RUN gem install bashly*.gem
 

edge/op.conf

@@ -1,2 +1,2 @@
-build: docker build --no-cache -t dannyben/bashly:edge . && docker images |grep bashly
+build: docker build --build-arg=branch=${1:-master} --no-cache -t dannyben/bashly:edge . && docker images |grep bashly
 push: docker push dannyben/bashly:edge

examples/catch-all/README.md

@@ -27,6 +27,10 @@ args:
 - name: message
   required: true
   help: Message
+
+flags:
+- long: --debug
+  short: -d
 ```
 
 
@@ -37,7 +41,7 @@ args:
 
 ```shell
 missing required argument: MESSAGE
-usage: download MESSAGE [...]
+usage: download MESSAGE [OPTIONS] [...]
 
 
 ```
@@ -48,7 +52,7 @@ usage: download MESSAGE [...]
 download - Catch All Example
 
 Usage:
-  download MESSAGE [...]
+  download MESSAGE [OPTIONS] [...]
   download --help | -h
   download --version | -v
 
@@ -59,6 +63,9 @@ Options:
   --version, -v
     Show version number
 
+  --debug, -d
+
+
 Arguments:
   MESSAGE
     Message
@@ -95,5 +102,25 @@ other_args:
 
 ```
 
+### `$ ./download something --debug -- also pass --debug to catch_all`
+
+```shell
+# this file is located in 'src/root_command.sh'
+# you can edit it freely and regenerate (it will not be overwritten)
+args:
+- ${args[--debug]} = 1
+- ${args[message]} = something
+
+other_args:
+- ${other_args[*]} = also pass --debug to catch_all
+- ${other_args[0]} = also
+- ${other_args[1]} = pass
+- ${other_args[2]} = --debug
+- ${other_args[3]} = to
+- ${other_args[4]} = catch_all
+
+
+```
+
 
 

examples/catch-all/src/bashly.yml

@@ -10,3 +10,6 @@ args:
   required: true
   help: Message
 
+flags:
+- long: --debug
+  short: -d

examples/catch-all/test.sh

@@ -11,4 +11,5 @@ bashly generate
 ./download
 ./download -h
 ./download something
-./download something with --additional args
+./download something with --additional args
+./download something --debug -- also pass --debug to catch_all

lib/bashly/views/command/parse_requirements_while.gtx

@@ -11,8 +11,16 @@ unless global_flags?
 end
 
 >
->     -?*)
+if catch_all.enabled?
+>     --)
+>       shift
+>       other_args+=("$@")
+>       break
+>       ;;
+>
+end
 
+>     -?*)
 if catch_all.enabled?
   >       other_args+=("$1")
   >       shift

spec/approvals/examples/catch-all

@@ -6,12 +6,12 @@ created ./download
 run ./download --help to test your bash script
 + ./download
 missing required argument: MESSAGE
-usage: download MESSAGE [...]
+usage: download MESSAGE [OPTIONS] [...]
 + ./download -h
 download - Catch All Example
 
 Usage:
-  download MESSAGE [...]
+  download MESSAGE [OPTIONS] [...]
   download --help | -h
   download --version | -v
 
@@ -22,6 +22,9 @@ Options:
   --version, -v
     Show version number
 
+  --debug, -d
+
+
 Arguments:
   MESSAGE
     Message
@@ -42,3 +45,17 @@ other_args:
 - ${other_args[0]} = with
 - ${other_args[1]} = --additional
 - ${other_args[2]} = args
++ ./download something --debug -- also pass --debug to catch_all
+# this file is located in 'src/root_command.sh'
+# you can edit it freely and regenerate (it will not be overwritten)
+args:
+- ${args[--debug]} = 1
+- ${args[message]} = something
+
+other_args:
+- ${other_args[*]} = also pass --debug to catch_all
+- ${other_args[0]} = also
+- ${other_args[1]} = pass
+- ${other_args[2]} = --debug
+- ${other_args[3]} = to
+- ${other_args[4]} = catch_all