docker-client 0.1.1 → 0.1.2

data/spec/docker/connection_spec.rb

@@ -54,7 +54,7 @@ describe Docker::Connection, :vcr do
   end
   
   it "returns a stream", :live do
-    id = create_and_start_container(command: hello_world_command)
+    id = create_and_start_container('test-returns-a-stream', command: hello_world_command)
     received_data = []
     params = {stream: 1, stdout: 1}
     timeout = 2

data/spec/docker/resource/container_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Docker::Resource::Container do
-  subject { Docker::API.new(base_url: 'http://10.0.5.5:4243').containers }
+  subject(:containers) { Docker::API.new(base_url: 'http://10.0.5.5:4243').containers }
   
   describe "lists", :vcr do
     before(:all) {
@@ -49,8 +49,6 @@ describe Docker::Resource::Container do
       status = subject.create(hello_world_command, 'base')
       status.should be_kind_of(Hash)
       status.should have_key('Id')
-      status.should have_key('Warnings')
-      status['Warnings'].should be_nil
       @container_id = status['Id']
     end
     
@@ -116,6 +114,27 @@ describe Docker::Resource::Container do
     end
   end
   
+  describe "commit", :vcr do
+    before(:all) {
+      @c = create_and_start_container('container_commit', command: ['touch', '/tmp/changes'], wait: true)
+    }
+    after(:all) { delete_containers(@c) }
+    
+    it "creates a new image from the container's changes" do
+      options = {m: 'Commit message', author: 'Docker Client' }
+      response = subject.commit(@c, 'test-repo', 'test-tag', options)
+      response.should have_key('Id')
+      image_id = response['Id']
+      delete_images(image_id)
+    end
+    
+    it "raises an exception for an unknown container" do
+      expect {
+        subject.commit('invalid_id', 'test-repo')
+      }.to raise_error(Docker::Error::ContainerNotFound)
+    end
+  end
+  
   describe "export" do
     # not yet implemented
   end
@@ -214,9 +233,7 @@ describe Docker::Resource::Container do
       received_data.size.should >= 2
     end
     
-    # TODO fails because docker always returns status 200
-    # See https://github.com/dotcloud/docker/issues/718
-    xit "raises an exception for an unknown container" do
+    it "raises an exception for an unknown container" do
       expect {
         subject.attach('invalid_id') {  }
       }.to raise_error(Docker::Error::ContainerNotFound)
@@ -239,9 +256,7 @@ describe Docker::Resource::Container do
       output.should include("stderr")
     end
     
-    # TODO fails because docker always returns status 200
-    # See https://github.com/dotcloud/docker/issues/718
-    xit "raises an exception for an unknown container" do
+    it "raises an exception for an unknown container" do
       expect {
         subject.logs('invalid_id')
       }.to raise_error(Docker::Error::ContainerNotFound)
@@ -249,10 +264,10 @@ describe Docker::Resource::Container do
   end
   
   describe "wait", :vcr do
-    before { 
+    before(:all) { 
       @c = create_and_start_container('container_wait', command: ['sleep', '3'])
     }
-    after { delete_containers(@c) }
+    after(:all) { delete_containers(@c) }
     
     it "blocks until the container stops" do
       status = subject.wait(@c)

data/spec/docker/resource/image_spec.rb

@@ -0,0 +1,104 @@
+require 'spec_helper'
+
+describe Docker::Resource::Image do
+  let(:docker) { Docker::API.new(base_url: 'http://10.0.5.5:4243') }
+  subject(:image) { docker.images }
+  
+  describe "list", :vcr do
+    subject { image.list(all: true) }
+    
+    it { should be_kind_of(Array) }
+    its(:size) { should >= 4 }
+    it "includes latest base image" do
+      subject.any? { |i| i["Repository"] == 'base' && i["Tag"] == 'latest' }.should be_true
+    end
+  end
+  
+  # We should name it 
+  # * image/pull
+  # * image/upload
+  describe "create" do
+  end
+  
+  describe "insert" do
+  end
+  
+  describe "show", :vcr do
+    subject { image.show('base') }
+    
+    it { should be_kind_of(Hash) }
+    it { should have_key('id') }
+    it { should have_key('container_config') }
+    it "raises an exception for an unknown image" do
+      expect {
+        image.show("invalid_image")
+      }.to raise_error(Docker::Error::ImageNotFound)
+    end
+  end
+  
+  describe "history", :vcr do
+    subject(:image_history) { image.history('base') }
+    
+    it { should be_kind_of(Array) }
+    its(:size) { should >= 2 }
+    
+    describe "step" do
+      subject { image_history.first }
+      it { should have_key('Id') }
+      it { should have_key('Created') }
+      it { should have_key('CreatedBy') }
+    end
+  end
+  
+  describe "push" do
+  end
+  
+  describe "tag", :vcr do
+    before(:all) { @img = create_image('test-tag') }
+    after(:all) { delete_images(@img) }
+    
+    it "an image into a repository" do
+      status = image.tag('test-tag', 'test-repo')
+      status.should be_true
+    end
+    
+    it "raises an exception for an unknown image" do
+      expect {
+        image.tag('inavlid_image', 'test-repo')
+      # }.to raise_error(Docker::Error::ImageNotFound)
+      # Should return ImageNotFound, this is an error in Docker source! as it returns 500 and not 404
+      }.to raise_error(Docker::Error::InternalServerError)
+    end
+  end
+  
+  describe "remove", :vcr do
+    before(:all) { @image = create_image('test-image') }
+    
+    it "deletes the image" do
+      subject.remove(@image)
+    end
+    
+    it "raises an exception for an unknown image" do
+      expect {
+        subject.remove('unknown-image')
+      }.to raise_error(Docker::Error::ImageNotFound)
+    end
+  end
+  
+  # FIXME not working with current Docker master
+  # describe "search", :vcr do
+  #   it "for an image in the docker index" do
+  #     response = subject.search('sshd')
+  #     response.should be_kind_of(Array)
+  #     response.size.should >= 1
+  #     response.first.should have_key('Name')
+  #     response.first.should have_key('Description')
+  #   end
+    
+  # end
+  
+  
+  
+  
+  
+end

data/spec/helpers.rb

@@ -27,8 +27,14 @@ module Helpers
     end
   end
   
+  def commit_container(id, repo)
+    VCR.use_cassette('test_setup/commit_container') do
+      container_resource.commit(id, repo)['Id']
+    end
+  end
+  
   def create_and_start_container(name, options = {})
-    wait = options.delete(:wait)
+    wait   = options.delete(:wait)
     
     id = create_container(name, options)
     start_container(id)
@@ -41,8 +47,31 @@ module Helpers
     ['/bin/sh', '-c', 'while true; do echo hello world; sleep 1; done']
   end
   
+  def create_image(name)
+    container_id = create_and_start_container(name, command: ['touch', '/tmp/changes'], wait: true, commit: true)
+    image_id = commit_container(container_id, name)
+    delete_containers(container_id)
+    image_id
+  end
+  
+  def delete_images(*ids)
+    VCR.use_cassette('test_setup/delete_image') do
+      ids.each do |id|
+        image_resource.remove(id) if id
+      end
+    end
+  end
+  
+  def image_resource
+    @_image ||= docker_resource.images
+  end
+  
   def container_resource
-    @container ||= Docker::API.new(base_url: 'http://10.0.5.5:4243').containers
+    @_container ||= docker_resource.containers
+  end
+  
+  def docker_resource
+    @_docker ||= Docker::API.new(base_url: 'http://10.0.5.5:4243')
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -226,6 +226,7 @@ files:
 - lib/docker/error.rb
 - lib/docker/error/bad_parameter_error.rb
 - lib/docker/error/container_not_found.rb
+- lib/docker/error/image_not_found.rb
 - lib/docker/error/internal_server_error.rb
 - lib/docker/error/not_found_error.rb
 - lib/docker/resource.rb
@@ -233,13 +234,17 @@ files:
 - lib/docker/resource/container.rb
 - lib/docker/resource/image.rb
 - lib/docker/version.rb
+- spec/cassettes/Docker_Connection/returns_a_stream.yml
 - spec/cassettes/Docker_Connection/returns_a_valid_response_for_a_basic_request.yml
 - spec/cassettes/Docker_Connection/returns_a_valid_response_for_get_request.yml
 - spec/cassettes/Docker_Connection/returns_a_valid_response_for_post_request.yml
 - spec/cassettes/Docker_Connection/returns_status_404_for_non_existent_path.yml
 - spec/cassettes/Docker_Connection/sets_given_query_parameters.yml
 - spec/cassettes/Docker_Connection/sets_given_request_headers.yml
+- spec/cassettes/Docker_Resource_Container/attach/raises_an_exception_for_an_unknown_container.yml
 - spec/cassettes/Docker_Resource_Container/changes/inspects_the_container_s_filesystem_changes.yml
+- spec/cassettes/Docker_Resource_Container/commit/creates_a_new_image_from_the_container_s_changes.yml
+- spec/cassettes/Docker_Resource_Container/commit/raises_an_exception_for_an_unknown_container.yml
 - spec/cassettes/Docker_Resource_Container/create/raises_an_exception_when_called_with_invalid_options.yml
 - spec/cassettes/Docker_Resource_Container/create/with_many_settings.yml
 - spec/cassettes/Docker_Resource_Container/create/with_minimal_settings.yml
@@ -250,6 +255,7 @@ files:
 - spec/cassettes/Docker_Resource_Container/lists/non-running_processes_too.yml
 - spec/cassettes/Docker_Resource_Container/lists/processes_before_a_certain_created_container.yml
 - spec/cassettes/Docker_Resource_Container/lists/processes_since_a_certain_created_container.yml
+- spec/cassettes/Docker_Resource_Container/logs/raises_an_exception_for_an_unknown_container.yml
 - spec/cassettes/Docker_Resource_Container/logs/returns_the_stderr_of_a_container.yml
 - spec/cassettes/Docker_Resource_Container/logs/returns_the_stdout_of_a_container.yml
 - spec/cassettes/Docker_Resource_Container/remove/deletes_the_container.yml
@@ -263,8 +269,24 @@ files:
 - spec/cassettes/Docker_Resource_Container/stop/raises_an_exception_for_an_unknown_container.yml
 - spec/cassettes/Docker_Resource_Container/wait/blocks_until_the_container_stops.yml
 - spec/cassettes/Docker_Resource_Container/wait/raises_an_exception_for_an_unknown_container.yml
+- spec/cassettes/Docker_Resource_Image/history/.yml
+- spec/cassettes/Docker_Resource_Image/history/size/.yml
+- spec/cassettes/Docker_Resource_Image/history/step/.yml
+- spec/cassettes/Docker_Resource_Image/list/.yml
+- spec/cassettes/Docker_Resource_Image/list/includes_latest_base_image.yml
+- spec/cassettes/Docker_Resource_Image/list/size/.yml
+- spec/cassettes/Docker_Resource_Image/remove/deletes_the_image.yml
+- spec/cassettes/Docker_Resource_Image/remove/raises_an_exception_for_an_unknown_image.yml
+- spec/cassettes/Docker_Resource_Image/show/.yml
+- spec/cassettes/Docker_Resource_Image/show/raises_an_exception_for_an_unknown_image.yml
+- spec/cassettes/Docker_Resource_Image/tag/an_image_into_a_repository.yml
+- spec/cassettes/Docker_Resource_Image/tag/raises_an_exception_for_an_unknown_image.yml
+- spec/cassettes/test_setup/commit_container.yml
+- spec/cassettes/test_setup/create_container__command_/bin/sh_-c_while_true_do_echo_hello_world_sleep_1_done_.yml
 - spec/cassettes/test_setup/create_container_connection_post.yml
+- spec/cassettes/test_setup/create_container_container_attach.yml
 - spec/cassettes/test_setup/create_container_container_changes.yml
+- spec/cassettes/test_setup/create_container_container_commit.yml
 - spec/cassettes/test_setup/create_container_container_kill.yml
 - spec/cassettes/test_setup/create_container_container_lists1.yml
 - spec/cassettes/test_setup/create_container_container_lists2.yml
@@ -275,12 +297,17 @@ files:
 - spec/cassettes/test_setup/create_container_container_start.yml
 - spec/cassettes/test_setup/create_container_container_stop.yml
 - spec/cassettes/test_setup/create_container_container_wait.yml
+- spec/cassettes/test_setup/create_container_test-image.yml
+- spec/cassettes/test_setup/create_container_test-returns-a-stream.yml
+- spec/cassettes/test_setup/create_container_test-tag.yml
 - spec/cassettes/test_setup/delete_container.yml
+- spec/cassettes/test_setup/delete_image.yml
 - spec/cassettes/test_setup/start_container.yml
 - spec/cassettes/test_setup/wait_on_container.yml
 - spec/docker/api_spec.rb
 - spec/docker/connection_spec.rb
 - spec/docker/resource/container_spec.rb
+- spec/docker/resource/image_spec.rb
 - spec/helpers.rb
 - spec/spec_helper.rb
 homepage: https://github.com/geku/docker-client
@@ -309,13 +336,17 @@ signing_key:
 specification_version: 3
 summary: Docker client library to access the Docker remote API.
 test_files:
+- spec/cassettes/Docker_Connection/returns_a_stream.yml
 - spec/cassettes/Docker_Connection/returns_a_valid_response_for_a_basic_request.yml
 - spec/cassettes/Docker_Connection/returns_a_valid_response_for_get_request.yml
 - spec/cassettes/Docker_Connection/returns_a_valid_response_for_post_request.yml
 - spec/cassettes/Docker_Connection/returns_status_404_for_non_existent_path.yml
 - spec/cassettes/Docker_Connection/sets_given_query_parameters.yml
 - spec/cassettes/Docker_Connection/sets_given_request_headers.yml
+- spec/cassettes/Docker_Resource_Container/attach/raises_an_exception_for_an_unknown_container.yml
 - spec/cassettes/Docker_Resource_Container/changes/inspects_the_container_s_filesystem_changes.yml
+- spec/cassettes/Docker_Resource_Container/commit/creates_a_new_image_from_the_container_s_changes.yml
+- spec/cassettes/Docker_Resource_Container/commit/raises_an_exception_for_an_unknown_container.yml
 - spec/cassettes/Docker_Resource_Container/create/raises_an_exception_when_called_with_invalid_options.yml
 - spec/cassettes/Docker_Resource_Container/create/with_many_settings.yml
 - spec/cassettes/Docker_Resource_Container/create/with_minimal_settings.yml
@@ -326,6 +357,7 @@ test_files:
 - spec/cassettes/Docker_Resource_Container/lists/non-running_processes_too.yml
 - spec/cassettes/Docker_Resource_Container/lists/processes_before_a_certain_created_container.yml
 - spec/cassettes/Docker_Resource_Container/lists/processes_since_a_certain_created_container.yml
+- spec/cassettes/Docker_Resource_Container/logs/raises_an_exception_for_an_unknown_container.yml
 - spec/cassettes/Docker_Resource_Container/logs/returns_the_stderr_of_a_container.yml
 - spec/cassettes/Docker_Resource_Container/logs/returns_the_stdout_of_a_container.yml
 - spec/cassettes/Docker_Resource_Container/remove/deletes_the_container.yml
@@ -339,8 +371,24 @@ test_files:
 - spec/cassettes/Docker_Resource_Container/stop/raises_an_exception_for_an_unknown_container.yml
 - spec/cassettes/Docker_Resource_Container/wait/blocks_until_the_container_stops.yml
 - spec/cassettes/Docker_Resource_Container/wait/raises_an_exception_for_an_unknown_container.yml
+- spec/cassettes/Docker_Resource_Image/history/.yml
+- spec/cassettes/Docker_Resource_Image/history/size/.yml
+- spec/cassettes/Docker_Resource_Image/history/step/.yml
+- spec/cassettes/Docker_Resource_Image/list/.yml
+- spec/cassettes/Docker_Resource_Image/list/includes_latest_base_image.yml
+- spec/cassettes/Docker_Resource_Image/list/size/.yml
+- spec/cassettes/Docker_Resource_Image/remove/deletes_the_image.yml
+- spec/cassettes/Docker_Resource_Image/remove/raises_an_exception_for_an_unknown_image.yml
+- spec/cassettes/Docker_Resource_Image/show/.yml
+- spec/cassettes/Docker_Resource_Image/show/raises_an_exception_for_an_unknown_image.yml
+- spec/cassettes/Docker_Resource_Image/tag/an_image_into_a_repository.yml
+- spec/cassettes/Docker_Resource_Image/tag/raises_an_exception_for_an_unknown_image.yml
+- spec/cassettes/test_setup/commit_container.yml
+- spec/cassettes/test_setup/create_container__command_/bin/sh_-c_while_true_do_echo_hello_world_sleep_1_done_.yml
 - spec/cassettes/test_setup/create_container_connection_post.yml
+- spec/cassettes/test_setup/create_container_container_attach.yml
 - spec/cassettes/test_setup/create_container_container_changes.yml
+- spec/cassettes/test_setup/create_container_container_commit.yml
 - spec/cassettes/test_setup/create_container_container_kill.yml
 - spec/cassettes/test_setup/create_container_container_lists1.yml
 - spec/cassettes/test_setup/create_container_container_lists2.yml
@@ -351,11 +399,16 @@ test_files:
 - spec/cassettes/test_setup/create_container_container_start.yml
 - spec/cassettes/test_setup/create_container_container_stop.yml
 - spec/cassettes/test_setup/create_container_container_wait.yml
+- spec/cassettes/test_setup/create_container_test-image.yml
+- spec/cassettes/test_setup/create_container_test-returns-a-stream.yml
+- spec/cassettes/test_setup/create_container_test-tag.yml
 - spec/cassettes/test_setup/delete_container.yml
+- spec/cassettes/test_setup/delete_image.yml
 - spec/cassettes/test_setup/start_container.yml
 - spec/cassettes/test_setup/wait_on_container.yml
 - spec/docker/api_spec.rb
 - spec/docker/connection_spec.rb
 - spec/docker/resource/container_spec.rb
+- spec/docker/resource/image_spec.rb
 - spec/helpers.rb
 - spec/spec_helper.rb