hoosegow 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2a18d761dbf6eafb32f8d3fb2b8da10fc21ea59a
-  data.tar.gz: 9c8756d048de9fd588bddd0ddd880be61c971bb0
+SHA256:
+  metadata.gz: e39782e9a5c8b68841412a3c05965f2f1fff65930971832c821f387250e24679
+  data.tar.gz: 8dc38e89647af50f078a7a1e14e2e4f8834c13a4ebeafbacb1044ee93fc125db
 SHA512:
-  metadata.gz: 8d9bb1c69adf1afc20c383e5c54f33ee2d2205511c5590ec428a204bf8141cccd82406528ed81ddaa052b02a255f3aa51a90eba90f60896ef244f32423e0a3d7
-  data.tar.gz: 358d6005a41b2b0b50cdd2464af40de18c09480443577313fed645d0a3ec31e79d9a65c183e5ff72dd084dcc0745c22005dcbb51d2442667d26801546fa1c56f
+  metadata.gz: 32625371ed542ffec17e775e837bd946db3717aea5f810236c2f1d44614c09469d68ea3073dcc87c035e7d4b7080b1e22727388990283994754b4feb49d3d996
+  data.tar.gz: 8404be59505bf62095bba370d4f61dedc2b88ba912c7eb22ae08d5e316a90f201e3f7f8bfb6b05a5901c89fc7dfa2e9f726e60d61febd69a6c7ceddefabc75aa

data/hoosegow.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hoosegow'
-  s.version     = '1.2.5'
+  s.version     = '1.2.6'
   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"]
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9.3"
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec',      '>= 2.14.1', '~> 2.14'
-  s.add_runtime_dependency     'msgpack',    '>= 0.5.6',  '~> 0.5'
+  s.add_runtime_dependency     'msgpack',    '~> 1.0.0'
   s.add_runtime_dependency     'yajl-ruby',  '>= 1.1.0',  '~> 1.1'
   s.add_runtime_dependency     'docker-api', '~> 1.19'
 end

data/lib/hoosegow/docker.rb

@@ -80,9 +80,11 @@ class Hoosegow
     # Returns nothing.
     def create_container(image)
       @container = ::Docker::Container.create @container_options.merge(
-        :StdinOnce => true,
-        :OpenStdin => true,
-        :Volumes   => volumes_for_create,
+        :StdinOnce  => true,
+        :OpenStdin  => true,
+        :HostConfig => {
+          :Binds    => volumes_for_bind
+        },
         :Image     => image
       )
       callback @after_create
@@ -92,7 +94,7 @@ class Hoosegow
     #
     # Returns nothing.
     def start_container
-      @container.start :Binds => volumes_for_bind
+      @container.start
       callback @after_start
     end
 
@@ -200,19 +202,7 @@ class Hoosegow
       end
     end
 
-    # Private: Generate the `Volumes` argument for creating a container.
-    #
-    # Given a hash of container_path => local_path in @volumes, generate a
-    # hash of container_path => {}.
-    def volumes_for_create
-      result = {}
-      each_volume do |container_path, local_path, permissions|
-        result[container_path] = {}
-      end
-      result
-    end
-
-    # Private: Generate the `Binds` argument for starting a container.
+    # Private: Generate the `Binds` argument for creating a container.
     #
     # Given a hash of container_path => local_path in @volumes, generate an
     # array of "local_path:container_path:rw".

data/spec/hoosegow_docker_spec.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require_relative '../lib/hoosegow'
 
 unless defined?(CONFIG)
@@ -18,13 +19,11 @@ describe Hoosegow::Docker do
 
     context 'unspecified' do
       subject { described_class.new }
-      its(:volumes_for_create) { should be_empty }
       its(:volumes_for_bind) { should be_empty }
     end
 
     context 'empty' do
       let(:volumes) { {} }
-      its(:volumes_for_create) { should be_empty }
       its(:volumes_for_bind) { should be_empty }
     end
 
@@ -33,10 +32,6 @@ describe Hoosegow::Docker do
         "/inside/path" => "/home/burke/data-for-container:rw",
         "/other/path" => "/etc/shared-config",
       } }
-      its(:volumes_for_create) { should == {
-        "/inside/path" => {},
-        "/other/path" => {},
-      } }
       its(:volumes_for_bind) { should == [
         "/home/burke/data-for-container:/inside/path:rw",
         "/etc/shared-config:/other/path:ro",
@@ -44,6 +39,32 @@ describe Hoosegow::Docker do
     end
   end
 
+  context "volume is writable" do
+    it "calls after_create" do
+      test_dir = File.join(Dir.pwd, 'volume-test')
+      FileUtils.remove_dir(test_dir, true)
+      FileUtils.mkpath(test_dir)
+
+      config = CONFIG.merge(
+        :Entrypoint => ['/usr/bin/touch',  '/volume-test/test'],
+        :volumes => { '/volume-test' => test_dir + ":rw"}
+      )
+      docker = Hoosegow::Docker.new(config)
+      begin
+        docker.create_container CONFIG[:image_name]
+        docker.start_container
+      ensure
+        docker.stop_container
+        docker.delete_container
+      end
+
+      exists = File.exists?(File.join(test_dir, 'test'))
+      expect(exists).to be_truthy
+      FileUtils.remove_dir(test_dir, true)
+    end
+  end
+
+
   context 'docker_url' do
     it "correctly generates TCP urls" do
       hoosegow = Hoosegow::Docker.new CONFIG.merge(:host => "1.1.1.1", :port => 1234)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoosegow
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Ben Toews
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -49,22 +49,16 @@ dependencies:
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.6
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.6
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Docker jail for ruby code