dockly 1.1.0 → 1.1.1

data/lib/dockly/build_cache.rb

@@ -44,6 +44,8 @@ class Dockly::BuildCache
 
   def run_build
     container = image.run(build_command)
+    status = container.wait(3600)['StatusCode'] # 1 hour max timeout
+    raise "Build Cache `#{build_command}` failed to run." unless status.zero?
     cache = copy_output_dir(container)
     debug "pushing #{output_dir} to s3"
     push_to_s3(cache)
@@ -55,7 +57,9 @@ class Dockly::BuildCache
     ensure_present! :output_dir
     if cache = pull_from_s3(version)
       debug "inserting to #{output_dir}"
-      self.image = image.insert_local(
+      container = image.run("mkdir #{File.dirname(output_dir)}")
+      image_with_dir = container.tap { |c| c.wait }.commit
+      self.image = image_with_dir.insert_local(
         'localPath' => cache.path,
         'outputPath' => File.dirname(output_dir)
       )
@@ -113,7 +117,10 @@ class Dockly::BuildCache
     ensure_present! :image, :hash_command
     @hash_output ||= begin
       resp = ""
-      image.run(hash_command).attach { |chunk| resp += chunk }
+      container = image.run(hash_command)
+      container.attach { |chunk| resp += chunk }
+      status = container.wait['StatusCode']
+      raise "Hash Command `#{hash_command} failed to run" unless status.zero?
       resp.strip
     end
   end

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/dockly/build_cache_spec.rb

@@ -8,7 +8,7 @@ describe Dockly::BuildCache, :docker do
     subject.s3_bucket 'lol'
     subject.s3_object_prefix 'swag'
     subject.image = image
-    subject.hash_command 'md6' # haters come at me
+    subject.hash_command 'md5sum /etc/vim/vimrc'
     subject.build_command 'touch lol'
     subject.output_dir '/'
   end
@@ -26,8 +26,7 @@ describe Dockly::BuildCache, :docker do
       it "does not have the file lol" do
         i = subject.execute!
         output = ""
-        puts i
-        i.run('ls').start.attach { |chunk| output += chunk }
+        i.run('ls').attach { |chunk| output += chunk }
         output.should_not include('lol')
       end
     end
@@ -49,17 +48,36 @@ describe Dockly::BuildCache, :docker do
       subject.stub(:push_to_s3)
     end
 
-    it "does have the file lol" do
-      i = subject.execute!
-      output = ""
-      i.run('ls').attach { |chunk| output += chunk }
-      output.should include('lol')
+    context "when the build succeeds" do
+      it "does have the file lol" do
+        i = subject.run_build
+        output = ""
+        i.run('ls').attach { |chunk| output += chunk }
+        output.should include('lol')
+      end
+    end
+
+    context "when the build fails" do
+      let!(:image) { subject.image }
+      before do
+        subject.image = double(:image).stub(:run) {
+          stub(:container, { :wait => { 'StatusCode' => 1 } })
+        }
+      end
+
+      after do
+        subject.image = image
+      end
+
+      it "raises an error" do
+        expect { subject.run_build }.to raise_error
+      end
     end
   end
 
   describe '#pull_from_s3' do
-    let (:file) { subject.pull_from_s3('hey') }
-    let (:object) { double(:object) }
+    let(:file) { subject.pull_from_s3('hey') }
+    let(:object) { double(:object) }
 
     before do
       subject.connection.stub(:get_object).and_return object
@@ -99,13 +117,26 @@ describe Dockly::BuildCache, :docker do
       "682aa2a07693cc27756eee9751db3903  /etc/vim/vimrc"
     }
 
-    before do
-      subject.image = image
-      subject.hash_command 'md5sum /etc/vim/vimrc'
+    context "when hash command returns successfully" do
+      before do
+        subject.image = image
+      end
+
+      it 'returns the output of the hash_command in the container' do
+        subject.hash_output.should == output
+      end
     end
 
-    it 'returns the output of the hash_command in the container' do
-      subject.hash_output.should == output
+    context "when hash command returns failure" do
+      before do
+        subject.image = double(:image).stub(:run, {
+          :wait => { 'StatusCode' => 1 }
+        })
+      end
+
+      it 'raises an error' do
+        expect { subject.hash_output }.to raise_error
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rspec'
 require 'dockly'
+require 'pry'
 
 Fog.mock!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp