dapp 0.16.2 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 446c0b5306a3b02a688fea13b10e04c238fb7907
-  data.tar.gz: 7b16af64330d60365f771190c66f38e057369a31
+  metadata.gz: e684e6f7f3c0d642a883702a304127a101d52438
+  data.tar.gz: 124cd8bfd2d196d7437cd9915508ae105670612d
 SHA512:
-  metadata.gz: d04f98aaa8b82c10233a6d589986abeee42fd134178be20ec24cffa75d08a682ed80899f49688785a2233be9044b17e5495fa1427f7f4137e6e442241f294c66
-  data.tar.gz: 76b812d206500e8ae0d0f601b0dc203d7c495ac8e97de8c77434de4281e2acd65fba9e63066da96fc36683c97fd77ce28026c030f5df68b2508132a3b58b19c6
+  metadata.gz: e7fab37354c67bc541acd52ebab95733b3d99add85a8e6a6424a6f606f0f86874cc6f1d79df5732fa7d6ed286329c68b4ad2c10d6707e2df3d445d80f77c9486
+  data.tar.gz: 6e44da6bfc5a7a4206e036149a671c243f8caf9be74efc3a3a859c033f370218f1bb1c057eed32b820dfd4bab1063f1ab2baea60693c30c381a20bc5d41b2b7a

data/lib/dapp/dimg/build/stage/artifact_base.rb

@@ -8,14 +8,15 @@ module Dapp
           end
 
           def prepare_image
-            super
-            artifacts_dimgs_build!
-            artifacts_labels = {}
-            artifacts.each do |artifact|
-              apply_artifact(artifact, image)
-              artifacts_labels["dapp-artifact-#{artifact[:name]}".to_sym] = artifact[:dimg].last_stage.image.built_id
+            super do
+              artifacts_dimgs_build!
+              artifacts_labels = {}
+              artifacts.each do |artifact|
+                apply_artifact(artifact, image)
+                artifacts_labels["dapp-artifact-#{artifact[:name]}".to_sym] = artifact[:dimg].last_stage.image.built_id
+              end
+              image.add_service_change_label artifacts_labels
             end
-            image.add_service_change_label artifacts_labels
           end
 
           def artifacts

data/lib/dapp/dimg/build/stage/before_install.rb

@@ -21,8 +21,9 @@ module Dapp
           end
 
           def prepare_image
-            super
-            dimg.builder.before_install(image)
+            super do
+              dimg.builder.before_install(image)
+            end
           end
 
           alias dependencies context

data/lib/dapp/dimg/build/stage/before_setup.rb

@@ -21,8 +21,9 @@ module Dapp
           end
 
           def prepare_image
-            super
-            dimg.builder.before_setup(image)
+            super do
+              dimg.builder.before_setup(image)
+            end
           end
         end # BeforeSetup
       end # Stage

data/lib/dapp/dimg/build/stage/build_artifact.rb

@@ -21,8 +21,9 @@ module Dapp
           end
 
           def prepare_image
-            super
-            dimg.builder.build_artifact(image)
+            super do
+              dimg.builder.build_artifact(image)
+            end
           end
         end # BuildArtifact
       end # Stage

data/lib/dapp/dimg/build/stage/docker_instructions.rb

@@ -13,9 +13,10 @@ module Dapp
           end
 
           def prepare_image
-            super
-            change_options.each do |k, v|
-              image.public_send("add_change_#{k}", v)
+            super do
+              change_options.each do |k, v|
+                image.public_send("add_change_#{k}", v)
+              end
             end
           end
         end # DockerInstructions

data/lib/dapp/dimg/build/stage/ga_base.rb

@@ -28,7 +28,7 @@ module Dapp
           def layer_commit(git_artifact)
             commits[git_artifact] ||= begin
               if dependencies_stage && dependencies_stage.image.tagged?
-                dependencies_stage.image.labels[git_artifact.full_name]
+                dependencies_stage.image.labels["dapp-git-#{git_artifact.paramshash}-commit"]
               else
                 git_artifact.latest_commit
               end

data/lib/dapp/dimg/build/stage/ga_dependencies_base.rb

@@ -4,9 +4,10 @@ module Dapp
       module Stage
         class GADependenciesBase < Base
           def prepare_image
-            super
-            dimg.git_artifacts.each do |git_artifact|
-              image.add_service_change_label(git_artifact.full_name.to_sym => git_artifact.latest_commit)
+            super do
+              dimg.git_artifacts.each do |git_artifact|
+                image.add_service_change_label("dapp-git-#{git_artifact.paramshash}-commit".to_sym => git_artifact.latest_commit)
+              end
             end
           end
 

data/lib/dapp/dimg/build/stage/import_artifact.rb

@@ -19,9 +19,10 @@ module Dapp
           end
 
           def prepare_image
-            super
-            change_options.each do |k, v|
-              image.public_send("add_change_#{k}", v)
+            super do
+              change_options.each do |k, v|
+                image.public_send("add_change_#{k}", v)
+              end
             end
           end
 

data/lib/dapp/dimg/build/stage/install/install.rb

@@ -24,8 +24,9 @@ module Dapp
             end
 
             def prepare_image
-              super
-              dimg.builder.install(image)
+              super do
+                dimg.builder.install(image)
+              end
             end
           end # Install
         end # Install

data/lib/dapp/dimg/build/stage/setup/setup.rb

@@ -24,8 +24,9 @@ module Dapp
             end
 
             def prepare_image
-              super
-              dimg.builder.setup(image)
+              super do
+                dimg.builder.setup(image)
+              end
             end
           end # Setup
         end # Setup

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.16.2'.freeze
-  BUILD_CACHE_VERSION = 19
+  VERSION = '0.17.0'.freeze
+  BUILD_CACHE_VERSION = 20
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.17.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout