minor template normalization

Author: DannyBen

lib/bashly/extensions/string.rb

@@ -5,7 +5,7 @@ def sanitize_for_print
 
   def indent(offset)
     return self unless offset > 0
-    split("\n").indent(offset).join("\n")
+    lines.indent(offset).join
   end
 
   def to_underscore
@@ -24,7 +24,7 @@ def wrap(length = 80)
   end
 
   def lint
-    gsub(/\s+\n/m, "\n\n").lines.reject { |l| l =~ /^\s*##/ }.join ""
+    gsub(/\s+\n/m, "\n\n").lines.reject { |l| l =~ /^\s*##/ }.join
   end
 
   def remove_front_matter

lib/bashly/views/command/long_usage.gtx

@@ -0,0 +1,13 @@
+= view_marker
+
+> if [[ -n $long_usage ]]; then
+>   printf "{{ strings[:options] }}\n"
+>
+= render(:usage_fixed_flags).indent 2
+= render(:usage_flags).indent 2 if flags.any?
+= render(:usage_args).indent 2 if args.any? or catch_all.help
+= render(:usage_environment_variables).indent 2 if environment_variables.any?
+= render(:usage_examples).indent 2 if examples
+= render(:footer).indent 2 if footer
+>
+> fi

lib/bashly/views/command/usage.gtx

@@ -40,19 +40,7 @@ end
 
 = render(:usage_commands).indent 2 if commands.any?
 >
-
->   if [[ -n $long_usage ]]; then
->     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? or catch_all.help
-= render(:usage_environment_variables).indent 4 if environment_variables.any?
-= render(:usage_examples).indent 4 if examples
-= render(:footer).indent 4 if footer
-
-> 
->   fi
+= render(:long_usage).indent 2
 > }
 >
 

lib/bashly/views/command/usage_args.gtx

@@ -15,3 +15,6 @@ if catch_all.help
 > printf "{{ catch_all.help.wrap(76).indent(4).sanitize_for_print }}\n"
 > echo
 end
+
+>
+

lib/bashly/views/command/usage_environment_variables.gtx

@@ -6,3 +6,5 @@
 environment_variables.each do |env_var|
 = env_var.render :usage
 end
+
+>

lib/bashly/views/command/usage_examples.gtx

@@ -1,11 +1,10 @@
 = view_marker
 
 > printf "{{ strings[:examples] }}\n"
-> 
 
 examples.each do |example|
 > printf "{{ example.wrap(78).indent(2).sanitize_for_print }}\n"
 end
 
 > echo
->
+>