Remove root command name from user filenames

examples/config-ini/configly

@@ -272,15 +272,15 @@ config_show() {
 # :command.command_functions
 # :command.function
 configly_set_command() {
- # :src/configly_set_command.sh
+ # :src/set_command.sh
  # Using the standard library (lib/config.sh) to store a value to the config
  config_set "${args[key]}" "${args[value]}"
  echo "saved: ${args[key]} = ${args[value]}"
 }
 
 # :command.function
 configly_get_command() {
- # :src/configly_get_command.sh
+ # :src/get_command.sh
  # Using the standard library (lib/config.sh) to show a value from the config
  config_get "${args[key]}"
 
@@ -291,7 +291,7 @@ configly_get_command() {
 
 # :command.function
 configly_list_command() {
- # :src/configly_list_command.sh
+ # :src/list_command.sh
  # Using the standard library (lib/config.sh) to show the entire config file
  config_show
 }

examples/multiline/multi

@@ -146,17 +146,17 @@ inspect_args() {
 # :command.command_functions
 # :command.function
 multi_multiline_command() {
- # :src/multi_multiline_command.sh
- echo "# this file is located in 'src/multi_multiline_command.sh'"
+ # :src/multiline_command.sh
+ echo "# this file is located in 'src/multiline_command.sh'"
  echo "# code for 'multi multiline' goes here"
  echo "# you can edit it freely and regenerate (it will not be overwritten)"
  inspect_args
 }
 
 # :command.function
 multi_regular_command() {
- # :src/multi_regular_command.sh
- echo "# this file is located in 'src/multi_regular_command.sh'"
+ # :src/regular_command.sh
+ echo "# this file is located in 'src/regular_command.sh'"
  echo "# code for 'multi regular' goes here"
  echo "# you can edit it freely and regenerate (it will not be overwritten)"
  inspect_args

examples/multiline/src/multi_multiline_command.sh → examples/multiline/src/multiline_command.sh

@@ -1,4 +1,4 @@
-echo "# this file is located in 'src/multi_multiline_command.sh'"
+echo "# this file is located in 'src/multiline_command.sh'"
 echo "# code for 'multi multiline' goes here"
 echo "# you can edit it freely and regenerate (it will not be overwritten)"
 inspect_args

examples/multiline/src/multi_regular_command.sh → examples/multiline/src/regular_command.sh

@@ -1,4 +1,4 @@
-echo "# this file is located in 'src/multi_regular_command.sh'"
+echo "# this file is located in 'src/regular_command.sh'"
 echo "# code for 'multi regular' goes here"
 echo "# you can edit it freely and regenerate (it will not be overwritten)"
 inspect_args

examples/subcommands/cli

@@ -161,17 +161,17 @@ inspect_args() {
 # :command.command_functions
 # :command.function
 cli_download_command() {
- # :src/cli_download_command.sh
- echo "# this file is located in 'src/cli_download_command.sh'"
+ # :src/download_command.sh
+ echo "# this file is located in 'src/download_command.sh'"
  echo "# code for 'cli download' goes here"
  echo "# you can edit it freely and regenerate (it will not be overwritten)"
  inspect_args
 }
 
 # :command.function
 cli_upload_command() {
- # :src/cli_upload_command.sh
- echo "# this file is located in 'src/cli_upload_command.sh'"
+ # :src/upload_command.sh
+ echo "# this file is located in 'src/upload_command.sh'"
  echo "# code for 'cli upload' goes here"
  echo "# you can edit it freely and regenerate (it will not be overwritten)"
  inspect_args

examples/subcommands/src/cli_download_command.sh → examples/subcommands/src/download_command.sh

@@ -1,4 +1,4 @@
-echo "# this file is located in 'src/cli_download_command.sh'"
+echo "# this file is located in 'src/download_command.sh'"
 echo "# code for 'cli download' goes here"
 echo "# you can edit it freely and regenerate (it will not be overwritten)"
 inspect_args

examples/subcommands/src/cli_upload_command.sh → examples/subcommands/src/upload_command.sh

@@ -1,4 +1,4 @@
-echo "# this file is located in 'src/cli_upload_command.sh'"
+echo "# this file is located in 'src/upload_command.sh'"
 echo "# code for 'cli upload' goes here"
 echo "# you can edit it freely and regenerate (it will not be overwritten)"
 inspect_args

lib/bashly/commands/generate.rb

@@ -37,7 +37,7 @@ def create_root_command_file
 
  def create_all_command_files
  command.commands.each do |subcommand|
- file = "#{Settings.source_dir}/#{subcommand.full_name.to_underscore}_command.sh"
+ file = "#{Settings.source_dir}/#{subcommand.name.to_underscore}_command.sh"
  content = subcommand.render :default_script
  create_file file, content
  end

lib/bashly/templates/lib/config.sh

@@ -100,7 +100,6 @@ config_show() {
 # done
 #
 config_keys() {
- key=$1
  regex="^(.*)\s*="
 
  config_init
@@ -112,5 +111,5 @@ config_keys() {
  keys+=("$key")
  fi
  done < "$CONFIG_FILE"
- echo ${keys[@]}
+ echo "${keys[@]}"
 }

lib/bashly/views/command/default_script.erb

@@ -1,4 +1,4 @@
-echo "# this file is located in '<%= Settings.source_dir %>/<%= full_name.to_underscore %>_command.sh'"
+echo "# this file is located in '<%= Settings.source_dir %>/<%= name.to_underscore %>_command.sh'"
 echo "# code for '<%= full_name %>' goes here"
 echo "# you can edit it freely and regenerate (it will not be overwritten)"
 inspect_args

lib/bashly/views/command/function.erb

@@ -1,4 +1,4 @@
 # :command.function
 <%= full_name.to_underscore %>_command() {
-<%= load_user_file("#{full_name.to_underscore}_command.sh").indent 2 %>
+<%= load_user_file("#{name.to_underscore}_command.sh").indent 2 %>
 }

spec/approvals/cli/generate/no-args

@@ -1,6 +1,6 @@
 creating user files in spec/tmp/src
 created spec/tmp/src/initialize.sh
-created spec/tmp/src/cli_download_command.sh
-created spec/tmp/src/cli_upload_command.sh
+created spec/tmp/src/download_command.sh
+created spec/tmp/src/upload_command.sh
 created spec/tmp/cli
 run spec/tmp/cli --help to test your bash script

spec/approvals/cli/generate/no-args-skip

@@ -1,6 +1,6 @@
 creating user files in spec/tmp/src
 skipped spec/tmp/src/initialize.sh (exists)
-skipped spec/tmp/src/cli_download_command.sh (exists)
-skipped spec/tmp/src/cli_upload_command.sh (exists)
+skipped spec/tmp/src/download_command.sh (exists)
+skipped spec/tmp/src/upload_command.sh (exists)
 created spec/tmp/cli
 run spec/tmp/cli --help to test your bash script

spec/approvals/examples/config-ini

@@ -1,9 +1,9 @@
 + bashly generate
 creating user files in src
 skipped src/initialize.sh (exists)
-skipped src/configly_set_command.sh (exists)
-skipped src/configly_get_command.sh (exists)
-skipped src/configly_list_command.sh (exists)
+skipped src/set_command.sh (exists)
+skipped src/get_command.sh (exists)
+skipped src/list_command.sh (exists)
 created ./configly
 run ./configly --help to test your bash script
 + ./configly -h

spec/approvals/examples/multiline

@@ -1,8 +1,8 @@
 + bashly generate
 creating user files in src
 created src/initialize.sh
-created src/multi_multiline_command.sh
-created src/multi_regular_command.sh
+created src/multiline_command.sh
+created src/regular_command.sh
 created ./multi
 run ./multi --help to test your bash script
 + ./multi
@@ -50,7 +50,7 @@ Examples:
  multi multiline --flag
 
 + ./multi multiline
-# this file is located in 'src/multi_multiline_command.sh'
+# this file is located in 'src/multiline_command.sh'
 # code for 'multi multiline' goes here
 # you can edit it freely and regenerate (it will not be overwritten)
 args:

spec/approvals/examples/short-flag

@@ -1,12 +1,12 @@
 + bashly generate
 creating user files in src
 created src/initialize.sh
-created src/rush_config_command.sh
-created src/rush_get_command.sh
+created src/config_command.sh
+created src/get_command.sh
 created ./rush
 run ./rush --help to test your bash script
 + ./rush c
-# this file is located in 'src/rush_config_command.sh'
+# this file is located in 'src/config_command.sh'
 # code for 'rush config' goes here
 # you can edit it freely and regenerate (it will not be overwritten)
 args:

spec/approvals/examples/subcommands

@@ -1,8 +1,8 @@
 + bashly generate
 creating user files in src
 created src/initialize.sh
-created src/cli_download_command.sh
-created src/cli_upload_command.sh
+created src/download_command.sh
+created src/upload_command.sh
 created ./cli
 run ./cli --help to test your bash script
 + ./cli
@@ -73,7 +73,7 @@ Examples:
 missing required argument: SOURCE
 usage: cli download SOURCE [TARGET] [options]
 + ./cli download sourcefile targetfile -f
-# this file is located in 'src/cli_download_command.sh'
+# this file is located in 'src/download_command.sh'
 # code for 'cli download' goes here
 # you can edit it freely and regenerate (it will not be overwritten)
 args:
@@ -106,7 +106,7 @@ Arguments:
 + ./cli upload sourcefile
 missing required flag: --user, -u USER
 + ./cli upload sourcefile -u username
-# this file is located in 'src/cli_upload_command.sh'
+# this file is located in 'src/upload_command.sh'
 # code for 'cli upload' goes here
 # you can edit it freely and regenerate (it will not be overwritten)
 args: