dapp 0.5.13 → 0.6.0

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

@@ -6,7 +6,7 @@ module Dapp
         include Mod::Artifact
 
         def initialize(application, next_stage)
-          @prev_stage = Install.new(application, self)
+          @prev_stage = InstallGroup::GAPostInstallPatch.new(application, self)
           super
         end
 
@@ -16,13 +16,18 @@ module Dapp
 
         def image
           super do |image|
-            artifacts.each { |artifact| apply_artifact(artifact, image) }
+            artifacts_labels = {}
+            artifacts.each do |artifact|
+              apply_artifact(artifact, image)
+              artifacts_labels["dapp-artifact-#{artifact[:name]}".to_sym] = artifact[:app].send(:last_stage).image.built_id
+            end
+            image.add_service_change_label artifacts_labels
           end
         end
 
         protected
 
-        def should_be_not_detailed?
+        def should_not_be_detailed?
           true
         end
 

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

@@ -17,17 +17,46 @@ module Dapp
           @next_stage.prev_stage = self
         end
 
+        def build_lock!
+          return yield if application.project.dry_run?
+
+          try_lock = lambda do
+            next yield unless should_be_tagged?
+
+            no_lock = false
+
+            application.project.lock("#{application.config._basename}.image.#{image.name}") do
+              image.cache_reset
+
+              if should_be_tagged?
+                yield
+              else
+                no_lock = true
+              end
+            end
+
+            yield if no_lock
+          end
+
+          if prev_stage
+            prev_stage.build_lock! { try_lock.call }
+          else
+            try_lock.call
+          end
+        end
+
         def build!
           return if should_be_skipped?
           prev_stage.build! if prev_stage
-          image_build unless empty? && !application.log_verbose?
+          log_image_build(&method(:image_build)) if image_should_be_build?
           raise Exception::IntrospectImage, data: { built_id: image.built_id, options: image.send(:prepared_options) } if should_be_introspected?
         end
 
         def save_in_cache!
           prev_stage.save_in_cache! if prev_stage
           return unless should_be_tagged?
-          image.tag!(log_verbose: application.log_verbose?, log_time: application.log_time?) unless application.dry_run?
+          image.tag!(log_verbose: application.project.log_verbose?,
+                     log_time: application.project.log_time?) unless application.project.dry_run?
         end
 
         def image
@@ -35,14 +64,18 @@ module Dapp
             if empty?
               prev_stage.image
             else
-              Image::Stage.new(name: image_name, from: from_image).tap do |image|
-                image.add_change_label dapp: application.config._basename
+              Image::Stage.new(name: image_name, from: from_image, project: application.project).tap do |image|
+                image.add_service_change_label dapp: application.stage_dapp_label
                 yield image if block_given?
               end
             end
           end
         end
 
+        def image_should_be_build?
+          !empty? || application.project.log_verbose?
+        end
+
         def empty?
           dependencies_empty?
         end
@@ -65,35 +98,15 @@ module Dapp
 
         protected
 
-        # rubocop:disable Metrics/AbcSize
         def image_build
-          if empty?
-            application.log_state(name, state: application.t(code: 'state.empty'))
-          elsif image.tagged?
-            application.log_state(name, state: application.t(code: 'state.using_cache'))
-          elsif should_be_not_present?
-            application.log_state(name, state: application.t(code: 'state.not_present'))
-          elsif application.dry_run?
-            application.log_state(name, state: application.t(code: 'state.build'), styles: { status: :success })
-          else
-            application.log_process(name, process: application.t(code: 'status.process.building'), short: should_not_be_detailed?) do
-              image_do_build
-            end
-          end
-        ensure
-          log_build
-        end
-        # rubocop:enable Metrics/AbcSize
-
-        def image_do_build
-          image.build!(log_verbose: application.log_verbose?,
-                       log_time: application.log_time?,
-                       introspect_error: application.cli_options[:introspect_error],
-                       introspect_before_error: application.cli_options[:introspect_before_error])
+          image.build!(log_verbose: application.project.log_verbose?,
+                       log_time: application.project.log_time?,
+                       introspect_error: application.project.cli_options[:introspect_error],
+                       introspect_before_error: application.project.cli_options[:introspect_before_error])
         end
 
         def should_be_tagged?
-          !(image.tagged? || empty? || should_be_not_present?)
+          !(empty? || image.tagged? || should_be_not_present?)
         end
 
         def should_be_not_present?
@@ -102,7 +115,7 @@ module Dapp
         end
 
         def image_name
-          "#{application.config._basename}-dappstage:#{signature}"
+          application.stage_cache_format % { signature: signature }
         end
 
         def from_image

data/lib/dapp/build/stage/{infra_install.rb → before_install.rb}

@@ -1,27 +1,27 @@
 module Dapp
   module Build
     module Stage
-      # InfraInstall
-      class InfraInstall < Base
+      # BeforeInstall
+      class BeforeInstall < Base
         def initialize(application, next_stage)
           @prev_stage = From.new(application, self)
           super
         end
 
         def empty?
-          super && !application.builder.infra_install?
+          super && !application.builder.before_install?
         end
 
         def dependencies
-          [application.builder.infra_install_checksum]
+          [application.builder.before_install_checksum]
         end
 
         def image
           super do |image|
-            application.builder.infra_install(image)
+            application.builder.before_install(image)
           end
         end
-      end # InfraInstall
+      end # BeforeInstall
     end # Stage
   end # Build
 end # Dapp

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

@@ -0,0 +1,27 @@
+module Dapp
+  module Build
+    module Stage
+      # BeforeSetup
+      class BeforeSetup < Base
+        def initialize(application, next_stage)
+          @prev_stage = Artifact.new(application, self)
+          super
+        end
+
+        def empty?
+          super && !application.builder.before_setup?
+        end
+
+        def dependencies
+          prev_stage.prev_stage.prev_stage.dependencies # GAPostInstallPatchDependencies
+        end
+
+        def image
+          super do |image|
+            application.builder.before_setup(image)
+          end
+        end
+      end # BeforeSetup
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -4,7 +4,7 @@ module Dapp
       # DockerInstructions
       class DockerInstructions < Base
         def initialize(application)
-          @prev_stage = Source5.new(application, self)
+          @prev_stage = GALatestPatch.new(application, self)
           @application = application
         end
 
@@ -20,6 +20,17 @@ module Dapp
           end
         end
 
+        def log_image_details
+          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

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

@@ -18,8 +18,9 @@ module Dapp
 
         protected
 
-        def image_do_build
-          from_image.pull!(log_time: application.log_time?)
+        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?
           super
         end
 
@@ -30,7 +31,7 @@ module Dapp
         end
 
         def from_image
-          @from_image ||= Image::Stage.new(name: from_image_name)
+          @from_image ||= Image::Stage.new(name: from_image_name, project: application.project)
         end
       end # Prepare
     end # Stage

data/lib/dapp/build/stage/{source_1_archive.rb → ga_archive.rb}

@@ -1,19 +1,19 @@
 module Dapp
   module Build
     module Stage
-      # Source1Archive
-      class Source1Archive < SourceBase
+      # GAArchive
+      class GAArchive < GABase
         def initialize(application, next_stage)
-          @prev_stage = Source1ArchiveDependencies.new(application, self)
+          @prev_stage = GAArchiveDependencies.new(application, self)
           super
         end
 
-        def prev_source_stage
+        def prev_g_a_stage
           nil
         end
 
-        def next_source_stage
-          next_stage.next_stage
+        def next_g_a_stage
+          next_stage.next_stage # GAPreInstallPatch
         end
 
         protected
@@ -21,7 +21,7 @@ module Dapp
         def apply_command_method
           :archive_apply_command
         end
-      end # Source1Archive
+      end # GAArchive
     end # Stage
   end # Build
 end # Dapp

data/lib/dapp/build/stage/{source_1_archive_dependencies.rb → ga_archive_dependencies.rb}

@@ -1,17 +1,17 @@
 module Dapp
   module Build
     module Stage
-      # Source1ArchiveDependencies
-      class Source1ArchiveDependencies < SourceDependenciesBase
+      # GAArchiveDependencies
+      class GAArchiveDependencies < GADependenciesBase
         def initialize(application, next_stage)
-          @prev_stage = InfraInstall.new(application, self)
+          @prev_stage = BeforeInstall.new(application, self)
           super
         end
 
         def dependencies
           [application.git_artifacts.map(&:paramshash).join]
         end
-      end # Source1ArchiveDependencies
+      end # GAArchiveDependencies
     end # Stage
   end # Build
 end # Dapp

data/lib/dapp/build/stage/{source_base.rb → ga_base.rb}

@@ -1,15 +1,17 @@
 module Dapp
   module Build
     module Stage
-      # Base of source stages
-      class SourceBase < Base
-        attr_accessor :prev_source_stage, :next_source_stage
+      # GABase
+      class GABase < Base
+        attr_accessor :prev_g_a_stage, :next_g_a_stage
 
-        def prev_source_stage
+        GITARTIFACT_IMAGE = 'dappdeps/gitartifact:0.1.5'.freeze
+
+        def prev_g_a_stage
           dependencies_stage.prev_stage.prev_stage
         end
 
-        def next_source_stage
+        def next_g_a_stage
           next_stage.next_stage.next_stage
         end
 
@@ -19,7 +21,9 @@ module Dapp
 
         def image
           super do |image|
-            image.add_volumes_from application.gitartifact_container
+            image.add_volumes_from g_a_container
+            image.add_command 'export PATH=/.dapp/deps/gitartifact/bin:$PATH'
+
             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)
@@ -44,6 +48,26 @@ 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 run',
+                                              '--restart=no',
+                                              "--name #{g_a_container_name}",
+                                              "--volume /.dapp/deps/gitartifact #{GITARTIFACT_IMAGE}",
+                                              '2>/dev/null'].join(' ')
+              end
+            end
+
+            g_a_container_name
+          end
+        end
+
         def should_not_be_detailed?
           true
         end
@@ -61,7 +85,7 @@ module Dapp
         def commits
           @commits ||= {}
         end
-      end # SourceBase
+      end # GABase
     end # Stage
   end # Build
 end # Dapp

data/lib/dapp/build/stage/{source_dependencies_base.rb → ga_dependencies_base.rb}

@@ -1,12 +1,12 @@
 module Dapp
   module Build
     module Stage
-      # base of source dependencies stages
-      class SourceDependenciesBase < Base
+      # GADependenciesBase
+      class GADependenciesBase < Base
         def image
           super do |image|
             application.git_artifacts.each do |git_artifact|
-              image.add_change_label(git_artifact.full_name.to_sym => git_artifact.latest_commit)
+              image.add_service_change_label(git_artifact.full_name.to_sym => git_artifact.latest_commit)
             end
           end
         end
@@ -18,12 +18,11 @@ module Dapp
         protected
 
         def dependencies_files_checksum(regs)
-          regs.map! { |reg| File.directory?(File.join(application.project_path, reg)) ? File.join(reg, '**', '*') : reg }
-          unless (files = regs.map { |reg| Dir[File.join(application.project_path, reg)].map { |f| File.read(f) if File.file?(f) } }).empty?
+          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 # SourceBase
+      end # GADependenciesBase
     end # Stage
   end # Build
 end # Dapp

data/lib/dapp/build/stage/{source_5.rb → ga_latest_patch.rb}

@@ -1,18 +1,18 @@
 module Dapp
   module Build
     module Stage
-      # Source5
-      class Source5 < SourceBase
+      # GALatestPatch
+      class GALatestPatch < GABase
         def initialize(application, next_stage)
-          @prev_stage = Source4.new(application, self)
+          @prev_stage = SetupGroup::GAPostSetupPatch.new(application, self)
           super
         end
 
-        def prev_source_stage
+        def prev_g_a_stage
           prev_stage
         end
 
-        def next_source_stage
+        def next_g_a_stage
           nil
         end
 
@@ -39,7 +39,7 @@ module Dapp
         def commit_list
           application.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
         end
-      end # Source5
+      end # GALatestPatch
     end # Stage
   end # Build
 end # Dapp