Fix #74

Author: DannyBen

lib/bashly/views/command/usage.erb

@@ -37,7 +37,7 @@
     printf "<%= strings[:options] %>\n"
 <%= render(:usage_fixed_flags).indent 4 %>
 <%= render(:usage_flags).indent 4 if flags.any? %>
-<%= render(:usage_args).indent 4 if args.any? %>
+<%= render(:usage_args).indent 4 if args.any? or catch_all_help %>
 <%= render(:usage_environment_variables).indent 4 if environment_variables.any? %>
 <%= render(:usage_examples).indent 4 if examples %>
 

lib/bashly/views/command/usage_args.erb

@@ -1,12 +1,14 @@
 # :command.usage_args
 printf "<%= strings[:arguments] %>\n"
+<%- if args.any? -%>
 
 <%- args.each do |arg| -%>
 <%= arg.render(:usage) %>
 <%- end -%>
-
+<%- end -%>
 <%- if catch_all_help -%>
+
 echo "  <%= catch_all_label %>"
 printf "<%= catch_all_help.wrap(76).indent(4).sanitize_for_print %>\n"
 echo
-<%- end -%>
+<%- end -%>

spec/approvals/examples/catch-all-no-args

@@ -0,0 +1,29 @@
++ bashly generate
+creating user files in src
+created src/initialize.sh
+created src/root_command.sh
+created ./download
+run ./download --help to test your bash script
++ ./download
+# this file is located in 'src/root_command.sh'
+# you can edit it freely and regenerate (it will not be overwritten)
+args: none
++ ./download --help
+download - Download something
+
+Usage:
+  download [URLS...]
+  download --help | -h
+  download --version | -v
+
+Options:
+  --help, -h
+    Show this help
+
+  --version, -v
+    Show version number
+
+Arguments:
+  URLS...
+    List of URLs
+

spec/fixtures/workspaces/catch-all-no-args/.gitignore

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

spec/fixtures/workspaces/catch-all-no-args/README.md

@@ -0,0 +1,3 @@
+This fixture tests that catch all with help is displayed even when the
+configuration file does not have any args defined.
+Reference issue: https://github.com/DannyBen/bashly/issues/74

spec/fixtures/workspaces/catch-all-no-args/src/bashly.yml

@@ -0,0 +1,7 @@
+name: download
+help: Download something
+version: 0.1.0
+
+catch_all:
+  label: "URLs"
+  help: "List of URLs"

spec/fixtures/workspaces/catch-all-no-args/test.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# This fixture tests that catch all with help is displayed even when the
+# configuration file does not have any args defined.
+# It is executed as part of the Runfile examples test
+# Reference issue: https://github.com/DannyBen/bashly/issues/74
+
+rm -f ./src/*.sh
+rm -f ./download
+
+set -x
+
+bashly generate
+
+./download
+./download --help