docker-api 1.21.2 → 1.21.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465cef36deedd1a54ea562f74f85b2f268e6851a
-  data.tar.gz: 1a786818a3a8b34680ea6ae056e6b37020a29da2
+  metadata.gz: 7f782a3d4812316b9a78a9c9850000409fcf2f58
+  data.tar.gz: 4d7aa0d552a978aefdb81bb9abd161a90b3a598b
 SHA512:
-  metadata.gz: 89f9d252d33a66488c67670113c4ae6461c32ce014a3f81adc582224eaa02c1c3d839b6c3740bcb55ae6b871206ef5cd9852bf24acfd84bf97ee125a30d48a3c
-  data.tar.gz: 1286dcbb395dc2e6b837a7f434bedcef62e6c3daf0f3698d248ca3236db19071430d9a8e8460dee9126cad269d5bdeffdce53b4483853d4bc39dd7f4ee7d1977
+  metadata.gz: ac799a15c88a4113554472df394449e71bd7ff935e65c2b2f5112ea8e8d0e1b65d2f5da1681b81985aa3dd98c4c211427a00ffd4c2805be2b07005f511f0ce45
+  data.tar.gz: c304cc3fc7ac0bc5970e3be2cf718ecb34540ff786a1f3e3196b374ae7566419ae361ba38c32106a5558c53b749ab35c420f1f0e46346ac7daf63771965d40d5

data/lib/docker/util.rb

@@ -138,8 +138,8 @@ module Docker::Util
         next unless stat.file?
 
         unprefixed_file_name = prefixed_file_name[directory.length..-1]
-        tar.add_file_simple(
-          unprefixed_file_name, stat.mode, stat.size
+        add_file_to_tar(
+          tar, unprefixed_file_name, stat.mode, stat.size, stat.mtime
         ) do |tar_file|
           IO.copy_stream(File.open(prefixed_file_name, 'rb'), tar_file)
         end
@@ -147,6 +147,31 @@ module Docker::Util
     end
   end
 
+  def add_file_to_tar(tar, name, mode, size, mtime)
+    tar.check_closed
+
+    io = tar.instance_variable_get(:@io)
+
+    name, prefix = tar.split_name(name)
+
+    header = Gem::Package::TarHeader.new(:name => name, :mode => mode,
+                                         :size => size, :prefix => prefix,
+                                         :mtime => mtime).to_s
+
+    io.write header
+    os = Gem::Package::TarWriter::BoundedStream.new io, size
+
+    yield os if block_given?
+
+    min_padding = size - os.written
+    io.write("\0" * min_padding)
+
+    remainder = (512 - (size % 512)) % 512
+    io.write("\0" * remainder)
+
+    tar
+  end
+
   def create_temp_file
     tempfile_name = Dir::Tmpname.create('out') {}
     File.open(tempfile_name, 'wb+')

data/lib/docker/version.rb

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

data/spec/docker/image_spec.rb

@@ -564,30 +564,37 @@ describe Docker::Image do
         Docker::Container.create('Image' => image.id,
                                  'Cmd' => %w[cat /Dockerfile])
       end
-      let!(:output) {
-        container.tap(&:start).streaming_logs(stdout: true)
-      }
+      let(:output) { container.streaming_logs(stdout: true) }
+
       after(:each) do
-        container.tap(&:wait).remove
         image.remove(:noprune => true)
       end
 
       context 'with no query parameters' do
         it 'builds the image', :vcr do
-          container.wait
+          container.tap(&:wait).start
           expect(output).to eq(docker_file.read)
         end
+
+        after do
+          container.remove
+        end
       end
 
       context 'with specifying a repo in the query parameters' do
         let(:opts) { { "t" => "#{ENV['DOCKER_API_USER']}/debian:from_dir" } }
         it 'builds the image and tags it', :vcr do
+          container.tap(&:wait).start
           expect(output).to eq(docker_file.read)
           image.refresh!
           expect(image.info["RepoTags"]).to eq(
             ["#{ENV['DOCKER_API_USER']}/debian:from_dir"]
           )
         end
+
+        after do
+          container.remove
+        end
       end
 
       context 'with a block capturing build output' do
@@ -598,6 +605,21 @@ describe Docker::Image do
           image # Create the image variable, which is lazy-loaded by Rspec
           expect(build_output).to match(/Step 0 : FROM debian:wheezy/)
         end
+
+        context 'uses a cached version the second time' do
+          let(:build_output_two) { "" }
+          let(:block_two) { Proc.new { |chunk| build_output_two << chunk } }
+          let(:image_two) { subject.build_from_dir(dir, opts, &block_two) }
+
+          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 match(/Step 0 : FROM debian:wheezy/)
+            expect(build_output).to_not match(/Using cache/)
+
+            image_two # Create the image_two variable, which is lazy-loaded by Rspec
+            expect(build_output_two).to match(/Using cache/)
+          end
+        end
       end
 
       context 'with credentials passed' do

data/spec/support/vcr.rb

@@ -4,7 +4,7 @@ require 'docker'
 
 VCR.configure do |c|
   c.allow_http_connections_when_no_cassette = false
-  c.filter_sensitive_data('<DOCKER_HOST>') { Docker.url.sub(/tcp\:/, 'https:') }
+  c.filter_sensitive_data('<DOCKER_HOST>') { Docker.url }
   c.filter_sensitive_data('<USERNAME>') { ENV['DOCKER_API_USER'] }
   c.filter_sensitive_data('<PASSWORD>') { ENV['DOCKER_API_PASS'] }
   c.filter_sensitive_data('<EMAIL>') { ENV['DOCKER_API_EMAIL'] }

data/spec/vcr/Docker_Image/_build_from_dir/with_a_valid_Dockerfile/with_a_block_capturing_build_output/uses_a_cached_version_the_second_time/calls_the_block_and_passes_build_output.yml

@@ -0,0 +1,96 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: "<DOCKER_HOST>/v1.16/build"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.0
+      Content-Type:
+      - application/tar
+      Transfer-Encoding:
+      - chunked
+      X-Registry-Config:
+      - eyJjb25maWdzIjp7IiI6eyJ1c2VybmFtZSI6IiIsInBhc3N3b3JkIjoiIiwiZW1haWwiOiIifX19
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 03 Apr 2015 20:19:34 GMT
+    body:
+      encoding: UTF-8
+      string: "{\"stream\":\"Step 0 : FROM debian:wheezy\\n\"}\r\n{\"stream\":\" ---\\u003e
+        1265e16d0c28\\n\"}\r\n{\"stream\":\"Step 1 : ADD . /\\n\"}\r\n{\"stream\":\"
+        ---\\u003e 1df5fb96c8b6\\n\"}\r\n{\"stream\":\"Removing intermediate container
+        31c097a22066\\n\"}\r\n{\"stream\":\"Successfully built 1df5fb96c8b6\\n\"}\r\n"
+    http_version: 
+  recorded_at: Wed, 08 Apr 2015 15:07:59 GMT
+- request:
+    method: post
+    uri: "<DOCKER_HOST>/v1.16/build"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.0
+      Content-Type:
+      - application/tar
+      Transfer-Encoding:
+      - chunked
+      X-Registry-Config:
+      - eyJjb25maWdzIjp7IiI6eyJ1c2VybmFtZSI6IiIsInBhc3N3b3JkIjoiIiwiZW1haWwiOiIifX19
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 03 Apr 2015 20:19:36 GMT
+    body:
+      encoding: UTF-8
+      string: "{\"stream\":\"Step 0 : FROM debian:wheezy\\n\"}\r\n{\"stream\":\" ---\\u003e
+        1265e16d0c28\\n\"}\r\n{\"stream\":\"Step 1 : ADD . /\\n\"}\r\n{\"stream\":\"
+        ---\\u003e Using cache\\n\"}\r\n{\"stream\":\" ---\\u003e 1df5fb96c8b6\\n\"}\r\n{\"stream\":\"Successfully
+        built 1df5fb96c8b6\\n\"}\r\n"
+    http_version: 
+  recorded_at: Wed, 08 Apr 2015 15:07:59 GMT
+- request:
+    method: delete
+    uri: "<DOCKER_HOST>/v1.16/images/1df5fb96c8b6?noprune=true"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.0
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 03 Apr 2015 20:19:37 GMT
+      Content-Length:
+      - '81'
+    body:
+      encoding: UTF-8
+      string: |-
+        [{"Deleted":"1df5fb96c8b6f0f21cf5898ad17867b80f0b58d2db5859fcc997dfde7d903b56"}
+        ]
+    http_version: 
+  recorded_at: Wed, 08 Apr 2015 15:07:59 GMT
+recorded_with: VCR 2.9.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.21.2
+  version: 1.21.3
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -262,6 +262,7 @@ files:
 - spec/vcr/Docker_Image/_build/with_a_valid_Dockerfile/without_query_parameters/builds_an_image.yml
 - 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_a_block_capturing_build_output/uses_a_cached_version_the_second_time/calls_the_block_and_passes_build_output.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
@@ -387,6 +388,7 @@ test_files:
 - spec/vcr/Docker_Image/_build/with_a_valid_Dockerfile/without_query_parameters/builds_an_image.yml
 - 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_a_block_capturing_build_output/uses_a_cached_version_the_second_time/calls_the_block_and_passes_build_output.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