dapp 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 745c76163ba1b96d6a8a73c478d7ea9de5a9aa32
-  data.tar.gz: d3ec2e586c4828ecd4044a7abf69109eb64f2cbc
+  metadata.gz: e0a054313430584b23e761f254913b80a57ecfc3
+  data.tar.gz: a4945c4837361278b2653fb91d161c5bc34e22f7
 SHA512:
-  metadata.gz: 32391a66ad27f57986540b813cec39d279cd549224cc1d8b3fbc9b8fcbb50f50a5aae2692f90948e7fff2594668b5ba245dcb62d1f3b4ae31f242d9b35fba3be
-  data.tar.gz: 33b1e5a759aacd3f183d45869eedb475462b52615b7182f5931e25835ae0f0368f5726d6026c0f2d6d95487b8a39b65a5ce16502dee38999f68d385b6044358c
+  metadata.gz: dcb3d7d9da637efd3e4357d6176af9af5158796de59912641f511facc61a6fcd11087e3d7c5a068e804f4ccff2bd3c7a5fd5237161c85c168b5e210c759f1fab
+  data.tar.gz: 3bf56658b7dc5cde6ca97bbdeb42771e74291f3f49959a155f9bcf9cf422a20aae6ebbaeb7c469e920369b5ce61c99ee012ff7e7dbd946f7867e4aed8feab9c9

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

@@ -189,8 +189,10 @@ module Dapp
             commits[git_artifact] ||= begin
               if image.built?
                 image.labels[dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash)]
-              else
+              elsif g_a_stage? && !empty?
                 git_artifact.latest_commit
+              elsif prev_stage
+                prev_stage.layer_commit(git_artifact)
               end
             end
           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_g_a_commit_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 => layer_commit(git_artifact))
                 image.add_command git_artifact.send(apply_command_method, self)
               end
             end

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

@@ -28,7 +28,9 @@ module Dapp
           private
 
           def commit_list
-            dimg.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
+            dimg.git_artifacts
+              .map { |git_artifact| layer_commit(git_artifact) if git_artifact.patch_any_changes?(self) }
+              .compact
           end
 
           def git_artifacts_dev_patch_hashes

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

@@ -129,6 +129,7 @@ module Dapp
           end
 
           def remove_base(query_format, ids, force: false)
+            return if ids.empty?
             force_option = force ? ' -f' : ''
             log(ids.join("\n")) if log_verbose? || dry_run?
             run_command(format(query_format, force_option: force_option, ids: ids.join(' ')))

data/lib/dapp/dimg/git_repo/base.rb

@@ -104,12 +104,12 @@ module Dapp
 
         def patches(from, to, paths: [], exclude_paths: [], **kwargs)
           diff(from, to, **kwargs).patches.select do |patch|
-            ignore_patch?(patch, paths: paths, exclude_paths: exclude_paths)
+            !ignore_patch?(patch, paths: paths, exclude_paths: exclude_paths)
           end
         end
 
         def ignore_patch?(patch, paths: [], exclude_paths: [])
-          !ignore_path?(patch.delta.new_file[:path], paths: paths, exclude_paths: exclude_paths)
+          ignore_path?(patch.delta.new_file[:path], paths: paths, exclude_paths: exclude_paths)
         end
 
         def entries(commit, paths: [], exclude_paths: [])

data/lib/dapp/dimg/git_repo/local.rb

@@ -48,9 +48,9 @@ module Dapp
           delta_new_file = patch.delta.new_file
           args = [delta_new_file[:path], paths: paths, exclude_paths: exclude_paths]
           if nested_git_repository_mode?(delta_new_file[:mode])
-            !ignore_directory?(*args)
+            ignore_directory?(*args)
           else
-            !ignore_path?(*args)
+            ignore_path?(*args)
           end
         end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.27.0"
-  BUILD_CACHE_VERSION = 27
+  VERSION = "0.27.1"
+  BUILD_CACHE_VERSION = 28
 end

metadata

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