dapp 0.21.1 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 820e36951767a0d35edbb24d56493dbc1b7c0e8db72bd1af0e92e3b24e37a2d3
-  data.tar.gz: c126480a69060112b39bea1bc6be9a1da03ff315f2bd7c035ff64b1e3d729c0c
+  metadata.gz: 6688aeaeb3fbb8ac79e79ebfb3a962fac517c837502baf782f63ba6ad0f66422
+  data.tar.gz: 51c4ec39d9f8a76d28e86d8c1b5c58003b62cb695759a8d2ea8fe059947bc5f0
 SHA512:
-  metadata.gz: 678dff10962739f00d578161d648722b40ebceaed134211d1b592d2413c080a34640f376ff012deb8c951614f461e8a70f04fed02153fce64e7a63f76fa8936d
-  data.tar.gz: c482b39a5186b4f85c74e3fb9b77bda7bca19ef8a80649c1cc988c23f4494fae6dd1395efb48b10361c4c4f389f3b41a0203ed218246fec0cda1edd04eb2dcff
+  metadata.gz: d9a403972969a94073332d428d83d641bceb4e5b0c23b036dc28db0b7bcd65e11e7337e97a0dad7598b72e063eba32c2adf1396d1bc644e523f82996750fe77d
+  data.tar.gz: 0c17e98a0a94b63999cf00d620b60472f45064f7f8ca98c6f61a2a0206059df98e97a22842d15ed3d1007cbf5cdd5c6e04b758ffd55f78d384a3cf4adf382ab4

data/lib/dapp/dapp/git_artifact.rb

@@ -7,9 +7,13 @@ module Dapp
         end
       end
 
-      def dimgstage_ga_label(paramshash)
+      def dimgstage_g_a_commit_label(paramshash)
         "dapp-git-#{paramshash}-commit"
       end
+
+      def dimgstage_g_a_type_label(paramshash)
+        "dapp-git-#{paramshash}-type"
+      end
     end # GitArtifact
   end # Dapp
 end # Dapp

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

@@ -191,7 +191,7 @@ module Dapp
           def layer_commit(git_artifact)
             commits[git_artifact] ||= begin
               if image.tagged?
-                image.labels[dimg.dapp.dimgstage_ga_label(git_artifact.paramshash)]
+                image.labels[dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash)]
               else
                 git_artifact.latest_commit
               end

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

@@ -10,7 +10,7 @@ module Dapp
               image.add_volume "#{dimg.tmp_path('patches')}:#{dimg.container_tmp_path('patches')}:ro"
 
               dimg.git_artifacts.each do |git_artifact|
-                image.add_service_change_label(dimg.dapp.dimgstage_ga_label(git_artifact.paramshash).to_sym => git_artifact.latest_commit)
+                image.add_service_change_label(dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash).to_sym => git_artifact.latest_commit)
                 image.add_command git_artifact.send(apply_command_method, self)
               end
             end

data/lib/dapp/dimg/dapp/command/stages/common.rb

@@ -72,7 +72,7 @@ module Dapp
                   dimgs.each do |dimg|
                     [dimg, dimg.artifacts].flatten
                                           .map(&:git_artifacts).flatten
-                                          .map { |ga_artifact| repositories[dimgstage_ga_label(ga_artifact.paramshash)] = ga_artifact.repo }
+                                          .map { |git_artifact| repositories[dimgstage_g_a_commit_label(git_artifact.paramshash)] = git_artifact.repo }
                   end
                 end
               end

data/lib/dapp/dimg/git_artifact.rb

@@ -65,12 +65,12 @@ module Dapp
           if archive_any_changes?(stage)
             case cwd_type(stage)
             when :directory
-              stage.image.add_service_change_label :"dapp-git-#{paramshash}-type" => 'directory'
+              stage.image.add_service_change_label(repo.dapp.dimgstage_g_a_type_label(paramshash).to_sym => 'directory')
 
               commands << "#{repo.dapp.install_bin} #{credentials.join(' ')} -d \"#{to}\""
               commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commit(stage))} -C \"#{to}\""
             when :file
-              stage.image.add_service_change_label :"dapp-git-#{paramshash}-type" => 'file'
+              stage.image.add_service_change_label(repo.dapp.dimgstage_g_a_type_label(paramshash).to_sym => 'file')
 
               commands << "#{repo.dapp.install_bin} #{credentials.join(' ')} -d \"#{File.dirname(to)}\""
               commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commit(stage))} -C \"#{File.dirname(to)}\""
@@ -79,15 +79,15 @@ module Dapp
         end
       end
 
-      def archive_type
-        repo.dimg.stage_by_name(:g_a_archive).image.labels["dapp-git-#{paramshash}-type"].to_s.to_sym
+      def archive_type(stage)
+        stage.prev_stage.image.labels[repo.dapp.dimgstage_g_a_type_label(paramshash)].to_s.to_sym
       end
 
       def apply_patch_command(stage)
         [].tap do |commands|
           if dev_mode?
             if any_changes?(*dev_patch_stage_commits(stage))
-              case archive_type
+              case archive_type(stage)
               when :directory
                 changed_files = diff_patches(*dev_patch_stage_commits(stage)).map {|p| "\"#{File.join(to, cwd, p.delta.new_file[:path])}\""}
                 commands << "#{repo.dapp.rm_bin} -rf #{changed_files.join(' ')}"
@@ -103,7 +103,7 @@ module Dapp
             end
           else
             if patch_any_changes?(stage)
-              case archive_type
+              case archive_type(stage)
               when :directory
                 commands << "#{repo.dapp.install_bin} #{credentials.join(' ')} -d \"#{to}\""
                 commands << "#{sudo}#{repo.dapp.git_bin} apply --whitespace=nowarn --directory=\"#{to}\" --unsafe-paths #{patch_file(stage, *patch_stage_commits(stage))}"
@@ -296,7 +296,7 @@ module Dapp
           modify_patch_line = proc do |line_number, path_char|
             action_part, path_part = lines[line_number].strip.split(' ', 2)
             if (path_with_cwd = path_part.partition("#{path_char}/").last).start_with?(cwd)
-              native_path = case archive_type
+              native_path = case archive_type(stage)
               when :directory
                 path_with_cwd.sub(cwd, '')
               when :file

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.21.1'.freeze
+  VERSION = '0.21.2'.freeze
   BUILD_CACHE_VERSION = 23
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout