docker-api 1.13.1 → 1.13.2

data/lib/docker.rb

@@ -70,12 +70,12 @@ module Docker
   end
 
   # Get the version of Go, Docker, and optionally the Git commit.
-  def version
+  def version(connection = self.connection)
     Util.parse_json(connection.get('/version'))
   end
 
   # Get more information about the Docker server.
-  def info
+  def info(connection = self.connection)
     Util.parse_json(connection.get('/info'))
   end
 

data/lib/docker/connection.rb

@@ -77,7 +77,7 @@ private
       :headers       => { 'Content-Type' => content_type,
                           'User-Agent'   => user_agent,
                         }.merge(headers),
-      :expects       => (200..204),
+      :expects       => (200..204).to_a << 304,
       :idempotent    => http_method == :get,
       :request_block => block
     }.merge(opts).reject { |_, v| v.nil? }

data/lib/docker/container.rb

@@ -26,7 +26,7 @@ class Docker::Container
   # UnexpectedResponseError is raised.
   def run(cmd, time = 1000)
     if (code = tap(&:start).wait(time)['StatusCode']).zero?
-      commit.run(cmd).tap(&:start)
+      commit.run(cmd)
     else
       raise UnexpectedResponseError, "Command returned status code #{code}."
     end

data/lib/docker/image.rb

@@ -192,15 +192,15 @@ class Docker::Image
 
   private
 
-  # A method to build auth headers and merge them into headers sent
-  # by build_from_dir.
+  # A method to build the config header and merge it into the
+  # headers sent by build_from_dir.
   def self.build_headers(creds)
     credentials = creds || Docker.creds || {}
-    auth_header = Docker::Util.build_auth_header(credentials.to_json)
+    config_header = Docker::Util.build_config_header(credentials)
 
     headers = { 'Content-Type'      => 'application/tar',
                 'Transfer-Encoding' => 'chunked' }
-    headers = headers.merge(auth_header) if auth_header
+    headers = headers.merge(config_header) if config_header
     headers
   end
 

data/lib/docker/util.rb

@@ -77,8 +77,28 @@ module Docker::Util
     credentials = credentials.to_json if credentials.is_a?(Hash)
     encoded_creds = Base64.encode64(credentials).gsub(/\n/, '')
     {
-      'X-Registry-Auth' => encoded_creds,
-      'X-Registry-Config' => encoded_creds,
+      'X-Registry-Auth' => encoded_creds
+    }
+  end
+
+  def build_config_header(credentials)
+    if credentials.is_a?(String)
+      credentials = JSON.parse(credentials, symbolize_names: true)
+    end
+    header = {
+      "configs" => {
+        credentials[:serveraddress].to_s => {
+          "username" => credentials[:username].to_s,
+          "password" => credentials[:password].to_s,
+          "email" => credentials[:email].to_s
+        }
+      }
+    }.to_json
+
+    encoded_header = Base64.encode64(header).gsub(/\n/, '')
+
+    {
+      'X-Registry-Config' => encoded_header
     }
   end
 end

data/lib/docker/version.rb

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

data/spec/docker/image_spec.rb

@@ -455,14 +455,15 @@ describe Docker::Image do
           {
             :username => 'nahiluhmot',
             :password => '*********',
-            :email => 'hulihan.tom159@gmail.com'
+            :email => 'hulihan.tom159@gmail.com',
+            :serveraddress => 'https://index.docker.io/v1'
           }
         }
 
         before { Docker.creds = creds }
 
-        it 'sends Docker.creds', :vcr do
-          expect(image.info[:headers].keys).to include('X-Registry-Auth')
+        it 'sends X-Registry-Config header', :vcr do
+          expect(image.info[:headers].keys).to include('X-Registry-Config')
         end
       end
     end

data/spec/docker/util_spec.rb

@@ -86,17 +86,16 @@ describe Docker::Util do
     }
     let(:credential_string) { credentials.to_json }
     let(:encoded_creds) { Base64.encode64(credential_string).gsub(/\n/, '') }
-    let(:expected_headers) {
+    let(:expected_header) {
       {
-        'X-Registry-Auth' => encoded_creds,
-        'X-Registry-Config' => encoded_creds
+        'X-Registry-Auth' => encoded_creds
       }
     }
 
 
     context 'given credentials as a Hash' do
       it 'returns an X-Registry-Auth header encoded' do
-        expect(subject.build_auth_header(credentials)).to eq(expected_headers)
+        expect(subject.build_auth_header(credentials)).to eq(expected_header)
       end
     end
 
@@ -104,7 +103,53 @@ describe Docker::Util do
       it 'returns an X-Registry-Auth header encoded' do
         expect(
           subject.build_auth_header(credential_string)
-        ).to eq(expected_headers)
+        ).to eq(expected_header)
+      end
+    end
+  end
+
+  describe '.build_config_header' do
+    subject { described_class }
+
+    let(:credentials) {
+      {
+        :username      => 'test',
+        :password      => 'password',
+        :email         => 'test@example.com',
+        :serveraddress => 'https://registry.com/'
+      }
+    }
+
+    let(:credentials_object) {
+      {
+        :configs => {
+          :'https://registry.com/' => {
+            :username => 'test',
+            :password => 'password',
+            :email    => 'test@example.com',
+          }
+        }
+      }.to_json
+    }
+
+    let(:encoded_creds) { Base64.encode64(credentials_object).gsub(/\n/, '') }
+    let(:expected_header) {
+      {
+        'X-Registry-Config' => encoded_creds
+      }
+    }
+
+    context 'given credentials as a Hash' do
+      it 'returns an X-Registry-Config header encoded' do
+        expect(subject.build_config_header(credentials)).to eq(expected_header)
+      end
+    end
+
+    context 'given credentials as a String' do
+      it 'returns an X-Registry-Config header encoded' do
+        expect(
+          subject.build_config_header(credentials.to_json)
+        ).to eq(expected_header)
       end
     end
   end

data/spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_credentials_passed/sends_X-Registry-Config_header.yml

@@ -0,0 +1,39 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: unix:///var/run/docker.sock/v1.12/build
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.13.1
+      Content-Type:
+      - application/tar
+      Transfer-Encoding:
+      - chunked
+      X-Registry-Config:
+      - eyJjb25maWdzIjp7Imh0dHBzOi8vaW5kZXguZG9ja2VyLmlvL3YxIjp7InVzZXJuYW1lIjoibmFoaWx1aG1vdCIsInBhc3N3b3JkIjoiKioqKioqKioqIiwiZW1haWwiOiJodWxpaGFuLnRvbTE1OUBnbWFpbC5jb20ifX19
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Mon, 21 Jul 2014 17:07:50 GMT
+      Connection:
+      - close
+      Transfer-Encoding:
+      - ''
+    body:
+      encoding: US-ASCII
+      string: ! "{\"stream\":\"Step 0 : from base\\n\"}\r\n{\"stream\":\" ---\\u003e
+        b750fe79269d\\n\"}\r\n{\"stream\":\"Step 1 : add / /\\n\"}\r\n{\"stream\":\"
+        ---\\u003e 282d877698a4\\n\"}\r\n{\"stream\":\"Removing intermediate container
+        f76554ba0d24\\n\"}\r\n{\"stream\":\"Successfully built 282d877698a4\\n\"}\r\n"
+    http_version: 
+  recorded_at: Mon, 21 Jul 2014 17:07:53 GMT
+recorded_with: VCR 2.9.2

metadata

@@ -1,74 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
+  prerelease: 
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.38.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,85 +94,97 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple REST client for the Docker Remote API
@@ -244,6 +267,7 @@ files:
 - spec/vcr/Docker_Image/_build/with_an_invalid_Dockerfile/throws_a_UnexpectedResponseError.yml
 - spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_a_block_capturing_build_output/calls_the_block_and_passes_build_output.yml
 - spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_credentials_passed/sends_Docker_creds.yml
+- spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_credentials_passed/sends_X-Registry-Config_header.yml
 - spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_no_query_parameters/builds_the_image.yml
 - spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_specifying_a_repo_in_the_query_parameters/builds_the_image_and_tags_it.yml
 - spec/vcr/Docker_Image/_create/when_the_Image_does_not_yet_exist_and_the_body_is_a_Hash/sets_the_id_and_sends_Docker_creds.yml
@@ -271,26 +295,27 @@ files:
 homepage: https://github.com/swipely/docker-api
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A simple REST client for the Docker Remote API
 test_files:
 - spec/docker/connection_spec.rb
@@ -344,6 +369,7 @@ test_files:
 - spec/vcr/Docker_Image/_build/with_an_invalid_Dockerfile/throws_a_UnexpectedResponseError.yml
 - spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_a_block_capturing_build_output/calls_the_block_and_passes_build_output.yml
 - spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_credentials_passed/sends_Docker_creds.yml
+- spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_credentials_passed/sends_X-Registry-Config_header.yml
 - spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_no_query_parameters/builds_the_image.yml
 - spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_specifying_a_repo_in_the_query_parameters/builds_the_image_and_tags_it.yml
 - spec/vcr/Docker_Image/_create/when_the_Image_does_not_yet_exist_and_the_body_is_a_Hash/sets_the_id_and_sends_Docker_creds.yml
@@ -368,4 +394,3 @@ test_files:
 - spec/vcr/Docker_Image/_run/when_the_argument_is_nil/no_command_configured_in_image/should_raise_an_error_if_no_command_is_specified.yml
 - spec/vcr/Docker_Image/_search/materializes_each_Image_into_a_Docker_Image.yml
 - spec/vcr/Docker_Image/_tag/tags_the_image_with_the_repo_name.yml
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c65d0d14dc98274bae2d57338d68b53e340b17b6
-  data.tar.gz: d1d3a1ce41bc4c4a38b720ab67b0c2ef91e7089f
-SHA512:
-  metadata.gz: ed39d770944b0ab5872bc62176b1fd529de09b920ad5c12665b8658f4e06356653fb4d01a0a4ea667d8577aaff81888e169ed581059f0ce369f5108c5522be55
-  data.tar.gz: 7233f50f86047421d4cc40cf94f34765670674ad33206277260167af885750a6c798a319eb315cb4d129e2ac665092ade0d394c4ebcb39fe951073796ac9206f