dapp 0.19.5 → 0.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aae9ac6942e53a5dfc819ef116bace7d9b6ee0b796854c19f1bbef759384fbd1
-  data.tar.gz: e6755cecd0d3974ecbd5f02272e1d7838fe1abd6e969753290420ca653821653
+  metadata.gz: f75eb328fb6d3f8a525907c77d0e22c098ebce785a9dc059c5cef6e7ec18031e
+  data.tar.gz: 173934daabfbdce583ae9fe00b2f2c4fa9ad0c1b0013e94bfdfd4570a99358cc
 SHA512:
-  metadata.gz: 82b164a8819abb9deac8ec34f7c3bf21853bb0e625698b73bf895ad1075ecf25c14666ceb5c1db2426c6fff0c28148541160cb93b49feb9d9b6e39c68143b57e
-  data.tar.gz: f72c0dcada882ed289d89f94574c0d06c4f32f08d8241f616c6c2e72c50b11506e2957e8a6359960791f53b7bf4949f6baa22468a226cf7090fe24ac638ff1a1
+  metadata.gz: 17901157d15cd5716296469ef9a6a85ebf1d0c316f332b88fd62e06015a63c353f01403ec8ec4541c5378cb254986b1b698b8b36325594a9225c5d75191a849e
+  data.tar.gz: 94c15b36849fed04ef597bf19e2dba9b483d8f37bda51a707e5da632b10de899d385c94f50c6fefa579bb04f7031744eae0b7a3273da12538a5290cdc6764caf

data/config/en/common.yml

@@ -67,22 +67,17 @@ en:
       import_artifact: 'Import Artifact'
       before_install: 'Before install'
       before_install_artifact: 'Before install artifact'
-      g_a_archive_dependencies: 'Git artifacts dependencies'
       g_a_archive: 'Git artifacts: create archive'
       install:
-        g_a_pre_install_patch_dependencies: 'Git artifacts dependencies'
         g_a_pre_install_patch: 'Git artifacts: apply patches (before install)'
         install: 'Install'
-        g_a_post_install_patch_dependencies: 'Git artifacts dependencies'
         g_a_post_install_patch: 'Git artifacts: apply patches (after install)'
       after_install_artifact: 'After install artifact'
       before_setup: 'Before setup'
       before_setup_artifact: 'Before setup artifact'
       setup:
-        g_a_pre_setup_patch_dependencies: 'Git artifacts dependencies'
         g_a_pre_setup_patch: 'Git artifacts: apply patches (before setup)'
         setup: 'Setup'
-        g_a_post_setup_patch_dependencies: 'Git artifacts dependencies'
         g_a_post_setup_patch: 'Git artifacts: apply patches (after setup)'
       after_setup_artifact: 'After setup artifact'
       g_a_latest_patch: 'Git artifacts: latest patch'

data/lib/dapp.rb

@@ -164,28 +164,22 @@ require 'dapp/dimg/build/stage/mod/logging'
 require 'dapp/dimg/build/stage/mod/group'
 require 'dapp/dimg/build/stage/base'
 require 'dapp/dimg/build/stage/ga_base'
-require 'dapp/dimg/build/stage/ga_dependencies_base'
-require 'dapp/dimg/build/stage/ga_related_dependencies_base'
+require 'dapp/dimg/build/stage/ga_related_base'
 require 'dapp/dimg/build/stage/artifact_base'
 require 'dapp/dimg/build/stage/artifact_default'
 require 'dapp/dimg/build/stage/from'
 require 'dapp/dimg/build/stage/import_artifact'
 require 'dapp/dimg/build/stage/before_install'
 require 'dapp/dimg/build/stage/before_install_artifact'
-require 'dapp/dimg/build/stage/ga_archive_dependencies'
 require 'dapp/dimg/build/stage/ga_archive'
-require 'dapp/dimg/build/stage/install/ga_pre_install_patch_dependencies'
 require 'dapp/dimg/build/stage/install/ga_pre_install_patch'
 require 'dapp/dimg/build/stage/install/install'
-require 'dapp/dimg/build/stage/install/ga_post_install_patch_dependencies'
 require 'dapp/dimg/build/stage/install/ga_post_install_patch'
 require 'dapp/dimg/build/stage/after_install_artifact'
 require 'dapp/dimg/build/stage/before_setup'
 require 'dapp/dimg/build/stage/before_setup_artifact'
-require 'dapp/dimg/build/stage/setup/ga_pre_setup_patch_dependencies'
 require 'dapp/dimg/build/stage/setup/ga_pre_setup_patch'
 require 'dapp/dimg/build/stage/setup/setup'
-require 'dapp/dimg/build/stage/setup/ga_post_setup_patch_dependencies'
 require 'dapp/dimg/build/stage/setup/ga_post_setup_patch'
 require 'dapp/dimg/build/stage/after_setup_artifact'
 require 'dapp/dimg/build/stage/ga_latest_patch'

data/lib/dapp/cli/command/base.rb

@@ -56,9 +56,10 @@ module Dapp
           super()
         end
 
-        def run_dapp_command(run_method, *args)
-          dapp = ::Dapp::Dapp.new(*args)
-          begin
+        def run_dapp_command(run_method, options: {}, log_running_time: true)
+          dapp = ::Dapp::Dapp.new(options: options)
+
+          log_dapp_running_time(dapp, ignore: !log_running_time) do
             if block_given?
               yield dapp
             elsif !run_method.nil?
@@ -67,6 +68,17 @@ module Dapp
           end
         end
 
+        def log_dapp_running_time(dapp, ignore: false)
+          return yield if ignore
+
+          begin
+            start_time = Time.now
+            yield
+          ensure
+            dapp.log_step("Running time #{(Time.now - start_time).round(2)} seconds")
+          end
+        end
+
         def run(_argv = ARGV)
           raise
         end

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

@@ -186,6 +186,16 @@ module Dapp
             dimg.git_artifacts.map { |git_artifact| git_artifact.stage_dependencies_checksum(self) }
           end
 
+          def layer_commit(git_artifact)
+            commits[git_artifact] ||= begin
+              if image.tagged?
+                image.labels["dapp-git-#{git_artifact.paramshash}-commit"]
+              else
+                git_artifact.latest_commit
+              end
+            end
+          end
+
           def dependencies
             []
           end
@@ -202,24 +212,10 @@ module Dapp
             false
           end
 
-          def prev_g_a_stage
-            stage = self
-            until (stage = stage.prev_stage).nil?
-              return stage if stage.g_a_stage?
-            end
-          end
-
-          def next_g_a_stage
-            stage = self
-            until (stage = stage.next_stage).nil?
-              return stage if stage.g_a_stage?
-            end
-          end
-
           protected
 
           def renew
-            dependencies_discard
+            commits_discard
             image_reset
             image_untag! if image_should_be_untagged?
           end
@@ -301,6 +297,14 @@ module Dapp
               end
             end
           end
+
+          def commits_discard
+            @commits = nil
+          end
+
+          def commits
+            @commits ||= {}
+          end
         end # Base
       end # Stage
     end # Build

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

@@ -3,13 +3,24 @@ module Dapp
     module Build
       module Stage
         class GAArchive < GABase
+          RESET_COMMIT_MESSAGES = ['[dapp reset]', '[reset dapp]'].freeze
+
           def initialize(dimg, next_stage)
-            @prev_stage = GAArchiveDependencies.new(dimg, self)
+            @prev_stage = BeforeInstallArtifact.new(dimg, self)
             super
           end
 
+          def dependencies
+            @dependencies ||= [dimg.git_artifacts.map(&:paramshash).join, reset_commits]
+          end
+
           protected
 
+          def reset_commits
+            regex = Regexp.union(RESET_COMMIT_MESSAGES)
+            dimg.git_artifacts.map { |git_artifact| git_artifact.repo.find_commit_id_by_message(regex) }.sort.uniq.compact
+          end
+
           def apply_command_method
             :apply_archive_command
           end

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

@@ -3,43 +3,34 @@ module Dapp
     module Build
       module Stage
         class GABase < Base
-          def dependencies_stage
-            prev_stage
-          end
-
           def prepare_image
             super do
               image.add_volumes_from dimg.dapp.gitartifact_container
               image.add_volume "#{dimg.tmp_path('archives')}:#{dimg.container_tmp_path('archives')}:ro"
               image.add_volume "#{dimg.tmp_path('patches')}:#{dimg.container_tmp_path('patches')}:ro"
 
-              dimg.git_artifacts.each { |git_artifact| image.add_command git_artifact.send(apply_command_method, self) }
+              dimg.git_artifacts.each do |git_artifact|
+                image.add_service_change_label("dapp-git-#{git_artifact.paramshash}-commit".to_sym => git_artifact.latest_commit)
+                image.add_command git_artifact.send(apply_command_method, self)
+              end
             end
           end
 
           def empty?
-            dependencies_stage.empty?
+            dimg.git_artifacts.empty? || super
           end
 
           def g_a_stage?
             true
           end
 
-          def layer_commit(git_artifact)
-            commits[git_artifact] ||= begin
-              if dependencies_stage && dependencies_stage.image.tagged?
-                dependencies_stage.image.labels["dapp-git-#{git_artifact.paramshash}-commit"]
-              else
-                git_artifact.latest_commit
-              end
+          def image_should_be_untagged_condition
+            return false unless image.tagged?
+            dimg.git_artifacts.any? do |git_artifact|
+              !git_artifact.repo.commit_exists? layer_commit(git_artifact)
             end
           end
 
-          def renew
-            @commits = {}
-            super
-          end
-
           protected
 
           def should_not_be_detailed?
@@ -53,12 +44,6 @@ module Dapp
           def apply_command_method
             :apply_patch_command
           end
-
-          private
-
-          def commits
-            @commits ||= {}
-          end
         end # GABase
       end # Stage
     end # Build

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

@@ -8,22 +8,23 @@ module Dapp
             super
           end
 
-          def dependencies_stage
-            nil
+          def renew
+            dependencies_discard
+            super
           end
 
           def dependencies
             @dependencies ||= [commit_list, git_artifacts_dev_patch_hashes]
           end
 
-          def layer_commit(git_artifact)
-            commits[git_artifact] ||= git_artifact.latest_commit
-          end
-
           def empty?
             dimg.git_artifacts.empty? || dependencies_empty?
           end
 
+          def layer_commit(git_artifact)
+            commits[git_artifact] ||= git_artifact.latest_commit
+          end
+
           private
 
           def commit_list

data/lib/dapp/dimg/build/stage/{ga_related_dependencies_base.rb → ga_related_base.rb}

@@ -2,7 +2,7 @@ module Dapp
   module Dimg
     module Build
       module Stage
-        class GARelatedDependenciesBase < GADependenciesBase
+        class GARelatedBase < GABase
           def dependencies
             @dependencies ||= dimg.stage_by_name(related_stage_name).context
           end
@@ -14,7 +14,7 @@ module Dapp
           def related_stage_name
             raise
           end
-        end # GARelatedDependenciesBase
+        end # GARelatedBase
       end # Stage
     end # Build
   end # Dimg

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

@@ -3,13 +3,17 @@ module Dapp
     module Build
       module Stage
         module Install
-          class GAPostInstallPatch < GABase
+          class GAPostInstallPatch < GARelatedBase
             include Mod::Group
 
             def initialize(dimg, next_stage)
-              @prev_stage = GAPostInstallPatchDependencies.new(dimg, self)
+              @prev_stage = Install.new(dimg, self)
               super
             end
+
+            def related_stage_name
+              :before_setup
+            end
           end # GAPostInstallPatch
         end
       end # Stage

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

@@ -3,13 +3,17 @@ module Dapp
     module Build
       module Stage
         module Install
-          class GAPreInstallPatch < GABase
+          class GAPreInstallPatch < GARelatedBase
             include Mod::Group
 
             def initialize(dimg, next_stage)
-              @prev_stage = GAPreInstallPatchDependencies.new(dimg, self)
+              @prev_stage = GAArchive.new(dimg, self)
               super
             end
+
+            def related_stage_name
+              :install
+            end
           end # GAPostInstallPatch
         end
       end # Stage

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

@@ -6,10 +6,33 @@ module Dapp
           class GAPostSetupPatch < GABase
             include Mod::Group
 
+            MAX_PATCH_SIZE = 1024 * 1024
+
             def initialize(dimg, next_stage)
-              @prev_stage = GAPostSetupPatchDependencies.new(dimg, self)
+              @prev_stage = Setup.new(dimg, self)
               super
             end
+
+            def renew
+              dependencies_discard
+              super
+            end
+
+            def dependencies
+              @dependencies ||= [(changes_size_since_g_a_pre_setup_patch / MAX_PATCH_SIZE).to_i]
+            end
+
+            private
+
+            def changes_size_since_g_a_pre_setup_patch
+              dimg.git_artifacts.map do |git_artifact|
+                if git_artifact.repo.commit_exists? prev_stage.layer_commit(git_artifact)
+                  git_artifact.patch_size(prev_stage.layer_commit(git_artifact), git_artifact.latest_commit)
+                else
+                  0
+                end
+              end.reduce(0, :+)
+            end
           end # GAPostSetupPatch
         end
       end # Stage

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

@@ -3,13 +3,17 @@ module Dapp
     module Build
       module Stage
         module Setup
-          class GAPreSetupPatch < GABase
+          class GAPreSetupPatch < GARelatedBase
             include Mod::Group
 
             def initialize(dimg, next_stage)
-              @prev_stage = GAPreSetupPatchDependencies.new(dimg, self)
+              @prev_stage = BeforeSetupArtifact.new(dimg, self)
               super
             end
+
+            def related_stage_name
+              :setup
+            end
           end # GAPrePatch
         end
       end # Stage

data/lib/dapp/dimg/cli/command/base.rb

@@ -6,8 +6,8 @@ module Dapp::Dimg::CLI
         run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments))
       end
 
-      def run_dapp_command(run_method, *args)
-        super(nil, *args) do |dapp|
+      def run_dapp_command(run_method, options: {}, log_running_time: true)
+        super(nil, options: options, log_running_time: log_running_time) do |dapp|
           begin
             dapp.host_docker_login
             if block_given?

data/lib/dapp/dimg/cli/command/dimg/run.rb

@@ -51,7 +51,7 @@ BANNER
           index = filtered_args.index('--') || filtered_args.count
           docker_options = index.nonzero? ? filtered_args.slice(0..index - 1) : []
           command = filtered_args.slice(index + 1..-1) || []
-          run_dapp_command(nil, options: cli_options(dimgs_patterns: patterns)) do |dapp|
+          run_dapp_command(nil, options: cli_options(dimgs_patterns: patterns), log_running_time: false) do |dapp|
             dapp.run(docker_options, command)
           end
         end

data/lib/dapp/dimg/cli/command/dimg/stages/base.rb

@@ -3,8 +3,8 @@ module Dapp::Dimg::CLI
     class Dimg < ::Dapp::CLI
       class Stages < ::Dapp::CLI
         class Base < Base
-          def run_dapp_command(run_command, options: {})
-            super(run_command, options: options.merge(verbose: true))
+          def run_dapp_command(run_command, options: {}, log_running_time: true)
+            super(run_command, options: options.merge(verbose: true), log_running_time: log_running_time)
           end
         end
       end

data/lib/dapp/dimg/cli/command/dimg/tag.rb

@@ -16,7 +16,7 @@ BANNER
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
           tag = self.class.required_argument(self, 'tag')
-          run_dapp_command(nil, options: cli_options(dimgs_patterns: cli_arguments)) do
+          run_dapp_command(nil, options: cli_options(dimgs_patterns: cli_arguments)) do |dapp|
             dapp.public_send(run_method, tag)
           end
         end

data/lib/dapp/dimg/git_artifact.rb

@@ -417,11 +417,11 @@ module Dapp
       end
 
       def patch_stage_commits(stage)
-        [stage.prev_g_a_stage.layer_commit(self), stage.layer_commit(self)]
+        [stage.prev_stage.layer_commit(self), stage.layer_commit(self)]
       end
 
       def dev_patch_stage_commits(stage)
-        [stage.prev_g_a_stage.layer_commit(self), nil]
+        [stage.prev_stage.layer_commit(self), nil]
       end
 
       def any_changes?(from_commit, to_commit)

data/lib/dapp/kube/cli/command/kube/lint.rb

@@ -35,7 +35,7 @@ BANNER
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
 
-        run_dapp_command(nil, options: cli_options) do |dapp|
+        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
           repo = if not cli_arguments[0].nil?
             self.class.required_argument(self, 'repo')
           else

data/lib/dapp/kube/cli/command/kube/render.rb

@@ -44,7 +44,7 @@ BANNER
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
 
-        run_dapp_command(nil, options: cli_options) do |dapp|
+        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
           repo = if not cli_arguments[0].nil?
             self.class.required_argument(self, 'repo')
           else

data/lib/dapp/kube/cli/command/kube/secret_edit.rb

@@ -17,7 +17,7 @@ BANNER
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         file_path = self.class.required_argument(self, 'FILE_PATH')
-        run_dapp_command(nil, options: cli_options) do |dapp|
+        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
           dapp.public_send(run_method, file_path)
         end
       end

data/lib/dapp/kube/cli/command/kube/secret_extract.rb

@@ -26,7 +26,7 @@ BANNER
             self.class.required_argument(self, 'FILE_PATH')
           end
         end
-        run_dapp_command(nil, options: cli_options) do |dapp|
+        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
           dapp.public_send(run_method, file_path)
         end
       end

data/lib/dapp/kube/cli/command/kube/secret_generate.rb

@@ -21,7 +21,7 @@ BANNER
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         file_path = cli_arguments.empty? ? nil : cli_arguments.first
-        run_dapp_command(nil, options: cli_options) do |dapp|
+        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
           dapp.public_send(run_method, file_path)
         end
       end

data/lib/dapp/kube/cli/command/kube/secret_key_generate.rb

@@ -8,6 +8,9 @@ Usage:
 
 Options:
 BANNER
+      def run_dapp_command(run_method, options: {}, log_running_time: false)
+        super(run_method, options: options, log_running_time: log_running_time)
+      end
     end
   end
 end

data/lib/dapp/kube/cli/command/kube/secret_regenerate.rb

@@ -16,7 +16,7 @@ BANNER
 
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
-        run_dapp_command(nil, options: cli_options) do |dapp|
+        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
           dapp.public_send(run_method, *cli_arguments)
         end
       end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.19.5'.freeze
-  BUILD_CACHE_VERSION = 21
+  VERSION = '0.19.6'.freeze
+  BUILD_CACHE_VERSION = 22
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.19.5
+  version: 0.19.6
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-18 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -502,24 +502,18 @@ files:
 - lib/dapp/dimg/build/stage/docker_instructions.rb
 - lib/dapp/dimg/build/stage/from.rb
 - lib/dapp/dimg/build/stage/ga_archive.rb
-- lib/dapp/dimg/build/stage/ga_archive_dependencies.rb
 - lib/dapp/dimg/build/stage/ga_artifact_patch.rb
 - lib/dapp/dimg/build/stage/ga_base.rb
-- lib/dapp/dimg/build/stage/ga_dependencies_base.rb
 - lib/dapp/dimg/build/stage/ga_latest_patch.rb
-- lib/dapp/dimg/build/stage/ga_related_dependencies_base.rb
+- lib/dapp/dimg/build/stage/ga_related_base.rb
 - lib/dapp/dimg/build/stage/import_artifact.rb
 - lib/dapp/dimg/build/stage/install/ga_post_install_patch.rb
-- lib/dapp/dimg/build/stage/install/ga_post_install_patch_dependencies.rb
 - lib/dapp/dimg/build/stage/install/ga_pre_install_patch.rb
-- lib/dapp/dimg/build/stage/install/ga_pre_install_patch_dependencies.rb
 - lib/dapp/dimg/build/stage/install/install.rb
 - lib/dapp/dimg/build/stage/mod/group.rb
 - lib/dapp/dimg/build/stage/mod/logging.rb
 - lib/dapp/dimg/build/stage/setup/ga_post_setup_patch.rb
-- lib/dapp/dimg/build/stage/setup/ga_post_setup_patch_dependencies.rb
 - lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch.rb
-- lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch_dependencies.rb
 - lib/dapp/dimg/build/stage/setup/setup.rb
 - lib/dapp/dimg/builder.rb
 - lib/dapp/dimg/builder/base.rb

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

@@ -1,27 +0,0 @@
-module Dapp
-  module Dimg
-    module Build
-      module Stage
-        class GAArchiveDependencies < GADependenciesBase
-          RESET_COMMIT_MESSAGES = ['[dapp reset]', '[reset dapp]'].freeze
-
-          def initialize(dimg, next_stage)
-            @prev_stage = BeforeInstallArtifact.new(dimg, self)
-            super
-          end
-
-          def dependencies
-            @dependencies ||= [dimg.git_artifacts.map(&:paramshash).join, reset_commits]
-          end
-
-          protected
-
-          def reset_commits
-            regex = Regexp.union(RESET_COMMIT_MESSAGES)
-            dimg.git_artifacts.map { |git_artifact| git_artifact.repo.find_commit_id_by_message(regex) }.sort.uniq.compact
-          end
-        end # GAArchiveDependencies
-      end # Stage
-    end # Build
-  end # Dimg
-end # Dapp

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

@@ -1,28 +0,0 @@
-module Dapp
-  module Dimg
-    module Build
-      module Stage
-        class GADependenciesBase < Base
-          def prepare_image
-            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
-
-          def empty?
-            dimg.git_artifacts.empty? || super
-          end
-
-          def image_should_be_untagged_condition
-            return false unless image.tagged?
-            dimg.git_artifacts.any? do |git_artifact|
-              !git_artifact.repo.commit_exists? image.labels["dapp-git-#{git_artifact.paramshash}-commit"]
-            end
-          end
-        end # GADependenciesBase
-      end # Stage
-    end # Build
-  end # Dimg
-end # Dapp

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

@@ -1,22 +0,0 @@
-module Dapp
-  module Dimg
-    module Build
-      module Stage
-        module Install
-          class GAPostInstallPatchDependencies < GARelatedDependenciesBase
-            include Mod::Group
-
-            def initialize(dimg, next_stage)
-              @prev_stage = Install.new(dimg, self)
-              super
-            end
-
-            def related_stage_name
-              :before_setup
-            end
-          end # GAPostInstallPatchDependencies
-        end
-      end # Stage
-    end # Build
-  end # Dimg
-end # Dapp

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

@@ -1,22 +0,0 @@
-module Dapp
-  module Dimg
-    module Build
-      module Stage
-        module Install
-          class GAPreInstallPatchDependencies < GARelatedDependenciesBase
-            include Mod::Group
-
-            def initialize(dimg, next_stage)
-              @prev_stage = GAArchive.new(dimg, self)
-              super
-            end
-
-            def related_stage_name
-              :install
-            end
-          end # GAPreInstallPatchDependencies
-        end
-      end # Stage
-    end # Build
-  end # Dimg
-end # Dapp

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

@@ -1,36 +0,0 @@
-module Dapp
-  module Dimg
-    module Build
-      module Stage
-        module Setup
-          class GAPostSetupPatchDependencies < GADependenciesBase
-            include Mod::Group
-
-            MAX_PATCH_SIZE = 1024 * 1024
-
-            def initialize(dimg, next_stage)
-              @prev_stage = Setup.new(dimg, self)
-              super
-            end
-
-            def dependencies
-              @dependencies ||= [(changes_size_since_g_a_pre_setup_patch / MAX_PATCH_SIZE).to_i]
-            end
-
-            private
-
-            def changes_size_since_g_a_pre_setup_patch
-              dimg.git_artifacts.map do |git_artifact|
-                if git_artifact.repo.commit_exists? prev_g_a_stage.layer_commit(git_artifact)
-                  git_artifact.patch_size(prev_g_a_stage.layer_commit(git_artifact), git_artifact.latest_commit)
-                else
-                  0
-                end
-              end.reduce(0, :+)
-            end
-          end # GAPostSetupPatchDependencies
-        end
-      end # Stage
-    end # Build
-  end # Dimg
-end # Dapp

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

@@ -1,22 +0,0 @@
-module Dapp
-  module Dimg
-    module Build
-      module Stage
-        module Setup
-          class GAPreSetupPatchDependencies < GARelatedDependenciesBase
-            include Mod::Group
-
-            def initialize(dimg, next_stage)
-              @prev_stage = BeforeSetupArtifact.new(dimg, self)
-              super
-            end
-
-            def related_stage_name
-              :setup
-            end
-          end # GAPreSetupPatchDependencies
-        end
-      end # Stage
-    end # Build
-  end # Dimg
-end # Dapp