dapp 0.6.17 → 0.7.1

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

@@ -3,26 +3,26 @@ module Dapp
     module Stage
       # BeforeInstall
       class BeforeInstall < Base
-        def initialize(application, next_stage)
-          @prev_stage = From.new(application, self)
+        def initialize(dimg, next_stage)
+          @prev_stage = From.new(dimg, self)
           super
         end
 
         def empty?
-          super && !application.builder.before_install?
-        end
-
-        def builder_checksum
-          application.builder.before_install_checksum
+          super && !dimg.builder.before_install?
         end
 
         def context
           [builder_checksum]
         end
 
+        def builder_checksum
+          dimg.builder.before_install_checksum
+        end
+
         def prepare_image
           super
-          application.builder.before_install(image)
+          dimg.builder.before_install(image)
         end
 
         alias dependencies context

data/lib/dapp/build/stage/before_install_artifact.rb

@@ -3,8 +3,8 @@ module Dapp
     module Stage
       # BeforeInstallArtifact
       class BeforeInstallArtifact < ArtifactDefault
-        def initialize(application, next_stage)
-          @prev_stage = BeforeInstall.new(application, self)
+        def initialize(dimg, next_stage)
+          @prev_stage = BeforeInstall.new(dimg, self)
           super
         end
       end # BeforeInstallArtifact

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

@@ -3,26 +3,26 @@ module Dapp
     module Stage
       # BeforeSetup
       class BeforeSetup < Base
-        def initialize(application, next_stage)
-          @prev_stage = AfterInstallArtifact.new(application, self)
+        def initialize(dimg, next_stage)
+          @prev_stage = AfterInstallArtifact.new(dimg, self)
           super
         end
 
         def empty?
-          !application.builder.before_setup?
-        end
-
-        def builder_checksum
-          application.builder.before_setup_checksum
+          !dimg.builder.before_setup?
         end
 
         def context
           [builder_checksum]
         end
 
+        def builder_checksum
+          dimg.builder.before_setup_checksum
+        end
+
         def prepare_image
           super
-          application.builder.before_setup(image)
+          dimg.builder.before_setup(image)
         end
       end # BeforeSetup
     end # Stage

data/lib/dapp/build/stage/before_setup_artifact.rb

@@ -3,8 +3,8 @@ module Dapp
     module Stage
       # BeforeSetupArtifact
       class BeforeSetupArtifact < ArtifactDefault
-        def initialize(application, next_stage)
-          @prev_stage = BeforeSetup.new(application, self)
+        def initialize(dimg, next_stage)
+          @prev_stage = BeforeSetup.new(dimg, self)
           super
         end
       end # BeforeSetupArtifact

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

@@ -3,32 +3,32 @@ module Dapp
     module Stage
       # BuildArtifact
       class BuildArtifact < Base
-        def initialize(application)
-          @prev_stage = GAArtifactPatch.new(application, self)
-          @application = application
+        def initialize(dimg)
+          @prev_stage = GAArtifactPatch.new(dimg, self)
+          @dimg = dimg
         end
 
         def empty?
-          !application.builder.build_artifact?
-        end
-
-        def builder_checksum
-          application.builder.build_artifact_checksum
+          !dimg.builder.build_artifact?
         end
 
         def context
           [artifact_dependencies_files_checksum, builder_checksum]
         end
 
+        def builder_checksum
+          dimg.builder.build_artifact_checksum
+        end
+
         def prepare_image
           super
-          application.builder.build_artifact(image)
+          dimg.builder.build_artifact(image)
         end
 
         private
 
         def artifact_dependencies_files_checksum
-          @artifact_files_checksum ||= dependencies_files_checksum(application.config._artifact_dependencies)
+          @artifact_files_checksum ||= dependencies_files_checksum(dimg.config._artifact_dependencies)
         end
       end # BuildArtifact
     end # Stage

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

@@ -3,9 +3,9 @@ module Dapp
     module Stage
       # DockerInstructions
       class DockerInstructions < Base
-        def initialize(application)
-          @prev_stage = GALatestPatch.new(application, self)
-          @application = application
+        def initialize(dimg)
+          @prev_stage = GALatestPatch.new(dimg, self)
+          @dimg = dimg
         end
 
         def dependencies

data/lib/dapp/build/stage/from.rb

@@ -3,8 +3,12 @@ module Dapp
     module Stage
       # From
       class From < Base
+        def signature
+          hashsum [*dependencies.flatten]
+        end
+
         def dependencies
-          [from_image_name, application.config._docker._from_cache_version]
+          [from_image_name, dimg.config._docker._from_cache_version, Dapp::BUILD_CACHE_VERSION]
         end
 
         protected
@@ -22,11 +26,11 @@ module Dapp
         private
 
         def from_image_name
-          application.config._docker._from
+          dimg.config._docker._from
         end
 
         def from_image
-          @from_image ||= Image::Stage.new(name: from_image_name, project: application.project)
+          @from_image ||= Image::Stage.new(name: from_image_name, project: dimg.project)
         end
       end # Prepare
     end # Stage

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

@@ -3,8 +3,8 @@ module Dapp
     module Stage
       # GAArchive
       class GAArchive < GABase
-        def initialize(application, next_stage)
-          @prev_stage = GAArchiveDependencies.new(application, self)
+        def initialize(dimg, next_stage)
+          @prev_stage = GAArchiveDependencies.new(dimg, self)
           super
         end
 

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

@@ -3,13 +3,13 @@ module Dapp
     module Stage
       # GAArchiveDependencies
       class GAArchiveDependencies < GADependenciesBase
-        def initialize(application, next_stage)
-          @prev_stage = BeforeInstallArtifact.new(application, self)
+        def initialize(dimg, next_stage)
+          @prev_stage = BeforeInstallArtifact.new(dimg, self)
           super
         end
 
         def dependencies
-          [application.git_artifacts.map(&:paramshash).join]
+          [dimg.git_artifacts.map(&:paramshash).join]
         end
       end # GAArchiveDependencies
     end # Stage

data/lib/dapp/build/stage/ga_artifact_patch.rb

@@ -3,8 +3,8 @@ module Dapp
     module Stage
       # GAArtifactPatch
       class GAArtifactPatch < GALatestPatch
-        def initialize(application, next_stage)
-          @prev_stage = SetupGroup::ChefCookbooks.new(application, self)
+        def initialize(dimg, next_stage)
+          @prev_stage = SetupGroup::ChefCookbooks.new(dimg, self)
           super
         end
 

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

@@ -19,9 +19,9 @@ module Dapp
 
         def prepare_image
           super
-          image.add_volumes_from application.project.gitartifact_container
+          image.add_volumes_from dimg.project.gitartifact_container
 
-          application.git_artifacts.each do |git_artifact|
+          dimg.git_artifacts.each do |git_artifact|
             image.add_volume "#{git_artifact.repo.path}:#{git_artifact.repo.container_path}:ro"
             image.add_command git_artifact.send(apply_command_method, self)
           end

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

@@ -5,13 +5,13 @@ module Dapp
       class GADependenciesBase < Base
         def prepare_image
           super
-          application.git_artifacts.each do |git_artifact|
+          dimg.git_artifacts.each do |git_artifact|
             image.add_service_change_label(git_artifact.full_name.to_sym => git_artifact.latest_commit)
           end
         end
 
         def empty?
-          application.git_artifacts.empty? ? true : false
+          dimg.git_artifacts.empty? ? true : false
         end
       end # GADependenciesBase
     end # Stage

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

@@ -3,8 +3,8 @@ module Dapp
     module Stage
       # GALatestPatch
       class GALatestPatch < GABase
-        def initialize(application, next_stage)
-          @prev_stage = AfterSetupArtifact.new(application, self)
+        def initialize(dimg, next_stage)
+          @prev_stage = AfterSetupArtifact.new(dimg, self)
           super
         end
 
@@ -37,7 +37,7 @@ module Dapp
         private
 
         def commit_list
-          application.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
+          dimg.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
         end
       end # GALatestPatch
     end # Stage

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

@@ -3,8 +3,8 @@ module Dapp
     module Stage
       # ImportArtifact
       class ImportArtifact < ArtifactBase
-        def initialize(application)
-          @application = application
+        def initialize(dimg)
+          @dimg = dimg
         end
 
         def signature
@@ -12,10 +12,10 @@ module Dapp
         end
 
         def image
-          @image ||= Image::Scratch.new(name: image_name, project: application.project)
+          @image ||= Image::Scratch.new(name: image_name, project: dimg.project)
         end
 
-        def image_add_tmp_volumes(_type)
+        def image_add_volumes
         end
 
         def prepare_image
@@ -29,36 +29,36 @@ module Dapp
 
         # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def apply_artifact(artifact, image)
-          return if application.project.dry_run?
+          return if dimg.project.dry_run?
 
           artifact_name = artifact[:name]
-          app = artifact[:app]
+          artifact_dimg = artifact[:dimg]
           cwd = artifact[:options][:cwd]
-          paths = artifact[:options][:paths]
+          include_paths = artifact[:options][:include_paths]
           owner = artifact[:options][:owner]
           group = artifact[:options][:group]
-          where_to_add = artifact[:options][:where_to_add]
+          to = artifact[:options][:to]
 
-          sudo = application.project.sudo_command(owner: Process.uid, group: Process.gid)
+          sudo = dimg.project.sudo_command(owner: Process.uid, group: Process.gid)
 
           credentials = ''
           credentials += "--owner=#{owner} " if owner
           credentials += "--group=#{group} " if group
           credentials += '--numeric-owner'
 
-          archive_path = application.tmp_path('artifact', artifact_name, 'archive.tar.gz')
-          container_archive_path = File.join(app.container_tmp_path(artifact_name), 'archive.tar.gz')
+          archive_path = dimg.tmp_path('artifact', artifact_name, 'archive.tar.gz')
+          container_archive_path = File.join(artifact_dimg.container_tmp_path(artifact_name), 'archive.tar.gz')
 
           exclude_paths = artifact[:options][:exclude_paths].map { |path| "--exclude=#{path}" }.join(' ')
-          paths = if paths.empty?
-                    [File.join(where_to_add, cwd, '*')]
-                  else
-                    paths.map { |path| File.join(where_to_add, cwd, path, '*') }
-                  end
-          paths.map! { |path| path[1..-1] } # relative path
+          include_paths = if include_paths.empty?
+                            [File.join(to, cwd, '*')]
+                          else
+                            include_paths.map { |path| File.join(to, cwd, path, '*') }
+                          end
+          include_paths.map! { |path| path[1..-1] } # relative path
 
-          command = "#{sudo} #{application.project.tar_path} -czf #{container_archive_path} #{exclude_paths} #{paths.join(' ')} #{credentials}"
-          run_artifact_app(app, artifact_name, command)
+          command = "#{sudo} #{dimg.project.tar_path} -czf #{container_archive_path} #{exclude_paths} #{include_paths.join(' ')} #{credentials}"
+          run_artifact_dimg(artifact_dimg, artifact_name, command)
 
           image.add_archive archive_path
         end

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

@@ -6,8 +6,8 @@ module Dapp
         class GAPostInstallPatch < GABase
           include Mod::Group
 
-          def initialize(application, next_stage)
-            @prev_stage = GAPostInstallPatchDependencies.new(application, self)
+          def initialize(dimg, next_stage)
+            @prev_stage = GAPostInstallPatchDependencies.new(dimg, self)
             super
           end
 

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

@@ -6,8 +6,8 @@ module Dapp
         class GAPostInstallPatchDependencies < GADependenciesBase
           include Mod::Group
 
-          def initialize(application, next_stage)
-            @prev_stage = Install.new(application, self)
+          def initialize(dimg, next_stage)
+            @prev_stage = Install.new(dimg, self)
             super
           end
 

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

@@ -6,8 +6,8 @@ module Dapp
         class GAPreInstallPatch < GABase
           include Mod::Group
 
-          def initialize(application, next_stage)
-            @prev_stage = GAPreInstallPatchDependencies.new(application, self)
+          def initialize(dimg, next_stage)
+            @prev_stage = GAPreInstallPatchDependencies.new(dimg, self)
             super
           end
 

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

@@ -6,8 +6,8 @@ module Dapp
         class GAPreInstallPatchDependencies < GADependenciesBase
           include Mod::Group
 
-          def initialize(application, next_stage)
-            @prev_stage = GAArchive.new(application, self)
+          def initialize(dimg, next_stage)
+            @prev_stage = GAArchive.new(dimg, self)
             super
           end
 

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

@@ -6,32 +6,32 @@ module Dapp
         class Install < Base
           include Mod::Group
 
-          def initialize(application, next_stage)
-            @prev_stage = GAPreInstallPatch.new(application, self)
+          def initialize(dimg, next_stage)
+            @prev_stage = GAPreInstallPatch.new(dimg, self)
             super
           end
 
           def empty?
-            !application.builder.install?
-          end
-
-          def builder_checksum
-            application.builder.install_checksum
+            !dimg.builder.install?
           end
 
           def context
             [install_dependencies_files_checksum, builder_checksum]
           end
 
+          def builder_checksum
+            dimg.builder.install_checksum
+          end
+
           def prepare_image
             super
-            application.builder.install(image)
+            dimg.builder.install(image)
           end
 
           private
 
           def install_dependencies_files_checksum
-            @install_dependencies_files_checksum ||= dependencies_files_checksum(application.config._install_dependencies)
+            @install_dependencies_files_checksum ||= dependencies_files_checksum(dimg.config._install_dependencies)
           end
         end # Install
       end

data/lib/dapp/build/stage/mod/group.rb

@@ -8,11 +8,11 @@ module Dapp
           def log_image_build
             return super if should_be_quiet?
             log_group_name if group_should_be_opened?
-            application.project.with_log_indent { super }
+            dimg.project.with_log_indent { super }
           end
 
           def log_group_name
-            application.project.log_step(application.project.t(code: group_name, context: :group))
+            dimg.project.log_step(dimg.project.t(code: group_name, context: :group))
           end
 
           def group_name