Merge pull request #241 from DannyBen/refactor/templates

Normalize templates

Author: DannyBen

lib/bashly/views/argument/usage.gtx

@@ -1,13 +1,14 @@
 = view_marker
+
 > echo "  {{ label }}"
 > printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
 
 if allowed
-> printf "    {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
+  > printf "    {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
 end
 
 if default
-> printf "    {{ strings[:default] % { value: default } }}\n"
+  > printf "    {{ strings[:default] % { value: default } }}\n"
 end
 
 > echo

lib/bashly/views/argument/validations.gtx

@@ -1,10 +1,11 @@
+if validate
+
 = view_marker
 
-if validate
 > if [[ -n $(validate_{{ validate }} "$1") ]]; then
 >   printf "{{ strings[:validation_error] }}\n" "{{ name.upcase }}" "$(validate_{{ validate }} "$1")"
 >   exit 1
 > fi
 > 
 
-end
+end

lib/bashly/views/command/catch_all_filter.gtx

@@ -1,10 +1,10 @@
-= view_marker
-
 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
+  = view_marker
 
->
+  > if [[ ${#other_args[@]} -eq 0 ]]; then
+  >   printf "{{ strings[:missing_required_argument] % { arg: catch_all.label, usage: usage_string } }}\n"
+  >   exit 1
+  > fi
+  >
+
+end

lib/bashly/views/command/command_fallback.gtx

@@ -1,55 +1,55 @@
 = view_marker
 
 if default_command
-> "" )
->   {{ function_name }}_usage
->   exit 1
->   ;;
-> 
-> * )
->   action="{{ default_command.name }}"
->   {{ default_command.function_name }}_parse_requirements "$@"
->   shift $#
->   ;;
->
+  > "" )
+  >   {{ 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
->     exit 1
->   fi
->
+  > "" )
+  >   {{ function_name }}_usage
+  >   exit 1
+  >   ;;
+  > 
+  > * )
+  >   if [[ -x "$(command -v "{{ extensible }}")" ]]; then
+  >     exec {{ extensible }} "$@"
+  >   else
+  >     {{ function_name }}_usage
+  >     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
->     exit 1
->   fi
->
+  > "" )
+  >   {{ function_name }}_usage
+  >   exit 1
+  >   ;;
+  > 
+  > * )
+  >   if [[ -x "$(command -v "{{ function_name }}-$action")" ]]; then
+  >     shift
+  >     exec "{{ function_name }}-$action" "$@"
+  >   else
+  >     {{ function_name }}_usage
+  >     exit 1
+  >   fi
+  >
 
 else
-> * )
->   {{ function_name }}_usage
->   exit 1
->   ;;
->
+  > * )
+  >   {{ function_name }}_usage
+  >   exit 1
+  >   ;;
+  >
 
 end
 

lib/bashly/views/command/command_filter.gtx

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

lib/bashly/views/command/command_functions.gtx

@@ -1,4 +1,5 @@
 = view_marker
+
 deep_commands.each do |command|
-= command.render :function unless command.commands.any?
+  = command.render :function unless command.commands.any?
 end

lib/bashly/views/command/default_assignments.gtx

@@ -1,11 +1,13 @@
-= view_marker
+if default_args.any? or default_flags.any?
+  = view_marker
 
-default_args.each do |arg|
-> [[ -n ${args[{{ arg.name }}]:-} ]] || args[{{ arg.name }}]="{{ arg.default }}"
-end
+  default_args.each do |arg|
+    > [[ -n ${args[{{ arg.name }}]:-} ]] || args[{{ arg.name }}]="{{ arg.default }}"
+  end
 
-default_flags.each do |flag|
-> [[ -n ${args[{{ flag.long }}]:-} ]] || args[{{ flag.long }}]="{{ flag.default }}"
-end
+  default_flags.each do |flag|
+    > [[ -n ${args[{{ flag.long }}]:-} ]] || args[{{ flag.long }}]="{{ flag.default }}"
+  end
 
->
+  >
+end

lib/bashly/views/command/dependencies_filter.gtx

@@ -1,6 +1,6 @@
-= view_marker
-
 if dependencies
+  = view_marker
+
   dependencies.each do |dependency|
     > if ! [[ -x "$(command -v {{ dependency }})" ]]; then
     >   printf "{{ strings[:missing_dependency] % { dependency: dependency } }}\n"

lib/bashly/views/command/environment_variables_filter.gtx

@@ -1,16 +1,18 @@
-= view_marker
+if default_environment_variables.any? or required_environment_variables.any?
+  = view_marker 
 
-if default_environment_variables.any?
-  default_environment_variables.each do |env_var|
-    > export {{ env_var.name.upcase }}="${<%= env_var.name.upcase %>:-<%= env_var.default %>}"
+  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
-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"
-    >   exit 1
-    > fi
+  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"
+      >   exit 1
+      > fi
+    end
   end
-end
+end

lib/bashly/views/command/footer.gtx

@@ -1,4 +1,5 @@
 = view_marker
+
 > printf "{{ footer.gsub("\n", '\n').gsub('"', '\"') }}\n"
 > echo
 >