dapp 0.16.2 → 0.17.0

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
  SHA1:
3
- metadata.gz: 446c0b5306a3b02a688fea13b10e04c238fb7907
4
- data.tar.gz: 7b16af64330d60365f771190c66f38e057369a31
3
+ metadata.gz: e684e6f7f3c0d642a883702a304127a101d52438
4
+ data.tar.gz: 124cd8bfd2d196d7437cd9915508ae105670612d
5
5
  SHA512:
6
- metadata.gz: d04f98aaa8b82c10233a6d589986abeee42fd134178be20ec24cffa75d08a682ed80899f49688785a2233be9044b17e5495fa1427f7f4137e6e442241f294c66
7
- data.tar.gz: 76b812d206500e8ae0d0f601b0dc203d7c495ac8e97de8c77434de4281e2acd65fba9e63066da96fc36683c97fd77ce28026c030f5df68b2508132a3b58b19c6
6
+ metadata.gz: e7fab37354c67bc541acd52ebab95733b3d99add85a8e6a6424a6f606f0f86874cc6f1d79df5732fa7d6ed286329c68b4ad2c10d6707e2df3d445d80f77c9486
7
+ data.tar.gz: 6e44da6bfc5a7a4206e036149a671c243f8caf9be74efc3a3a859c033f370218f1bb1c057eed32b820dfd4bab1063f1ab2baea60693c30c381a20bc5d41b2b7a
@@ -8,14 +8,15 @@ module Dapp
8
8
  end
9
9
 
10
10
  def prepare_image
11
- super
12
- artifacts_dimgs_build!
13
- artifacts_labels = {}
14
- artifacts.each do |artifact|
15
- apply_artifact(artifact, image)
16
- artifacts_labels["dapp-artifact-#{artifact[:name]}".to_sym] = artifact[:dimg].last_stage.image.built_id
11
+ super do
12
+ artifacts_dimgs_build!
13
+ artifacts_labels = {}
14
+ artifacts.each do |artifact|
15
+ apply_artifact(artifact, image)
16
+ artifacts_labels["dapp-artifact-#{artifact[:name]}".to_sym] = artifact[:dimg].last_stage.image.built_id
17
+ end
18
+ image.add_service_change_label artifacts_labels
17
19
  end
18
- image.add_service_change_label artifacts_labels
19
20
  end
20
21
 
21
22
  def artifacts
@@ -21,8 +21,9 @@ module Dapp
21
21
  end
22
22
 
23
23
  def prepare_image
24
- super
25
- dimg.builder.before_install(image)
24
+ super do
25
+ dimg.builder.before_install(image)
26
+ end
26
27
  end
27
28
 
28
29
  alias dependencies context
@@ -21,8 +21,9 @@ module Dapp
21
21
  end
22
22
 
23
23
  def prepare_image
24
- super
25
- dimg.builder.before_setup(image)
24
+ super do
25
+ dimg.builder.before_setup(image)
26
+ end
26
27
  end
27
28
  end # BeforeSetup
28
29
  end # Stage
@@ -21,8 +21,9 @@ module Dapp
21
21
  end
22
22
 
23
23
  def prepare_image
24
- super
25
- dimg.builder.build_artifact(image)
24
+ super do
25
+ dimg.builder.build_artifact(image)
26
+ end
26
27
  end
27
28
  end # BuildArtifact
28
29
  end # Stage
@@ -13,9 +13,10 @@ module Dapp
13
13
  end
14
14
 
15
15
  def prepare_image
16
- super
17
- change_options.each do |k, v|
18
- image.public_send("add_change_#{k}", v)
16
+ super do
17
+ change_options.each do |k, v|
18
+ image.public_send("add_change_#{k}", v)
19
+ end
19
20
  end
20
21
  end
21
22
  end # DockerInstructions
@@ -28,7 +28,7 @@ module Dapp
28
28
  def layer_commit(git_artifact)
29
29
  commits[git_artifact] ||= begin
30
30
  if dependencies_stage && dependencies_stage.image.tagged?
31
- dependencies_stage.image.labels[git_artifact.full_name]
31
+ dependencies_stage.image.labels["dapp-git-#{git_artifact.paramshash}-commit"]
32
32
  else
33
33
  git_artifact.latest_commit
34
34
  end
@@ -4,9 +4,10 @@ module Dapp
4
4
  module Stage
5
5
  class GADependenciesBase < Base
6
6
  def prepare_image
7
- super
8
- dimg.git_artifacts.each do |git_artifact|
9
- image.add_service_change_label(git_artifact.full_name.to_sym => git_artifact.latest_commit)
7
+ super do
8
+ dimg.git_artifacts.each do |git_artifact|
9
+ image.add_service_change_label("dapp-git-#{git_artifact.paramshash}-commit".to_sym => git_artifact.latest_commit)
10
+ end
10
11
  end
11
12
  end
12
13
 
@@ -19,9 +19,10 @@ module Dapp
19
19
  end
20
20
 
21
21
  def prepare_image
22
- super
23
- change_options.each do |k, v|
24
- image.public_send("add_change_#{k}", v)
22
+ super do
23
+ change_options.each do |k, v|
24
+ image.public_send("add_change_#{k}", v)
25
+ end
25
26
  end
26
27
  end
27
28
 
@@ -24,8 +24,9 @@ module Dapp
24
24
  end
25
25
 
26
26
  def prepare_image
27
- super
28
- dimg.builder.install(image)
27
+ super do
28
+ dimg.builder.install(image)
29
+ end
29
30
  end
30
31
  end # Install
31
32
  end # Install
@@ -24,8 +24,9 @@ module Dapp
24
24
  end
25
25
 
26
26
  def prepare_image
27
- super
28
- dimg.builder.setup(image)
27
+ super do
28
+ dimg.builder.setup(image)
29
+ end
29
30
  end
30
31
  end # Setup
31
32
  end # Setup
data/lib/dapp/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Dapp
2
- VERSION = '0.16.2'.freeze
3
- BUILD_CACHE_VERSION = 19
2
+ VERSION = '0.17.0'.freeze
3
+ BUILD_CACHE_VERSION = 20
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.16.2
4
+ version: 0.17.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-10-26 00:00:00.000000000 Z
11
+ date: 2017-10-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout