docker-api 1.33.3 → 1.33.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42767ab7e841489031343b1c14c4d532e7591dfc
-  data.tar.gz: 077fe4007fe57982b97ca4a4b9c6cc420cd1ce83
+  metadata.gz: bc4cc0582b0d1790debfb8be47bb928f5c1a92c8
+  data.tar.gz: ec329aa7f8fcbdf7991faa44ca5a54cb962d8dc0
 SHA512:
-  metadata.gz: 34340f2ca5efe8fd76ee137414d3ebcda7ad51e31bb15beb8974e679fc652fde4658119b106bffca1d606d58d1b9400c07c5bc102eaf6e1ec32d2768577e561f
-  data.tar.gz: 288c5fd826ddce4c543d305cbabdf390e034b866f19b352c6368a08a441cbfc23ddd10c277f2728a4ef6fd6b00d63fb678734224f2e42d7af86b5e5e4eb3e1a5
+  metadata.gz: 707a35dfc34923c91c0f41971c1932749b932396a8a3f8b345630754a07113faa23be27a8af5b4838c4ed6b8f783e24e49d1e416fbfb9a98734f9ee9a246f7e1
+  data.tar.gz: c40703a85329908dc1ca5654fc4e59af856db02504e6b50029f2170f4e465d6d39984aee1b417abfe0c36145578ab2df9263b3b6c6362b4ea4fdb499e7d39a60

data/README.md

@@ -339,6 +339,13 @@ container.kill(:signal => "SIGHUP")
 container.top
 # => [{"PID"=>"4851", "TTY"=>"pts/0", "TIME"=>"00:00:00", "CMD"=>"lxc-start"}]
 
+# Same as above, but uses the original format
+container.top(format: :hash)
+# => {
+#      "Titles" => ["PID", "TTY", "TIME", "CMD"],
+#      "Processes" => [["4851", "pts/0", "00:00:00", "lxc-start"]]
+#    }
+
 # To expose 1234 to bridge
 # In Dockerfile: EXPOSE 1234/tcp
 # docker run resulting-image-name

data/lib/docker/container.rb

@@ -17,11 +17,12 @@ class Docker::Container
 
   # Return a List of Hashes that represents the top running processes.
   def top(opts = {})
+    format = opts.delete(:format) { :array }
     resp = Docker::Util.parse_json(connection.get(path_for(:top), opts))
     if resp['Processes'].nil?
-      []
+      format == :array ? [] : {}
     else
-      resp['Processes'].map { |ary| Hash[resp['Titles'].zip(ary)] }
+      format == :array ? resp['Processes'].map { |ary| Hash[resp['Titles'].zip(ary)] } : resp
     end
   end
 

data/lib/docker/version.rb

@@ -1,6 +1,6 @@
 module Docker
   # The version of the docker-api gem.
-  VERSION = '1.33.3'
+  VERSION = '1.33.4'
 
   # 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.33.3
+  version: 1.33.4
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon