dockly 2.0.2 → 2.1.0

data/README.md

@@ -283,7 +283,7 @@ In addition to the above attributes, `deb` has the following references:
     - required: `false`
     - default: `nil`
     - class: `Dockly::Foreman`
-    - description: any Foreman scripts used in the deb
+    - description: any Foreman scripts used in the deb.
 
 `rpm`
 -----

data/lib/dockly/build_cache/base.rb

@@ -9,7 +9,7 @@ class Dockly::BuildCache::Base
   dsl_attribute :s3_bucket, :s3_object_prefix, :use_latest,
                 :hash_command, :build_command, :parameter_commands,
                 :base_dir, :command_dir, :output_dir, :tmp_dir,
-                :keep_old_files
+                :keep_old_files, :safe_push_cache
 
   default_value :use_latest, false
   default_value :parameter_commands, {}
@@ -17,6 +17,7 @@ class Dockly::BuildCache::Base
   default_value :output_dir, '.'
   default_value :tmp_dir, Dir.tmpdir
   default_value :keep_old_files, false
+  default_value :safe_push_cache, false
 
   def execute!
     debug "Looking for cache for hash: #{hash_output}"

data/lib/dockly/build_cache/docker.rb

@@ -25,25 +25,11 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
     ensure_present! :output_dir
     if cache = pull_from_s3(version)
       debug "inserting to #{output_directory}"
-      path = File.expand_path(cache.path)
-      path_parent = File.dirname(path)
-      tar_flags = keep_old_files ? '-xkf' : 'xf'
-      container = ::Docker::Container.create(
-        'Image' => image.id,
-        'Cmd' => ['/bin/bash', '-c', [
-            "mkdir -p #{File.dirname(output_directory)}",
-            '&&',
-            "tar #{tar_flags} #{File.join('/', 'host', path)} -C #{File.dirname(output_directory)}"
-          ].join(' ')
-        ],
-        'Volumes' => {
-          File.join('/', 'host', path_parent) => { path_parent => 'rw' }
-        }
-      )
-      container.start('Binds' => ["#{path_parent}:#{File.join('/', 'host', path_parent)}"])
-      result = container.wait['StatusCode']
-      raise "Got bad status code when copying build cache: #{result}" unless result.zero?
-      self.image = container.commit
+      if safe_push_cache
+        push_cache_safe(cache)
+      else
+        push_cache_with_volumes(cache)
+      end
       debug "inserted cache into #{output_directory}"
       cache.close
     else
@@ -51,6 +37,37 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
     end
   end
 
+  def push_cache_safe(cache)
+    container = image.run("mkdir -p #{File.dirname(output_directory)}")
+    image_with_dir = container.tap(&:wait).commit
+    self.image = image_with_dir.insert_local(
+      'localPath' => cache.path,
+      'outputPath' => File.dirname(output_directory)
+    )
+  end
+
+  def push_cache_with_volumes(cache)
+    path = File.expand_path(cache.path)
+    path_parent = File.dirname(path)
+    tar_flags = keep_old_files ? '-xkf' : 'xf'
+    container = ::Docker::Container.create(
+      'Image' => image.id,
+      'Cmd' => ['/bin/bash', '-c', [
+          "mkdir -p #{File.dirname(output_directory)}",
+          '&&',
+          "tar #{tar_flags} #{File.join('/', 'host', path)} -C #{File.dirname(output_directory)}"
+        ].join(' ')
+      ],
+      'Volumes' => {
+        File.join('/', 'host', path_parent) => { path_parent => 'rw' }
+      }
+    )
+    container.start('Binds' => ["#{path_parent}:#{File.join('/', 'host', path_parent)}"])
+    result = container.wait['StatusCode']
+    raise "Got bad status code when copying build cache: #{result}" unless result.zero?
+    self.image = container.commit
+  end
+
   def copy_output_dir(container)
     ensure_present! :output_dir
     file_path = File.join(tmp_dir,s3_object(hash_output))

data/lib/dockly/deb.rb

@@ -10,7 +10,7 @@ class Dockly::Deb
                 :post_uninstall, :s3_bucket, :files, :app_user, :vendor
 
   dsl_class_attribute :docker, Dockly::Docker
-  dsl_class_attribute :foreman, Dockly::Foreman
+  dsl_class_attribute :foreman, Dockly::Foreman, type: Array
 
   default_value :version, '0.0'
   default_value :release, '0'
@@ -127,14 +127,14 @@ private
   end
 
   def add_foreman(package)
-    return if foreman.nil?
-    info "adding foreman export"
-    foreman.create!
-    package.attributes[:prefix] = foreman.init_dir
-    Dir.chdir(foreman.build_dir) do
-      package.input('.')
+    return if (foreman || []).empty?
+    foreman.each do |fore|
+      info "adding foreman export '#{fore.name}'"
+      fore.create!
+      package.attributes[:prefix] = fore.init_dir
+      Dir.chdir(fore.build_dir) { package.input('.') }
+      package.attributes[:prefix] = nil
     end
-    package.attributes[:prefix] = nil
   end
 
   def add_files(package)

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/snippets/file_diff_docker_import.erb

@@ -13,7 +13,7 @@ docker_import() {
 
 worked=1
 for attempt in {1..200}; do
-  [[ $worked != 0]] || break
+  [[ $worked != 0 ]] || break
   docker_import && worked=0 || (log "fetch: attempt $attempt failed, sleeping 30"; sleep 30)
 done
 [[ $worked != 0 ]] && fatal "fetch: failed to import diff image"

data/spec/dockly/deb_spec.rb

@@ -25,23 +25,36 @@ describe Dockly::Deb do
       end
     end
 
-    context 'when it has a foreman export' do
+    context 'when it has foreman exports' do
+      let(:contents) { `dpkg --contents #{filename}` }
+
       before do
         subject.foreman do
-          name 'foreman'
-          init_dir '/etc/systemd/system'
+          name 'systemd-foreman'
           build_dir 'build/foreman'
+          init_dir '/etc/systemd/system'
           procfile File.join(File.dirname(__FILE__), '..', 'fixtures', 'Procfile')
           user 'root'
           type 'systemd'
           prefix '/bin/sh'
         end
-      end
 
-      it 'export the foreman to the deb' do
+        subject.foreman do
+          name 'upstart-foreman'
+          build_dir 'build/foreman'
+          init_dir '/etc/systemd/system'
+          procfile File.join(File.dirname(__FILE__), '..', 'fixtures', 'Procfile')
+          user 'root'
+          type 'upstart'
+          prefix '/bin/sh'
+        end
+
         subject.create_package!
-        `dpkg --contents #{filename}`
-            .lines.grep(/foreman/).should_not be_empty
+      end
+
+      it 'exports the foreman to the deb', :cur do
+        expect(contents).to match(/upstart-foreman/)
+        expect(contents).to match(/systemd-foreman/)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp