Merge pull request #245 from DannyBen/change/invalid-command-behavior

Show error instead of usage on invalid command call

Author: DannyBen

examples/commands-nested/test.sh

@@ -12,10 +12,14 @@ bashly generate
 ./cli -h
 ./cli dir
 ./cli file
+# verify invalid commands properly error
+./cli dig
 ./cli dir -h
 ./cli file -h
 ./cli dir list
 ./cli dir list -h
+# verify invalid subcommands properly error
+./cli dir lost -h
 ./cli file edit
 ./cli file edit -h
 ./cli file edit filename

lib/bashly/templates/strings.yml

@@ -26,6 +26,7 @@ version_flag_text: Show version number
 flag_requires_an_argument: "%{name} requires an argument: %{usage}"
 invalid_argument: "invalid argument: %s"
 invalid_flag: "invalid option: %s"
+invalid_command: "invalid command: %s"
 conflicting_flags: "conflicting options: %s cannot be used with %s"
 missing_required_argument: "missing required argument: %{arg}\\nusage: %{usage}"
 missing_required_flag: "missing required flag: %{usage}"

lib/bashly/views/command/command_fallback.gtx

@@ -1,56 +1,42 @@
 = view_marker
 
+> "" )
+>   {{ function_name }}_usage
+>   exit 1
+>   ;;
+>
+> * )
+
 if default_command
-  > "" )
-  >   {{ function_name }}_usage
-  >   exit 1
-  >   ;;
-  > 
-  > * )
   >   action="{{ default_command.name }}"
   >   {{ default_command.function_name }}_parse_requirements "$@"
   >   shift $#
   >   ;;
   >
 
 elsif extensible.is_a? String
-  > "" )
-  >   {{ function_name }}_usage
-  >   exit 1
-  >   ;;
-  > 
-  > * )
   >   if [[ -x "$(command -v "{{ extensible }}")" ]]; then
   >     exec {{ extensible }} "$@"
   >   else
-  >     {{ function_name }}_usage
+  >     printf "{{ strings[:invalid_command] }}\n" "$action"
   >     exit 1
   >   fi
   >
 
 elsif extensible
-  > "" )
-  >   {{ function_name }}_usage
-  >   exit 1
-  >   ;;
-  > 
-  > * )
   >   if [[ -x "$(command -v "{{ function_name }}-$action")" ]]; then
   >     shift
   >     exec "{{ function_name }}-$action" "$@"
   >   else
-  >     {{ function_name }}_usage
+  >     printf "{{ strings[:invalid_command] }}\n" "$action"
   >     exit 1
   >   fi
   >
 
 else
-  > * )
-  >   {{ function_name }}_usage
+  >   printf "{{ strings[:invalid_command] }}\n" "$action"
   >   exit 1
   >   ;;
   >
 
 end
-
-

spec/approvals/examples/commands-nested

@@ -64,6 +64,8 @@ Commands:
   show   Show file contents
   edit   Edit the file
 
++ ./cli dig
+invalid command: dig
 + ./cli dir -h
 cli dir - Directory commands
 
@@ -116,6 +118,8 @@ Arguments:
   PATH
     Directory path
 
++ ./cli dir lost -h
+invalid command: lost
 + ./cli file edit
 missing required argument: PATH
 usage: cli file edit PATH

spec/approvals/fixtures/version-in-subcommands

@@ -6,7 +6,7 @@ created ./cli
 run ./cli --help to test your bash script
 + ./cli --version
 1.2.3
-+ ./cli help
++ ./cli --help
 cli - Sample application
 
 Usage:
@@ -17,6 +17,13 @@ Usage:
 Commands:
   git   Delegate to git
 
+Options:
+  --help, -h
+    Show this help
+
+  --version, -v
+    Show version number
+
 + ./cli git --version
 # this file is located in 'src/git_command.sh'
 # code for 'cli git' goes here

spec/fixtures/workspaces/version-in-subcommands/test.sh

@@ -7,6 +7,6 @@ set -x
 bundle exec bashly generate
 
 ./cli --version
-./cli help
+./cli --help
 ./cli git --version
 ./cli git any "other args" -or --flags