Skip to content

Commit 1b104a5

Browse files
authored
Merge pull request #549 from DannyBen/fix/bash-vars-in-yaml-strings
Update script generation to allow bash variables in some YAML strings
2 parents 6f3ed4a + 60c8044 commit 1b104a5

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

lib/bashly/views/argument/usage.gtx

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
> printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
55

66
if allowed
7-
> printf " {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
7+
> printf " %s\n" "{{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
88
end
99

1010
if default
1111
if default.is_a? Array
12-
> printf " {{ strings[:default] % { value: default.join(', ') } }}\n"
12+
> printf " %s\n" "{{ strings[:default] % { value: default.join(', ') } }}"
1313
else
14-
> printf " {{ strings[:default] % { value: default } }}\n"
14+
> printf " %s\n" "{{ strings[:default] % { value: default } }}"
1515
end
1616
end
1717

lib/bashly/views/environment_variable/usage.gtx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
> printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
55

66
if allowed
7-
> printf " {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
7+
> printf " %s\n" "{{ strings[:allowed] % { values: allowed.join(', ') } }}"
88
end
99

1010
if default
11-
> printf " {{ strings[:default] % { value: default } }}\n"
11+
> printf " %s\n" "{{ strings[:default] % { value: default } }}"
1212
end
1313

1414
> echo

lib/bashly/views/flag/usage.gtx

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
> printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
55

66
if allowed
7-
> printf " {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
7+
> printf " %s\n" "{{ strings[:allowed] % { values: allowed.join(', ') } }}"
88
end
99

1010
if default
1111
if default.is_a? Array
12-
> printf " {{ strings[:default] % { value: default.join(', ') } }}\n"
12+
> printf " %s\n" "{{ strings[:default] % { value: default.join(', ') } }}"
1313
else
14-
> printf " {{ strings[:default] % { value: default } }}\n"
14+
> printf " %s\n" "{{ strings[:default] % { value: default } }}"
1515
end
1616
end
1717

1818
if needs
19-
> printf " {{ strings[:needs] % { values: needs.join(', ') } }}\n"
19+
> printf " %s\n" "{{ strings[:needs] % { values: needs.join(', ') } }}"
2020
end
2121

2222
if conflicts
23-
> printf " {{ strings[:conflicts] % { values: conflicts.join(', ') } }}\n"
23+
> printf " %s\n" "{{ strings[:conflicts] % { values: conflicts.join(', ') } }}"
2424
end
2525

2626
> echo

spec/bashly/integration/bash_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
describe 'bash' do
2-
context 'when bash version is < 4', :slow do
2+
context 'when bash version is < 4', :slow, :noci do
33
before { system 'docker pull bash:3 >/dev/null' }
44

55
it 'errors gracefully' do

spec/spec_helper.rb

+1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@
4747
config.include SpecMixin
4848
config.example_status_persistence_file_path = 'spec/status.txt'
4949
config.strip_ansi_escape = true
50+
config.filter_run_excluding :noci if ENV['CI']
5051
end

0 commit comments

Comments
 (0)