Merge pull request #98 from DannyBen/update/erb-shorthand

Refactor erb views to use % shorthand

Author: DannyBen

lib/bashly/views/argument/usage.erb

@@ -1,10 +1,10 @@
 # :argument.usage
 echo "  <%= name.upcase %>"
 printf "<%= help.wrap(76).indent(4).sanitize_for_print %>\n"
-<%- if allowed -%>
+% if allowed
 printf "    <%= strings[:allowed] % { values: allowed.join(', ') } -%>\n"
-<%- end -%>
-<%- if default -%>
+% end
+% if default
 printf "    <%= strings[:default] % { value: default } -%>\n"
-<%- end -%>
+% end
 echo

lib/bashly/views/command/catch_all_filter.erb

@@ -1,7 +1,7 @@
 # :command.catch_all_filter
-<%- if catch_all_required? -%>
+% if catch_all_required?
 if [[ ${#other_args[@]} -eq 0 ]]; then
   printf "<%= strings[:missing_required_argument] % { arg: catch_all_label, usage: usage_string } %>\n"
   exit 1
 fi
-<%- end -%>
+% end

lib/bashly/views/command/command_fallback.erb

@@ -1,5 +1,5 @@
 # :command.command_fallback
-<%- if default_command -%>
+% if default_command
 "" )
   <%= function_name %>_usage
   exit 1
@@ -10,7 +10,7 @@
   <%= default_command.function_name %>_parse_requirements "$@"
   shift $#
   ;;
-<%- elsif extensible.is_a? String -%>
+% elsif extensible.is_a? String
 "" )
   <%= function_name %>_usage
   exit 1
@@ -23,7 +23,7 @@
     <%= function_name %>_usage
     exit 1
   fi
-<%- elsif extensible -%>
+% elsif extensible
 "" )
   <%= function_name %>_usage
   exit 1
@@ -37,9 +37,9 @@
     <%= function_name %>_usage
     exit 1
   fi
-<%- else -%>
+% else
 * )
   <%= function_name %>_usage
   exit 1
   ;;
-<%- end -%>
+% end

lib/bashly/views/command/command_filter.erb

@@ -1,22 +1,22 @@
 # :command.command_filter
-<%- if commands.any? -%>
+% if commands.any?
 action=$1
 
 case $action in
 -* )
   ;;
 
-<%- commands.each do |command| -%>
+% commands.each do |command|
 <%= command.aliases.join " | " %> )
   action="<%= command.name %>"
   shift
   <%= command.function_name %>_parse_requirements "$@"
   shift $#
   ;;    
 
-<%- end -%>
+% end
 <%= render :command_fallback %>
 esac
-<%- else -%>
+% else
 action="<%= action_name %>"
-<%- end -%>
+% end

lib/bashly/views/command/command_functions.erb

@@ -1,4 +1,4 @@
 # :command.command_functions
-<%- deep_commands.each do |command| -%>
+% deep_commands.each do |command|
 <%= command.render :function unless command.commands.any? %>
-<%- end -%>
+% end

lib/bashly/views/command/default_assignments.erb

@@ -1,7 +1,7 @@
 # :command.default_assignments
-<%- default_args.each do |arg| -%>
+% default_args.each do |arg|
 [[ -n ${args[<%= arg.name %>]} ]] || args[<%= arg.name %>]="<%= arg.default %>"
-<%- end -%>
-<%- default_flags.each do |flag| -%>
+% end
+% default_flags.each do |flag|
 [[ -n ${args[<%= flag.long %>]} ]] || args[<%= flag.long %>]="<%= flag.default %>"
-<%- end -%>
+% end

lib/bashly/views/command/dependencies_filter.erb

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

lib/bashly/views/command/environment_variables_filter.erb

@@ -1,14 +1,14 @@
 # :command.environment_variables_filter
-<%- if default_environment_variables.any? -%>
-<%- default_environment_variables.each do |env_var| -%>
+% if default_environment_variables.any?
+% default_environment_variables.each do |env_var|
 export <%= env_var.name.upcase %>="${<%= env_var.name.upcase %>:-<%= env_var.default %>}"
-<%- end -%>
-<%- end -%>
-<%- if required_environment_variables.any? -%>
-<%- required_environment_variables.each do |env_var| -%>
+% end
+% end
+% if required_environment_variables.any?
+% required_environment_variables.each do |env_var|
 if [[ -z "$<%= env_var.name.upcase %>" ]]; then
-  printf "<%= strings[:missing_required_environment_variable] % { var: env_var.name.upcase } -%>\n"
+  printf "<%= strings[:missing_required_environment_variable] % { var: env_var.name.upcase } %>\n"
   exit 1
 fi
-<%- end -%>
-<%- end -%>
+% end
+% end

lib/bashly/views/command/fixed_flags_filter.erb

@@ -1,19 +1,19 @@
 # :command.fixed_flag_filter
 case "$1" in
-<%- if short_flag_exist? "-v" -%>
+% if short_flag_exist? "-v"
 --version )
-<%- else -%>
+% else
 --version | -v )
-<%- end -%>
+% end
   version_command
   exit
   ;;
 
-<%- if short_flag_exist? "-h" -%>
+% if short_flag_exist? "-h"
 --help )
-<%- else -%>
+% else
 --help | -h )
-<%- end -%>
+% end
   long_usage=yes
   <%= function_name %>_usage
   exit

lib/bashly/views/command/parse_requirements.erb

@@ -1,9 +1,9 @@
 # :command.parse_requirements
-<%- if root_command? -%>
+% if root_command?
 parse_requirements() {
-<%- else -%>
+% else
 <%= function_name %>_parse_requirements() {
-<%- end -%>
+% end
 <%= render(:fixed_flags_filter).indent 2 %>
 <%= render(:environment_variables_filter).indent 2 %>
 <%= render(:dependencies_filter).indent 2 %>
@@ -16,6 +16,6 @@ parse_requirements() {
 <%= render(:whitelist_filter).indent 2 %>
 }
 
-<%- commands.each do |command| %>
+% commands.each do |command|
 <%= command.render :parse_requirements %>
-<%- end -%>
+% end