hoosegow 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a743e7ec41c3707de2a2e28ac52496e05453c70
-  data.tar.gz: b69f9d254a0c2fe8f3639cdeaadaf2957632e1af
+  metadata.gz: ceed4f5d348d898d233966dfc25bf9fac28a6940
+  data.tar.gz: bc31af907f34fb7cebf7e17634a3ed3b95395e6c
 SHA512:
-  metadata.gz: 51cca6f9ed8ab60e905c3f601541eefa119425fd4a24e969c3f0426daa34d87d31aa9b1adf02a76bf03e58c7f832beb17309438dcac7e0b249d776fbbc338d68
-  data.tar.gz: 6a424b86b4fbf080eb87056a9a85d5266bc6071d044bac12751557ece029d9f7ae712a98b60db1f87abea488fb240f36799d6b3352b46723074aff88d27b0618
+  metadata.gz: d02daa560bdfa44dcc50c79998d57886d5502843cd8de6d49d1f0cf39ba8f3f4f1908e1478c61ca0ca2246c6df6e5ce5d867d13d42acfe1e2bf978fa60e842ac
+  data.tar.gz: 7fdef10365911b536da35c20c83c21e63590a844cc413194f70edac6d75c80041e97397cae9de93e62862096aa86a26985b928623e2042d51f99a689660a021f

data/hoosegow.gemspec

@@ -2,7 +2,7 @@ require 'rake'
 
 Gem::Specification.new do |s|
   s.name        = 'hoosegow'
-  s.version     = '1.2.1'
+  s.version     = '1.2.2'
   s.summary     = "A Docker jail for ruby code"
   s.description = "Hoosegow provides an RPC layer on top of Docker containers so that you can isolate unsafe parts of your application."
   s.authors     = ["Ben Toews", "Matt Burke"]
@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec',      '>= 2.14.1', '~> 2.14'
   s.add_runtime_dependency     'msgpack',    '>= 0.5.6',  '~> 0.5'
   s.add_runtime_dependency     'yajl-ruby',  '>= 1.1.0',  '~> 1.1'
-  s.add_runtime_dependency     'docker-api', '~> 1.13.6'
+  s.add_runtime_dependency     'docker-api', '~> 1.19'
 end

data/lib/hoosegow/docker.rb

@@ -38,7 +38,7 @@ class Hoosegow
     #           :Other - any option with a capitalized key will be passed on
     #                    to the 'create container' call. See http://docs.docker.io/en/latest/reference/api/docker_remote_api_v1.9/#create-a-container
     def initialize(options = {})
-      ::Docker.url       = docker_url options
+      set_docker_url! options
       @after_create      = options[:after_create]
       @after_start       = options[:after_start]
       @after_stop        = options[:after_stop]
@@ -168,6 +168,13 @@ class Hoosegow
     end
 
   private
+    # Private: Set the docker URL, if related options are present.
+    def set_docker_url!(options)
+      if url = docker_url(options)
+        ::Docker.url = url
+      end
+    end
+
     # Private: Get the URL to use for communicating with Docker. If a host and/or
     # port a present, a TCP socket URL will be generated. Otherwise a Unix
     # socket will be used.
@@ -184,9 +191,10 @@ class Hoosegow
         host = options[:host] || DEFAULT_HOST
         port = options[:port] || DEFAULT_PORT
         "tcp://#{host}:#{port}"
-      else
-        path = options[:socket] || DEFAULT_SOCKET
+      elsif path = options[:socket]
         "unix://#{path}"
+      else
+        nil
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoosegow
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ben Toews
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -97,14 +97,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.6
+        version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.6
+        version: '1.19'
 description: Hoosegow provides an RPC layer on top of Docker containers so that you
   can isolate unsafe parts of your application.
 email: mastahyeti@github.com
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Docker jail for ruby code