kitchen-verifier-serverspec 0.5.0 → 0.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/kitchen/verifier/serverspec.rb +8 -12
- data/lib/kitchen/verifier/serverspec_version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a067d2b127ace39b0d5301184b0b3a733b0892f3
|
|
4
|
+
data.tar.gz: 130ce91416d6c4fed054158aa3c3add6c3632200
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ac02a4ee402582b8c0fce7c197e0d8685f8b48875f880f1ca5aa3c15ca8b47a0d2e2e81bd2e42e1b073413f2e2a9a56d45ae1b18c72342f441ad241c02f97c44
|
|
7
|
+
data.tar.gz: ec8c73f9cb19c7bc1248f6bb4ed26594fbb589e199dffe5213d1eb87d3991fb45b858cd92601733ec752e80c8a9c003dad41c78d2f13a74b9d900ef3cf2f931a
|
|
@@ -98,17 +98,14 @@ module Kitchen
|
|
|
98
98
|
INSTALL
|
|
99
99
|
end
|
|
100
100
|
elsif custom_serverspec_command
|
|
101
|
-
|
|
102
|
-
system custom_serverspec_command
|
|
101
|
+
shellout custom_serverspec_command
|
|
103
102
|
else
|
|
104
103
|
if config[:additional_serverspec_command]
|
|
105
104
|
c = config[:additional_serverspec_command]
|
|
106
|
-
|
|
107
|
-
system c
|
|
105
|
+
shellout c
|
|
108
106
|
end
|
|
109
107
|
c = rspec_commands
|
|
110
|
-
|
|
111
|
-
system c
|
|
108
|
+
shellout c
|
|
112
109
|
end
|
|
113
110
|
end
|
|
114
111
|
|
|
@@ -144,8 +141,7 @@ module Kitchen
|
|
|
144
141
|
info('Installing bundler and serverspec locally on workstation')
|
|
145
142
|
if config[:additional_install_command]
|
|
146
143
|
c = config[:additional_install_command]
|
|
147
|
-
|
|
148
|
-
system c
|
|
144
|
+
shellout c
|
|
149
145
|
end
|
|
150
146
|
install_bundler
|
|
151
147
|
install_serverspec
|
|
@@ -166,7 +162,7 @@ module Kitchen
|
|
|
166
162
|
begin
|
|
167
163
|
require 'bundler'
|
|
168
164
|
rescue LoadError
|
|
169
|
-
|
|
165
|
+
shellout `gem install --no-ri --no-rdoc bundler`
|
|
170
166
|
end
|
|
171
167
|
end
|
|
172
168
|
end
|
|
@@ -213,7 +209,7 @@ module Kitchen
|
|
|
213
209
|
end
|
|
214
210
|
gemfile = config[:gemfile] if config[:gemfile]
|
|
215
211
|
begin
|
|
216
|
-
|
|
212
|
+
shellout "#{bundler_local_cmd} install --gemfile=#{gemfile}"
|
|
217
213
|
rescue
|
|
218
214
|
raise ActionFailed, 'Serverspec install failed'
|
|
219
215
|
end
|
|
@@ -363,7 +359,7 @@ module Kitchen
|
|
|
363
359
|
begin
|
|
364
360
|
cmd.error!
|
|
365
361
|
rescue Mixlib::ShellOut::ShellCommandFailed
|
|
366
|
-
raise ActionFailed, "
|
|
362
|
+
raise ActionFailed, "Command #{command.inspect} failed for #{instance.to_str}"
|
|
367
363
|
end
|
|
368
364
|
end
|
|
369
365
|
|
|
@@ -373,7 +369,7 @@ module Kitchen
|
|
|
373
369
|
env_state[:environment]['KITCHEN_PLATFORM'] = instance.platform.name
|
|
374
370
|
env_state[:environment]['KITCHEN_SUITE'] = instance.suite.name
|
|
375
371
|
state.each_pair do |key, value|
|
|
376
|
-
env_state[:environment]['KITCHEN_' + key.to_s.upcase] = value
|
|
372
|
+
env_state[:environment]['KITCHEN_' + key.to_s.upcase] = value.to_s
|
|
377
373
|
ENV['KITCHEN_' + key.to_s.upcase] = value.to_s
|
|
378
374
|
info("Environment variable #{'KITCHEN_' + key.to_s.upcase} value #{value}")
|
|
379
375
|
end
|