dockly 1.5.0 → 1.5.1

data/README.md

@@ -93,6 +93,10 @@ The `build_cache` DSL is used to prevent rebuilding assets every build and used
     - required: `false`
     - default: `false`
     - description: when using S3, will insert the S3 object tagged as latest in your "s3://s3_bucket/s3_object_prefix" before running the build command to quicken build times
+- `keep_old_files`
+    - required: `false`
+    - default: `false`
+    - description: if this option is false when using docker, it will overwrite files that already exist in `output_dir`
 
 `docker`
 --------

data/lib/dockly/build_cache/base.rb

@@ -8,13 +8,15 @@ 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
+                :base_dir, :command_dir, :output_dir, :tmp_dir,
+                :keep_old_files
 
   default_value :use_latest, false
   default_value :parameter_commands, {}
   default_value :command_dir, '.'
   default_value :output_dir, '.'
   default_value :tmp_dir, Dir.tmpdir
+  default_value :keep_old_files, false
 
   def execute!
     debug "Looking for cache for hash: #{hash_output}"

data/lib/dockly/build_cache/docker.rb

@@ -8,7 +8,7 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
   end
 
   def run_build
-    status, body, container = run_command(build_command)
+    status, _, container = run_command(build_command)
     raise "Build Cache `#{build_command}` failed to run." unless status.zero?
     cache = copy_output_dir(container)
     debug "pushing #{output_directory} to s3"
@@ -32,7 +32,7 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
         'Cmd' => ['/bin/bash', '-lc', [
             "mkdir -p #{File.dirname(output_directory)}",
             '&&',
-            "tar -xf #{File.join('/', 'host', path)} -C #{File.dirname(output_directory)}"
+            "tar -xf#{'k' if keep_old_files} #{File.join('/', 'host', path)} -C #{File.dirname(output_directory)}"
           ].join(' ')
         ],
         'Volumes' => {
@@ -63,7 +63,7 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
   def hash_output
     ensure_present! :image, :hash_command
     @hash_output ||= begin
-      status, body, container = run_command(hash_command)
+      status, body, _ = run_command(hash_command)
       raise "Hash Command `#{hash_command}` failed to run" unless status.zero?
       body
     end
@@ -73,7 +73,7 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
     ensure_present! :image
     raise "Parameter Command tried to run but not found" unless parameter_commands.keys.include?(command)
     @parameter_commands[command] ||= begin
-      status, body, container = run_command(command)
+      status, body, _ = run_command(command)
       raise "Parameter Command `#{command}` failed to run" unless status.zero?
       body
     end

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

metadata

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