docker-api 1.27.0 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a402451b60cf3ee27d968b6c406b763ba02fd064
-  data.tar.gz: 239c7b7261f471873819ade511325c785e632d0f
+  metadata.gz: 208227d2b48722c6c994b7182065a13ee1e478ce
+  data.tar.gz: 7fe1de106942c93a80884c0b5ca65a06bf237e81
 SHA512:
-  metadata.gz: 68228f7e53d244b754ce9c26c3a2e412c4162595ae4fc069afea00aa5b89a499f205bcd2be5e055a274ce6e1f5ef2a9188dec364c2086505817176c4bb66a737
-  data.tar.gz: 128d69692f073e103aeef72af0743d5ab3db5020b770242f8df4964da3b0ec6c88c70e587e25822e0a66c80cd3c6bebfdf05f7fa90d501850960b71272c29df9
+  metadata.gz: 8420bbc610fa614cd590c9ff449a98e237c9bdaa20c91b03954c2c9d797849cb48f97e2048ee4589b095f0448fe9ab9e46685dcbe884d232cb3c9339313c47e3
+  data.tar.gz: 64af52f1ed2c4a9b25c69759c06d77745e8ce7843db8675247b6225318b809754b4c336f50ebae01fbfcd20cc3b4adde22042c2eeb9fb96e7a03aba85a7b2a8d

data/README.md

@@ -108,7 +108,7 @@ require 'docker'
 Docker.version
 # => { 'Version' => '0.5.2', 'GoVersion' => 'go1.1' }
 
-# docker command for reference: docker info 
+# docker command for reference: docker info
 Docker.info
 # => { "Debug" => false, "Containers" => 187, "Images" => 196, "NFd" => 10, "NGoroutines" => 9, "MemoryLimit" => true }
 
@@ -245,6 +245,16 @@ Docker::Image.get('df4f1bdecf40')
 Docker::Image.exist?('ef723dcdac09')
 # => true
 
+# Load an image from the file system
+Docker::Image.load('./my-image.tar')
+# => ""
+
+# An IO object may also be specified for loading
+File.open('./my-image.tar', 'rb') do |file|
+  Docker::Image.load(file)
+end
+# => ""
+
 # Export multiple images to a single tarball
 # docker command for reference: docker save my_image1 my_image2:not_latest > my_export.tar
 names = %w( my_image1 my_image2:not_latest )

data/lib/docker/image.rb

@@ -171,14 +171,14 @@ class Docker::Image
     # Load a tar Image
     def load(tar, opts = {}, conn = Docker.connection, creds = nil, &block)
        headers = build_headers(creds)
+       io = tar.is_a?(String) ? File.open(tar, 'rb') : tar
        body = ""
-       f = File.open(tar,'rb')
        conn.post(
          '/images/load',
          opts,
          :headers => headers,
          :response_block => response_block(body, &block)
-       ) { f.read(Excon.defaults[:chunk_size]).to_s }
+       ) { io.read(Excon.defaults[:chunk_size]).to_s }
     end
 
     # Check if an image exists.

data/lib/docker/version.rb

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

data/spec/docker/image_spec.rb

@@ -280,17 +280,6 @@ describe Docker::Image do
     end
   end
 
-  describe '#load' do
-    include_context "local paths"
-    let(:file) { File.join(project_dir, 'spec', 'fixtures', 'load.tar') }
-    context 'test image upload' do
-      it 'load tianon/true image' do
-        result = Docker::Image.load(file)
-        expect(result).to eq("")
-      end
-    end
-  end
-
   describe '#refresh!' do
     let(:image) { Docker::Image.create('fromImage' => 'debian:wheezy') }
 
@@ -312,6 +301,29 @@ describe Docker::Image do
     end
   end
 
+  describe '.load' do
+    include_context "local paths"
+    let(:file) { File.join(project_dir, 'spec', 'fixtures', 'load.tar') }
+
+    context 'when the argument is a String' do
+      it 'loads tianon/true image from the file system' do
+        result = Docker::Image.load(file)
+        expect(result).to eq("")
+      end
+    end
+
+    context 'when the argument is an IO' do
+      let(:io) { File.open(file) }
+
+      after { io.close }
+
+      it 'loads tinan/true image from the IO' do
+        result = Docker::Image.load(io)
+        expect(result).to eq("")
+      end
+    end
+  end
+
   describe '.create' do
     subject { described_class }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.28.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon