dapp 0.32.1 → 0.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e53bf1f4f23e9c9d6a142cf56aad7fefb1c704405b3e633da4c46a6848d00380
-  data.tar.gz: f7d77efca8a9921229699d9c80afa45464a2caf3ced3a201dc9c1c4c53a84386
+  metadata.gz: 6dfe648c584065e6db4066e8107af42608eccb035310acdeb06cb877eef479b3
+  data.tar.gz: e6028c928aadbded1802f68ad3a2de56d1c6b5f31e40af505a4be6ad021ed976
 SHA512:
-  metadata.gz: efc034a6c62b2ece90d2d5bfa25d26f444249b10b7102fc9abe1b42fe6711417fa86faa18c999590070682839ebd0757130d6a0867e6c1f7bf9441fcb8903ca1
-  data.tar.gz: 7addc6c0444189fd08780cbb3bb009b1c16e6c09265b332c7c9bb10f37dc359a32a2c32202e3a21a1549a93bf5d32382cf2607e96b957f3ae56b489fec625a0a
+  metadata.gz: 642f30700becacb64ba61cbd270c2048400a47bf6f9bb3c5f8e59311dee15af7430a5d24bcf544f427edede6baea4109be5e2934d174ddfe46f90609f50e9458
+  data.tar.gz: c2a7407020cda71b916fa3913b407a737ca16f01afb1bb75157f84f02eecf6cf92f1094efdb9e3e836570f70487c2270ff01e817eb6b6160638aacf836696216

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.32.1"
+  VERSION = "0.32.2"
   BUILD_CACHE_VERSION = 31
 end

metadata

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