docker-api 1.32.1 → 1.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5844d897e60f3ae8d2cbd363dc7fb56ef55eea87
-  data.tar.gz: c4ed797a4159108d793011f8a6c947c699676100
+  metadata.gz: bb5ad2f5239058b4cbe3ceca06ac1455e659211d
+  data.tar.gz: dbeb560e89cacb6fecaf28a2370da23d44350da8
 SHA512:
-  metadata.gz: b2ee7320b73738fcd948baf7e7833e697dadf721051f25d8e72a85a4b0cc9e35f8b2b26e917ca2854f01522e938878d0b8ec91a5e8aa52c2c02c9fa1c7407a67
-  data.tar.gz: 523d65b0eefc2204d4fab0f707853acd50f31429007a5d0c499efe87615b97164e43ff008cbdee8a926b6959d1b012d3b6ab7436ed3a1e9c70aba95f56f5622d
+  metadata.gz: c2d333d808a12618046aeb497f11455db5053ae80bcb2fecd404ce94f7fa74f891b1df7f54c77d73a17478f835c721ce4bf9fb29f84553cc6ebd6e3e644866ac
+  data.tar.gz: 09f89ca78aef353c1727529649accc22604ad47668809e90e3a370095e93a178baba3299e96617f86ebfc0a3dda2cb172ce70eb198c2543d0c229750797158dd

data/README.md

@@ -372,6 +372,12 @@ Docker::Container.create(
   }
 )
 
+# To set container name pass `name` key to options
+Docker::Container.create(
+  'name' => 'my-new-container',
+  'Image' => 'image-name'
+)
+
 # Stores a file with the given content in the container
 container.store_file("/test", "Hello world")
 

data/lib/docker.rb

@@ -14,7 +14,7 @@ require 'open-uri'
 require 'excon/middlewares/hijack'
 Excon.defaults[:middlewares].unshift Excon::Middleware::Hijack
 
-# The top-level module for this gem. It's purpose is to hold global
+# The top-level module for this gem. Its purpose is to hold global
 # configuration variables that are used as defaults in other classes.
 module Docker
   attr_accessor :creds, :logger

data/lib/docker/container.rb

@@ -158,9 +158,23 @@ class Docker::Container
     connection.get(path_for(:logs), opts)
   end
 
-  # TODO: Implement Streaming stats
-  def stats
-    Docker::Util.parse_json(connection.get(path_for(:stats), {stream: 0}))
+  def stats(options = {})
+    if block_given?
+      options[:read_timeout] ||= 10
+      options[:idempotent] ||= false
+      parser = lambda do |chunk, remaining_bytes, total_bytes|
+        yield Docker::Util.parse_json(chunk)
+      end
+      begin
+        connection.get(path_for(:stats), nil, {response_block: parser}.merge(options))
+      rescue Docker::Error::TimeoutError
+        # If the container stops, the docker daemon will hold the connection
+        # open forever, but stop sending events.
+        # So this Timeout indicates the stream is over.
+      end
+    else
+      Docker::Util.parse_json(connection.get(path_for(:stats), {stream: 0}.merge(options)))
+    end
   end
 
   def rename(new_name)
@@ -317,7 +331,7 @@ class Docker::Container
 
   # Create a new Container.
   def self.create(opts = {}, conn = Docker.connection)
-    name = opts.delete('name')
+    name = opts.delete('name') || opts.delete(:name)
     query = {}
     query['name'] = name if name
     resp = conn.post('/containers/create', query, :body => opts.to_json)

data/lib/docker/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.32.1
+  version: 1.33.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon