hoosegow 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceed4f5d348d898d233966dfc25bf9fac28a6940
-  data.tar.gz: bc31af907f34fb7cebf7e17634a3ed3b95395e6c
+  metadata.gz: 5236254c19caca40ddba281a7b4881ed849885c4
+  data.tar.gz: 7f266fd4654f08680b084fbe5ff6daf86b3e5f48
 SHA512:
-  metadata.gz: d02daa560bdfa44dcc50c79998d57886d5502843cd8de6d49d1f0cf39ba8f3f4f1908e1478c61ca0ca2246c6df6e5ce5d867d13d42acfe1e2bf978fa60e842ac
-  data.tar.gz: 7fdef10365911b536da35c20c83c21e63590a844cc413194f70edac6d75c80041e97397cae9de93e62862096aa86a26985b928623e2042d51f99a689660a021f
+  metadata.gz: 612bd862bbdb713fafabf7605d8b98136f121bf8321437e71c55fb86946209c8cc06a945b7bb508eef90fd1329e0f7d502827aeb75875c960fa666334da1ac0e
+  data.tar.gz: 66a72c410f73b9aa21238568e21d5eccef15b48f6bf35f1de94838db2f98579b1238cf5cce9fdce6c5835e836dc2d714e29ca7b1a95af9beae493dc6cb93973a

data/Rakefile

@@ -1,5 +1,6 @@
 require_relative 'lib/hoosegow'
 
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 begin

data/hoosegow.gemspec

@@ -2,7 +2,7 @@ require 'rake'
 
 Gem::Specification.new do |s|
   s.name        = 'hoosegow'
-  s.version     = '1.2.2'
+  s.version     = '1.2.3'
   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.executables = ['hoosegow']
   s.homepage    = 'https://github.com/github/hoosegow'
   s.required_ruby_version = ">= 1.9.3"
-  s.add_development_dependency 'rake',       '>= 10.3.2', '~> 10.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     'yajl-ruby',  '>= 1.1.0',  '~> 1.1'

data/lib/hoosegow/docker.rb

@@ -127,6 +127,8 @@ class Hoosegow
     def delete_container
       return unless @container
       @container.delete
+    rescue ::Docker::Error::ServerError => e
+      $stderr.puts "Docker could not delete #{@container.id}: #{e}"
     end
 
     # Public: Build a new image.

data/script/bootstrap

@@ -1,2 +1,2 @@
 #!/bin/bash
-bundle install -j4
+bundle install -j4 --path .bundle --binstubs bundler-bin

data/spec/hoosegow_docker_spec.rb

@@ -106,4 +106,26 @@ describe Hoosegow::Docker do
       expect(docker.image_exist?("not_there")).to eq(false)
     end
   end
+
+  context "delete_container" do
+    let(:docker) { Hoosegow::Docker.new CONFIG }
+    let(:container) { Object.new }
+    before do
+      docker.instance_variable_set(:@container, container)
+      allow(container).to receive(:id).and_return("1234")
+      $old_stderr = $stderr
+      $stderr = StringIO.new
+    end
+    after do
+      $stderr = $old_stderr
+    end
+
+    it "rescues error and prints when error is raised" do
+      allow(container).to receive(:delete).
+        and_raise(::Docker::Error::ServerError, "device or resource busy")
+      docker.delete_container
+      $stderr.rewind
+      expect($stderr.read).to eql("Docker could not delete 1234: device or resource busy\n")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoosegow
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ben Toews
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,20 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.3.2
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.3.2
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement