Merge pull request #294 from DannyBen/fix/multi-global-flags

Fix multiple global flags

Author: DannyBen

Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'byebug'
 gem 'lp'
-gem 'rentacop'
 gem 'rspec'
 gem 'rspec_approvals'
 gem 'runfile'

lib/bashly/views/command/fixed_flags_filter.gtx

@@ -1,6 +1,7 @@
 = view_marker
 
-> case "${1:-}" in
+> while [[ $# -gt 0 ]]; do
+>   case "${1:-}" in
 
 if root_command?
   = short_flag_exist?("-v") ? "--version )" : "--version | -v )"
@@ -19,9 +20,14 @@ end
 
 if global_flags?
   flags.each do |flag|
-    = flag.render(:case)
+    = flag.render(:case).indent(2)
   end
 end
 
-> esac
+>   * )
+>     break
+>     ;;
+>
+>   esac
+> done
 >

spec/approvals/fixtures/global-flags

@@ -0,0 +1,52 @@
++ bundle exec bashly generate
+creating user files in src
+created src/initialize.sh
+created src/show_command.sh
+created ./flags
+run ./flags --help to test your bash script
++ ./flags -h
+flags - Verifies multiple global flags work as expected
+
+Usage:
+  flags [OPTIONS] COMMAND
+  flags [COMMAND] --help | -h
+  flags --version | -v
+
+Commands:
+  show   
+
+Options:
+  --help, -h
+    Show this help
+
+  --version, -v
+    Show version number
+
+  --alpha, -a
+    Alpha
+
+  --bravo, -b
+    Bravo
+
+  --charlie, -c NAME (required)
+    Charlie
+    Allowed: chaplin
+
++ ./flags show
+missing required flag: --charlie, -c NAME
++ ./flags -c clark show
+--charlie must be one of: chaplin
++ ./flags -c chaplin show
+# this file is located in 'src/show_command.sh'
+# code for 'flags show' goes here
+# you can edit it freely and regenerate (it will not be overwritten)
+args:
+- ${args[--charlie]} = chaplin
++ ./flags -c chaplin -ab show
+# this file is located in 'src/show_command.sh'
+# code for 'flags show' goes here
+# you can edit it freely and regenerate (it will not be overwritten)
+args:
+- ${args[--alpha]} = 1
+- ${args[--bravo]} = 1
+- ${args[--charlie]} = chaplin

spec/fixtures/workspaces/global-flags/.gitignore

@@ -0,0 +1,2 @@
+flags
+src/*.sh

spec/fixtures/workspaces/global-flags/README.md

@@ -0,0 +1,4 @@
+This fixture tests the global flags feature, and specifically, that it works
+with multiple flags.
+
+Reference issue: https://github.com/DannyBen/bashly/issues/293

spec/fixtures/workspaces/global-flags/src/bashly.yml

@@ -0,0 +1,20 @@
+name: flags
+help: Verifies multiple global flags work as expected
+version: 0.1.0
+
+flags:
+  - long: --alpha
+    short: -a
+    help: Alpha
+  - long: --bravo
+    short: -b
+    help: Bravo
+  - long: --charlie
+    short: -c
+    help: Charlie
+    arg: name
+    required: true
+    allowed: [chaplin]
+
+commands:
+  - name: show

spec/fixtures/workspaces/global-flags/test.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# This fixture tests the global flags feature, and specifically, that it works
+# with multiple flags.
+# Reference issue: https://github.com/DannyBen/bashly/issues/293
+
+rm -f ./src/*.sh
+rm -f ./flags
+
+set -x
+
+bundle exec bashly generate
+
+./flags -h
+./flags show
+./flags -c clark show
+./flags -c chaplin show
+./flags -c chaplin -ab show