dockly 1.5.7 → 1.5.8

data/lib/dockly/build_cache/local.rb

@@ -2,7 +2,7 @@ class Dockly::BuildCache::Local < Dockly::BuildCache::Base
   def run_build
     puts "Build command: #{build_command}"
     status, body = run_command(build_command)
-    raise "Build Cache `#{build_command}` failed to run." unless status.success?
+    raise "Build Cache `#{build_command}` failed to run.\nError: #{body}" unless status.success?
     FileUtils.mkdir_p(File.dirname(save_file))
     tar_file = Dockly::Util::Tar.tar(output_directory, save_file)
     push_to_s3(tar_file)

data/lib/dockly/docker.rb

@@ -26,6 +26,13 @@ class Dockly::Docker
   default_value :timeout, 60
 
   def generate!
+    image = generate_build
+    export_image(image)
+  ensure
+    cleanup([image]) if cleanup_images
+  end
+
+  def generate_build
     Docker.options = { :read_timeout => timeout, :write_timeout => timeout }
     images = {}
 
@@ -42,11 +49,7 @@ class Dockly::Docker
 
     images[:two] = add_git_archive(images[:one])
     images[:three] = run_build_caches(images[:two])
-    images[:four] = build_image(images[:three])
-
-    export_image(images[:four])
-
-    true
+    build_image(images[:three])
   ensure
     cleanup(images.values.compact) if cleanup_images
   end

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.5.7'
+  VERSION = '1.5.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp