dockly 1.1.1 → 1.2.0

data/dockly.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w{lib}
   gem.version       = Dockly::VERSION
   gem.add_dependency 'clamp', '~> 0.6'
-  gem.add_dependency 'docker-api', '~> 1.6.0'
+  gem.add_dependency 'docker-api', '~> 1.7.2'
   gem.add_dependency 'dockly-util', '~> 0.0.5'
   gem.add_dependency 'excon'
   gem.add_dependency 'fog', '~> 1.18.0'

data/lib/dockly/build_cache.rb

@@ -118,7 +118,7 @@ class Dockly::BuildCache
     @hash_output ||= begin
       resp = ""
       container = image.run(hash_command)
-      container.attach { |chunk| resp += chunk }
+      container.attach { |source,chunk| resp += chunk }
       status = container.wait['StatusCode']
       raise "Hash Command `#{hash_command} failed to run" unless status.zero?
       resp.strip

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/spec/dockly/build_cache_spec.rb

@@ -26,7 +26,7 @@ describe Dockly::BuildCache, :docker do
       it "does not have the file lol" do
         i = subject.execute!
         output = ""
-        i.run('ls').attach { |chunk| output += chunk }
+        i.run('ls').attach { |source,chunk| output += chunk }
         output.should_not include('lol')
       end
     end
@@ -37,7 +37,7 @@ describe Dockly::BuildCache, :docker do
       it "does have the file lol" do
         i = subject.execute!
         output = ""
-        i.run('ls').attach { |chunk| output += chunk }
+        i.run('ls').attach { |source,chunk| output += chunk }
         output.should include('lol')
       end
     end
@@ -52,7 +52,7 @@ describe Dockly::BuildCache, :docker do
       it "does have the file lol" do
         i = subject.run_build
         output = ""
-        i.run('ls').attach { |chunk| output += chunk }
+        i.run('ls').attach { |source,chunk| output += chunk }
         output.should include('lol')
       end
     end

data/spec/dockly/docker_spec.rb

@@ -84,8 +84,8 @@ describe Dockly::Docker do
       subject.build "run touch /lol"
       image = subject.build_image(image)
       container = Docker::Container.create('Image' => image.id, 'Cmd' => ['ls', '-1', '/'])
-      output = container.tap(&:start).attach(:stream => true, :stdout => true, :stderr => true)
-      output.lines.grep(/lol/).should_not be_empty
+      output = container.tap(&:start).attach
+      output[0].grep(/lol/).should_not be_empty
       # TODO: stop resetting the connection, once no longer necessary after attach
       Docker.reset_connection!
       subject.instance_variable_set(:@connection, Docker.connection)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: dockly-util
   requirement: !ruby/object:Gem::Requirement