engineyard-serverside 2.6.1 → 2.6.2
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.
|
@@ -80,9 +80,9 @@ module EY
|
|
|
80
80
|
elsif pid == -1
|
|
81
81
|
# waitpid encountered an error (as defined in linux waitpid manpage)
|
|
82
82
|
# apparently it can leak through ruby's waitpid abstraction
|
|
83
|
-
raise "Fatal error encountered while waiting for a child process to exit. waitpid2 returned: [#{pid.
|
|
83
|
+
raise "Fatal error encountered while waiting for a child process to exit. waitpid2 returned: [#{pid.inspect}, #{status.inspect}].\nExpected one of children: #{@child_by_pid.keys.inspect}"
|
|
84
84
|
else
|
|
85
|
-
raise "Unknown pid returned from waitpid2 => #{pid.
|
|
85
|
+
raise "Unknown pid returned from waitpid2 => #{pid.inspect}, #{status.inspect}.\nExpected one of children: #{@child_by_pid.keys.inspect}"
|
|
86
86
|
end
|
|
87
87
|
rescue Errno::ECHILD
|
|
88
88
|
possible_children = false
|
|
@@ -99,7 +99,7 @@ describe "the bundler version retrieved from the lockfile" do
|
|
|
99
99
|
end
|
|
100
100
|
|
|
101
101
|
it "uses the default version when we get a pessimistic qualifier and is lower than the default version" do
|
|
102
|
-
expect(subject.fetch_version('~>', '1.
|
|
102
|
+
expect(subject.fetch_version('~>', '1.7.1')).to eq(EY::Serverside::DependencyManager::Bundler.default_version)
|
|
103
103
|
end
|
|
104
104
|
|
|
105
105
|
it "uses the given version when we get a pessimistic qualifier that doesn't match the default version" do
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: engineyard-serverside
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.6.
|
|
4
|
+
version: 2.6.2
|
|
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:
|
|
12
|
+
date: 2015-02-04 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rspec
|
|
@@ -482,7 +482,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
482
482
|
version: '0'
|
|
483
483
|
segments:
|
|
484
484
|
- 0
|
|
485
|
-
hash:
|
|
485
|
+
hash: 1398954121383376069
|
|
486
486
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
487
487
|
none: false
|
|
488
488
|
requirements:
|