dapp 0.6.1 → 0.6.2

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

@@ -0,0 +1,13 @@
+module Dapp
+  module Build
+    module Stage
+      # BeforeSetupArtifact
+      class BeforeSetupArtifact < ArtifactDefault
+        def initialize(application, next_stage)
+          @prev_stage = BeforeSetup.new(application, self)
+          super
+        end
+      end # BeforeSetupArtifact
+    end # Stage
+  end # Build
+end # Dapp

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

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

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

@@ -12,29 +12,11 @@ module Dapp
           [change_options]
         end
 
-        def image
-          super do |image|
-            change_options.each do |k, v|
-              image.public_send("add_change_#{k}", v)
-            end
-          end
-        end
-
-        def log_image_details
+        def prepare_image
           super
-          log_image_instructions
-        end
-
-        def log_image_instructions
-          return if (instructions = image.prepare_instructions(image.send(:change_options))).empty?
-          application.project.log_info application.project.t(code: 'image.instructions')
-          application.project.with_log_indent { application.project.log_info instructions.join("\n") }
-        end
-
-        private
-
-        def change_options
-          @change_options ||= application.config._docker._change_options.delete_if { |_, val| val.nil? || (val.respond_to?(:empty?) && val.empty?) }
+          change_options.each do |k, v|
+            image.public_send("add_change_#{k}", v)
+          end
         end
       end # DockerInstructions
     end # Stage

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

@@ -11,19 +11,18 @@ module Dapp
           [from_image_name, application.config._docker._from_cache_version, Dapp::BUILD_CACHE_VERSION]
         end
 
-        def save_in_cache!
-          from_image.untag! if from_image.pulled?
-          super
-        end
-
         protected
 
-        def image_build
-          from_image.pull!(log_time: application.project.log_time?)
-          raise Error::Build, code: :from_image_not_found, data: { name: from_image_name } if from_image.built_id.nil?
+        def prepare_image
+          from_image.pull!
+          raise Error::Build, code: :from_image_not_found, data: { name: from_image_name } unless from_image.tagged?
           super
         end
 
+        def should_not_be_detailed?
+          from_image.tagged?
+        end
+
         private
 
         def from_image_name

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

@@ -19,7 +19,7 @@ module Dapp
         protected
 
         def apply_command_method
-          :archive_apply_command
+          :apply_archive_command
         end
       end # GAArchive
     end # Stage

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

@@ -4,7 +4,7 @@ module Dapp
       # GAArchiveDependencies
       class GAArchiveDependencies < GADependenciesBase
         def initialize(application, next_stage)
-          @prev_stage = BeforeInstall.new(application, self)
+          @prev_stage = BeforeInstallArtifact.new(application, self)
           super
         end
 

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

@@ -0,0 +1,21 @@
+module Dapp
+  module Build
+    module Stage
+      # GAArtifactPatch
+      class GAArtifactPatch < GALatestPatch
+        def initialize(application, next_stage)
+          @prev_stage = SetupGroup::ChefCookbooks.new(application, self)
+          super
+        end
+
+        def dependencies
+          next_stage.context # BuildArtifact
+        end
+
+        def prev_g_a_stage
+          super.prev_stage.prev_stage # GAPreSetupPatch
+        end
+      end # GAArtifactPatch
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -5,8 +5,6 @@ module Dapp
       class GABase < Base
         attr_accessor :prev_g_a_stage, :next_g_a_stage
 
-        GITARTIFACT_IMAGE = 'dappdeps/gitartifact:0.1.5'.freeze
-
         def prev_g_a_stage
           dependencies_stage.prev_stage.prev_stage
         end
@@ -19,16 +17,13 @@ module Dapp
           prev_stage
         end
 
-        def image
-          super do |image|
-            image.add_volumes_from g_a_container
-            image.add_command 'export PATH=/.dapp/deps/gitartifact/bin:$PATH'
+        def prepare_image
+          super
+          image.add_volumes_from application.project.gitartifact_container
 
-            application.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
-            yield image if block_given?
+          application.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
         end
 
@@ -48,24 +43,6 @@ module Dapp
 
         protected
 
-        def g_a_container_name # FIXME: hashsum(image) or dockersafe()
-          GITARTIFACT_IMAGE.tr('/', '_').tr(':', '_')
-        end
-
-        def g_a_container
-          @gitartifact_container ||= begin
-            if application.project.shellout("docker inspect #{g_a_container_name}").exitstatus.nonzero?
-              application.project.log_secondary_process(application.project.t(code: 'process.git_artifact_loading'), short: true) do
-                application.project.shellout ['docker create',
-                                              "--name #{g_a_container_name}",
-                                              "--volume /.dapp/deps/gitartifact #{GITARTIFACT_IMAGE}"].join(' ')
-              end
-            end
-
-            g_a_container_name
-          end
-        end
-
         def should_not_be_detailed?
           true
         end

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

@@ -3,25 +3,16 @@ module Dapp
     module Stage
       # GADependenciesBase
       class GADependenciesBase < Base
-        def image
-          super do |image|
-            application.git_artifacts.each do |git_artifact|
-              image.add_service_change_label(git_artifact.full_name.to_sym => git_artifact.latest_commit)
-            end
+        def prepare_image
+          super
+          application.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
         end
-
-        protected
-
-        def dependencies_files_checksum(regs)
-          unless (files = regs.map { |reg| Dir[File.join(application.home_path, reg)].map { |f| File.read(f) if File.file?(f) } }).empty?
-            hashsum files
-          end
-        end
       end # GADependenciesBase
     end # Stage
   end # Build

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

@@ -4,12 +4,12 @@ module Dapp
       # GALatestPatch
       class GALatestPatch < GABase
         def initialize(application, next_stage)
-          @prev_stage = SetupGroup::GAPostSetupPatch.new(application, self)
+          @prev_stage = AfterSetupArtifact.new(application, self)
           super
         end
 
         def prev_g_a_stage
-          prev_stage
+          prev_stage.prev_stage # GAPostSetupPatch
         end
 
         def next_g_a_stage

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

@@ -0,0 +1,69 @@
+module Dapp
+  module Build
+    module Stage
+      # ImportArtifact
+      class ImportArtifact < ArtifactBase
+        def initialize(application)
+          @application = application
+        end
+
+        def signature
+          hashsum [*dependencies.flatten, change_options]
+        end
+
+        def image
+          @image ||= Image::Scratch.new(name: image_name, project: application.project)
+        end
+
+        def image_add_tmp_volumes(_type)
+        end
+
+        def prepare_image
+          super
+          change_options.each do |k, v|
+            image.public_send("add_change_#{k}", v)
+          end
+        end
+
+        protected
+
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        def apply_artifact(artifact, image)
+          return if application.project.dry_run?
+
+          artifact_name = artifact[:name]
+          app = artifact[:app]
+          cwd = artifact[:options][:cwd]
+          paths = artifact[:options][:paths]
+          owner = artifact[:options][:owner]
+          group = artifact[:options][:group]
+          where_to_add = artifact[:options][:where_to_add]
+
+          sudo = application.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')
+
+          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
+
+          command = "#{sudo} #{application.project.tar_path} -czf #{container_archive_path} #{exclude_paths} #{paths.join(' ')} #{credentials}"
+          run_artifact_app(app, artifact_name, command)
+
+          image.add_archive archive_path
+        end
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      end # ImportArtifact
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -12,7 +12,7 @@ module Dapp
           end
 
           def next_g_a_stage
-            super.next_stage # GAPreSetupPatch
+            super.next_stage.next_stage # GAPreSetupPatch
           end
         end # GAPostInstallPatch
       end

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

@@ -12,7 +12,7 @@ module Dapp
           end
 
           def dependencies
-            [application.builder.before_setup_checksum]
+            next_stage.next_stage.next_stage.context # BeforeSetup
           end
         end # GAPostInstallPatchDependencies
       end

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

@@ -12,18 +12,12 @@ module Dapp
           end
 
           def dependencies
-            [install_dependencies_files_checksum, application.builder.install_checksum]
+            next_stage.next_stage.context # Install
           end
 
           def empty?
             super || dependencies_empty?
           end
-
-          private
-
-          def install_dependencies_files_checksum
-            @install_dependencies_files_checksum ||= dependencies_files_checksum(application.config._install_dependencies)
-          end
         end # GAPreInstallPatchDependencies
       end
     end # Stage

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

@@ -12,17 +12,22 @@ module Dapp
           end
 
           def empty?
-            super && !application.builder.install?
+            !application.builder.install?
           end
 
-          def dependencies
-            prev_stage.prev_stage.dependencies # GAPreInstallPatchDependencies
+          def context
+            [install_dependencies_files_checksum, application.builder.install_checksum]
           end
 
-          def image
-            super do |image|
-              application.builder.install(image)
-            end
+          def prepare_image
+            super
+            application.builder.install(image)
+          end
+
+          private
+
+          def install_dependencies_files_checksum
+            @install_dependencies_files_checksum ||= dependencies_files_checksum(application.config._install_dependencies)
           end
         end # Install
       end

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

@@ -29,6 +29,13 @@ module Dapp
               log_image_size
             end
             log_image_commands unless ignore_log_commands?
+            log_image_instructions
+          end
+
+          def log_image_instructions
+            return if (instructions = image.prepare_instructions(image.send(:change_options))).empty?
+            application.project.log_info application.project.t(code: 'image.instructions')
+            application.project.with_log_indent { application.project.log_info instructions.join("\n") }
           end
 
           def log_image_created_at
@@ -37,7 +44,7 @@ module Dapp
           end
 
           def log_image_size
-            if from_image.tagged? && !prev_stage.nil?
+            if !prev_stage.nil? && from_image.tagged?
               size = image.size.to_f - from_image.size.to_f
               code = 'image.info.difference'
             else
@@ -79,20 +86,16 @@ module Dapp
             false
           end
 
-          def should_be_skipped?
-            image.tagged? && !application.project.log_verbose? && application.project.cli_options[:introspect_stage].nil?
-          end
-
           def should_not_be_detailed?
             image.send(:bash_commands).empty?
           end
 
           def should_be_introspected?
-            application.project.cli_options[:introspect_stage] == name && !application.project.dry_run? && !application.is_artifact
+            application.project.cli_options[:introspect_stage] == name && !application.project.dry_run? && !application.artifact?
           end
 
           def should_be_quiet?
-            application.is_artifact && !application.project.log_verbose?
+            application.artifact? && !application.project.log_verbose?
           end
         end
       end # Mod

data/lib/dapp/build/stage/setup/chef_cookbooks.rb

@@ -15,10 +15,9 @@ module Dapp
             [application.builder.chef_cookbooks_checksum]
           end
 
-          def image
-            super do |image|
-              application.builder.chef_cookbooks(image)
-            end
+          def prepare_image
+            super
+            application.builder.chef_cookbooks(image)
           end
 
           protected