dockly 1.4.5 → 1.4.6

data/dockly.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Dockly::VERSION
   gem.add_dependency 'clamp', '~> 0.6'
   gem.add_dependency 'docker-api', '~> 1.8.4'
-  gem.add_dependency 'dockly-util', '~> 0.0.7'
+  gem.add_dependency 'dockly-util', '~> 0.0.8'
   gem.add_dependency 'excon'
   gem.add_dependency 'fog', '~> 1.18.0'
   gem.add_dependency 'foreman'

data/lib/dockly/build_cache.rb

@@ -10,7 +10,7 @@ module Dockly::BuildCache
     attr_writer :model
 
     def model
-      @mode ||= Dockly::BuildCache::Docker
+      @model ||= Dockly::BuildCache::Docker
     end
   end
 end

data/lib/dockly/docker.rb

@@ -62,6 +62,7 @@ class Dockly::Docker
   end
 
   def cleanup(images)
+    info 'Cleaning up intermediate images'
     ::Docker::Container.all(:all => true).each do |container|
       image_id = container.json['Image']
       if images.any? { |image| image.id.start_with?(image_id) || image_id.start_with?(image.id) }
@@ -70,6 +71,7 @@ class Dockly::Docker
       end
     end
     images.each { |image| image.remove rescue nil }
+    info 'Done cleaning images'
   end
 
   def export_filename
@@ -113,6 +115,7 @@ class Dockly::Docker
     Grit::Git.with_timeout(120) do
       Dockly::Util::Git.git_repo.archive_to_file(Dockly::Util::Git.git_sha, prefix, git_archive_path, 'tar', 'cat')
     end
+    info "made the git archive for sha #{Dockly::Util::Git.git_sha}"
     git_archive_path
   end
 
@@ -131,26 +134,27 @@ class Dockly::Docker
   def import_base(docker_tar)
     info "importing the docker image from #{docker_tar}"
     image = ::Docker::Image.import(docker_tar)
-    info "imported docker image: #{image.id}"
+    info "imported initial docker image: #{image.id}"
     image
   end
 
   def add_git_archive(image)
     return image if git_archive.nil?
-
-    image.insert_local(
+    info "adding the git archive"
+    new_image = image.insert_local(
       'localPath' => git_archive_tar,
       'outputPath' => '/'
     )
+    info "successfully added the git archive"
+    new_image
   end
 
   def build_image(image)
     ensure_present! :name, :build
-    info "starting build from #{image.id}"
+    info "running custom build steps, starting with id: #{image.id}"
     out_image = ::Docker::Image.build("from #{image.id}\n#{build}")
-    info "built the image: #{out_image.id}"
-    out_image.tag(:repo => repo, :tag => tag)
-    out_image
+    info "finished running custom build steps, result id: #{out_image.id}"
+    out_image.tap { |img| img.tag(:repo => repo, :tag => tag) }
   end
 
   def repo
@@ -168,6 +172,7 @@ class Dockly::Docker
     ensure_present! :name
     if registry.nil?
       ensure_present! :build_dir
+      info "Exporting the image with id #{image.id} to file #{File.expand_path(tar_path)}"
       container = ::Docker::Container.create('Image' => image.id, 'Cmd' => %w[true])
       info "created the container: #{container.id}"
       Zlib::GzipWriter.open(tar_path) do |file|

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.4.5'
+  VERSION = '1.4.6'
 end

data/spec/dockly/build_cache/docker_spec.rb

@@ -151,12 +151,11 @@ describe Dockly::BuildCache::Docker, :docker do
     before do
       build_cache.parameter_command command
     end
-    let(:output) { "3.12.9-2-ARCH" }
 
     context "when parameter command returns successfully" do
       let(:command) { "uname -r" }
       it 'returns the output of the parameter_command' do
-        expect(build_cache.parameter_output(command)).to eq(output)
+        expect(build_cache.parameter_output(command)).to match(/\A3\.\d{2}\.\d-\d-ARCH\Z/)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement