docker-api 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dab7caebda8a517a9660ae2c95ea440ee306f726
-  data.tar.gz: de34214e3e4529b93a3f0a2a5cc6d4a9361b12d8
+  metadata.gz: 026147324341d46ecc633b106fa941316435e612
+  data.tar.gz: c9022722fa623436a9a7f5b5ece2383c946eb21d
 SHA512:
-  metadata.gz: 67e1f79132a6d26c962e7df5dee773fe196c7e6416db0024500ec517563cb1403a831f7215e795c6d985efd76381388b8d9cbaa66f45ea9f55305b7b893b5add
-  data.tar.gz: fa18fd517d9cefaa26f5bc4342eba57e1dd27016400ee7de00cb65e2f06a2f933988157f867036890e8b36b65904d05e2365b06efdd0b45ee3fba229987ad6fd
+  metadata.gz: 0361890e0d8bd23b86c4b1cc362a4f7d5f327222ea0261c8a1159daaa331f5b7b90d5a93e8142558fd2e514b5d22ff7481fa80b60fc6fb64a55c6868e6bff1b6
+  data.tar.gz: 4d22cb2d2fb45120b9a7485e4be4e8a35b56085287c397ae624be1d6c6036acfe4cbb57879afa096fa8089d3e03524f54542841c9ae626087611086fee07a57f

data/lib/docker.rb

@@ -35,11 +35,24 @@ module Docker
   end
 
   def env_url
-    ENV['DOCKER_URL']
+    ENV['DOCKER_URL'] || ENV['DOCKER_HOST']
+  end
+
+  def env_options
+    if cert_path = ENV['DOCKER_CERT_PATH']
+      {
+        client_cert: File.join(cert_path, 'cert.pem'),
+        client_key: File.join(cert_path, 'key.pem'),
+        ssl_ca_file: File.join(cert_path, 'ca.pem'),
+        scheme: 'https'
+      }
+    else
+      {}
+    end
   end
 
   def url
-    @url ||= ENV['DOCKER_URL'] || ENV['DOCKER_HOST'] || default_socket_url
+    @url ||= env_url || default_socket_url
     # docker uses a default notation tcp:// which means tcp://localhost:2375
     if @url == 'tcp://'
       @url = 'tcp://localhost:2375'
@@ -48,7 +61,7 @@ module Docker
   end
 
   def options
-    @options ||= {}
+    @options ||= env_options
   end
 
   def url=(new_url)
@@ -57,7 +70,7 @@ module Docker
   end
 
   def options=(new_options)
-    @options = new_options
+    @options = env_options.merge(new_options || {})
     reset_connection!
   end
 
@@ -98,8 +111,8 @@ module Docker
     raise Docker::Error::VersionError, "Expected API Version: #{API_VERSION}"
   end
 
-  module_function :default_socket_url, :env_url, :url, :url=, :options,
-                  :options=, :creds, :creds=, :logger, :logger=,
+  module_function :default_socket_url, :env_url, :url, :url=, :env_options,
+                  :options, :options=, :creds, :creds=, :logger, :logger=,
                   :connection, :reset_connection!, :version, :info,
                   :authenticate!, :validate_version!
 end

data/lib/docker/version.rb

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

data/spec/docker_spec.rb

@@ -6,6 +6,7 @@ describe Docker do
   before do
     ENV['DOCKER_URL'] = nil
     ENV['DOCKER_HOST'] = nil
+    ENV['DOCKER_CERT_PATH'] = nil
   end
 
   it { should be_a Module }
@@ -17,7 +18,7 @@ describe Docker do
     end
 
     context "when the DOCKER_* ENV variables aren't set" do
-      its(:options) { {} }
+      its(:options) { should == {} }
       its(:url) { should == 'unix:///var/run/docker.sock' }
       its(:connection) { should be_a Docker::Connection }
     end
@@ -25,9 +26,10 @@ describe Docker do
     context "when the DOCKER_* ENV variables are set" do
       before do
         ENV['DOCKER_URL'] = 'unixs:///var/run/not-docker.sock'
+        Docker.options = nil
       end
 
-      its(:options) { {} }
+      its(:options) { should == {} }
       its(:url) { should == 'unixs:///var/run/not-docker.sock' }
       its(:connection) { should be_a Docker::Connection }
     end
@@ -35,19 +37,21 @@ describe Docker do
     context "when the DOCKER_HOST is set and uses default tcp://" do
       before do
         ENV['DOCKER_HOST'] = 'tcp://'
+        Docker.options = nil
       end
 
-      its(:options) { {} }
+      its(:options) { should == {} }
       its(:url) { should == 'tcp://localhost:2375' }
       its(:connection) { should be_a Docker::Connection }
     end
 
-    context "when the DOCKER_HOST ENV variables is set" do
+    context "when the DOCKER_HOST ENV variable is set" do
       before do
         ENV['DOCKER_HOST'] = 'tcp://someserver:8103'
+        Docker.options = nil
       end
 
-      its(:options) { {} }
+      its(:options) { should == {} }
       its(:url) { should == 'tcp://someserver:8103' }
       its(:connection) { should be_a Docker::Connection }
     end
@@ -56,13 +60,32 @@ describe Docker do
       before do
         ENV['DOCKER_HOST'] = 'tcp://someserver:8103'
         ENV['DOCKER_URL'] = 'tcp://someotherserver:8103'
-
+        Docker.options = nil
       end
 
-      its(:options) { {} }
+      its(:options) { should == {} }
       its(:url) { should == 'tcp://someotherserver:8103' }
       its(:connection) { should be_a Docker::Connection }
     end
+
+    context "when the DOCKER_CERT_PATH and DOCKER_HOST ENV variables are set" do
+      before do
+        ENV['DOCKER_HOST'] = 'tcp://someserver:8103'
+        ENV['DOCKER_CERT_PATH'] = '/boot2dockert/cert/path'
+        Docker.options = nil
+      end
+
+      its(:options) {
+        should == {
+          client_cert: '/boot2dockert/cert/path/cert.pem',
+          client_key: '/boot2dockert/cert/path/key.pem',
+          ssl_ca_file: '/boot2dockert/cert/path/ca.pem',
+          scheme: 'https'
+        }
+      }
+      its(:url) { should == 'tcp://someserver:8103' }
+      its(:connection) { should be_a Docker::Connection }
+    end
   end
 
   describe '#reset_connection!' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon