docker-api 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33761a492e5f028a4763c43ed5817e60528b322d
-  data.tar.gz: fb6aecb4c3868e6687feef8804812774bc223231
+  metadata.gz: c825c19470641dddbfb22ffd3d9ea6e18d460ee5
+  data.tar.gz: bb27f66ef99c3f67bc6d6ccf5929131cbc0e60b7
 SHA512:
-  metadata.gz: a63b8c76795698e418404d37e059932f48d9e37fee3b28cba3e779e537564058426ad5afe9d84f8398385514fae60fddfd1ad4daa2313c5d0a71ef74fca62ceb
-  data.tar.gz: da843f4c78637af6d8b74976b66ff4a4a5b9df6fddb3fe28a20ead6e19e4bb691694583398300ea77a59e7ecc075931bf33b5de437488cc79c4b94ef34d451c3
+  metadata.gz: 926b20f1d2d77d45e374acfe49a323e15c75304da91b2460ddad4d748c77724196381c8273b6aca45741d86a6519da3ba64d393db72bb8dbfcd631c0ebd558f0
+  data.tar.gz: 7cc64f84f7ef5ac175322e2f999b9d77cd0a35d2bedb595109cd1aabc198bd100601eaca8fc41dc3369ca86bdf32d61734691c45bb041460bff2a05e9c6481e1

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
     - 1.9.2
     - 1.9.3
     - 2.0.0
+    - 2.1.1
 script: bundle exec rake

data/docker-api.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'json'
   gem.add_dependency 'archive-tar-minitar'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'vcr', '>= 2.7.0'

data/lib/docker/image.rb

@@ -195,7 +195,7 @@ class Docker::Image
     ensure
       unless tar.nil?
         tar.close
-        FileUtils.rm(tar.path)
+        FileUtils.rm(tar.path, force: true)
       end
     end
   end

data/lib/docker/util.rb

@@ -35,7 +35,8 @@ module Docker::Util
 
   def create_dir_tar(directory)
     cwd = FileUtils.pwd
-    tempfile = Tempfile.new('out')
+    tempfile_name = Dir::Tmpname.create('out') {}
+    tempfile = File.open(tempfile_name, 'w+')
     FileUtils.cd(directory)
     Archive::Tar::Minitar.pack('.', tempfile)
     File.new(tempfile.path, 'r')

data/lib/docker/version.rb

@@ -1,6 +1,6 @@
 module Docker
   # The version of the docker-api gem.
-  VERSION = '1.11.0'
+  VERSION = '1.11.1'
 
   # The version of the compatible Docker remote API.
   API_VERSION = '1.10'

data/spec/docker/connection_spec.rb

@@ -36,8 +36,8 @@ describe Docker::Connection do
 
       context 'and the second argument is a Hash' do
         it 'sets the url and options' do
-          subject.url.should == url
-          subject.options.should == options
+          expect(subject.url).to eq url
+          expect(subject.options).to eq options
         end
       end
     end
@@ -70,19 +70,21 @@ describe Docker::Connection do
     }
 
     before do
-      subject.stub(:resource).and_return(resource)
-      resource.should_receive(:request).with(expected_hash).and_return(response)
+      allow(subject).to receive(:resource).and_return(resource)
+      expect(resource).to receive(:request).
+        with(expected_hash).
+        and_return(response)
     end
 
     it 'sends #request to #resource with the compiled params' do
-      subject.request(method, path, query, options).should == body
+      expect(subject.request(method, path, query, options)).to eq body
     end
   end
 
   [:get, :put, :post, :delete].each do |method|
     describe "##{method}" do
       it 'is delegated to #request' do
-        subject.should_receive(:request).with(method)
+        expect(subject).to receive(:request).with(method)
         subject.public_send(method)
       end
     end
@@ -97,7 +99,7 @@ describe Docker::Connection do
     subject { described_class.new(url, options) }
 
     it 'returns a pretty version with the url and port' do
-      subject.to_s.should == expected_string
+      expect(subject.to_s).to eq expected_string
     end
   end
 end

data/spec/docker/container_spec.rb

@@ -28,8 +28,8 @@ describe Docker::Container do
     let(:description) { subject.json }
 
     it 'returns the description as a Hash', :vcr do
-      description.should be_a(Hash)
-      description['ID'].should start_with(subject.id)
+      expect(description).to be_a Hash
+      expect(description['ID']).to start_with(subject.id)
     end
   end
 
@@ -39,16 +39,16 @@ describe Docker::Container do
     context "when not selecting any stream" do
       let(:non_destination) { subject.logs }
       it 'returns the error message', :vcr do
-        non_destination.should be_a(String)
-        non_destination.should be =~ /You must choose at least one/
+        expect(non_destination).to be_a String
+        expect(non_destination).to match /You must choose at least one/
       end
     end
 
     context "when selecting stdout" do
       let(:stdout) { subject.logs(stdout: 1) }
       it 'returns blank logs', :vcr do
-        stdout.should be_a(String)
-        stdout.should eq ""
+        expect(stdout).to be_a String
+        expect(stdout).to eq ""
       end
     end
   end
@@ -62,7 +62,7 @@ describe Docker::Container do
       let(:opts) { {"name" => "bob"} }
 
       it 'should have name set to bob', :vcr do
-        subject.json["Name"].should == "/bob"
+        expect(subject.json["Name"]).to eq "/bob"
       end
     end
   end
@@ -76,7 +76,7 @@ describe Docker::Container do
     before { subject.tap(&:start).tap(&:wait) }
 
     it 'returns the changes as an array', :vcr do
-      changes.should == [
+      expect(changes).to eq [
         {
           "Path" => "/dev",
           "Kind" => 0
@@ -102,9 +102,9 @@ describe Docker::Container do
     let!(:container) { image.run('/while') }
 
     it 'returns the top commands as an Array', :vcr do
-      top.should be_a Array
-      top.should_not be_empty
-      top.first.keys.should == %w(UID PID PPID C STIME TTY TIME CMD)
+      expect(top).to be_a Array
+      expect(top).to_not be_empty
+      expect(top.first.keys).to eq %w(UID PID PPID C STIME TTY TIME CMD)
     end
   end
 
@@ -117,7 +117,7 @@ describe Docker::Container do
 
     context 'when the file does not exist' do
       it 'raises an error', :vcr do
-        pending 'Docker no longer returns a 500 when the file does not exist'
+        skip 'Docker no longer returns a 500 when the file does not exist'
         expect { subject.copy('/lol/not/a/real/file') { |chunk| puts chunk } }
             .to raise_error
       end
@@ -137,7 +137,7 @@ describe Docker::Container do
         chunks = []
         subject.copy('/etc/vim') { |chunk| chunks << chunk }
         chunks = chunks.join("\n")
-        %w[vimrc vimrc.tiny].should be_all { |file| chunks.include?(file) }
+        expect(%w[vimrc vimrc.tiny]).to be_all { |file| chunks.include?(file) }
       end
     end
   end
@@ -155,7 +155,7 @@ describe Docker::Container do
       subject.export do |chunk|
         first ||= chunk
       end
-      first[257..261].should == "ustar" # Make sure the export is a tar.
+      expect(first[257..261]).to eq "ustar" # Make sure the export is a tar.
     end
   end
 
@@ -198,7 +198,7 @@ describe Docker::Container do
     # VCR, so it is currently pending until a good way to test it without
     # a running Docker daemon is discovered
     it 'yields the output' do
-      pending 'HTTP socket hijacking not compatible with VCR'
+      skip 'HTTP socket hijacking not compatible with VCR'
       container = described_class.create(
         'Cmd'       => %w[cat],
         'Image'     => 'base',
@@ -226,8 +226,8 @@ describe Docker::Container do
     before { subject.start('Binds' => ["/tmp:/foo"]) }
 
     it 'starts the container', :vcr do
-      all.map(&:id).should be_any { |id| id.start_with?(subject.id) }
-      subject.wait(10)['StatusCode'].should be_zero
+      expect(all.map(&:id)).to be_any { |id| id.start_with?(subject.id) }
+      expect(subject.wait(10)['StatusCode']).to be_zero
     end
   end
 
@@ -237,10 +237,10 @@ describe Docker::Container do
     before { subject.tap(&:start).stop('timeout' => '10') }
 
     it 'stops the container', :vcr do
-      described_class.all(:all => true).map(&:id).should be_any { |id|
+      expect(described_class.all(:all => true).map(&:id)).to be_any { |id|
         id.start_with?(subject.id)
       }
-      described_class.all.map(&:id).should be_none { |id|
+      expect(described_class.all.map(&:id)).to be_none { |id|
         id.start_with?(subject.id)
       }
     end
@@ -251,10 +251,10 @@ describe Docker::Container do
 
     it 'kills the container', :vcr do
       subject.kill
-      described_class.all.map(&:id).should be_none { |id|
+      expect(described_class.all.map(&:id)).to be_none { |id|
         id.start_with?(subject.id)
       }
-      described_class.all(:all => true).map(&:id).should be_any { |id|
+      expect(described_class.all(:all => true).map(&:id)).to be_any { |id|
         id.start_with?(subject.id)
       }
     end
@@ -265,7 +265,7 @@ describe Docker::Container do
 
     it 'deletes the container', :vcr do
       subject.delete(:force => true)
-      described_class.all.map(&:id).should be_none { |id|
+      expect(described_class.all.map(&:id)).to be_none { |id|
         id.start_with?(subject.id)
       }
     end
@@ -277,15 +277,15 @@ describe Docker::Container do
     before { subject.start }
 
     it 'restarts the container', :vcr do
-      described_class.all.map(&:id).should be_any { |id|
+      expect(described_class.all.map(&:id)).to be_any { |id|
         id.start_with?(subject.id)
       }
       subject.stop
-      described_class.all.map(&:id).should be_none { |id|
+      expect(described_class.all.map(&:id)).to be_none { |id|
         id.start_with?(subject.id)
       }
       subject.restart('timeout' => '10')
-      described_class.all.map(&:id).should be_any { |id|
+      expect(described_class.all.map(&:id)).to be_any { |id|
         id.start_with?(subject.id)
       }
     end
@@ -298,7 +298,7 @@ describe Docker::Container do
     before { subject.start }
 
     it 'waits for the command to finish', :vcr do
-      subject.wait['StatusCode'].should_not be_zero
+      expect(subject.wait['StatusCode']).to_not be_zero
     end
 
     context 'when an argument is given' do
@@ -306,12 +306,12 @@ describe Docker::Container do
                                        'Image' => 'base') }
 
       it 'sets the :read_timeout to that amount of time', :vcr do
-        subject.wait(6)['StatusCode'].should be_zero
+        expect(subject.wait(6)['StatusCode']).to be_zero
       end
 
       context 'and a command runs for too long' do
         it 'raises a ServerError', :vcr do
-          pending "VCR doesn't like to record errors"
+          skip "VCR doesn't like to record errors"
           expect { subject.wait(4) }.to raise_error(Docker::Error::TimeoutError)
         end
       end
@@ -335,7 +335,7 @@ describe Docker::Container do
                                        'Image' => 'base') }
 
       it 'creates a new container to run the specified command', :vcr do
-        run_command.wait['StatusCode'].should be_zero
+        expect(run_command.wait['StatusCode']).to be_zero
       end
     end
   end
@@ -347,14 +347,14 @@ describe Docker::Container do
     before { subject.start }
 
     it 'creates a new Image from the  Container\'s changes', :vcr do
-      image.should be_a Docker::Image
-      image.id.should_not be_nil
+      expect(image).to be_a Docker::Image
+      expect(image.id).to_not be_nil
     end
 
     context 'if run is passed, it saves the command in the image', :vcr do
       let(:image) { subject.commit }
       it 'saves the command' do
-        pending 'This is no longer working in v0.8'
+        skip 'This is no longer working in v0.8'
         expect(image.run('pwd').attach).to eql [["/\n"],[]]
       end
     end
@@ -405,9 +405,9 @@ describe Docker::Container do
         let(:container) { subject.create(options) }
 
         it 'sets the id', :vcr do
-          container.should be_a Docker::Container
-          container.id.should_not be_nil
-          container.connection.should_not be_nil
+          expect(container).to be_a Docker::Container
+          expect(container.id).to_not be_nil
+          expect(container.connection).to_not be_nil
         end
       end
     end
@@ -436,7 +436,7 @@ describe Docker::Container do
       let(:container) { subject.create('Cmd' => ['ls'], 'Image' => 'base') }
 
       it 'materializes the Container into a Docker::Container', :vcr do
-        subject.get(container.id).should be_a(Docker::Container)
+        expect(subject.get(container.id)).to be_a Docker::Container
       end
     end
 
@@ -465,10 +465,10 @@ describe Docker::Container do
       before { described_class.create('Cmd' => ['ls'], 'Image' => 'base') }
 
       it 'materializes each Container into a Docker::Container', :vcr do
-        subject.all(:all => true).should be_all { |container|
+        expect(subject.all(:all => true)).to be_all { |container|
           container.is_a?(Docker::Container)
         }
-        subject.all(:all => true).length.should_not be_zero
+        expect(subject.all(:all => true).length).to_not be_zero
       end
     end
   end

data/spec/docker/event_spec.rb

@@ -21,8 +21,8 @@ describe Docker::Event do
 
   describe ".stream" do
     it 'receives three events', :vcr do
-      pending "get VCR to record events that break"
-      Docker::Event.should_receive(:new_event).exactly(3).times
+      skip "get VCR to record events that break"
+      expect(Docker::Event).to receive(:new_event).exactly(3).times
         .and_call_original
       fork do
         sleep 1
@@ -41,8 +41,8 @@ describe Docker::Event do
     let!(:time) { Time.now.to_i }
 
     it 'receives three events', :vcr do
-      pending "get VCR to record events that break"
-      Docker::Event.should_receive(:new_event).exactly(3).times
+      skip "get VCR to record events that break"
+      expect(Docker::Event).to receive(:new_event).exactly(3).times
         .and_call_original
       fork do
         sleep 1

data/spec/docker/image_spec.rb

@@ -26,7 +26,7 @@ describe Docker::Image do
 
     it 'removes the Image', :vcr do
       subject.remove(:force => true)
-      Docker::Image.all.map(&:id).should_not include(id)
+      expect(Docker::Image.all.map(&:id)).to_not include(id)
     end
   end
 
@@ -159,7 +159,7 @@ describe Docker::Image do
 
     it 'tags the image with the repo name', :vcr do
       subject.tag(:repo => :base2, :force => true)
-      subject.info['RepoTags'].should include('base2:latest')
+      expect(subject.info['RepoTags']).to include 'base2:latest'
     end
   end
 
@@ -168,8 +168,8 @@ describe Docker::Image do
     let(:json) { subject.json }
 
     it 'returns additional information about image image', :vcr do
-      json.should be_a Hash
-      json.length.should_not be_zero
+      expect(json).to be_a Hash
+      expect(json.length).to_not be_zero
     end
   end
 
@@ -178,9 +178,9 @@ describe Docker::Image do
     let(:history) { subject.history }
 
     it 'returns the history of the Image', :vcr do
-      history.should be_a Array
-      history.length.should_not be_zero
-      history.should be_all { |elem| elem.is_a? Hash }
+      expect(history).to be_a Array
+      expect(history.length).to_not be_zero
+      expect(history).to be_all { |elem| elem.is_a? Hash }
     end
   end
 
@@ -218,7 +218,7 @@ describe Docker::Image do
         subject { container.commit('run' => {"Cmd" => %w[pwd]}) }
 
         it 'should normally show result if image has Cmd configured' do
-          pending 'The docs say this should work, but it clearly does not'
+          skip 'The docs say this should work, but it clearly does not'
           expect(output).to eql [["/\n"],[]]
         end
       end
@@ -231,7 +231,7 @@ describe Docker::Image do
     it 'updates the @info hash', :vcr do
       size = image.info.size
       image.refresh!
-      image.info.size.should be > size
+      expect(image.info.size).to be > size
     end
   end
 
@@ -251,12 +251,12 @@ describe Docker::Image do
       before { Docker.creds = creds }
 
       it 'sets the id and sends Docker.creds', :vcr do
-        image.should be_a Docker::Image
-        image.id.should match(/\A[a-fA-F0-9]+\Z/)
-        image.id.should_not include('base')
-        image.id.should_not be_nil
-        image.id.should_not be_empty
-        image.info[:headers].keys.should include('X-Registry-Auth')
+        expect(image).to be_a Docker::Image
+        expect(image.id).to match(/\A[a-fA-F0-9]+\Z/)
+        expect(image.id).to_not include('base')
+        expect(image.id).to_not be_nil
+        expect(image.id).to_not be_empty
+        expect(image.info[:headers].keys).to include 'X-Registry-Auth'
       end
     end
   end
@@ -308,12 +308,14 @@ describe Docker::Image do
       let(:file) { 'spec/fixtures/export.tar' }
       let(:body) { StringIO.new }
 
-      before { Docker::Image.stub(:open).with(file).and_yield(body) }
+      before do
+        allow(Docker::Image).to receive(:open).with(file).and_yield(body)
+      end
 
       it 'creates the Image', :vcr do
         import = subject.import(file)
-        import.should be_a Docker::Image
-        import.id.should_not be_nil
+        expect(import).to be_a Docker::Image
+        expect(import.id).to_not be_nil
       end
     end
 
@@ -330,8 +332,8 @@ describe Docker::Image do
 
         it 'returns an Image', :vcr do
           image = subject.import(uri)
-          image.should be_a Docker::Image
-          image.id.should_not be_nil
+          expect(image).to be_a Docker::Image
+          expect(image.id).to_not be_nil
         end
       end
     end
@@ -345,18 +347,18 @@ describe Docker::Image do
 
     it 'materializes each Image into a Docker::Image', :vcr do
       images.each do |image|
-        image.should_not be_nil
+        expect(image).to_not be_nil
 
-        image.should be_a(described_class)
+        expect(image).to be_a(described_class)
 
-        image.id.should_not be_nil
+        expect(image.id).to_not be_nil
 
         %w(Created Size VirtualSize).each do |key|
-          image.info.should have_key(key)
+          expect(image.info).to have_key(key)
         end
       end
 
-      images.length.should_not be_zero
+      expect(images.length).to_not be_zero
     end
   end
 
@@ -364,7 +366,7 @@ describe Docker::Image do
     subject { described_class }
 
     it 'materializes each Image into a Docker::Image', :vcr do
-      subject.search('term' => 'sshd').should be_all { |image|
+      expect(subject.search('term' => 'sshd')).to be_all { |image|
         !image.id.nil? && image.is_a?(described_class)
       }
     end
@@ -471,7 +473,7 @@ describe Docker::Image do
         before { Docker.creds = creds }
 
         it 'sends Docker.creds', :vcr do
-          image.info[:headers].keys.should include('X-Registry-Auth')
+          expect(image.info[:headers].keys).to include('X-Registry-Auth')
         end
       end
     end

data/spec/docker/util_spec.rb

@@ -36,7 +36,7 @@ describe Docker::Util do
       let(:arg) { '{"yolo":"swag"}' }
 
       it 'parses the JSON into a Hash' do
-        subject.should == { 'yolo' => 'swag' }
+        expect(subject).to eq 'yolo' => 'swag'
       end
     end
   end
@@ -46,7 +46,7 @@ describe Docker::Util do
     subject { Docker::Util.fix_json(response) }
 
     it 'fixes the "JSON" response that Docker returns' do
-      subject.should == [
+      expect(subject).to eq [
         {
           'this' => 'is'
         },
@@ -57,6 +57,22 @@ describe Docker::Util do
     end
   end
 
+  describe '.create_dir_tar' do
+    attr_accessor :tmpdir
+
+    around do |example|
+      Dir.mktmpdir do |tmpdir|
+        self.tmpdir = tmpdir
+        example.call
+      end
+    end
+
+    specify do
+      tar = subject.create_dir_tar tmpdir
+      expect { FileUtils.rm tar }.to_not raise_error
+    end
+  end
+
   describe '.build_auth_header' do
     subject { described_class }
 

data/spec/docker_spec.rb

@@ -76,12 +76,13 @@ describe Docker do
 
   [:options=, :url=].each do |method|
     describe "##{method}" do
-      after(:all) do
-        subject.instance_variable_set(:@url, nil)
-        subject.instance_variable_set(:@options, nil)
+      before do
+        subject.url = nil
+        subject.options = nil
       end
+
       it 'calls #reset_connection!' do
-        subject.should_receive(:reset_connection!)
+        expect(subject).to receive(:reset_connection!)
         subject.public_send(method, {})
       end
     end
@@ -96,8 +97,8 @@ describe Docker do
 
     let(:version) { subject.version }
     it 'returns the version as a Hash', :vcr do
-      version.should be_a Hash
-      version.keys.sort.should == expected
+      expect(version).to be_a Hash
+      expect(version.keys.sort).to eq expected
     end
   end
 
@@ -115,8 +116,8 @@ describe Docker do
     end
 
     it 'returns the info as a Hash', :vcr do
-      info.should be_a Hash
-      info.keys.sort.should == keys
+      expect(info).to be_a Hash
+      expect(info.keys.sort).to eq keys
     end
   end
 
@@ -144,7 +145,7 @@ describe Docker do
       }
 
       it 'logs in and sets the creds', :vcr do
-        expect(authentication).to be_true
+        expect(authentication).to be true
         expect(Docker.creds).to eq(credentials.to_json)
       end
     end
@@ -162,7 +163,7 @@ describe Docker do
       }
 
       it "raises an error and doesn't set the creds", :vcr do
-        pending "VCR won't record when Excon::Expects fail"
+        skip "VCR won't record when Excon::Expects fail"
         expect {
           authentication
         }.to raise_error(Docker::Error::AuthenticationError)
@@ -178,7 +179,9 @@ describe Docker do
     end
 
     context 'when a Docker Error is raised' do
-      before { Docker.stub(:info).and_raise(Docker::Error::ClientError) }
+      before do
+        allow(Docker).to receive(:info).and_raise(Docker::Error::ClientError)
+      end
 
       it 'raises a Version Error' do
         expect { subject.validate_version! }
@@ -187,7 +190,7 @@ describe Docker do
     end
 
     context 'when nothing is raised', :vcr do
-      its(:validate_version!) { should be_true }
+      its(:validate_version!) { should be true }
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rspec'
+require 'rspec/its'
 require 'simplecov'
 require 'docker'
 
@@ -8,8 +9,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.color_enabled = true
+  config.color = true
   config.formatter = :documentation
   config.tty = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -68,6 +68,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='