Merge pull request #240 from DannyBen/refactor/templates

Switch from ERB to GTX templates

Author: DannyBen

.gitattributes

@@ -1 +1,2 @@
 Runfile linguist-language=Ruby
+*.gtx linguist-language=Ruby

Gemfile

@@ -7,5 +7,6 @@ gem 'rspec_approvals'
 gem 'runfile'
 gem 'runfile-tasks'
 gem 'simplecov'
+gem 'gtx'
 
 gemspec

bashly.gemspec

@@ -17,8 +17,10 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.required_ruby_version = ">= 2.7.0"
 
-  s.add_runtime_dependency 'colsole', '~> 0.7'
   s.add_runtime_dependency 'completely', '~> 0.4.2'
+  s.add_runtime_dependency 'gtx', '~> 0.1.0'
+
+  s.add_runtime_dependency 'colsole', '~> 0.7'
   s.add_runtime_dependency 'mister_bin', '~> 0.7'
   s.add_runtime_dependency 'requires', '~> 0.2'
   s.add_runtime_dependency 'filewatcher', '~> 1.1'

lib/bashly/concerns/renderable.rb

@@ -1,12 +1,9 @@
-require 'erb'
+require 'gtx'
 
 module Bashly
   module Renderable
     def render(view)
-      template = File.read view_path(view)
-      erb = ERB.new(template, trim_mode: '%-')
-      erb.filename = "#{views_subfolder}.#{view}"
-      erb.result binding
+      GTX.render_file view_path(view), context: binding, filename: "#{views_subfolder}.#{view}"
     end
 
     def strings
@@ -37,7 +34,7 @@ def load_user_file(file, placeholder: true)
   private
 
     def view_path(view)
-      "#{self_views_path}/#{view}.erb"
+      "#{self_views_path}/#{view}.gtx"
     end
 
     def self_views_path

lib/bashly/views/README.md

@@ -0,0 +1,6 @@
+# View Tempaltes
+
+These are [GTX](https://github.com/dannyben/gtx) templates.
+
+For syntax highlighting, set up your editor to treat `*.gtx` files as Ruby
+source code.

lib/bashly/views/argument/usage.erb

@@ -0,0 +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"
+end
+
+if default
+> printf "    {{ strings[:default] % { value: default } }}\n"
+end
+
+> echo
+> 

lib/bashly/views/argument/usage.gtx

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