docker-api 1.7.6 → 1.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc5ba28fab5aed18ec66531e1b33aa0cbec86e12
+  data.tar.gz: b860c92de1e24af1f431399b07ee529f7c1a73dc
+SHA512:
+  metadata.gz: 3ab3594b2951e5789078ea05081a9f9dfdc595cd8b2de06cab2ca75c877e0f5936184076de080d8ce6d7c3aada2ce1a7244b0f76ae0042cff8997fdcce26836d
+  data.tar.gz: a239960f224a37afc14432b7e450dd26b374e3dea52d25b83fa161f204491efc40375f7343b3701f52eaff6356120f3c5a3815e3d1ba119df5c29188ec38b4af

data/lib/docker.rb

@@ -6,12 +6,21 @@ require 'base64'
 require 'rubygems/package'
 require 'archive/tar/minitar'
 require 'uri'
+require 'docker/version'
 
 # The top-level module for this gem. It's purpose is to hold global
 # configuration variables that are used as defaults in other classes.
 module Docker
   attr_accessor :creds, :logger
 
+  autoload :Connection, 'docker/connection'
+  autoload :Container, 'docker/container'
+  autoload :Error, 'docker/error'
+  autoload :Event, 'docker/event'
+  autoload :Image, 'docker/image'
+  autoload :Messages, 'docker/messages'
+  autoload :Util, 'docker/util'
+
   def default_socket_url
     'unix:///var/run/docker.sock'
   end
@@ -80,12 +89,3 @@ module Docker
                   :connection, :reset_connection!, :version, :info,
                   :authenticate!, :validate_version!
 end
-
-require 'docker/version'
-require 'docker/error'
-require 'docker/util'
-require 'docker/messages'
-require 'docker/connection'
-require 'docker/container'
-require 'docker/image'
-require 'docker/event'

data/lib/docker/connection.rb

@@ -35,7 +35,7 @@ class Docker::Connection
   def request(*args, &block)
     request = compile_request_params(*args, &block)
     if Docker.logger
-      Docker.logger.info(
+      Docker.logger.debug(
         [request[:method], request[:path], request[:query], request[:body]]
       )
     end

data/lib/docker/container.rb

@@ -73,8 +73,7 @@ class Docker::Container
     config = options.delete('run')
     hash = Docker::Util.parse_json(connection.post('/commit',
                                                    options,
-                                                   :body => config.to_json)
-                                  )
+                                                   :body => config.to_json))
     Docker::Image.send(:new, self.connection, hash['Id'])
   end
 

data/lib/docker/image.rb

@@ -23,9 +23,9 @@ class Docker::Image
     begin
       Docker::Container.create(opts, connection)
                        .tap(&:start!)
-    rescue ServerError
+    rescue ServerError => ex
       if cmd
-        raise ServerError, "Docker Server Error."
+        raise ex
       else
         raise ServerError, "No command specified."
       end
@@ -34,13 +34,14 @@ class Docker::Image
 
   # Push the Image to the Docker registry.
   def push(creds = nil, options = {})
-    repository = self.info['Repository']
+    repository = self.info['RepoTags'].first.split(/:/)[0] rescue nil
+
     unless repository
       raise ArgumentError
         "Image does not have a name to push, got: #{repository}."
     end
 
-    credentials = (creds.nil?) ? Docker.creds : creds.to_json
+    credentials = creds || Docker.creds
     headers = Docker::Util.build_auth_header(credentials)
     connection.post(
       "/images/#{repository}/push",
@@ -58,7 +59,7 @@ class Docker::Image
   # Insert a file into the Image, returns a new Image that has that file.
   def insert(query = {})
     body = connection.post(path_for(:insert), query)
-    if (id = body.match(/{"Id":"([a-f0-9]+)"}\z/)).nil? || id[1].empty?
+    if (id = body.match(/{"status":"([a-f0-9]+)"}\z/)).nil? || id[1].empty?
       raise UnexpectedResponseError, "Could not find Id in '#{body}'"
     else
       self.class.send(:new, connection, id[1])
@@ -140,7 +141,7 @@ class Docker::Image
     def search(query = {}, connection = Docker.connection)
       body = connection.get('/images/search', query)
       hashes = Docker::Util.parse_json(body) || []
-      hashes.map { |hash| new(connection, hash['Name']) }
+      hashes.map { |hash| new(connection, hash['name']) }
     end
 
     # Import an Image from the output of Docker::Container#export.

data/lib/docker/version.rb

@@ -1,7 +1,7 @@
 module Docker
   # The version of the docker-api gem.
-  VERSION = '1.7.6'
+  VERSION = '1.8.0'
 
   # The version of the compatible Docker remote API.
-  API_VERSION = '1.6'
+  API_VERSION = '1.8'
 end

data/spec/docker/connection_spec.rb

@@ -53,8 +53,8 @@ describe Docker::Connection do
     let(:query) { { :all => true } }
     let(:options) { { :expects => 201, :lol => true } }
     let(:body) { rand(10000000) }
-    let(:resource) { mock(:resource) }
-    let(:response) { mock(:response, :body => body) }
+    let(:resource) { double(:resource) }
+    let(:response) { double(:response, :body => body) }
     let(:expected_hash) {
       {
         :method  => method,

data/spec/docker/container_spec.rb

@@ -55,18 +55,18 @@ describe Docker::Container do
 
     it 'returns the changes as an array', :vcr do
       changes.should == [
-        {
-          "Path" => "/root",
-          "Kind" => 2
-        },
         {
           "Path" => "/dev",
           "Kind" => 0
         },
         {
           "Path" => "/dev/kmsg",
-          "Kind" => 1
-        }
+          "Kind" => 0
+        },
+        {
+          "Path" => "/root",
+          "Kind" => 2
+        },
       ]
     end
   end
@@ -79,12 +79,12 @@ describe Docker::Container do
     let(:top) { sleep 1; container.top }
     let!(:container) { image.run('/while') }
 
-    after { container.kill; image.remove }
+    after { container.kill; container.delete; image.remove }
 
     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(PID TTY TIME CMD)
+      top.first.keys.should == %w(UID PID PPID C STIME TTY TIME CMD)
     end
   end
 
@@ -97,6 +97,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'
         expect { subject.copy('/lol/not/a/real/file') { |chunk| puts chunk } }
             .to raise_error
       end
@@ -311,9 +312,10 @@ describe Docker::Container do
     end
 
     context 'if run is passed, it saves the command in the image', :vcr do
-      let(:image) { subject.commit('run' => {"Cmd" => %w[pwd]}) }
+      let(:image) { subject.commit }
       it 'saves the command' do
-        expect(image.run.attach).to eql [["/\n"],[]]
+        pending 'This is no longer working in v0.8'
+        expect(image.run('pwd').attach).to eql [["/\n"],[]]
       end
     end
 

data/spec/docker/image_spec.rb

@@ -103,13 +103,12 @@ describe Docker::Image do
   end
 
   describe '#push' do
-    subject { described_class.create('fromImage' => 'base') }
     let(:credentials) {
       {
-        :username => 'test',
-        :password => 'test',
-        :auth     => '',
-        :email    => 'test@test.com'
+        'username' => 'nahiluhmot',
+        'password' => '******',
+        'serveraddress' => 'https://index.docker.io/v1',
+        'email'    => 'tomhulihan@swipely.com'
       }
     }
     let(:base_image) {
@@ -118,11 +117,10 @@ describe Docker::Image do
     let(:container) {
       base_image.run('true')
     }
-    let(:repo_name) { 'test/base' }
     let(:new_image) {
-      container.commit('repo' => repo_name)
-      Docker::Image.all.select { |image|
-        image.info['Repository'] == repo_name
+      container.commit('repo' => 'nahiluhmot/base2')
+      Docker::Image.all(:all => true).select { |image|
+        image.info['RepoTags'].include?('nahiluhmot/base2:latest')
       }.first
     }
 
@@ -193,7 +191,9 @@ describe Docker::Image do
         let(:container) {Docker::Container.create('Cmd' => %w[true],
                                                   'Image' => 'base')}
         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'
           expect(output).to eql [["/\n"],[]]
         end
       end
@@ -333,7 +333,7 @@ describe Docker::Image do
           expect(image).to be_a Docker::Image
           expect(image.id).to_not be_nil
           expect(image.connection).to be_a Docker::Connection
-          expect(images.first.info["Repository"]).to eq("swipely/base")
+          expect(images.first.info["RepoTags"]).to eq(["swipely/base:latest"])
         end
       end
 
@@ -343,7 +343,7 @@ describe Docker::Image do
         let!(:image) { subject.build("FROM base\n", &block) }
 
         it 'calls the block and passes build output', :vcr do
-          expect(build_output).to start_with('Step 1 : FROM base')
+          expect(build_output).to match(/Step 0 : FROM base/)
         end
       end
     end
@@ -378,7 +378,7 @@ describe Docker::Image do
         let(:opts) { { "t" => "swipely/base2" } }
         it 'builds the image and tags it', :vcr do
           expect(output).to eq([[docker_file.read],[]])
-          expect(images.first.info["Repository"]).to eq("swipely/base2")
+          expect(images.first.info["RepoTags"]).to eq(["swipely/base2:latest"])
         end
       end
 
@@ -388,7 +388,7 @@ describe Docker::Image do
 
         it 'calls the block and passes build output', :vcr do
           image # Create the image variable, which is lazy-loaded by Rspec
-          expect(build_output).to start_with("Step 1 : FROM base")
+          expect(build_output).to match(/Step 0 : from base/)
         end
       end
     end

data/spec/docker_spec.rb

@@ -59,11 +59,12 @@ describe Docker do
       subject.url = nil
       subject.options = nil
     end
+    let(:expected) { %w[Arch GitCommit GoVersion KernelVersion Os Version] }
 
     let(:version) { subject.version }
     it 'returns the version as a Hash', :vcr do
       version.should be_a Hash
-      version.keys.sort.should == %w[GitCommit GoVersion Version]
+      version.keys.sort.should == expected
     end
   end
 
@@ -75,9 +76,9 @@ describe Docker do
 
     let(:info) { subject.info }
     let(:keys) do
-      %w(Containers Debug IPv4Forwarding Images IndexServerAddress
-         KernelVersion LXCVersion MemoryLimit NEventsListener NFd
-         NGoroutines)
+      %w(Containers Debug Driver DriverStatus ExecutionDriver IPv4Forwarding
+         Images IndexServerAddress InitPath InitSha1 KernelVersion MemoryLimit
+         NEventsListener NFd NGoroutines SwapLimit)
     end
 
     it 'returns the info as a Hash', :vcr do

data/spec/vcr/Docker/_authenticate_/with_valid_credentials/logs_in_and_sets_the_creds.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: unix:///var/run/docker.sock/v1.6/auth
+    uri: unix:///var/run/docker.sock/v1.8/auth
     body:
       encoding: UTF-8
       string: ! '{"username":"test","password":"account","email":"test@test.com","serveraddress":"https://index.docker.io/v1/"}'

data/spec/vcr/Docker/_info/returns_the_info_as_a_Hash.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: unix:///var/run/docker.sock/v1.6/info
+    uri: unix:///var/run/docker.sock/v1.8/info
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - Swipely/Docker-API 1.6.0
+      - Swipely/Docker-API 1.7.6
       Content-Type:
       - text/plain
   response:
@@ -16,18 +16,20 @@ http_interactions:
       code: 200
       message: 
     headers:
-      !binary "Q29udGVudC1UeXBl":
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbg==
-      !binary "Q29udGVudC1MZW5ndGg=":
-      - !binary |-
-        MjM1
-      !binary "RGF0ZQ==":
-      - !binary |-
-        RnJpLCAyNSBPY3QgMjAxMyAxNjoyNDo0NyBHTVQ=
+      Content-Type:
+      - application/json
+      Job-Name:
+      - info
+      Date:
+      - Wed, 12 Feb 2014 17:06:43 GMT
+      Content-Length:
+      - '694'
+      Connection:
+      - close
     body:
-      encoding: US-ASCII
-      string: ! '{"Debug":false,"Containers":8,"Images":9,"NFd":9,"NGoroutines":12,"MemoryLimit":true,"IPv4Forwarding":true,"LXCVersion":"0.9.0","NEventsListener":12,"KernelVersion":"3.8.0-27-generic","IndexServerAddress":"https://index.docker.io/v1/"}'
+      encoding: UTF-8
+      string: |
+        {"Containers":40,"Debug":0,"Driver":"devicemapper","DriverStatus":[["Pool Name","docker-8:4-394003-pool"],["Data file","/var/lib/docker/devicemapper/devicemapper/data"],["Metadata file","/var/lib/docker/devicemapper/devicemapper/metadata"],["Data Space Used","582.5 Mb"],["Data Space Total","102400.0 Mb"],["Metadata Space Used","3.4 Mb"],["Metadata Space Total","2048.0 Mb"]],"ExecutionDriver":"lxc-0.9.0","IPv4Forwarding":1,"Images":14,"IndexServerAddress":"https://index.docker.io/v1/","InitPath":"/usr/lib/docker/dockerinit","InitSha1":"c6e2619aa393a45c9d0851ef2740eb0d29368350","KernelVersion":"3.12.9-2-ARCH","MemoryLimit":1,"NEventsListener":440,"NFd":11,"NGoroutines":90,"SwapLimit":0}
     http_version: 
-  recorded_at: Fri, 25 Oct 2013 16:24:47 GMT
-recorded_with: VCR 2.6.0
+  recorded_at: Wed, 12 Feb 2014 17:06:43 GMT
+recorded_with: VCR 2.8.0

data/spec/vcr/Docker/_validate_version/when_nothing_is_raised/validate_version_/.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: unix:///var/run/docker.sock/v1.6/info
+    uri: unix:///var/run/docker.sock/v1.8/info
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - Swipely/Docker-API 1.6.0
+      - Swipely/Docker-API 1.7.6
       Content-Type:
       - text/plain
   response:
@@ -16,18 +16,20 @@ http_interactions:
       code: 200
       message: 
     headers:
-      !binary "Q29udGVudC1UeXBl":
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbg==
-      !binary "Q29udGVudC1MZW5ndGg=":
-      - !binary |-
-        MjM2
-      !binary "RGF0ZQ==":
-      - !binary |-
-        RnJpLCAyNSBPY3QgMjAxMyAxNjoyNDo0NyBHTVQ=
+      Content-Type:
+      - application/json
+      Job-Name:
+      - info
+      Date:
+      - Wed, 12 Feb 2014 17:06:44 GMT
+      Content-Length:
+      - '694'
+      Connection:
+      - close
     body:
-      encoding: US-ASCII
-      string: ! '{"Debug":false,"Containers":8,"Images":9,"NFd":10,"NGoroutines":13,"MemoryLimit":true,"IPv4Forwarding":true,"LXCVersion":"0.9.0","NEventsListener":12,"KernelVersion":"3.8.0-27-generic","IndexServerAddress":"https://index.docker.io/v1/"}'
+      encoding: UTF-8
+      string: |
+        {"Containers":40,"Debug":0,"Driver":"devicemapper","DriverStatus":[["Pool Name","docker-8:4-394003-pool"],["Data file","/var/lib/docker/devicemapper/devicemapper/data"],["Metadata file","/var/lib/docker/devicemapper/devicemapper/metadata"],["Data Space Used","582.5 Mb"],["Data Space Total","102400.0 Mb"],["Metadata Space Used","3.4 Mb"],["Metadata Space Total","2048.0 Mb"]],"ExecutionDriver":"lxc-0.9.0","IPv4Forwarding":1,"Images":14,"IndexServerAddress":"https://index.docker.io/v1/","InitPath":"/usr/lib/docker/dockerinit","InitSha1":"c6e2619aa393a45c9d0851ef2740eb0d29368350","KernelVersion":"3.12.9-2-ARCH","MemoryLimit":1,"NEventsListener":440,"NFd":11,"NGoroutines":90,"SwapLimit":0}
     http_version: 
-  recorded_at: Fri, 25 Oct 2013 16:24:47 GMT
-recorded_with: VCR 2.6.0
+  recorded_at: Wed, 12 Feb 2014 17:06:44 GMT
+recorded_with: VCR 2.8.0

data/spec/vcr/Docker/_version/returns_the_version_as_a_Hash.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: unix:///var/run/docker.sock/v1.6/version
+    uri: unix:///var/run/docker.sock/v1.8/version
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - Swipely/Docker-API 1.6.0
+      - Swipely/Docker-API 1.7.6
       Content-Type:
       - text/plain
   response:
@@ -16,18 +16,20 @@ http_interactions:
       code: 200
       message: 
     headers:
-      !binary "Q29udGVudC1UeXBl":
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbg==
-      !binary "Q29udGVudC1MZW5ndGg=":
-      - !binary |-
-        NjM=
-      !binary "RGF0ZQ==":
-      - !binary |-
-        RnJpLCAyNSBPY3QgMjAxMyAxNTo1NTozNyBHTVQ=
+      Content-Type:
+      - application/json
+      Job-Name:
+      - version
+      Date:
+      - Wed, 12 Feb 2014 17:06:43 GMT
+      Content-Length:
+      - '122'
+      Connection:
+      - close
     body:
-      encoding: US-ASCII
-      string: ! '{"Version":"0.6.4","GitCommit":"2f74b1c","GoVersion":"go1.1.2"}'
+      encoding: UTF-8
+      string: |
+        {"Arch":"amd64","GitCommit":"cc3a8c8","GoVersion":"go1.2","KernelVersion":"3.12.9-2-ARCH","Os":"linux","Version":"0.8.0"}
     http_version: 
-  recorded_at: Fri, 25 Oct 2013 15:55:37 GMT
-recorded_with: VCR 2.6.0
+  recorded_at: Wed, 12 Feb 2014 17:06:43 GMT
+recorded_with: VCR 2.8.0