bosh-stemcell 1.2583.0 → 1.2596.0
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.
- data/lib/bosh/stemcell/version.rb +1 -1
- data/lib/monkeypatch/serverspec/backend/exec.rb +18 -18
- metadata +5 -5
@@ -4,28 +4,29 @@ require 'serverspec'
|
|
4
4
|
require 'serverspec/helper/backend'
|
5
5
|
require 'pathname'
|
6
6
|
|
7
|
-
unless Serverspec::VERSION == '0.
|
7
|
+
unless Serverspec::VERSION == '0.15.4'
|
8
8
|
raise "Unexpected Serverspec version #{Serverspec::VERSION}"
|
9
9
|
end
|
10
10
|
|
11
11
|
module SpecInfra::Backend
|
12
12
|
class Exec
|
13
13
|
# ORIGINAL
|
14
|
-
#def run_command(cmd, opts={})
|
15
|
-
#
|
16
|
-
#
|
17
|
-
#
|
18
|
-
#
|
19
|
-
#
|
14
|
+
# def run_command(cmd, opts={})
|
15
|
+
# cmd = build_command(cmd)
|
16
|
+
# cmd = add_pre_command(cmd)
|
17
|
+
# stdout = run_with_no_ruby_environment do
|
18
|
+
# `#{build_command(cmd)} 2>&1`
|
19
|
+
# end
|
20
|
+
# # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
|
21
|
+
# # stdout, stderr, status = Open3.capture3(cmd)
|
20
22
|
#
|
21
|
-
#
|
22
|
-
#
|
23
|
-
#
|
24
|
-
#
|
23
|
+
# if @example
|
24
|
+
# @example.metadata[:command] = cmd
|
25
|
+
# @example.metadata[:stdout] = stdout
|
26
|
+
# end
|
25
27
|
#
|
26
|
-
#
|
27
|
-
#
|
28
|
-
#end
|
28
|
+
# CommandResult.new :stdout => stdout, :exit_status => $?.exitstatus
|
29
|
+
# end
|
29
30
|
#/ORIGINAL
|
30
31
|
|
31
32
|
def run_command(cmd, opts={})
|
@@ -39,8 +40,8 @@ module SpecInfra::Backend
|
|
39
40
|
stdout = get_stdout(chroot_stdout)
|
40
41
|
exit_status = get_exit_status(chroot_stdout)
|
41
42
|
else
|
42
|
-
stdout = `#{cmd} 2>&1`
|
43
|
-
exit_status =
|
43
|
+
stdout = run_with_no_ruby_environment { `#{cmd} 2>&1` }
|
44
|
+
exit_status = $?.exitstatus
|
44
45
|
end
|
45
46
|
# In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
|
46
47
|
#stdout, stderr, status = Open3.capture3(cmd)
|
@@ -50,8 +51,7 @@ module SpecInfra::Backend
|
|
50
51
|
@example.metadata[:stdout] = stdout
|
51
52
|
end
|
52
53
|
|
53
|
-
|
54
|
-
:exit_status => exit_status, :exit_signal => nil }
|
54
|
+
CommandResult.new :stdout => stdout, :exit_status => exit_status
|
55
55
|
end
|
56
56
|
|
57
57
|
attr_accessor :chroot_dir
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bosh-stemcell
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.2596.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-
|
12
|
+
date: 2014-06-07 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bosh_aws_cpi
|
@@ -18,7 +18,7 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 1.
|
21
|
+
version: 1.2596.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -26,7 +26,7 @@ dependencies:
|
|
26
26
|
requirements:
|
27
27
|
- - ~>
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 1.
|
29
|
+
version: 1.2596.0
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: fakefs
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
188
188
|
version: '0'
|
189
189
|
segments:
|
190
190
|
- 0
|
191
|
-
hash:
|
191
|
+
hash: 54102638517344833
|
192
192
|
requirements: []
|
193
193
|
rubyforge_project:
|
194
194
|
rubygems_version: 1.8.23.2
|