docker-api 1.28.0 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 208227d2b48722c6c994b7182065a13ee1e478ce
-  data.tar.gz: 7fe1de106942c93a80884c0b5ca65a06bf237e81
+  metadata.gz: 29ba56360b810e2e0ba6b89d141050924fe411af
+  data.tar.gz: 5e13ee3c1047314c24d22db68061ba92ff9e6244
 SHA512:
-  metadata.gz: 8420bbc610fa614cd590c9ff449a98e237c9bdaa20c91b03954c2c9d797849cb48f97e2048ee4589b095f0448fe9ab9e46685dcbe884d232cb3c9339313c47e3
-  data.tar.gz: 64af52f1ed2c4a9b25c69759c06d77745e8ce7843db8675247b6225318b809754b4c336f50ebae01fbfcd20cc3b4adde22042c2eeb9fb96e7a03aba85a7b2a8d
+  metadata.gz: 8f2b8f6a76c9ad7e608b4b8405e5e8456849b81b4570b079a5c58f11940b4f53c9f20c5a7eaeca7b11105945f84811921d5e1aa1aaeaf78b9878dd2716970ca9
+  data.tar.gz: 3b5e1c48e6c7a7afdab6679abca8e8ca99393b7b8e95d4fb0a4eb131f54c3368d5b75253f8d7fd469eff6bbc0b7c6089deab9ebfc8ad7c53738ac96466d25ca6

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
   - 2.0
   - 1.9.3
 env:
+  - DOCKER_VERSION=1.11.1
   - DOCKER_VERSION=1.10.3
   - DOCKER_VERSION=1.9.1
   - DOCKER_VERSION=1.8.2

data/README.md

@@ -401,6 +401,10 @@ container = Docker::Container.create('Image' => 'ubuntu', 'Cmd' => command, 'Tty
 container.tap(&:start).attach(:tty => true)
 # => [["I'm a TTY!"], []]
 
+# Obtaining the current statistics of a container
+container.stats
+# => {"read"=>"2016-02-29T20:47:05.221608695Z", "precpu_stats"=>{"cpu_usage"=> ... }
+
 # Create an Image from a Container's changes.
 container.commit
 # => Docker::Image { :id => eaeb8d00efdf, :connection => Docker::Connection { :url => tcp://localhost, :options => {:port=>2375} } }

data/lib/docker/container.rb

@@ -156,6 +156,11 @@ 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}))
+  end
+
   def rename(new_name)
     query = {}
     query['name'] = new_name

data/lib/docker/util.rb

@@ -185,6 +185,8 @@ module Docker::Util
     body.lines.reverse_each do |line|
       if (id = line.match(/Successfully built ([a-f0-9]+)/)) && !id[1].empty?
         return id[1]
+      elsif (id = line.match(/sha256:([a-f0-9]+)/)) && !id[1].empty?
+        return id[1]
       end
     end
     raise UnexpectedResponseError, "Couldn't find id: #{body}"

data/lib/docker/version.rb

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

data/spec/docker/container_spec.rb

@@ -81,6 +81,20 @@ describe Docker::Container do
     end
   end
 
+  describe '#stats', docker_1_9: true do
+    subject {
+      described_class.create('Cmd' => "echo hello", 'Image' => 'debian:wheezy')
+    }
+    after(:each) { subject.remove }
+
+    context "when requesting container stats" do
+      let(:output) { subject.stats }
+      it "returns a Hash" do
+        expect(output).to be_a Hash
+      end
+    end
+  end
+
   describe '#logs' do
     subject {
       described_class.create('Cmd' => "echo hello", 'Image' => 'debian:wheezy')

data/spec/docker_spec.rb

@@ -172,9 +172,9 @@ describe Docker do
     let(:info) { subject.info }
     let(:keys) do
       %w(Containers Debug DockerRootDir Driver DriverStatus ExecutionDriver ID
-         IPv4Forwarding Images IndexServerAddress InitPath InitSha1
-         KernelVersion Labels MemTotal MemoryLimit NCPU NEventsListener NFd
-         NGoroutines Name OperatingSystem SwapLimit)
+         IPv4Forwarding Images IndexServerAddress KernelVersion Labels MemTotal
+         MemoryLimit NCPU NEventsListener NFd NGoroutines Name
+         OperatingSystem SwapLimit)
     end
 
     it 'returns the info as a Hash' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.29.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon