dapp 0.31.19 → 0.31.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71f158782fda3d90c0c2d273b55ecf0af7752359ca9d4b046f5c8a0709f66d25
-  data.tar.gz: 08f4f858231735368614444506b7ba654841b1ae15c250459f2906f9f8de5341
+  metadata.gz: 9c1213d9bd0e63a30db5ba27de3a2d2b1683284acf6b81e14ebccfb18fe638a1
+  data.tar.gz: cc97f19d141008c2412a9b8c7a047994b01c9f808693658cfbf818ff85707d60
 SHA512:
-  metadata.gz: b9c0ad5796c51a8d52cfdb61ccc0f097f2e6f0fda3ad973479de812bc14a32bbb3a7f679066b447296db0a1300004607d7e245a0ea3b88c900982ba5ae25b5df
-  data.tar.gz: cefa02762fb7e46110d47ad062b4eeef9097ec28a7d7c1b86d0444572b400362b25dee2c7fe97937b1e8cde08299c8b217e4ca4dbb00362fabc932db82afc7f1
+  metadata.gz: 2d623ae7361fc1d87101289d160bf16c47c80b0410c9d8c039eb32dda33609169e17b8be8c8ab7a8e4b71b5aa2281de4d5ee80902d094a3cea4241ce3e649384
+  data.tar.gz: cbcc1a1a6befba835a35561fd0b258ca33f6bdede1a548e61657161b2218e2c0745ed2ca15c5206da2ba56d20b64fd1ff6ec93beee1d8167ff37f827e6f5e64e

data/lib/dapp/dapp/sentry.rb

@@ -50,6 +50,7 @@ module Dapp
           "build-dir" => self.build_dir,
           "options" => self.options,
           "env-options" => {
+            "DAPP_FORCE_SAVE_CACHE" => ENV["DAPP_FORCE_SAVE_CACHE"],
             "DAPP_BIN_DAPPFILE_YML" => ENV["DAPP_BIN_DAPPFILE_YML"],
             "ANSIBLE_ARGS" => ENV["ANSIBLE_ARGS"],
             "DAPP_CHEF_DEBUG" => ENV["DAPP_CHEF_DEBUG"],

data/lib/dapp/dimg/cli/command/dimg/bp.rb

@@ -19,22 +19,27 @@ BANNER
         extend ::Dapp::CLI::Options::Ssh
 
         option :tmp_dir_prefix,
-              long: '--tmp-dir-prefix PREFIX',
-              description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
+               long: '--tmp-dir-prefix PREFIX',
+               description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
 
         option :lock_timeout,
-              long: '--lock-timeout TIMEOUT',
-              description: 'Redefine resource locking timeout (in seconds)',
-              proc: ->(v) { v.to_i }
+               long: '--lock-timeout TIMEOUT',
+               description: 'Redefine resource locking timeout (in seconds)',
+               proc: ->(v) { v.to_i }
 
         option :build_context_directory,
-              long: '--build-context-directory DIR_PATH',
-              default: nil
+               long: '--build-context-directory DIR_PATH',
+               default: nil
 
         option :use_system_tar,
-              long: '--use-system-tar',
-              boolean: true,
-              default: false
+               long: '--use-system-tar',
+               boolean: true,
+               default: false
+
+        option :force_save_cache,
+               long: '--force-save-cache',
+               boolean: true,
+               default: false
 
         # push options
 

data/lib/dapp/dimg/cli/command/dimg/build.rb

@@ -32,6 +32,11 @@ BANNER
                long: '--use-system-tar',
                boolean: true,
                default: false
+
+        option :force_save_cache,
+               long: '--force-save-cache',
+               boolean: true,
+               default: false
       end
     end
   end

data/lib/dapp/dimg/dimg.rb

@@ -57,6 +57,7 @@ module Dapp
       end
 
       def after_stages_build!
+        return unless dev_mode? || force_save_cache?
         last_stage.save_in_cache!
         artifacts.each { |artifact| artifact.last_stage.save_in_cache! }
       end
@@ -240,6 +241,14 @@ module Dapp
         dapp.dev_mode?
       end
 
+      def force_save_cache?
+        if ENV.key? "DAPP_FORCE_SAVE_CACHE"
+          %w(yes 1 true).include? ENV["DAPP_FORCE_SAVE_CACHE"].to_s
+        else
+          !!dapp.options[:force_save_cache]
+        end
+      end
+
       def build_cache_version
         [::Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
       end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.19"
+  VERSION = "0.31.20"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.31.19
+  version: 0.31.20
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout