docker-api 1.1.0 → 1.1.1

data/lib/docker.rb

@@ -2,6 +2,7 @@ require 'cgi'
 require 'json'
 require 'excon'
 require 'tempfile'
+require 'rubygems/package'
 require 'archive/tar/minitar'
 
 # The top-level module for this gem. It's purpose is to hold global

data/lib/docker/container.rb

@@ -12,19 +12,19 @@ class Docker::Container
   end
 
   # Get more information about the Container.
-  get :json
+  request :get, :json
   # Wait for the current command to finish executing.
-  post :wait
+  request :post, :wait
   # Start the Container.
-  post :start
+  request :post, :start
   # Inspect the Container's changes to the filesysetem
-  get :changes
+  request :get, :changes
   # Stop the Container.
-  post :stop
+  request :post, :stop
   # Kill the Container.
-  post :kill
+  request :post, :kill
   # Restart the Container
-  post :restart
+  request :post, :restart
 
   # Export the Container as a tar.
   def export(&block)

data/lib/docker/image.rb

@@ -14,11 +14,11 @@ class Docker::Image
   end
 
   # Tag the Image.
-  post :tag
+  request :post, :tag
   # Get more information about the Image.
-  get :json
+  request :get, :json
   # Get the history of the Image.
-  get :history
+  request :get, :history
 
   # Given a command and optional list of streams to attach to, run a command on
   # an Image. This will not modify the Image, but rather create a new Container
@@ -104,19 +104,11 @@ class Docker::Image
     end
 
     def create_tar(input)
-      cwd = FileUtils.pwd
-      path = "/tmp/docker/tar-#{rand(10000)}"
-      string = StringIO.new
-      tar = Archive::Tar::Minitar::Output.new(string)
-      FileUtils.mkdir_p(path)
-      FileUtils.cd(path)
-      file = File.new('Dockerfile', 'w')
-      file.write(input)
-      file.close
-      Archive::Tar::Minitar.pack_file("Dockerfile", tar)
-      FileUtils.cd(cwd)
-      FileUtils.rm_rf(path)
-      string.tap(&:rewind)
+      output = StringIO.new
+      Gem::Package::TarWriter.new(output) do |tar|
+        tar.add_file('Dockerfile', '640') { |tar_file| tar_file.write(input) }
+      end
+      output.tap(&:rewind)
     end
 
     def create_dir_tar(directory)

data/lib/docker/model.rb

@@ -8,8 +8,8 @@ module Docker::Model
   def self.included(base)
     base.class_eval do
       extend ClassMethods
-      private_class_method :new, :request, :get, :put, :post, :delete,
-                           :set_create_request, :set_resource_prefix
+      private_class_method :new, :request, :set_create_request,
+                           :set_resource_prefix
     end
   end
 
@@ -58,10 +58,6 @@ module Docker::Model
       end
     end
 
-    [:get, :put, :post, :delete].each do |method|
-      define_method(method) { |*args, &block| request(method, *args, &block) }
-    end
-
     # Create a Model with the specified body. Raises a
     # Docker::Error::ArgumentError if the argument is not a Hash. Otherwise,
     # instances execs the Class's #create_request method with the single

data/lib/docker/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors: