docker-client 0.1.2 → 0.1.3

data/lib/docker/connection.rb

@@ -13,71 +13,80 @@ class Docker::Connection
   end
     
   def initialize(options = {})
-    @curl = Curl::Easy.new
     @base_url = options[:base_url]
     raise(ArgumentError, ':base_url missing') unless @base_url
   end
   
   def get(path, params = {}, headers = {})
-    resp = perform_request(:GET, path, params, nil, headers)
+    resp = perform_request(:GET, path, params, headers)
     raise(Docker::Error::InternalServerError, resp.body) if resp.status == 500
     resp
   end
   
   def post(path, params = {}, body = '', headers = {})
-    resp = perform_request(:POST, path, params, body, headers)
+    resp = perform_request(:POST, path, params, headers, body)
     raise(Docker::Error::InternalServerError, resp.body) if resp.status == 500
     resp
   end
   
   def delete(path, params = {}, headers = {})
-    resp = perform_request(:DELETE, path, params, nil, headers)
+    resp = perform_request(:DELETE, path, params, headers)
     raise(Docker::Error::InternalServerError, resp.body) if resp.status == 500
     resp
   end
   
   def stream(path, params = {}, timeout = nil, headers = {}, &block)
     raise(ArgumentError, 'Block required to handle streaming response') if block.nil?
+
+    curl = curl_for(path, params, headers)
+
     begin
       timeout_raised = false
-      set_url(path, params)
-      set_headers(headers)
-      @curl.timeout = timeout if timeout
-      @curl.on_body {|data| block.call(data); data.size }
-      @curl.http(:POST)
+      curl.timeout = timeout if timeout
+      curl.on_body {|data| block.call(data); data.size }
+      curl.http(:POST)
     rescue Curl::Err::TimeoutError => e
       timeout_raised = true
     end
-    Response.new(@curl.body_str, @curl.response_code, @curl.content_type, timeout_raised)
+
+    Response.new(curl.body_str, curl.response_code, curl.content_type, timeout_raised)
   end
   
   
   private
     
-    def perform_request(verb, path, query_params, body, headers)
-      set_url(path, query_params)
-      set_headers(headers)
-      set_body(body)
-      @curl.http(verb)
-      Response.new(@curl.body_str, @curl.response_code, @curl.content_type)
+    def perform_request(verb, path, query_params = {}, headers = {}, body = nil)
+      curl = curl_for(path, query_params, headers, body)
+
+      curl.http(verb)
+
+      Response.new(curl.body_str, curl.response_code, curl.content_type)
     end
     
-    def set_body(body)
-      @curl.post_body = body if body
+    def curl_for(path, query_params = {}, headers = {}, body = nil)
+      Curl::Easy.new do |curl|
+        set_url(curl, path, query_params)
+        set_headers(curl, headers)
+        set_body(curl, body)
+      end
+    end
+
+    def set_body(curl, body)
+      curl.post_body = body if body
     end
     
-    def set_url(path, query_params)
+    def set_url(curl, path, query_params)
       params = query_params.collect do |key, value|
-        "#{@curl.escape(key)}=#{@curl.escape(value)}"
+        "#{curl.escape(key)}=#{curl.escape(value)}"
       end
       param_str = params.empty? ? '' : "?#{params.join('&')}"
-      @curl.url = "#{@base_url}#{path}#{param_str}"
+      curl.url = "#{@base_url}#{path}#{param_str}"
     end
     
-    def set_headers(headers)
+    def set_headers(curl, headers)
       headers.each do |key, value|
-        @curl.headers[key] = value
+        curl.headers[key] = value
       end
     end
   
-end
+end

data/lib/docker/version.rb

@@ -1,3 +1,3 @@
 module Docker
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/docker/connection_spec.rb

@@ -20,7 +20,7 @@ describe Docker::Connection, :vcr do
   end
   
   it "returns a valid response for a basic request" do
-    response = subject.send(:perform_request, :GET, '/containers/ps', {}, nil, {})
+    response = subject.send(:perform_request, :GET, '/containers/ps', {}, {}, nil)
     response.should be_kind_of(Docker::Connection::Response)
     response.status.should == 200
     response.content_type.should == "application/json"
@@ -28,7 +28,7 @@ describe Docker::Connection, :vcr do
   end
   
   it "returns status 404 for non existent path" do
-    response = subject.send(:perform_request, :GET, '/invalid_path', {}, nil, {})
+    response = subject.send(:perform_request, :GET, '/invalid_path', {}, {}, nil)
     response.status.should == 404
   end
   
@@ -78,4 +78,4 @@ describe Docker::Connection, :vcr do
   # Alternative syntax
   # "Hello".should == 'Hello' 
   # expect("Hello").to eq("Hello")
-end
+end

data/spec/docker/resource/container_spec.rb

@@ -110,7 +110,7 @@ describe Docker::Resource::Container do
     it "inspects the container's filesystem changes" do
       changes = subject.changes(@c)
       changes.should be_kind_of(Array)
-      changes.any? {|c| c['path'] == '/tmp/changes'}
+      changes.any? {|c| c['Path'] == '/tmp/changes'}.should be_true
     end
   end
   

data/spec/spec_helper.rb

@@ -23,6 +23,7 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.filter_run_excluding :live
   config.order = 'random'
   config.include Helpers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler