dockly 1.1.1 → 1.2.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/dockly.gemspec +1 -1
- data/lib/dockly/build_cache.rb +1 -1
- data/lib/dockly/version.rb +1 -1
- data/spec/dockly/build_cache_spec.rb +3 -3
- data/spec/dockly/docker_spec.rb +2 -2
- metadata +3 -3
data/dockly.gemspec
CHANGED
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
|
|
15
15
|
gem.require_paths = %w{lib}
|
16
16
|
gem.version = Dockly::VERSION
|
17
17
|
gem.add_dependency 'clamp', '~> 0.6'
|
18
|
-
gem.add_dependency 'docker-api', '~> 1.
|
18
|
+
gem.add_dependency 'docker-api', '~> 1.7.2'
|
19
19
|
gem.add_dependency 'dockly-util', '~> 0.0.5'
|
20
20
|
gem.add_dependency 'excon'
|
21
21
|
gem.add_dependency 'fog', '~> 1.18.0'
|
data/lib/dockly/build_cache.rb
CHANGED
@@ -118,7 +118,7 @@ class Dockly::BuildCache
|
|
118
118
|
@hash_output ||= begin
|
119
119
|
resp = ""
|
120
120
|
container = image.run(hash_command)
|
121
|
-
container.attach { |chunk| resp += chunk }
|
121
|
+
container.attach { |source,chunk| resp += chunk }
|
122
122
|
status = container.wait['StatusCode']
|
123
123
|
raise "Hash Command `#{hash_command} failed to run" unless status.zero?
|
124
124
|
resp.strip
|
data/lib/dockly/version.rb
CHANGED
@@ -26,7 +26,7 @@ describe Dockly::BuildCache, :docker do
|
|
26
26
|
it "does not have the file lol" do
|
27
27
|
i = subject.execute!
|
28
28
|
output = ""
|
29
|
-
i.run('ls').attach { |chunk| output += chunk }
|
29
|
+
i.run('ls').attach { |source,chunk| output += chunk }
|
30
30
|
output.should_not include('lol')
|
31
31
|
end
|
32
32
|
end
|
@@ -37,7 +37,7 @@ describe Dockly::BuildCache, :docker do
|
|
37
37
|
it "does have the file lol" do
|
38
38
|
i = subject.execute!
|
39
39
|
output = ""
|
40
|
-
i.run('ls').attach { |chunk| output += chunk }
|
40
|
+
i.run('ls').attach { |source,chunk| output += chunk }
|
41
41
|
output.should include('lol')
|
42
42
|
end
|
43
43
|
end
|
@@ -52,7 +52,7 @@ describe Dockly::BuildCache, :docker do
|
|
52
52
|
it "does have the file lol" do
|
53
53
|
i = subject.run_build
|
54
54
|
output = ""
|
55
|
-
i.run('ls').attach { |chunk| output += chunk }
|
55
|
+
i.run('ls').attach { |source,chunk| output += chunk }
|
56
56
|
output.should include('lol')
|
57
57
|
end
|
58
58
|
end
|
data/spec/dockly/docker_spec.rb
CHANGED
@@ -84,8 +84,8 @@ describe Dockly::Docker do
|
|
84
84
|
subject.build "run touch /lol"
|
85
85
|
image = subject.build_image(image)
|
86
86
|
container = Docker::Container.create('Image' => image.id, 'Cmd' => ['ls', '-1', '/'])
|
87
|
-
output = container.tap(&:start).attach
|
88
|
-
output.
|
87
|
+
output = container.tap(&:start).attach
|
88
|
+
output[0].grep(/lol/).should_not be_empty
|
89
89
|
# TODO: stop resetting the connection, once no longer necessary after attach
|
90
90
|
Docker.reset_connection!
|
91
91
|
subject.instance_variable_set(:@connection, Docker.connection)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dockly
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.2.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -34,7 +34,7 @@ dependencies:
|
|
34
34
|
requirements:
|
35
35
|
- - ~>
|
36
36
|
- !ruby/object:Gem::Version
|
37
|
-
version: 1.
|
37
|
+
version: 1.7.2
|
38
38
|
type: :runtime
|
39
39
|
prerelease: false
|
40
40
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -42,7 +42,7 @@ dependencies:
|
|
42
42
|
requirements:
|
43
43
|
- - ~>
|
44
44
|
- !ruby/object:Gem::Version
|
45
|
-
version: 1.
|
45
|
+
version: 1.7.2
|
46
46
|
- !ruby/object:Gem::Dependency
|
47
47
|
name: dockly-util
|
48
48
|
requirement: !ruby/object:Gem::Requirement
|