bashly 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 457aceee843507aa8834ede40e17d0ede1bfdfadea943688d5d74277bdee1446
-  data.tar.gz: 56b445b5d0517045e5deafbd994bce1ef5cf60b8fae536bd522a53d82bf20bf4
+  metadata.gz: 665f22f00a1ebc72e1d6e549cfea6030410a386a9375f39734a00e4091290e89
+  data.tar.gz: 7e2a7b0afb183f1103d7a789fa6955e7520b63505130e764b91b14a3d3e15235
 SHA512:
-  metadata.gz: 00f9df5aa5d43035267d49ec83ccfff4225f8866da6b350ee085d42e968ab04739feacbcf6e85a5d105f6c40ccc504f1be6bc2423a87c96c2a740157f6fd8fd6
-  data.tar.gz: d372d3e369e6d3a3e54a6630285db36251b89149717813248e1370ee9f2ec93ea98d594addc68e1499174e2b48a0c1bc67a9c7c437b7f71abe4fd7e80651c02e
+  metadata.gz: 77d14c4d2ce85b462aea89a4cce5aadef3bf70ca6373bf782b58bedcf17fcd52d2fbe2bfd26569d9c0a03fecea2a1eec8c630eec51003438bdf8fe099b28bf3e
+  data.tar.gz: c6b803f2390630053483ca5507df869c95f0fa50752d3f3cf9595807a5779b01724c99460ee8bf0c5a258959769100199a5876bafe62430189e925d697abd979

data/lib/bashly/commands/add.rb

@@ -18,7 +18,7 @@ module Bashly
       command "colors", "Add standard functions for printing colorful and formatted text to the lib directory."
       command "yaml", "Add standard functions for reading YAML files to the lib directory."
 
-      environment "BASHLY_SOURCE_DIR", "The path to use for creating the configuration file [default: src]"
+      environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
 
       def strings_command
         safe_copy asset("templates/strings.yml"), "#{Settings.source_dir}/bashly-strings.yml"

data/lib/bashly/commands/generate.rb

@@ -8,7 +8,7 @@ module Bashly
 
       option "-f --force", "Overwrite existing files"
 
-      environment "BASHLY_SOURCE_DIR", "The path to use for creating the configuration file [default: src]"
+      environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
       environment "BASHLY_TARGET_DIR", "The path to use for creating the bash script [default: .]"
 
       def run

data/lib/bashly/templates/lib/colors.sh

@@ -10,23 +10,23 @@
 #
 # ---
 
-red() { echo -e "\e[31m$*\e[0m" ; }
-green() { echo -e "\e[32m$*\e[0m" ; }
-yellow() { echo -e "\e[33m$*\e[0m" ; }
-blue() { echo -e "\e[34m$*\e[0m" ; }
-magenta() { echo -e "\e[35m$*\e[0m" ; }
-cyan() { echo -e "\e[36m$*\e[0m" ; }
-bold() { echo -e "\e[1m$*\e[0m" ; }
-underlined() { echo -e "\e[4m$*\e[0m" ; }
-red_bold() { echo -e "\e[1;31m$*\e[0m" ; }
-green_bold() { echo -e "\e[1;32m$*\e[0m" ; }
-yellow_bold() { echo -e "\e[1;33m$*\e[0m" ; }
-blue_bold() { echo -e "\e[1;34m$*\e[0m" ; }
-magenta_bold() { echo -e "\e[1;35m$*\e[0m" ; }
-cyan_bold() { echo -e "\e[1;36m$*\e[0m" ; }
-red_underlined() { echo -e "\e[4;31m$*\e[0m" ; }
-green_underlined() { echo -e "\e[4;32m$*\e[0m" ; }
-yellow_underlined() { echo -e "\e[4;33m$*\e[0m" ; }
-blue_underlined() { echo -e "\e[4;34m$*\e[0m" ; }
-magenta_underlined() { echo -e "\e[4;35m$*\e[0m" ; }
-cyan_underlined() { echo -e "\e[4;36m$*\e[0m" ; }
+red() { printf "\e[31m%b\e[0m\n" "$*"; }
+green() { printf "\e[32m%b\e[0m\n" "$*"; }
+yellow() { printf "\e[33m%b\e[0m\n" "$*"; }
+blue() { printf "\e[34m%b\e[0m\n" "$*"; }
+magenta() { printf "\e[35m%b\e[0m\n" "$*"; }
+cyan() { printf "\e[36m%b\e[0m\n" "$*"; }
+bold() { printf "\e[1m%b\e[0m\n" "$*"; }
+underlined() { printf "\e[4m%b\e[0m\n" "$*"; }
+red_bold() { printf "\e[1;31m%b\e[0m\n" "$*"; }
+green_bold() { printf "\e[1;32m%b\e[0m\n" "$*"; }
+yellow_bold() { printf "\e[1;33m%b\e[0m\n" "$*"; }
+blue_bold() { printf "\e[1;34m%b\e[0m\n" "$*"; }
+magenta_bold() { printf "\e[1;35m%b\e[0m\n" "$*"; }
+cyan_bold() { printf "\e[1;36m%b\e[0m\n" "$*"; }
+red_underlined() { printf "\e[4;31m%b\e[0m\n" "$*"; }
+green_underlined() { printf "\e[4;32m%b\e[0m\n" "$*"; }
+yellow_underlined() { printf "\e[4;33m%b\e[0m\n" "$*"; }
+blue_underlined() { printf "\e[4;34m%b\e[0m\n" "$*"; }
+magenta_underlined() { printf "\e[4;35m%b\e[0m\n" "$*"; }
+cyan_underlined() { printf "\e[4;36m%b\e[0m\n" "$*"; }

data/lib/bashly/templates/lib/config.sh

@@ -63,7 +63,7 @@ config_set() {
     output="$output$key = $value\n"
   fi
 
-  echo -e "$output" > "$CONFIG_FILE"
+  printf "%b\n" "$output" > "$CONFIG_FILE"
 }
 
 # Delete a key from teh config.
@@ -83,7 +83,7 @@ config_del() {
     fi
   done < "$CONFIG_FILE"
 
-  echo -e "$output" > "$CONFIG_FILE"
+  printf "%b\n" "$output" > "$CONFIG_FILE"
 }
 
 # Show the config file

data/lib/bashly/templates/strings.yml

@@ -12,8 +12,8 @@ version_flag_text: Show version number
 
 # Error messages
 flag_requires_an_argument: "%{long} requires an argument: %{usage}"
-invalid_argument: "invalid argument: %{arg}"
-invalid_flag: "invalid option: %{flag}"
+invalid_argument: "invalid argument: %s"
+invalid_flag: "invalid option: %s"
 missing_required_argument: "missing required argument: %{arg}\\nusage: %{usage}"
 missing_required_flag: "missing required flag: %{usage}"
 missing_required_environment_variable: "missing required environment variable: %{var}"

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/bashly/views/argument/usage.erb

@@ -1,4 +1,4 @@
 # :argument.usage
 echo "  <%= name.upcase %>"
-echo -e "<%= help.wrap(76).indent(4).sanitize_for_print %>"
+printf "<%= help.wrap(76).indent(4).sanitize_for_print %>\n"
 echo

data/lib/bashly/views/command/dependencies_filter.erb

@@ -2,7 +2,7 @@
 <%- if dependencies -%>
 <%- dependencies.each do |dependency| -%>
 if ! [[ -x "$(command -v <%= dependency %>)" ]]; then
-  echo -e "<%= strings[:missing_dependency] % { dependency: dependency } -%>"
+  printf "<%= strings[:missing_dependency] % { dependency: dependency } -%>\n"
   exit 1
 fi
 <%- end -%>

data/lib/bashly/views/command/environment_variables_filter.erb

@@ -2,7 +2,7 @@
 <%- if required_environment_variables.any? -%>
 <%- required_environment_variables.each do |env_var| -%>
 if [[ -z "$<%= env_var.name.upcase %>" ]]; then
-  echo -e "<%= strings[:missing_required_environment_variable] % { var: env_var.name.upcase } -%>"
+  printf "<%= strings[:missing_required_environment_variable] % { var: env_var.name.upcase } -%>\n"
   exit 1
 fi
 <%- end -%>

data/lib/bashly/views/command/parse_requirements_case.erb

@@ -8,10 +8,10 @@
 <%- condition = "elif" -%>
 <%- end -%>
 else
-  echo -e "<%= strings[:invalid_argument] % { arg: "$key" } %>"
+  printf "<%= strings[:invalid_argument] %>\n" "$key"
   exit 1
 fi
 <%- else -%>
-echo -e "<%= strings[:invalid_argument] % { arg: "$key" } %>"
+printf "<%= strings[:invalid_argument] %>\n" "$key"
 exit 1
 <%- end -%>

data/lib/bashly/views/command/parse_requirements_while.erb

@@ -8,7 +8,7 @@ while [[ $# -gt 0 ]]; do
   <%- end -%>
 
   -* )
-    echo -e "<%= strings[:invalid_flag] % { flag: "$key" } %>"
+    printf "<%= strings[:invalid_flag] %>\n" "$key"
     exit 1
     ;;
 

data/lib/bashly/views/command/required_args_filter.erb

@@ -4,7 +4,7 @@ if [[ $1 && $1 != -* ]]; then
   args[<%= arg.name %>]=$1
   shift
 else
-  echo -e "<%= strings[:missing_required_argument] % { arg: arg.name.upcase, usage: usage_string } %>"
+  printf "<%= strings[:missing_required_argument] % { arg: arg.name.upcase, usage: usage_string } %>\n"
   exit 1
 fi
 

data/lib/bashly/views/command/required_flags_filter.erb

@@ -4,7 +4,7 @@ argstring="$*"
 <%- end -%>
 <%- required_flags.each do |flag| -%>
 if [[ <%= flag.aliases.map { |a| %Q["$argstring" != *#{a}*] }.join " && " %> ]]; then
-  echo -e "<%= strings[:missing_required_flag] % { usage: flag.usage_string } %>"
+  printf "<%= strings[:missing_required_flag] % { usage: flag.usage_string } %>\n"
   exit 1
 fi
 <%- end %>

data/lib/bashly/views/command/usage.erb

@@ -2,33 +2,33 @@
 <%= function_name %>_usage() {
   if [[ -n $long_usage ]]; then
     <%- if summary == help -%>
-    echo -e "<%= caption_string %>"
+    printf "<%= caption_string %>\n"
     echo 
     <%- else -%>
-    echo -e "<%= full_name %>"
+    printf "<%= full_name %>\n"
     echo 
-    echo -e "<%= help.wrap(78).indent(2).sanitize_for_print %>"
+    printf "<%= help.wrap(78).indent(2).sanitize_for_print %>\n"
     echo 
     <%- end -%>
   else
-    echo -e "<%= caption_string %>"
+    printf "<%= caption_string %>\n"
     echo 
   fi
-  echo -e "<%= strings[:usage] %>"
-  echo -e "  <%= usage_string %>"
+  printf "<%= strings[:usage] %>\n"
+  printf "  <%= usage_string %>\n"
   <%- if commands.any? -%>
-  echo -e "  <%= full_name %> [command] --help | -h"
+  printf "  <%= full_name %> [command] --help | -h\n"
   <%- else -%>
-  echo -e "  <%= full_name %> --help | -h"
+  printf "  <%= full_name %> --help | -h\n"
   <%- end -%>
   <%- if root_command? -%>
-  echo -e "  <%= full_name %> --version"
+  printf "  <%= full_name %> --version\n"
   <%- end -%>
   echo
 <%= render(:usage_commands).indent 2 if commands.any? %>
 
   if [[ -n $long_usage ]]; then
-    echo -e "<%= strings[:options] %>"
+    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? %>

data/lib/bashly/views/command/usage_args.erb

@@ -1,5 +1,5 @@
 # :command.usage_args
-echo -e "<%= strings[:arguments] %>"
+printf "<%= strings[:arguments] %>\n"
 
 <%- args.each do |arg| -%>
 <%= arg.render(:usage) %>

data/lib/bashly/views/command/usage_commands.erb

@@ -1,5 +1,5 @@
 # :command.usage_commands
-echo -e "<%= strings[:commands] %>"
+printf "<%= strings[:commands] %>\n"
 <%- maxlen = command_names.map(&:size).max -%>
 <%- commands.each do |command| -%>
 <%- summary = command.summary -%>

data/lib/bashly/views/command/usage_environment_variables.erb

@@ -1,5 +1,5 @@
 # :command.usage_environment_variables
-echo -e "<%= strings[:environment_variables] %>"
+printf "<%= strings[:environment_variables] %>\n"
 
 <%- environment_variables.each do |env_var| -%>
 <%= env_var.render(:usage) %>

data/lib/bashly/views/command/usage_examples.erb

@@ -1,7 +1,7 @@
 # :command.usage_examples
-echo -e "<%= strings[:examples] %>"
+printf "<%= strings[:examples] %>\n"
 
 <%- examples.each do |example| -%>
-echo -e "<%= example.wrap(78).indent(2).sanitize_for_print %>"
+printf "<%= example.wrap(78).indent(2).sanitize_for_print %>\n"
 <%- end -%>
 echo

data/lib/bashly/views/command/usage_fixed_flags.erb

@@ -1,9 +1,9 @@
 # :command.usage_fixed_flags
 echo "  --help, -h"
-echo -e "    <%= strings[:help_flag_text] %>"
+printf "    <%= strings[:help_flag_text] %>\n"
 echo
 <%- if root_command? -%>
 echo "  --version"
-echo -e "    <%= strings[:version_flag_text] %>"
+printf "    <%= strings[:version_flag_text] %>\n"
 echo
 <%- end -%>

data/lib/bashly/views/environment_variable/usage.erb

@@ -1,4 +1,4 @@
 # :environment_variable.usage
 echo "  <%= usage_string extended: true %>"
-echo -e "<%= help.wrap(76).indent(4).sanitize_for_print %>"
+printf "<%= help.wrap(76).indent(4).sanitize_for_print %>\n"
 echo

data/lib/bashly/views/flag/case.erb

@@ -6,7 +6,7 @@
     shift
     shift
   else
-    echo -e "<%= strings[:flag_requires_an_argument] % { long: long, usage: usage_string } %>"
+    printf "<%= strings[:flag_requires_an_argument] % { long: long, usage: usage_string } %>\n"
     exit 1
   fi
   <%- else -%>

data/lib/bashly/views/flag/usage.erb

@@ -1,4 +1,4 @@
 # :flag.usage
 echo "  <%= usage_string extended: true %>"
-echo -e "<%= help.wrap(76).indent(4).sanitize_for_print %>"
+printf "<%= help.wrap(76).indent(4).sanitize_for_print %>\n"
 echo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole