dapp 0.32.1 → 0.32.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e53bf1f4f23e9c9d6a142cf56aad7fefb1c704405b3e633da4c46a6848d00380
4
- data.tar.gz: f7d77efca8a9921229699d9c80afa45464a2caf3ced3a201dc9c1c4c53a84386
3
+ metadata.gz: 6dfe648c584065e6db4066e8107af42608eccb035310acdeb06cb877eef479b3
4
+ data.tar.gz: e6028c928aadbded1802f68ad3a2de56d1c6b5f31e40af505a4be6ad021ed976
5
5
  SHA512:
6
- metadata.gz: efc034a6c62b2ece90d2d5bfa25d26f444249b10b7102fc9abe1b42fe6711417fa86faa18c999590070682839ebd0757130d6a0867e6c1f7bf9441fcb8903ca1
7
- data.tar.gz: 7addc6c0444189fd08780cbb3bb009b1c16e6c09265b332c7c9bb10f37dc359a32a2c32202e3a21a1549a93bf5d32382cf2607e96b957f3ae56b489fec625a0a
6
+ metadata.gz: 642f30700becacb64ba61cbd270c2048400a47bf6f9bb3c5f8e59311dee15af7430a5d24bcf544f427edede6baea4109be5e2934d174ddfe46f90609f50e9458
7
+ data.tar.gz: c2a7407020cda71b916fa3913b407a737ca16f01afb1bb75157f84f02eecf6cf92f1094efdb9e3e836570f70487c2270ff01e817eb6b6160638aacf836696216
@@ -50,6 +50,7 @@ module Dapp
50
50
  "build-dir" => self.build_dir,
51
51
  "options" => self.options,
52
52
  "env-options" => {
53
+ "DAPP_FORCE_SAVE_CACHE" => ENV["DAPP_FORCE_SAVE_CACHE"],
53
54
  "DAPP_BIN_DAPPFILE_YML" => ENV["DAPP_BIN_DAPPFILE_YML"],
54
55
  "ANSIBLE_ARGS" => ENV["ANSIBLE_ARGS"],
55
56
  "DAPP_CHEF_DEBUG" => ENV["DAPP_CHEF_DEBUG"],
@@ -19,22 +19,27 @@ BANNER
19
19
  extend ::Dapp::CLI::Options::Ssh
20
20
 
21
21
  option :tmp_dir_prefix,
22
- long: '--tmp-dir-prefix PREFIX',
23
- description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
22
+ long: '--tmp-dir-prefix PREFIX',
23
+ description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
24
24
 
25
25
  option :lock_timeout,
26
- long: '--lock-timeout TIMEOUT',
27
- description: 'Redefine resource locking timeout (in seconds)',
28
- proc: ->(v) { v.to_i }
26
+ long: '--lock-timeout TIMEOUT',
27
+ description: 'Redefine resource locking timeout (in seconds)',
28
+ proc: ->(v) { v.to_i }
29
29
 
30
30
  option :build_context_directory,
31
- long: '--build-context-directory DIR_PATH',
32
- default: nil
31
+ long: '--build-context-directory DIR_PATH',
32
+ default: nil
33
33
 
34
34
  option :use_system_tar,
35
- long: '--use-system-tar',
36
- boolean: true,
37
- default: false
35
+ long: '--use-system-tar',
36
+ boolean: true,
37
+ default: false
38
+
39
+ option :force_save_cache,
40
+ long: '--force-save-cache',
41
+ boolean: true,
42
+ default: false
38
43
 
39
44
  # push options
40
45
 
@@ -32,6 +32,11 @@ BANNER
32
32
  long: '--use-system-tar',
33
33
  boolean: true,
34
34
  default: false
35
+
36
+ option :force_save_cache,
37
+ long: '--force-save-cache',
38
+ boolean: true,
39
+ default: false
35
40
  end
36
41
  end
37
42
  end
@@ -57,6 +57,7 @@ module Dapp
57
57
  end
58
58
 
59
59
  def after_stages_build!
60
+ return unless dev_mode? || force_save_cache?
60
61
  last_stage.save_in_cache!
61
62
  artifacts.each { |artifact| artifact.last_stage.save_in_cache! }
62
63
  end
@@ -240,6 +241,14 @@ module Dapp
240
241
  dapp.dev_mode?
241
242
  end
242
243
 
244
+ def force_save_cache?
245
+ if ENV.key? "DAPP_FORCE_SAVE_CACHE"
246
+ %w(yes 1 true).include? ENV["DAPP_FORCE_SAVE_CACHE"].to_s
247
+ else
248
+ !!dapp.options[:force_save_cache]
249
+ end
250
+ end
251
+
243
252
  def build_cache_version
244
253
  [::Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
245
254
  end
@@ -1,4 +1,4 @@
1
1
  module Dapp
2
- VERSION = "0.32.1"
2
+ VERSION = "0.32.2"
3
3
  BUILD_CACHE_VERSION = 31
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.32.1
4
+ version: 0.32.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-08-21 00:00:00.000000000 Z
11
+ date: 2018-08-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout