docker-api 1.33.6 → 1.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5531d0312fee71792d5f38dcd31a12b6852d2245
-  data.tar.gz: c077536fb349e32d0631ec9865a7e47cb8e54a18
+  metadata.gz: 9b1247193395e3bff8d8813de77e6b2ec7462b5a
+  data.tar.gz: d2eab94c0fc86823c3c2367bc2ac7fdcf9c439d1
 SHA512:
-  metadata.gz: 0faf8023e582dd678958e593f0d83fb406e687a0e6ecbe570b4e2d9abc932ce79009935a84cffd4ba1b1c45b09943e67c206492d0ec873297a6c05c54a533c1a
-  data.tar.gz: 919a70b572b5568c9d60990beb99a96624d259687c7686fd0093418871d35d738fa7bf572166c0ba5c80e3858ca22e4a2144a36de433157de5e589ad3d74f93c
+  metadata.gz: da393c71a9de916af0748b925eb6643d4a716701de07fbcb27349cbf5d6dad1a19757a503b6d94168bc7e7839641b8a23a3d6d2784b12fc1a1b1a0a670b6e51d
+  data.tar.gz: 593f911817f00d6c8ea3da3176549dad5a487c047c2608ddfe05297187c0db3876a88944ff7773cf364b3e39e9f1b4b67044031cf0b6447d44229a17b3e929a8

data/lib/docker.rb

@@ -1,5 +1,5 @@
 require 'cgi'
-require 'json'
+require 'multi_json'
 require 'excon'
 require 'tempfile'
 require 'base64'
@@ -121,8 +121,8 @@ module Docker
 
   # Login to the Docker registry.
   def authenticate!(options = {}, connection = self.connection)
-    creds = options.to_json
-    connection.post('/auth', {}, :body => creds)
+    creds = MultiJson.dump(options)
+    connection.post('/auth', {}, body: creds)
     @creds = creds
     true
   rescue Docker::Error::ServerError, Docker::Error::UnauthorizedError

data/lib/docker/container.rb

@@ -135,10 +135,10 @@ class Docker::Container
     # Based on the link, the config passed as run, needs to be passed as the
     # body of the post so capture it, remove from the options, and pass it via
     # the post body
-    config = options.delete('run')
-    hash = Docker::Util.parse_json(connection.post('/commit',
-                                                   options,
-                                                   :body => config.to_json))
+    config = MultiJson.dump(options.delete('run'))
+    hash = Docker::Util.parse_json(
+      connection.post('/commit', options, body: config)
+    )
     Docker::Image.send(:new, self.connection, hash)
   end
 
@@ -185,7 +185,7 @@ class Docker::Container
   end
 
   def update(opts)
-    connection.post(path_for(:update), {}, body: opts.to_json)
+    connection.post(path_for(:update), {}, body: MultiJson.dump(opts))
   end
 
   def streaming_logs(opts = {}, &block)
@@ -199,7 +199,7 @@ class Docker::Container
   end
 
   def start!(opts = {})
-    connection.post(path_for(:start), {}, :body => opts.to_json)
+    connection.post(path_for(:start), {}, body: MultiJson.dump(opts))
     self
   end
 
@@ -225,7 +225,7 @@ class Docker::Container
       timeout = opts.delete('timeout')
       query = {}
       request_options = {
-        :body => opts.to_json
+        :body => MultiJson.dump(opts)
       }
       if timeout
         query['t'] = timeout
@@ -267,9 +267,11 @@ class Docker::Container
   end
 
   def copy(path, &block)
-    connection.post(path_for(:copy), {},
-      :body => { "Resource" => path }.to_json,
-      :response_block => block
+    connection.post(
+      path_for(:copy),
+      {},
+      body: MultiJson.dump('Resource' => path),
+      response_block: block
     )
     self
   end
@@ -332,10 +334,9 @@ class Docker::Container
 
   # Create a new Container.
   def self.create(opts = {}, conn = Docker.connection)
-    name = opts.delete('name') || opts.delete(:name)
-    query = {}
-    query['name'] = name if name
-    resp = conn.post('/containers/create', query, :body => opts.to_json)
+    query = opts.select {|key| ['name', :name].include?(key) }
+    clean_opts = opts.reject {|key| ['name', :name].include?(key) }
+    resp = conn.post('/containers/create', query, :body => MultiJson.dump(clean_opts))
     hash = Docker::Util.parse_json(resp) || {}
     new(conn, hash)
   end
@@ -353,6 +354,12 @@ class Docker::Container
     hashes.map { |hash| new(conn, hash) }
   end
 
+  # Prune images
+  def self.prune(conn = Docker.connection)
+    conn.post("/containers/prune", {})
+    nil
+  end
+
   # Convenience method to return the path for a particular resource.
   def path_for(resource)
     "/containers/#{self.id}/#{resource}"

data/lib/docker/exec.rb

@@ -20,7 +20,7 @@ class Docker::Exec
   def self.create(options = {}, conn = Docker.connection)
     container = options.delete('Container')
     resp = conn.post("/containers/#{container}/exec", {},
-      :body => options.to_json)
+      body: MultiJson.dump(options))
     hash = Docker::Util.parse_json(resp) || {}
     new(conn, hash)
   end
@@ -51,11 +51,11 @@ class Docker::Exec
     read_timeout = options[:wait]
 
     # Create API Request Body
-    body = {
-      "Tty" => tty,
-      "Detach" => detached
-    }
-    excon_params = { :body => body.to_json }
+    body = MultiJson.dump(
+      'Tty' => tty,
+      'Detach' => detached
+    )
+    excon_params = { body: body }
 
     msgs = Docker::Messages.new
     unless detached

data/lib/docker/image.rb

@@ -108,7 +108,7 @@ class Docker::Image
 
     # Create a new Image.
     def create(opts = {}, creds = nil, conn = Docker.connection, &block)
-      credentials = creds.nil? ? Docker.creds : creds.to_json
+      credentials = creds.nil? ? Docker.creds : MultiJson.dump(creds)
       headers = credentials && Docker::Util.build_auth_header(credentials) || {}
       body = ''
       conn.post(
@@ -137,6 +137,12 @@ class Docker::Image
     end
     alias_method :delete, :remove
 
+    # Prune images
+    def prune(conn = Docker.connection)
+      conn.post("/images/prune", {})
+    end
+
+
     # Save the raw binary representation or one or more Docker images
     #
     # @param names [String, Array#String] The image(s) you wish to save

data/lib/docker/network.rb

@@ -3,17 +3,17 @@ class Docker::Network
   include Docker::Base
 
   def connect(container, opts = {}, body_opts = {})
+    body = MultiJson.dump({ container: container }.merge(body_opts))
     Docker::Util.parse_json(
-      connection.post(path_for('connect'), opts,
-                      body: { container: container }.merge(body_opts).to_json)
+      connection.post(path_for('connect'), opts, body: body)
     )
     reload
   end
 
   def disconnect(container, opts = {})
+    body = MultiJson.dump(container: container)
     Docker::Util.parse_json(
-      connection.post(path_for('disconnect'), opts,
-                      body: { container: container }.to_json)
+      connection.post(path_for('disconnect'), opts, body: body)
     )
     reload
   end
@@ -41,12 +41,11 @@ class Docker::Network
 
   class << self
     def create(name, opts = {}, conn = Docker.connection)
-      default_opts = {
+      default_opts = MultiJson.dump({
         'Name' => name,
         'CheckDuplicate' => true
-      }
-      resp = conn.post('/networks/create', {},
-                       body: default_opts.merge(opts).to_json)
+      }.merge(opts))
+      resp = conn.post('/networks/create', {}, body: default_opts)
       response_hash = Docker::Util.parse_json(resp) || {}
       get(response_hash['Id'], {}, conn) || {}
     end
@@ -67,6 +66,11 @@ class Docker::Network
       nil
     end
     alias_method :delete, :remove
+
+    def prune(conn = Docker.connection)
+      conn.post("/networks/prune", {})
+      nil
+    end
   end
 
   # Convenience method to return the path for a particular resource.

data/lib/docker/util.rb

@@ -102,8 +102,8 @@ module Docker::Util
   end
 
   def parse_json(body)
-    JSON.parse(body) unless body.nil? || body.empty? || (body == 'null')
-  rescue JSON::ParserError => ex
+    MultiJson.load(body) unless body.nil? || body.empty? || (body == 'null')
+  rescue MultiJson::ParseError => ex
     raise UnexpectedResponseError, ex.message
   end
 
@@ -232,7 +232,7 @@ module Docker::Util
   end
 
   def build_auth_header(credentials)
-    credentials = credentials.to_json if credentials.is_a?(Hash)
+    credentials = MultiJson.dump(credentials) if credentials.is_a?(Hash)
     encoded_creds = Base64.urlsafe_encode64(credentials)
     {
       'X-Registry-Auth' => encoded_creds
@@ -243,13 +243,13 @@ module Docker::Util
     if credentials.is_a?(String)
       credentials = JSON.parse(credentials, symbolize_names: true)
     end
-    header = {
+    header = MultiJson.dump(
       credentials[:serveraddress].to_s => {
-        "username" => credentials[:username].to_s,
-        "password" => credentials[:password].to_s,
-        "email" => credentials[:email].to_s
+        'username' => credentials[:username].to_s,
+        'password' => credentials[:password].to_s,
+        'email' => credentials[:email].to_s
       }
-    }.to_json
+    )
 
     encoded_header = Base64.urlsafe_encode64(header)
 

data/lib/docker/version.rb

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

data/lib/docker/volume.rb

@@ -31,9 +31,14 @@ class Docker::Volume
     # creates a volume with an arbitrary name
     def create(name, opts = {}, conn = Docker.connection)
       opts['Name'] = name
-      resp = conn.post('/volumes/create', {}, :body => opts.to_json)
+      resp = conn.post('/volumes/create', {}, body: MultiJson.dump(opts))
       hash = Docker::Util.parse_json(resp) || {}
       new(conn, hash)
     end
+
+    def prune(conn = Docker.connection)
+      conn.post("/volumes/prune")
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.33.6
+  version: 1.34.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.47.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.47.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="