docker-api 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfc50f47e7b014bac994dd4077a3fd77abf38a3b
-  data.tar.gz: 6ccc92a4b1be40bef5628a7800a4870e408e027e
+  metadata.gz: 649da0fe1cfd65917ce9975d649ba38846ce728c
+  data.tar.gz: 17a7e5506eccab710826b563b8fa74961f3d31ff
 SHA512:
-  metadata.gz: 6bf902fd4852f9662dbf942f929be54a8d84416bd9ddbd4d2acbb822f5e3f7a7e6ec09ef73f14485598c5d90261256e362b32cdfa65734286b6356398b805a07
-  data.tar.gz: 748c6151a34ce6aeae730af14e339bff538f3d637def12ebdc24db30e3185912cd61b37f4e73bfe95e9391ee31ac7fcdbacd82c6de25f40f8e6ee2e1a572747c
+  metadata.gz: 0884b950410fc3d3d8b169dbc6561efd26e08640cf9d5a0439e36ef743eb2decdb880378639b090da4f9e0a1380cf9fe5aef5829a9eb7b169112c33df893b6e6
+  data.tar.gz: 26c0b55692549c0f77f6a946967c228f5f86c005fdb555b2366dd1e015fcccab157b77fae1c31dc7a3ed2ab2346cba9295299b29fb617632ca16fa036f146015

data/README.md

@@ -2,7 +2,7 @@ docker-api
 ==========
 [![Gem Version](https://badge.fury.io/rb/docker-api.png)](http://badge.fury.io/rb/docker-api) [![travis-ci](https://travis-ci.org/swipely/docker-api.png?branch=master)](https://travis-ci.org/swipely/docker-api) [![Code Climate](https://codeclimate.com/github/swipely/docker-api.png)](https://codeclimate.com/github/swipely/docker-api) [![Dependency Status](https://gemnasium.com/swipely/docker-api.png)](https://gemnasium.com/swipely/docker-api)
 
-This gem provides an object-oriented interface to the [Docker Remote API](http://docs.docker.io/en/latest/api/docker_remote_api_v1.4/). Every method listed there is implemented, with the exception of attaching to the STDIN of a Container. At the time of this writing, docker-api is meant to interface with Docker version 0.5.1.
+This gem provides an object-oriented interface to the [Docker Remote API](http://docs.docker.io/en/latest/api/docker_remote_api_v1.4/). Every method listed there is implemented, with the exception of attaching to the STDIN of a Container. At the time of this writing, docker-api is meant to interface with Docker version 0.5.*.
 
 Installation
 ------------
@@ -74,7 +74,7 @@ require 'docker'
 # => true
 
 Docker.version
-# => { 'Version' => '0.4.0', 'GoVersion' => 'go1.0.3' }
+# => { 'Version' => '0.5.2', 'GoVersion' => 'go1.1' }
 
 Docker.info
 # => { "Debug" => false, "Containers" => 187, "Images" => 196, "NFd" => 10, "NGoroutines" => 9, "MemoryLimit" => true }
@@ -160,19 +160,19 @@ container.json
 
 # Start running the Container.
 container.start
-# => nil
+# => Docker::Container { :id => 492510dd38e4, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }
 
 # Stop running the Container.
 container.stop
-# => nil
+# => Docker::Container { :id => 492510dd38e4, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }
 
 # Restart the Container.
 container.restart
-# => nil
+# => Docker::Container { :id => 492510dd38e4, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }
 
 # Kill the command running in the Container.
 container.kill
-# => nil
+# => Docker::Container { :id => 492510dd38e4, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }
 
 # Return the currently executing processes in a Container.
 container.top

data/lib/docker.rb

@@ -8,8 +8,6 @@ require 'archive/tar/minitar'
 # The top-level module for this gem. It's purpose is to hold global
 # configuration variables that are used as defaults in other classes.
 module Docker
-  extend self
-
   attr_reader :creds
 
   def url
@@ -64,12 +62,15 @@ module Docker
   rescue Docker::Error::DockerError
     raise Docker::Error::VersionError, "Expected API Version: #{API_VERSION}"
   end
+
+  module_function :url, :url=, :options, :options=, :connection,
+                  :reset_connection!, :version, :info, :authenticate!,
+                  :validate_version!
 end
 
 require 'docker/version'
 require 'docker/error'
 require 'docker/util'
 require 'docker/connection'
-require 'docker/model'
 require 'docker/container'
 require 'docker/image'

data/lib/docker/connection.rb

@@ -53,12 +53,13 @@ private
     query ||= {}
     opts ||= {}
     headers = opts.delete(:headers) || {}
+    content_type = opts[:body].nil? ?  'text/plain' : 'application/json'
     user_agent = "Swipely/Docker-API #{Docker::VERSION}"
     {
       :method        => http_method,
       :path          => "/v#{Docker::API_VERSION}#{path}",
       :query         => query,
-      :headers       => { 'Content-Type' => 'text/plain',
+      :headers       => { 'Content-Type' => content_type,
                           'User-Agent'   => user_agent,
                         }.merge(headers),
       :expects       => (200..204),

data/lib/docker/container.rb

@@ -1,48 +1,32 @@
 # This class represents a Docker Container. It's important to note that nothing
 # is cached so that the information is always up to date.
 class Docker::Container
-  include Docker::Model
   include Docker::Error
 
-  set_resource_prefix '/containers'
+  attr_accessor :id, :connection
 
-  set_create_request do |body|
-    response = connection.post('/containers/create', nil, :body => body.to_json)
-    @id = Docker::Util.parse_json(response)['Id']
-    self
+  # The private new method accepts a connection and optional id.
+  def initialize(connection, id = nil)
+    if connection.is_a?(Docker::Connection)
+      @connection, @id = connection, id
+    else
+      raise ArgumentError, "Expected a Docker::Connection, got: #{connection}."
+    end
   end
 
-  # Get more information about the Container.
-  request :get, :json
-  # Start the Container.
-  request :post, :start
-  # Inspect the Container's changes to the filesysetem
-  request :get, :changes
-  # Stop the Container.
-  request :post, :stop
-  # Kill the Container.
-  request :post, :kill
-  # Restart the Container
-  request :post, :restart
-
   # Return a List of Hashes that represents the top running processes.
   def top(opts = {})
-    resp = connection.get("/containers/#{id}/top", opts)
-    hash = Docker::Util.parse_json(resp)
-    hash['Processes'].map { |ary| Hash[hash['Titles'].zip(ary)] }
-  end
-
-  # For each method, `m`, define a method called `m?` that attempts the method,
-  # but catches all Server errors.
-  [:stop, :start, :kill, :restart].each do |method|
-    define_method :"#{method}?" do |*args|
-      begin; public_send(method, *args); rescue ServerError; end
+    resp = Docker::Util.parse_json(connection.get(path_for(:top), opts))
+    if resp['Processes'].nil?
+      []
+    else
+      resp['Processes'].map { |ary| Hash[resp['Titles'].zip(ary)] }
     end
   end
 
   # Wait for the current command to finish executing.
   def wait(time = 60)
-    resp = connection.post("/containers/#{id}/wait", nil, :read_timeout => time)
+    resp = connection.post(path_for(:wait), nil, :read_timeout => time)
     Docker::Util.parse_json(resp)
   end
 
@@ -51,8 +35,8 @@ class Docker::Container
   # the command that is currently executing does not return a 0 status code, an
   # UnexpectedResponseError is raised.
   def run(cmd, time = 1000)
-    if (code = tap(&:start?).wait(time)['StatusCode']).zero?
-      commit.run(cmd).tap(&:start?)
+    if (code = tap(&:start).wait(time)['StatusCode']).zero?
+      commit.run(cmd).tap(&:start)
     else
       raise UnexpectedResponseError, "Command returned status code #{code}."
     end
@@ -60,21 +44,72 @@ class Docker::Container
 
   # Export the Container as a tar.
   def export(&block)
-    connection.get("/containers/#{id}/export", nil, :response_block => block)
-    true
+    connection.get(path_for(:export), {}, :response_block => block)
+    self
   end
 
   # Attach to a container's standard streams / logs.
   def attach(options = {}, &block)
-    options = { :stream => true, :stdout => true }.merge(options)
-    connection.post("/containers/#{id}/attach", options,
-                    :response_block => block)
+    opts = { :stream => true, :stdout => true }.merge(options)
+    connection.post(path_for(:attach), opts, :response_block => block)
   end
 
   # Create an Image from a Container's change.s
   def commit(options = {})
     options.merge!('container' => self.id[0..7])
     hash = Docker::Util.parse_json(connection.post('/commit', options))
-    Docker::Image.send(:new, :id => hash['Id'], :connection => self.connection)
+    Docker::Image.send(:new, self.connection, hash['Id'])
+  end
+
+  # Return a String represntation of the Container.
+  def to_s
+    "Docker::Container { :id => #{self.id}, :connection => #{self.connection} }"
   end
+
+  # #json returns information about the Container, #changes returns a list of
+  # the changes the Container has made to the filesystem.
+  [:json, :changes].each do |method|
+    define_method(method) do |opts = {}|
+      Docker::Util.parse_json(connection.get(path_for(method), opts))
+    end
+  end
+
+  # #start!, #stop!, #kill!, and #restart! all perform the associated action and
+  # return the Container. #start, #stop, #kill, and #restart all do the same,
+  # but rescue from ServerErrors.
+  [:start, :stop, :kill, :restart].each do |method|
+    define_method(:"#{method}!") do |opts = {}|
+      connection.post(path_for(method), {}, :body => opts.to_json)
+      self
+    end
+
+    define_method(method) do |*args|
+      begin; public_send(:"#{method}!", *args); rescue ServerError; self end
+    end
+  end
+
+  # Create a new Container.
+  def self.create(opts = {}, conn = Docker.connection)
+    instance = new(conn)
+    resp = conn.post('/containers/create', {}, :body => opts.to_json)
+    if (instance.id = Docker::Util.parse_json(resp)['Id']).nil?
+      raise UnexpectedResponseError, 'Create response did not contain an Id'
+    else
+      instance
+    end
+  end
+
+  # Return all of the Containers.
+  def self.all(opts = {}, conn = Docker.connection)
+    hashes = Docker::Util.parse_json(conn.get('/containers/json', opts)) || []
+    hashes.map { |hash| new(conn, hash['Id']) }
+  end
+
+  # Convenience method to return the path for a particular resource.
+  def path_for(resource)
+    "/containers/#{self.id}/#{resource}"
+  end
+
+  private :path_for
+  private_class_method :new
 end

data/lib/docker/image.rb

@@ -1,47 +1,45 @@
 # This class represents a Docker Image.
 class Docker::Image
-  include Docker::Model
   include Docker::Error
 
-  set_resource_prefix '/images'
+  attr_accessor :id, :connection
 
-  set_create_request do |options|
-    body = connection.post('/images/create', options)
-    @id = Docker::Util.parse_json(body)['status'] rescue nil
-    @id ||= options['fromImage']
-    @id ||= "#{options['repo']}/#{options['tag']}"
-    self
+  # The private new method accepts a connection and optional id.
+  def initialize(connection, id = nil)
+    if connection.is_a?(Docker::Connection)
+      @connection, @id = connection, id
+    else
+      raise ArgumentError, "Expected a Docker::Connection, got: #{connection}."
+    end
   end
 
-  # Tag the Image.
-  request :post, :tag
-  # Get more information about the Image.
-  request :get, :json
-  # Get the history of the Image.
-  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
   # to run the Image.
   def run(cmd)
     cmd = cmd.split(/\s+/) if cmd.is_a?(String)
     Docker::Container.create({ 'Image' => self.id, 'Cmd' => cmd }, connection)
-                     .tap(&:start)
+                     .tap(&:start!)
   end
 
   # Push the Image to the Docker registry.
   def push(options = {})
-    connection.post("/images/#{self.id}/push", options, :body => Docker.creds)
-    true
+    connection.post(path_for(:push), options, :body => Docker.creds)
+    self
+  end
+
+  # Tag the Image.
+  def tag(opts = {})
+    Docker::Util.parse_json(connection.post(path_for(:tag), opts))
   end
 
   # Insert a file into the Image, returns a new Image that has that file.
   def insert(query = {})
-    body = connection.post("/images/#{self.id}/insert", query)
+    body = connection.post(path_for(:insert), query)
     if (id = body.match(/{"Id":"([a-f0-9]+)"}\z/)).nil? || id[1].empty?
       raise UnexpectedResponseError, "Could not find Id in '#{body}'"
     else
-      self.class.send(:new, :id => id[1], :connection => self.connection)
+      self.class.send(:new, connection, id[1])
     end
   end
 
@@ -50,15 +48,46 @@ class Docker::Image
     connection.delete("/images/#{self.id}")
   end
 
+  # Return a String representation of the Image.
+  def to_s
+    "Docker::Image { :id => #{self.id}, :connection => #{self.connection} }"
+  end
+
+  # #json returns extra information about an Image, #history returns its
+  # history.
+  [:json, :history].each do |method|
+    define_method(method) do |opts = {}|
+      Docker::Util.parse_json(connection.get(path_for(method), opts))
+    end
+  end
+
   class << self
     include Docker::Error
 
+    # Create a new Image.
+    def create(opts = {}, conn = Docker.connection)
+      instance = new(conn)
+      conn.post('/images/create', opts)
+      id = opts['repo'] ? "#{opts['repo']}/#{opts['tag']}" : opts['fromImage']
+      if (instance.id = id).nil?
+        raise UnexpectedResponseError, 'Create response did not contain an Id'
+      else
+        instance
+      end
+    end
+
+    # Return every Image.
+    def all(opts = {}, conn = Docker.connection)
+      hashes = Docker::Util.parse_json(conn.get('/images/json', opts)) || []
+      hashes.map { |hash| new(conn, hash['Id']) }
+    end
+
     # Given a query like `{ :term => 'sshd' }`, queries the Docker Registry for
-    # a corresponiding Image.
+    # a corresponding Image.
     def search(query = {}, connection = Docker.connection)
       body = connection.get('/images/search', query)
       hashes = Docker::Util.parse_json(body) || []
-      hashes.map { |hash| new(:id => hash['Name'], :connection => connection) }
+      hashes.map { |hash| new(connection, hash['Name']) }
     end
 
     # Import an Image from the output of Docker::Container#export.
@@ -67,17 +96,17 @@ class Docker::Image
         body = connection.post(
           '/images/create',
            options.merge('fromSrc' => '-'),
-           :headers => { 'Transfer-Encoding' => 'chunked' }
+           :headers => { 'Content-Type' => 'application/tar',
+                         'Transfer-Encoding' => 'chunked' }
         ) { io.read(Excon.defaults[:chunk_size]).to_s }
-        new(:id => Docker::Util.parse_json(body)['status'],
-            :connection => connection)
+        new(connection, Docker::Util.parse_json(body)['status'])
       end
     end
 
     # Given a Dockerfile as a string, builds an Image.
     def build(commands, connection = Docker.connection)
       body = connection.post('/build', {}, :body => create_tar(commands))
-      new(:id => extract_id(body), :connection => connection)
+      new(connection, extract_id(body))
     end
 
     # Given a directory that contains a Dockerfile, builds an Image.
@@ -88,7 +117,7 @@ class Docker::Image
         :headers => { 'Content-Type'      => 'application/tar',
                       'Transfer-Encoding' => 'chunked' }
       ) { tar.read(Excon.defaults[:chunk_size]).to_s }
-      new(:id => extract_id(body), :connection => connection)
+      new(connection, extract_id(body))
     ensure
       tar.close unless tar.nil?
     end
@@ -121,4 +150,11 @@ class Docker::Image
       FileUtils.cd(cwd)
     end
   end
+
+  # Convenience method to return the path for a particular resource.
+  def path_for(resource)
+    "/images/#{self.id}/#{resource}"
+  end
+
+  private :path_for
 end

data/lib/docker/util.rb

@@ -1,7 +1,6 @@
 # This module holds shared logic that doesn't really belong anywhere else in the
 # gem.
 module Docker::Util
-  extend self
   include Docker::Error
 
   def parse_json(body)
@@ -9,4 +8,6 @@ module Docker::Util
   rescue JSON::ParserError => ex
     raise UnexpectedResponseError, ex.message
   end
+
+  module_function :parse_json
 end

data/lib/docker/version.rb

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

data/spec/docker/container_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 # Docker daemon and have the base Image pulled.
 describe Docker::Container do
   describe '#to_s' do
-    subject { described_class.send(:new, :id => rand(10000).to_s) }
+    subject { described_class.send(:new, Docker.connection, rand(10000).to_s) }
 
     let(:id) { 'bf119e2' }
     let(:connection) { Docker.connection }
@@ -91,13 +91,20 @@ describe Docker::Container do
   end
 
   describe '#start' do
-    subject { described_class.create('Cmd' => %w[true], 'Image' => 'base') }
+    subject {
+      described_class.create(
+        'Cmd' => %w[test -d /foo],
+        'Image' => 'base',
+        'Volumes' => {'/foo' => {}}
+      )
+    }
+    let(:all) { Docker::Container.all }
+
+    before { subject.start('Binds' => ["/tmp:/foo"]) }
 
     it 'starts the container', :vcr do
-      subject.start
-      described_class.all.map(&:id).should be_any { |id|
-        id.start_with?(subject.id)
-      }
+      all.map(&:id).should be_any { |id| id.start_with?(subject.id) }
+      subject.wait(10)['StatusCode'].should be_zero
     end
   end
 
@@ -214,14 +221,7 @@ describe Docker::Container do
   describe '.create' do
     subject { described_class }
 
-    context 'when the body is not a Hash' do
-      it 'raises an error' do
-        expect { subject.create(:not_a_hash) }
-            .to raise_error(Docker::Error::ArgumentError)
-      end
-    end
-
-    context 'when the Container does not yet exist and the body is a Hash' do
+    context 'when the Container does not yet exist' do
       context 'when the HTTP request does not return a 200' do
         before { Excon.stub({ :method => :post }, { :status => 400 }) }
         after { Excon.stubs.shift }

data/spec/docker/image_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Docker::Image do
   describe '#to_s' do
-    subject { described_class.send(:new, :id => rand(10000).to_s) }
+    subject { described_class.send(:new, Docker.connection, id) }
 
     let(:id) { 'bf119e2' }
     let(:connection) { Docker.connection }
@@ -102,13 +102,6 @@ describe Docker::Image do
   describe '.create' do
     subject { described_class }
 
-    context 'when the body is not a Hash' do
-      it 'raises an error' do
-        expect { subject.create(:not_a_hash) }
-            .to raise_error(Docker::Error::ArgumentError)
-      end
-    end
-
     context 'when the Image does not yet exist and the body is a Hash' do
       let(:image) { subject.create('fromImage' => 'base') }
 

data/spec/vcr/Docker_Container/_create/when_the_Container_does_not_yet_exist/when_the_HTTP_request_returns_a_200/sets_the_id.yml

@@ -0,0 +1,30 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:4243/v1.4/containers/create
+    body:
+      encoding: UTF-8
+      string: '{"Hostname":"","User":"","Memory":0,"MemorySwap":0,"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"PortSpecs":null,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":["date"],"Dns":null,"Image":"base","Volumes":{},"VolumesFrom":""}'
+    headers:
+      Content-Type:
+      - text/plain
+      User-Agent:
+      - Swipely/Docker-API 1.4.0
+  response:
+    status:
+      code: 201
+      message: ''
+    headers:
+      Content-Type:
+      - text/plain; charset=utf-8
+      Content-Length:
+      - '21'
+      Date:
+      - Thu, 08 Aug 2013 14:47:05 GMT
+    body:
+      encoding: UTF-8
+      string: '{"Id":"3e4587069eb0"}'
+    http_version: 
+  recorded_at: Thu, 08 Aug 2013 14:47:05 GMT
+recorded_with: VCR 2.4.0

data/spec/vcr/Docker_Container/_start/starts_the_container.yml

@@ -5,55 +5,61 @@ http_interactions:
     uri: http://localhost:4243/v1.4/containers/create
     body:
       encoding: UTF-8
-      string: '{"Cmd":["true"],"Image":"base"}'
+      string: ! '{"Cmd":["test","-d","/foo"],"Image":"base","Volumes":{"/foo":{}}}'
     headers:
       Content-Type:
       - text/plain
       User-Agent:
-      - Swipely/Docker-API 1.3.1
+      - Swipely/Docker-API 1.4.0
   response:
     status:
       code: 201
       message: ''
     headers:
-      Content-Type:
-      - text/plain; charset=utf-8
-      Content-Length:
-      - '21'
-      Date:
-      - Wed, 07 Aug 2013 16:51:14 GMT
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        dGV4dC9wbGFpbjsgY2hhcnNldD11dGYtOA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        MjE=
+      !binary "RGF0ZQ==":
+      - !binary |-
+        RnJpLCAwOSBBdWcgMjAxMyAwODo1MDowNSBHTVQ=
     body:
-      encoding: UTF-8
-      string: '{"Id":"006a81e3a9ef"}'
+      encoding: US-ASCII
+      string: ! '{"Id":"3632688f5774"}'
     http_version: 
-  recorded_at: Wed, 07 Aug 2013 16:51:14 GMT
+  recorded_at: Fri, 09 Aug 2013 08:50:06 GMT
 - request:
     method: post
-    uri: http://localhost:4243/v1.4/containers/006a81e3a9ef/start
+    uri: http://localhost:4243/v1.4/containers/3632688f5774/start
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: ! '{"Binds":["/tmp:/foo"]}'
     headers:
       Content-Type:
-      - text/plain
+      - application/json
       User-Agent:
-      - Swipely/Docker-API 1.3.1
+      - Swipely/Docker-API 1.4.0
   response:
     status:
       code: 204
       message: ''
     headers:
-      Content-Type:
-      - text/plain; charset=utf-8
-      Content-Length:
-      - '0'
-      Date:
-      - Wed, 07 Aug 2013 16:51:14 GMT
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        dGV4dC9wbGFpbjsgY2hhcnNldD11dGYtOA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        MA==
+      !binary "RGF0ZQ==":
+      - !binary |-
+        RnJpLCAwOSBBdWcgMjAxMyAwODo1MDowNiBHTVQ=
     body:
-      encoding: UTF-8
+      encoding: US-ASCII
       string: ''
     http_version: 
-  recorded_at: Wed, 07 Aug 2013 16:51:14 GMT
+  recorded_at: Fri, 09 Aug 2013 08:50:06 GMT
 - request:
     method: get
     uri: http://localhost:4243/v1.4/containers/json
@@ -64,22 +70,84 @@ http_interactions:
       Content-Type:
       - text/plain
       User-Agent:
-      - Swipely/Docker-API 1.3.1
+      - Swipely/Docker-API 1.4.0
   response:
     status:
       code: 200
       message: ''
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbg==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        OTQ2
+      !binary "RGF0ZQ==":
+      - !binary |-
+        RnJpLCAwOSBBdWcgMjAxMyAwODo1MDowNiBHTVQ=
+    body:
+      encoding: US-ASCII
+      string: ! '[{"Id":"3632688f5774a1a5077e0b29e4410458ae43ec9dbaa400b10e68b385206e0cff","Image":"base:latest","Command":"test
+        -d /foo","Created":1376038205,"Status":"Up Less than a second","Ports":"","SizeRw":0,"SizeRootFs":0},{"Id":"965d1be64f580f590fa712f6e34b1186cd937f1448b6d5feeeb02174dd562cba","Image":"c401009f3872","Command":"/bin/bash
+        --login -c cd /app && bundle exec rackup -p $PORT","Created":1376001906,"Status":"Up
+        10 hours","Ports":"","SizeRw":0,"SizeRootFs":0},{"Id":"371a31ee0515e231b53331827e2169a781d605259ca75f0d1b1593095fee6924","Image":"69e523818a5f","Command":"/bin/bash
+        --login -c cd /app && bundle exec rackup config.ru -p 80","Created":1375967943,"Status":"Up
+        19 hours","Ports":"","SizeRw":0,"SizeRootFs":0},{"Id":"c7a4fe69a7249d6db5f24106891e1c28ee4bfe538ece09a53574c0b91850f165","Image":"samalba/hipache:latest","Command":"supervisord
+        -n","Created":1375657256,"Status":"Up 19 hours","Ports":"80-\u003e80","SizeRw":0,"SizeRootFs":0}]'
+    http_version: 
+  recorded_at: Fri, 09 Aug 2013 08:50:06 GMT
+- request:
+    method: post
+    uri: http://localhost:4243/v1.4/containers/3632688f5774/wait
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Content-Type:
-      - application/json
-      Content-Length:
-      - '207'
-      Date:
-      - Wed, 07 Aug 2013 16:51:14 GMT
+      - text/plain
+      User-Agent:
+      - Swipely/Docker-API 1.4.0
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbg==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        MTY=
+      !binary "RGF0ZQ==":
+      - !binary |-
+        RnJpLCAwOSBBdWcgMjAxMyAwODo1MDowNiBHTVQ=
     body:
-      encoding: UTF-8
-      string: '[{"Id":"006a81e3a9efb2d6b6b1bf7b25031f7c0ca972e731c4efeaaab30b75997d5804","Image":"base2:latest","Command":"true
-        ","Created":1375894274,"Status":"Up Less than a second","Ports":"","SizeRw":0,"SizeRootFs":0}]'
+      encoding: US-ASCII
+      string: ! '{"StatusCode":0}'
+    http_version: 
+  recorded_at: Fri, 09 Aug 2013 08:50:06 GMT
+- request:
+    method: post
+    uri: http://localhost:4243/v1.4/containers/3632688f5774/attach?logs=true&stderr=true&stdout=true&stream=false
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - text/plain
+      User-Agent:
+      - Swipely/Docker-API 1.4.0
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vdm5kLmRvY2tlci5yYXctc3RyZWFt
+    body:
+      encoding: US-ASCII
+      string: ''
     http_version: 
-  recorded_at: Wed, 07 Aug 2013 16:51:14 GMT
-recorded_with: VCR 2.4.0
+  recorded_at: Fri, 09 Aug 2013 08:50:06 GMT
+recorded_with: VCR 2.5.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -171,7 +171,6 @@ files:
 - lib/docker/container.rb
 - lib/docker/error.rb
 - lib/docker/image.rb
-- lib/docker/model.rb
 - lib/docker/util.rb
 - lib/docker/version.rb
 - spec/docker/connection_spec.rb
@@ -189,6 +188,7 @@ files:
 - spec/vcr/Docker_Container/_attach/yields_each_chunk.yml
 - spec/vcr/Docker_Container/_changes/returns_the_changes_as_an_array.yml
 - spec/vcr/Docker_Container/_commit/creates_a_new_Image_from_the_Container_s_changes.yml
+- spec/vcr/Docker_Container/_create/when_the_Container_does_not_yet_exist/when_the_HTTP_request_returns_a_200/sets_the_id.yml
 - spec/vcr/Docker_Container/_create/when_the_Container_does_not_yet_exist_and_the_body_is_a_Hash/when_the_HTTP_request_returns_a_200/sets_the_id.yml
 - spec/vcr/Docker_Container/_export/yields_each_chunk.yml
 - spec/vcr/Docker_Container/_json/returns_the_description_as_a_Hash.yml
@@ -254,6 +254,7 @@ test_files:
 - spec/vcr/Docker_Container/_attach/yields_each_chunk.yml
 - spec/vcr/Docker_Container/_changes/returns_the_changes_as_an_array.yml
 - spec/vcr/Docker_Container/_commit/creates_a_new_Image_from_the_Container_s_changes.yml
+- spec/vcr/Docker_Container/_create/when_the_Container_does_not_yet_exist/when_the_HTTP_request_returns_a_200/sets_the_id.yml
 - spec/vcr/Docker_Container/_create/when_the_Container_does_not_yet_exist_and_the_body_is_a_Hash/when_the_HTTP_request_returns_a_200/sets_the_id.yml
 - spec/vcr/Docker_Container/_export/yields_each_chunk.yml
 - spec/vcr/Docker_Container/_json/returns_the_description_as_a_Hash.yml

data/lib/docker/model.rb

@@ -1,77 +0,0 @@
-# This module is intended to be used as a Mixin for all objects exposed by the
-# Remote API. Currently, these are limited to Containers and Images.
-module Docker::Model
-  include Docker::Error
-
-  attr_reader :id, :connection
-
-  def self.included(base)
-    base.class_eval do
-      extend ClassMethods
-      private_class_method :new, :request, :set_create_request,
-                           :set_resource_prefix
-    end
-  end
-
-  # Creates a new Model with the specified id and Connection. If a Connection
-  # is specified and it is not a Docker::Connection, a
-  # Docker::Error::ArgumentError is raised.
-  def initialize(options = {})
-    if (options[:connection] ||= Docker.connection).is_a?(Docker::Connection)
-      @id, @connection = options[:id], options[:connection]
-    else
-      raise ArgumentError, 'Expected a Docker::Connection.'
-    end
-  end
-
-  def to_s
-    "#{self.class.name} { :id => #{id}, :connection => #{connection} }"
-  end
-
-  # This defines the DSL for the including Classes.
-  module ClassMethods
-    include Docker::Error
-    attr_reader :resource_prefix, :create_request
-
-    # Define the Model's prefix for all requests.
-    def set_resource_prefix(val)
-      @resource_prefix = val
-    end
-
-    # Define how the Model should send a create request to the server.
-    def set_create_request(&block)
-      @create_request = block
-    end
-
-    # Define a method named `action` that sends an http `method` request to the
-    # Docker Server.
-    def request(method, action, opts = {}, &outer_block)
-      define_method(action) do |query = nil, &block|
-        new_opts = {
-          :path => "#{self.class.resource_prefix}/#{self.id}/#{action}",
-          :json => true
-        }.merge(opts)
-        body = connection.request(method, new_opts[:path], query,
-                                  new_opts[:excon], &block)
-        body = Docker::Util.parse_json(body) if new_opts[:json]
-        outer_block.nil? ? body : instance_exec(body, &outer_block)
-      end
-    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
-    # argument.
-    def create(opts = {}, conn = Docker.connection)
-      raise Docker::Error::ArgumentError, 'Expected a Hash' if !opts.is_a?(Hash)
-      new(:connection => conn).instance_exec(opts, &create_request)
-    end
-
-    # Retrieve every Instance of a model for the given server.
-    def all(options = {}, connection = Docker.connection)
-      path = "#{resource_prefix}/json"
-      hashes = Docker::Util.parse_json(connection.get(path, options)) || []
-      hashes.map { |hash| new(:id => hash['Id'], :connection => connection) }
-    end
-  end
-end