docker-api 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f014fbf8eec822892584240bab7d8afa3ba9005e
-  data.tar.gz: 904edd7019308e5c17cdfb326d1ef49fc9a161b8
+  metadata.gz: 8561445c82a9399f7fc303f3a0980b9a0435cb0e
+  data.tar.gz: 436d9e686521e49445dc2e6f786998f2dfd81730
 SHA512:
-  metadata.gz: 1a25da3ac701b0dc000b4e04b694b04c82fc25f7f18be51202eb94e379eee8c17c5e948089e7ef6dd5e656a279df94eb27d9b9c6b6dd70837a77e5a8be9fc3c0
-  data.tar.gz: eb715f87b92d6acbcde4522463ba0a07f18b1f464fd1c8d75937240054911191dd515ab291544439e2081c1ccaa35a7b76c82b4c9fb5da8aa1ec5167e8a8f359
+  metadata.gz: b42de620e15d9b503791ef23fc7bdd9598f4541ddff03d7a7b306b6e48ba30ec6c263038e2719c37405e3176ca9fc05042d5a864ded610f1664362bb7051ec62
+  data.tar.gz: f75aec1ebe9c929cca1bac68a0a46e0c474e03b73259c87c7f72ba30ba5e0dbe86f1395a45aa092553a8d50b94d4216b975c7de23ad5c385af8b3e3df87cc5e6

data/docker-api.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Docker::VERSION
   gem.add_dependency 'excon', '>= 0.38.0'
   gem.add_dependency 'json'
-  gem.add_dependency 'archive-tar-minitar'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'rspec-its'

data/lib/docker.rb

@@ -3,8 +3,8 @@ require 'json'
 require 'excon'
 require 'tempfile'
 require 'base64'
+require 'find'
 require 'rubygems/package'
-require 'archive/tar/minitar'
 require 'uri'
 require 'open-uri'
 

data/lib/docker/connection.rb

@@ -49,7 +49,7 @@ class Docker::Connection
   rescue Excon::Errors::NotFound => ex
     raise NotFoundError, ex.message
   rescue Excon::Errors::Conflict => ex
-    raise ConfictError, ex.message
+    raise ConflictError, ex.message
   rescue Excon::Errors::InternalServerError => ex
     raise ServerError, ex.response.data[:body]
   rescue Excon::Errors::Timeout => ex

data/lib/docker/container.rb

@@ -138,6 +138,12 @@ class Docker::Container
     connection.get(path_for(:logs), opts)
   end
 
+  def rename(new_name)
+    query = {}
+    query['name'] = new_name
+    connection.post(path_for(:rename), query)
+  end
+
   def streaming_logs(opts = {}, &block)
     msgs = Docker::Messages.new
     excon_params = {response_block: Docker::Util.attach_for(block, msgs, false)}

data/lib/docker/error.rb

@@ -18,7 +18,7 @@ module Docker::Error
   class NotFoundError < DockerError; end
 
   # Raised when a request returns a 409.
-  class ConfictError < DockerError; end
+  class ConflictError < DockerError; end
 
   # Raised when a request returns a 500.
   class ServerError < DockerError; end

data/lib/docker/event.rb

@@ -1,4 +1,4 @@
-# This class represents a Docker Image.
+# This class represents a Docker Event.
 class Docker::Event
   include Docker::Error
 

data/lib/docker/util.rb

@@ -123,14 +123,33 @@ module Docker::Util
   end
 
   def create_dir_tar(directory)
-    cwd = FileUtils.pwd
-    tempfile_name = Dir::Tmpname.create('out') {}
-    tempfile = File.open(tempfile_name, 'wb+')
-    FileUtils.cd(directory)
-    Archive::Tar::Minitar.pack('.', tempfile)
+    tempfile = create_temp_file
+    directory += '/' unless directory.end_with?('/')
+
+    create_relative_dir_tar(directory, tempfile)
+
     File.new(tempfile.path, 'r')
-  ensure
-    FileUtils.cd(cwd)
+  end
+
+  def create_relative_dir_tar(directory, output)
+    Gem::Package::TarWriter.new(output) do |tar|
+      Find.find(directory) do |prefixed_file_name|
+        stat = File.stat(prefixed_file_name)
+        next unless stat.file?
+
+        unprefixed_file_name = prefixed_file_name[directory.length..-1]
+        tar.add_file_simple(
+          unprefixed_file_name, stat.mode, stat.size
+        ) do |tar_file|
+          IO.copy_stream(File.open(prefixed_file_name, 'rb'), tar_file)
+        end
+      end
+    end
+  end
+
+  def create_temp_file
+    tempfile_name = Dir::Tmpname.create('out') {}
+    File.open(tempfile_name, 'wb+')
   end
 
   def extract_id(body)

data/lib/docker/version.rb

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

data/spec/docker/container_spec.rb

@@ -98,6 +98,24 @@ describe Docker::Container do
     end
   end
 
+  describe '#rename' do
+    subject {
+      described_class.create({
+        'name' => 'foo',
+        'Cmd' => %w[true],
+        'Image' => 'debian:wheezy'
+      })
+    }
+
+    before { subject.start }
+    after(:each) { subject.kill!.remove }
+
+    it 'renames the container', :vcr do
+      subject.rename('bar')
+      expect(subject.json["Name"]).to eq "bar"
+    end
+  end
+
   describe '#changes' do
     subject {
       described_class.create(

data/spec/vcr/Docker_Container/_rename/renames_the_container.yml

@@ -0,0 +1,149 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: "<DOCKER_HOST>/v1.16/containers/create?name=foo"
+    body:
+      encoding: UTF-8
+      string: '{"Cmd":["true"],"Image":"debian:wheezy"}'
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.19.0
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 201
+      message: 
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Mon, 23 Feb 2015 19:44:39 GMT
+      Content-Length:
+      - '90'
+    body:
+      encoding: UTF-8
+      string: |
+        {"Id":"9da0d07895abd822be26f56dfebca52628b6ebc4cfa1216b633cca367e5632b2","Warnings":null}
+    http_version: 
+  recorded_at: Mon, 23 Feb 2015 19:44:39 GMT
+- request:
+    method: post
+    uri: "<DOCKER_HOST>/v1.16/containers/9da0d07895abd822be26f56dfebca52628b6ebc4cfa1216b633cca367e5632b2/start"
+    body:
+      encoding: UTF-8
+      string: "{}"
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.19.0
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 204
+      message: 
+    headers:
+      Date:
+      - Mon, 23 Feb 2015 19:44:39 GMT
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Mon, 23 Feb 2015 19:44:39 GMT
+- request:
+    method: post
+    uri: "<DOCKER_HOST>/v1.16/containers/9da0d07895abd822be26f56dfebca52628b6ebc4cfa1216b633cca367e5632b2/rename?name=bar"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.19.0
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 204
+      message: 
+    headers:
+      Date:
+      - Mon, 23 Feb 2015 19:44:39 GMT
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Mon, 23 Feb 2015 19:44:39 GMT
+- request:
+    method: get
+    uri: "<DOCKER_HOST>/v1.16/containers/9da0d07895abd822be26f56dfebca52628b6ebc4cfa1216b633cca367e5632b2/json"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.19.0
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Mon, 23 Feb 2015 19:44:39 GMT
+    body:
+      encoding: UTF-8
+      string: |
+        {"AppArmorProfile":"","Args":[],"Config":{"AttachStderr":false,"AttachStdin":false,"AttachStdout":false,"Cmd":["true"],"CpuShares":0,"Cpuset":"","Domainname":"","Entrypoint":null,"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"ExposedPorts":null,"Hostname":"9da0d07895ab","Image":"debian:wheezy","MacAddress":"","Memory":0,"MemorySwap":0,"NetworkDisabled":false,"OnBuild":null,"OpenStdin":false,"PortSpecs":null,"StdinOnce":false,"Tty":false,"User":"","Volumes":null,"WorkingDir":""},"Created":"2015-02-23T19:44:39.002713163Z","Driver":"aufs","ExecDriver":"native-0.2","ExecIDs":null,"HostConfig":{"Binds":null,"CapAdd":null,"CapDrop":null,"ContainerIDFile":"","Devices":null,"Dns":null,"DnsSearch":null,"ExtraHosts":null,"IpcMode":"","Links":null,"LxcConf":null,"NetworkMode":"","PidMode":"","PortBindings":null,"Privileged":false,"PublishAllPorts":false,"ReadonlyRootfs":false,"RestartPolicy":{"MaximumRetryCount":0,"Name":""},"SecurityOpt":null,"VolumesFrom":null},"HostnamePath":"/data/docker/containers/9da0d07895abd822be26f56dfebca52628b6ebc4cfa1216b633cca367e5632b2/hostname","HostsPath":"/data/docker/containers/9da0d07895abd822be26f56dfebca52628b6ebc4cfa1216b633cca367e5632b2/hosts","Id":"9da0d07895abd822be26f56dfebca52628b6ebc4cfa1216b633cca367e5632b2","Image":"479215127fa7b852902ed734f3a7ac69177c0d4d9446ad3a1648938230c3c8ab","MountLabel":"","Name":"bar","NetworkSettings":{"Bridge":"docker0","Gateway":"172.17.42.1","GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"IPAddress":"172.17.8.30","IPPrefixLen":16,"IPv6Gateway":"","LinkLocalIPv6Address":"fe80::42:acff:fe11:81e","LinkLocalIPv6PrefixLen":64,"MacAddress":"02:42:ac:11:08:1e","PortMapping":null,"Ports":{}},"Path":"true","ProcessLabel":"","ResolvConfPath":"/data/docker/containers/9da0d07895abd822be26f56dfebca52628b6ebc4cfa1216b633cca367e5632b2/resolv.conf","RestartCount":0,"State":{"Error":"","ExitCode":0,"FinishedAt":"0001-01-01T00:00:00Z","OOMKilled":false,"Paused":false,"Pid":29174,"Restarting":false,"Running":true,"StartedAt":"2015-02-23T19:44:39.19713536Z"},"Volumes":{},"VolumesRW":{}}
+    http_version: 
+  recorded_at: Mon, 23 Feb 2015 19:44:39 GMT
+- request:
+    method: post
+    uri: "<DOCKER_HOST>/v1.16/containers/9da0d07895abd822be26f56dfebca52628b6ebc4cfa1216b633cca367e5632b2/kill"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.19.0
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 204
+      message: 
+    headers:
+      Date:
+      - Mon, 23 Feb 2015 19:44:39 GMT
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Mon, 23 Feb 2015 19:44:39 GMT
+- request:
+    method: delete
+    uri: "<DOCKER_HOST>/v1.16/containers/9da0d07895abd822be26f56dfebca52628b6ebc4cfa1216b633cca367e5632b2"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.19.0
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 204
+      message: 
+    headers:
+      Date:
+      - Mon, 23 Feb 2015 19:44:39 GMT
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Mon, 23 Feb 2015 19:44:39 GMT
+recorded_with: VCR 2.9.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: archive-tar-minitar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +237,7 @@ files:
 - spec/vcr/Docker_Container/_logs/when_not_selecting_any_stream/raises_a_client_error.yml
 - spec/vcr/Docker_Container/_logs/when_selecting_stdout/returns_blank_logs.yml
 - spec/vcr/Docker_Container/_pause/pauses_the_container.yml
+- spec/vcr/Docker_Container/_rename/renames_the_container.yml
 - spec/vcr/Docker_Container/_restart/restarts_the_container.yml
 - spec/vcr/Docker_Container/_run/when_the_Container_s_command_does_not_return_status_code_of_0/raises_an_error.yml
 - spec/vcr/Docker_Container/_run/when_the_Container_s_command_returns_a_status_code_of_0/creates_a_new_container_to_run_the_specified_command.yml
@@ -375,6 +362,7 @@ test_files:
 - spec/vcr/Docker_Container/_logs/when_not_selecting_any_stream/raises_a_client_error.yml
 - spec/vcr/Docker_Container/_logs/when_selecting_stdout/returns_blank_logs.yml
 - spec/vcr/Docker_Container/_pause/pauses_the_container.yml
+- spec/vcr/Docker_Container/_rename/renames_the_container.yml
 - spec/vcr/Docker_Container/_restart/restarts_the_container.yml
 - spec/vcr/Docker_Container/_run/when_the_Container_s_command_does_not_return_status_code_of_0/raises_an_error.yml
 - spec/vcr/Docker_Container/_run/when_the_Container_s_command_returns_a_status_code_of_0/creates_a_new_container_to_run_the_specified_command.yml