dapp 0.25.6 → 0.25.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38693a8d1134d6e580ae6f714082d7db743e5a2d
-  data.tar.gz: 94bbff9ef8274b6cdcddcae4906cfee521a79d11
+  metadata.gz: aef8ea2f6a2d8c3d4082b084d4b0233c26ffe33f
+  data.tar.gz: fd5c263de25eccd3f85276b8bbd333cef39b9857
 SHA512:
-  metadata.gz: bc3004df4e897106044271927384174097301ba1b0678fa65f6920862a5c6575f9194fc5a92cd10fd0a0c7f449a37fff5c62f47abd1f29e2ef3edd3f663017e5
-  data.tar.gz: 5c43c9458405b6b7d512cd969594c9d0e10d6395d89e828cb5c3b8d315354988b730e79bf2114c95565d44baf8d27da6839482ba33d3c7f5ff7cdc748f10705c
+  metadata.gz: 515cfb5a3ea8ab80506bede101b128af04504faa68c9688b876be23f846407dd601dc8505a40ee5fe72e24de88011a16d362347bcd654cd02dd2f8eabd75d2f2
+  data.tar.gz: df790680c28f11d83cd562f1357fb9e7209c33e6ab58ab5c81c40a1483180b1d86222f4e54016adadac83fa695eb32fe0c491f0620d1bce8490c4fca88ec99d6

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
+              .select { |ga| ga.repo.commit_exists?(prev_stage.layer_commit(ga)) && ga.patch_any_changes?(self) }
+              .map(&method(:layer_commit))
           end
 
           def git_artifacts_dev_patch_hashes

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

@@ -35,7 +35,6 @@ module Dapp
         end
 
         def image_delete(tag)
-          image_blobs(tag).each { |hash| blob_delete(hash.values.first) }
           api_request(repo_suffix, "/manifests/#{image_digest(tag)}",
                       method: :delete,
                       expects: [202, 404],
@@ -54,10 +53,6 @@ module Dapp
                           headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' }).headers['Docker-Content-Digest']
         end
 
-        def image_blobs(tag)
-          manifest_v1(tag)['fsLayers']
-        end
-
         def manifest_v1(tag)
           api_request(repo_suffix, "/manifests/#{tag}")
         end
@@ -67,11 +62,6 @@ module Dapp
                       headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' })
         end
 
-        def blob_delete(id)
-          api_request(repo_suffix, "/blobs/#{id}",
-                      method: :delete, expects: [202, 404])
-        end
-
         def api_request(*uri, **options)
           JSON.load(raw_api_request(*uri, **options).body)
         end

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.25.6"
-  BUILD_CACHE_VERSION = 26.1
+  VERSION = "0.25.7"
+  BUILD_CACHE_VERSION = 26.2
 end

metadata

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