Merge pull request #549 from DannyBen/fix/bash-vars-in-yaml-strings

Update script generation to allow bash variables in some YAML strings

Author: DannyBen

lib/bashly/views/argument/usage.gtx

@@ -4,14 +4,14 @@
 > printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
 
 if allowed
- > printf " {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
+ > printf " %s\n" "{{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
 end
 
 if default
  if default.is_a? Array
- > printf " {{ strings[:default] % { value: default.join(', ') } }}\n"
+ > printf " %s\n" "{{ strings[:default] % { value: default.join(', ') } }}"
  else
- > printf " {{ strings[:default] % { value: default } }}\n"
+ > printf " %s\n" "{{ strings[:default] % { value: default } }}"
  end
 end
 

lib/bashly/views/environment_variable/usage.gtx

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

lib/bashly/views/flag/usage.gtx

@@ -4,23 +4,23 @@
 > printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
 
 if allowed
- > printf " {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
+ > printf " %s\n" "{{ strings[:allowed] % { values: allowed.join(', ') } }}"
 end
 
 if default
  if default.is_a? Array
- > printf " {{ strings[:default] % { value: default.join(', ') } }}\n"
+ > printf " %s\n" "{{ strings[:default] % { value: default.join(', ') } }}"
  else
- > printf " {{ strings[:default] % { value: default } }}\n"
+ > printf " %s\n" "{{ strings[:default] % { value: default } }}"
  end
 end
 
 if needs
- > printf " {{ strings[:needs] % { values: needs.join(', ') } }}\n"
+ > printf " %s\n" "{{ strings[:needs] % { values: needs.join(', ') } }}"
 end
 
 if conflicts
- > printf " {{ strings[:conflicts] % { values: conflicts.join(', ') } }}\n"
+ > printf " %s\n" "{{ strings[:conflicts] % { values: conflicts.join(', ') } }}"
 end
 
 > echo

spec/bashly/integration/bash_spec.rb

@@ -1,5 +1,5 @@
 describe 'bash' do
- context 'when bash version is < 4', :slow do
+ context 'when bash version is < 4', :slow, :noci do
  before { system 'docker pull bash:3 >/dev/null' }
 
  it 'errors gracefully' do

spec/spec_helper.rb

@@ -47,4 +47,5 @@
  config.include SpecMixin
  config.example_status_persistence_file_path = 'spec/status.txt'
  config.strip_ansi_escape = true
+ config.filter_run_excluding :noci if ENV['CI']
 end