percheron 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aa1dd04adcc5a0570327825d599e9a0f9a9af87
-  data.tar.gz: c279d99e8dacd85601293984d6653764db508d4c
+  metadata.gz: e18f226a73f9b60d6dd7e9c9a49fd6df9c82ac1d
+  data.tar.gz: a9f3235e80372c19c29f6fcf620808b2e98ea815
 SHA512:
-  metadata.gz: 16994a1a63a0e6f468d9619113abfda4b0cbf7d7501feb510d8cf814ff24d7dd704f1d56b744105edc7b58e379a631460da8a7f3780746d571cc84144c844c18
-  data.tar.gz: e75b7829e7572a6864a5301afe36c408d109717c9681a9a8ec336e100c5f55145bb5ae79bf4cb07b2aef08c5edf003e885d1b7d701e90c8719626a8932f377f5
+  metadata.gz: 281eebaec3b0e16468d82a7396af767e3d0453a929fbc3fdec0c9ebfe4ff184adacf5306913b153f0e71d6cc4f01d34c2705caf9fe2e9b64036d95506cf6a86a
+  data.tar.gz: 6c75aa2ba576b00d448901c6d18b8c8edc0a38d664a64993c3647f8044a959e05bf665d46e9ae146e0ef2ef0cd2b17199a22aec74b6bdcaa557e3cd690316877

data/lib/percheron/docker_connection.rb

@@ -6,24 +6,8 @@ module Percheron
     end
 
     def setup!
-      Docker.logger = $logger if ENV['DOCKER_DEBUG'] == 'true'
-      Docker.url = config.docker.host
-
-      opts = {
-        chunk_size:       1,
-        connect_timeout:  config.docker.timeout,
-        scheme:          'https'
-      }
-
-      if cert_path
-        opts.merge!({
-          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')
-        })
-      end
-
-      Docker.options = opts
+      set_url!
+      set_options!
     end
 
     private
@@ -31,13 +15,39 @@ module Percheron
       attr_reader :config
 
       def cert_path
-        @cert_path ||= begin
-          if ENV['DOCKER_CERT_PATH']
-            File.expand_path(ENV['DOCKER_CERT_PATH'])
-          else
-            nil
-          end
+        @cert_path ||= ENV['DOCKER_CERT_PATH'] ? File.expand_path(ENV['DOCKER_CERT_PATH']) : nil
+      end
+
+      def set_url!
+        Docker.url = config.docker.host
+      end
+
+      def set_options!
+        Docker.options = docker_options
+      end
+
+      def docker_options
+        base_docker_options.merge(extra_docker_opts)
+      end
+
+      def base_docker_options
+        {
+          connect_timeout:  config.docker.timeout,
+          scheme:          'https'
+        }
+      end
+
+      def extra_docker_opts
+        if 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')
+          }
+        else
+          {}
         end
       end
+
   end
 end

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ash McKenzie