docker-api 0.0.2 → 0.0.3

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 *.swp
+*.gem
 Gemfile.lock

data/README.md

@@ -90,9 +90,9 @@ image.create!('fromRepo' => 'base', 'fromSrc' => '-')
 image.created?
 # => true
 
-# Insert a file into an Image.
-image.insert('path' => '/usr', 'url' => '/home/user/.vimrc')
-# => { 'Id' => '' }
+# Insert a file into an Image. Returns a new Image that contains that file.
+image.insert('path' => '/google', 'url' => 'http://google.com')
+# => Docker::Image { :id => 11ef6c882, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }
 
 # Tag an Image.
 image.tag('repo' => 'base2', 'force' => true)

data/lib/docker/image.rb

@@ -1,6 +1,7 @@
 # This class represents a Docker Image.
 class Docker::Image
   include Docker::Model
+  include Docker::Error
   resource_prefix '/images'
 
   create_request do |options|
@@ -20,11 +21,24 @@ class Docker::Image
   docker_request :json, :get
   # Push the Image to the Docker registry.
   docker_request :push, :post
-  # Insert a file into the Image.
-  docker_request :insert, :post
   # Get the history of the Image.
   docker_request :history, :get
 
+  # Insert a file into the Image, returns a new Image that has that file.
+  def insert(query = {})
+    ensure_created!
+    body = self.connection.post(
+      :path    => "/images/#{self.id}/insert",
+      :query   => query,
+      :expects => (200..204)
+    ).body
+    if (id = body.match(/{"Id":"([a-f0-9]+)"}\z/)).nil? || id[1].empty?
+      raise UnexpectedResponseError, "Could not find Id in '#{body}'"
+    else
+      Docker::Image.new(:id => id[1], :connection => self.connection)
+    end
+  end
+
   # Remove the Image from the server.
   def remove
     ensure_created!

data/lib/docker/version.rb

@@ -1,3 +1,3 @@
 module Docker
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/docker/image_spec.rb

@@ -168,11 +168,19 @@ describe Docker::Image do
       end
 
       context 'when the HTTP response status is 200' do
-        before { subject.create!('fromRepo' => 'base', 'fromSrc' => '-') }
+        subject { described_class.build('from base') }
+        let(:new_image) { subject.insert(:path => '/stallman',
+                                         :url => 'http://stallman.org') }
+        let(:container) { Docker::Container.new }
+        let(:ls_output) do
+          container.tap(&:start)
+                   .attach(:stream => true, :stdout => true)
+                   .split("\n")
+        end
+        before { container.create!('Image' => new_image.id, 'Cmd' => %w[ls /]) }
 
-        it 'inserts the file', :vcr do
-          expect { subject.insert('path' => '/', 'url' => 'lol') }
-              .to_not raise_error
+        it 'inserts the url\'s file into a new Image', :vcr do
+          ls_output.should include('stallman')
         end
       end
     end

data/spec/vcr/Docker_Image/_insert/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/inserts_the_url_s_file_into_a_new_Image.yml

@@ -0,0 +1,198 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:4243/build
+    body:
+      encoding: US-ASCII
+      string: ! "-------------RubyMultipartPost\r\nContent-Disposition: form-data;
+        name=\"Dockerfile\"; filename=\"Dockerfile\"\r\nContent-Length: 10\r\nContent-Type:
+        application/octet-stream\r\nContent-Transfer-Encoding: binary\r\n\r\nfrom
+        base\n\r\n-------------RubyMultipartPost--\r\n\r\n"
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - multipart/form-data; boundary=-----------RubyMultipartPost
+      Content-Length:
+      - '251'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain; charset=utf-8
+      Date:
+      - Thu, 20 Jun 2013 18:06:06 GMT
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: US-ASCII
+      string: ! 'FROM base ()
+
+        ===> b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc
+
+        Build successful.
+
+        ===> b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc
+
+'
+    http_version: 
+  recorded_at: Thu, 20 Jun 2013 18:06:06 GMT
+- request:
+    method: post
+    uri: http://localhost:4243/images/b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc/insert?path=/stallman&url=http://stallman.org
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbg==
+      !binary "RGF0ZQ==":
+      - !binary |-
+        VGh1LCAyMCBKdW4gMjAxMyAxODowNjowNyBHTVQ=
+      !binary "VHJhbnNmZXItRW5jb2Rpbmc=":
+      - !binary |-
+        Y2h1bmtlZA==
+    body:
+      encoding: US-ASCII
+      string: ! '{"status":"Downloading","progress":"6700/93351 (7%)"}{"status":"Downloading","progress":"12252/93351
+        (13%)"}{"status":"Downloading","progress":"16416/93351 (18%)"}{"status":"Downloading","progress":"23356/93351
+        (25%)"}{"status":"Downloading","progress":"27520/93351 (29%)"}{"status":"Downloading","progress":"33072/93351
+        (35%)"}{"status":"Downloading","progress":"37236/93351 (40%)"}{"status":"Downloading","progress":"44176/93351
+        (47%)"}{"status":"Downloading","progress":"49728/93351 (53%)"}{"status":"Downloading","progress":"53892/93351
+        (58%)"}{"status":"Downloading","progress":"58056/93351 (62%)"}{"status":"Downloading","progress":"62220/93351
+        (67%)"}{"status":"Downloading","progress":"66384/93351 (71%)"}{"status":"Downloading","progress":"71936/93351
+        (77%)"}{"status":"Downloading","progress":"77488/93351 (83%)"}{"status":"Downloading","progress":"81652/93351
+        (87%)"}{"status":"Downloading","progress":"87204/93351 (93%)"}{"status":"Downloading","progress":"91368/93351
+        (98%)"}{"status":"Downloading","progress":"93351/93351 (100%)"}{}{"status":"30c8d2ff0f6b646177231f6b5df651b231be1600b8fbe648f7c10092f394b759"}{"Id":"30c8d2ff0f6b"}'
+    http_version: 
+  recorded_at: Thu, 20 Jun 2013 18:06:08 GMT
+- request:
+    method: post
+    uri: http://localhost:4243/containers/create
+    body:
+      encoding: UTF-8
+      string: ! '{"Image":"30c8d2ff0f6b","Cmd":["ls","/"]}'
+    headers:
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 201
+      message: ''
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        dGV4dC9wbGFpbjsgY2hhcnNldD11dGYtOA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        MjE=
+      !binary "RGF0ZQ==":
+      - !binary |-
+        VGh1LCAyMCBKdW4gMjAxMyAxODowNjowOCBHTVQ=
+    body:
+      encoding: US-ASCII
+      string: ! '{"Id":"153265f2e682"}'
+    http_version: 
+  recorded_at: Thu, 20 Jun 2013 18:06:08 GMT
+- request:
+    method: post
+    uri: http://localhost:4243/containers/153265f2e682/start
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 204
+      message: ''
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        dGV4dC9wbGFpbjsgY2hhcnNldD11dGYtOA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        MA==
+      !binary "RGF0ZQ==":
+      - !binary |-
+        VGh1LCAyMCBKdW4gMjAxMyAxODowNjowOCBHTVQ=
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 20 Jun 2013 18:06:08 GMT
+- request:
+    method: post
+    uri: http://localhost:4243/containers/153265f2e682/attach?stdout=true&stream=true
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vdm5kLmRvY2tlci5yYXctc3RyZWFt
+    body:
+      encoding: US-ASCII
+      string: ! 'bin
+
+        boot
+
+        dev
+
+        etc
+
+        home
+
+        lib
+
+        lib64
+
+        media
+
+        mnt
+
+        opt
+
+        proc
+
+        root
+
+        run
+
+        sbin
+
+        selinux
+
+        srv
+
+        stallman
+
+        sys
+
+        tmp
+
+        usr
+
+        var
+
+'
+    http_version: 
+  recorded_at: Thu, 20 Jun 2013 18:06:08 GMT
+recorded_with: VCR 2.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -218,7 +218,7 @@ files:
 - spec/vcr/Docker_Image/_build/with_an_invalid_Dockerfile/throws_a_UnexpectedResponseError.yml
 - spec/vcr/Docker_Image/_create_/when_the_Image_does_not_yet_exist_and_the_body_is_a_Hash/when_the_HTTP_request_returns_a_200/sets_the_id.yml
 - spec/vcr/Docker_Image/_history/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/returns_the_history_of_the_Image.yml
-- spec/vcr/Docker_Image/_insert/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/inserts_the_file.yml
+- spec/vcr/Docker_Image/_insert/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/inserts_the_url_s_file_into_a_new_Image.yml
 - spec/vcr/Docker_Image/_json/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/returns_additional_information_about_image_image.yml
 - spec/vcr/Docker_Image/_remove/when_the_Image_has_been_created/when_the_HTTP_response_status_is_204/nils_out_the_id.yml
 - spec/vcr/Docker_Image/_search/when_the_HTTP_response_is_a_200/materializes_each_Container_into_a_Docker_Container.yml
@@ -273,9 +273,8 @@ test_files:
 - spec/vcr/Docker_Image/_build/with_an_invalid_Dockerfile/throws_a_UnexpectedResponseError.yml
 - spec/vcr/Docker_Image/_create_/when_the_Image_does_not_yet_exist_and_the_body_is_a_Hash/when_the_HTTP_request_returns_a_200/sets_the_id.yml
 - spec/vcr/Docker_Image/_history/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/returns_the_history_of_the_Image.yml
-- spec/vcr/Docker_Image/_insert/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/inserts_the_file.yml
+- spec/vcr/Docker_Image/_insert/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/inserts_the_url_s_file_into_a_new_Image.yml
 - spec/vcr/Docker_Image/_json/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/returns_additional_information_about_image_image.yml
 - spec/vcr/Docker_Image/_remove/when_the_Image_has_been_created/when_the_HTTP_response_status_is_204/nils_out_the_id.yml
 - spec/vcr/Docker_Image/_search/when_the_HTTP_response_is_a_200/materializes_each_Container_into_a_Docker_Container.yml
 - spec/vcr/Docker_Image/_tag/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/tags_the_image_with_the_repo_name.yml
-has_rdoc: 

data/spec/vcr/Docker_Image/_insert/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/inserts_the_file.yml

@@ -1,59 +0,0 @@
----
-http_interactions:
-- request:
-    method: post
-    uri: http://localhost:4243/images/create
-    body:
-      encoding: US-ASCII
-      string: fromRepo=base&fromSrc=-
-    headers:
-      Content-Type:
-      - application/x-www-form-urlencoded
-  response:
-    status:
-      code: 200
-      message: ''
-    headers:
-      !binary "Q29udGVudC1UeXBl":
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbg==
-      !binary "RGF0ZQ==":
-      - !binary |-
-        VHVlLCAxOCBKdW4gMjAxMyAxNjowNDozOSBHTVQ=
-      !binary "VHJhbnNmZXItRW5jb2Rpbmc=":
-      - !binary |-
-        Y2h1bmtlZA==
-    body:
-      encoding: US-ASCII
-      string: ! '{"status":"17c3631b2ef6"}'
-    http_version: 
-  recorded_at: Tue, 18 Jun 2013 16:04:39 GMT
-- request:
-    method: post
-    uri: http://localhost:4243/images/17c3631b2ef6/insert?path=/&url=lol
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Content-Type:
-      - application/json
-  response:
-    status:
-      code: 200
-      message: ''
-    headers:
-      !binary "Q29udGVudC1UeXBl":
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbg==
-      !binary "RGF0ZQ==":
-      - !binary |-
-        VHVlLCAxOCBKdW4gMjAxMyAxNjowNDozOSBHTVQ=
-      !binary "VHJhbnNmZXItRW5jb2Rpbmc=":
-      - !binary |-
-        Y2h1bmtlZA==
-    body:
-      encoding: US-ASCII
-      string: ! '{"Id":""}'
-    http_version: 
-  recorded_at: Tue, 18 Jun 2013 16:04:39 GMT
-recorded_with: VCR 2.5.0