dapp 0.4.8 → 0.5.0

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

@@ -8,8 +8,10 @@ module Dapp
           def log_build
             application.with_log_indent do
               application.log_info application.t(code: 'image.signature', data: { signature: image_name })
-              log_image_info
-              log_image_commands
+              unless empty?
+                log_image_info
+                log_image_commands unless ignore_log_commands?
+              end
             end if application.log? && application.log_verbose?
           end
 
@@ -41,6 +43,10 @@ module Dapp
             from_image.tagged? && !prev_stage.nil?
           end
 
+          def ignore_log_commands?
+            false
+          end
+
           def should_be_skipped?
             image.tagged? && !application.log_verbose? && application.cli_options[:introspect_stage].nil?
           end

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

@@ -8,6 +8,14 @@ module Dapp
           super
         end
 
+        def empty?
+          super && !application.builder.setup?
+        end
+
+        def dependencies
+          prev_stage.prev_stage.dependencies
+        end
+
         def image
           super do |image|
             application.builder.setup(image)

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

@@ -4,26 +4,16 @@ module Dapp
       # Source1
       class Source1 < SourceBase
         def initialize(application, next_stage)
-          @prev_stage = Source1Archive.new(application, self)
+          @prev_stage = Source1Dependencies.new(application, self)
           super
         end
 
         def prev_source_stage
-          prev_stage
+          dependencies_stage.prev_stage
         end
 
-        protected
-
-        def dependencies_checksum
-          hashsum [super,
-                   install_dependencies_files_checksum,
-                   *application.builder.install_checksum]
-        end
-
-        private
-
-        def install_dependencies_files_checksum
-          @install_dependencies_files_checksum ||= dependencies_files_checksum(application.config._install_dependencies)
+        def next_source_stage
+          super.next_stage
         end
       end # Source1
     end # Stage

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

@@ -4,7 +4,7 @@ module Dapp
       # Source1Archive
       class Source1Archive < SourceBase
         def initialize(application, next_stage)
-          @prev_stage = InfraInstall.new(application, self)
+          @prev_stage = Source1ArchiveDependencies.new(application, self)
           super
         end
 
@@ -13,7 +13,7 @@ module Dapp
         end
 
         def next_source_stage
-          next_stage
+          next_stage.next_stage
         end
 
         protected

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

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

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

@@ -0,0 +1,27 @@
+module Dapp
+  module Build
+    module Stage
+      # Source1Dependencies
+      class Source1Dependencies < SourceDependenciesBase
+        def initialize(application, next_stage)
+          @prev_stage = Source1Archive.new(application, self)
+          super
+        end
+
+        def dependencies
+          [install_dependencies_files_checksum, application.builder.install_checksum]
+        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 # Source1Dependencies
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -4,15 +4,12 @@ module Dapp
       # Source2
       class Source2 < SourceBase
         def initialize(application, next_stage)
-          @prev_stage = Install.new(application, self)
+          @prev_stage = Source2Dependencies.new(application, self)
           super
         end
 
-        protected
-
-        def dependencies_checksum
-          hashsum [super,
-                   *application.builder.infra_setup_checksum]
+        def prev_source_stage
+          super.prev_stage
         end
       end # Source2
     end # Stage

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

@@ -0,0 +1,17 @@
+module Dapp
+  module Build
+    module Stage
+      # Source2Dependencies
+      class Source2Dependencies < SourceDependenciesBase
+        def initialize(application, next_stage)
+          @prev_stage = Artifact.new(application, self)
+          super
+        end
+
+        def dependencies
+          [application.builder.infra_setup_checksum]
+        end
+      end # Source2Dependencies
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -4,22 +4,12 @@ module Dapp
       # Source3
       class Source3 < SourceBase
         def initialize(application, next_stage)
-          @prev_stage = InfraSetup.new(application, self)
+          @prev_stage = Source3Dependencies.new(application, self)
           super
         end
 
-        protected
-
-        def dependencies_checksum
-          hashsum [super,
-                   setup_dependencies_files_checksum,
-                   *application.builder.setup_checksum]
-        end
-
-        private
-
-        def setup_dependencies_files_checksum
-          @setup_files_checksum ||= dependencies_files_checksum(application.config._setup_dependencies)
+        def next_source_stage
+          super.next_stage
         end
       end # Source3
     end # Stage

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

@@ -0,0 +1,23 @@
+module Dapp
+  module Build
+    module Stage
+      # Source3Dependencies
+      class Source3Dependencies < SourceDependenciesBase
+        def initialize(application, next_stage)
+          @prev_stage = InfraSetup.new(application, self)
+          super
+        end
+
+        def dependencies
+          [setup_dependencies_files_checksum, application.builder.setup_checksum]
+        end
+
+        private
+
+        def setup_dependencies_files_checksum
+          @setup_files_checksum ||= dependencies_files_checksum(application.config._setup_dependencies)
+        end
+      end # Source3Dependencies
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -3,32 +3,18 @@ module Dapp
     module Stage
       # Source4
       class Source4 < SourceBase
-        MAX_PATCH_SIZE = 1024 * 1024
-
         def initialize(application, next_stage)
-          @prev_stage = ChefCookbooks.new(application, self)
+          @prev_stage = Source4Dependencies.new(application, self)
           super
         end
 
         def prev_source_stage
-          prev_stage.prev_stage.prev_stage
+          super.prev_stage
         end
 
         def next_source_stage
           next_stage
         end
-
-        def dependencies_checksum
-          hashsum [super, (changes_size_since_source3 / MAX_PATCH_SIZE).to_i]
-        end
-
-        private
-
-        def changes_size_since_source3
-          application.git_artifacts.map do |git_artifact|
-            git_artifact.patch_size(prev_source_stage.layer_commit(git_artifact), git_artifact.latest_commit)
-          end.reduce(0, :+)
-        end
       end # Source4
     end # Stage
   end # Build

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

@@ -0,0 +1,27 @@
+module Dapp
+  module Build
+    module Stage
+      # Source4Dependencies
+      class Source4Dependencies < SourceDependenciesBase
+        MAX_PATCH_SIZE = 1024 * 1024
+
+        def initialize(application, next_stage)
+          @prev_stage = ChefCookbooks.new(application, self)
+          super
+        end
+
+        def dependencies
+          [(changes_size_since_source3 / MAX_PATCH_SIZE).to_i]
+        end
+
+        private
+
+        def changes_size_since_source3
+          application.git_artifacts.map do |git_artifact|
+            git_artifact.patch_size(prev_stage.prev_stage.prev_stage.layer_commit(git_artifact), git_artifact.latest_commit)
+          end.reduce(0, :+)
+        end
+      end # Source4Dependencies
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -3,9 +3,9 @@ module Dapp
     module Stage
       # Source5
       class Source5 < SourceBase
-        def initialize(application)
+        def initialize(application, next_stage)
           @prev_stage = Source4.new(application, self)
-          @application = application
+          super
         end
 
         def prev_source_stage
@@ -16,27 +16,28 @@ module Dapp
           nil
         end
 
-        def signature
-          hashsum [super, change_options]
+        def dependencies_stage
+          nil
         end
 
-        def image
-          super do |image|
-            change_options.each do |k, v|
-              next if v.nil? || v.empty?
-              image.public_send("add_change_#{k}", v)
-            end
-          end
+        def dependencies
+          [commit_list]
         end
 
-        protected
+        def layer_commit(git_artifact)
+          commits[git_artifact] ||= begin
+            git_artifact.latest_commit
+          end
+        end
 
-        def change_options
-          application.config._docker._change_options
+        def empty?
+          dependencies_empty?
         end
 
-        def layers_commits_write!
-          nil
+        private
+
+        def commit_list
+          application.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
         end
       end # Source5
     end # Stage

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

@@ -8,48 +8,38 @@ module Dapp
         GITARTIFACT_IMAGE = 'dappdeps/gitartifact:0.1.3'.freeze
 
         def prev_source_stage
-          prev_stage.prev_stage
+          dependencies_stage.prev_stage.prev_stage
         end
 
         def next_source_stage
-          next_stage.next_stage
+          next_stage.next_stage.next_stage
         end
 
-        def save_in_cache!
-          super
-          layers_commits_write!
-        end
-
-        def signature
-          hashsum [dependencies_checksum, *commit_list]
+        def dependencies_stage
+          prev_stage
         end
 
         def image
           super do |image|
-            bash_commands = []
-            volumes = []
-            application.git_artifacts.each do |git_artifact|
-              volumes << "#{git_artifact.repo.path}:#{git_artifact.repo.container_path}"
-              bash_commands.concat(git_artifact.send(apply_command_method, self))
-            end
+            image.add_volumes_from gitartifact_container
+            image.add_command 'export PATH=/.dapp/deps/gitartifact/bin:$PATH'
 
-            unless bash_commands.empty?
-              image.add_volumes_from(gitartifact_container)
-              image.add_volume(volumes)
-              image.add_commands 'export PATH=/.dapp/deps/gitartifact/bin:$PATH', *bash_commands
+            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?
           end
         end
 
-        def dependencies_checksum
-          hashsum [prev_stage.signature, artifacts_signatures]
+        def empty?
+          dependencies_stage.empty?
         end
 
         def layer_commit(git_artifact)
           commits[git_artifact] ||= begin
-            if layer_commit_file_path(git_artifact).exist?
-              layer_commit_file_path(git_artifact).read.strip
+            if dependencies_stage && dependencies_stage.image.tagged?
+              dependencies_stage.image.labels[git_artifact.full_name]
             else
               git_artifact.latest_commit
             end
@@ -81,24 +71,12 @@ module Dapp
           true
         end
 
-        def apply_command_method
-          :apply_patch_command
-        end
-
-        def commit_list
-          application.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
-        end
-
-        def layers_commits_write!
-          application.git_artifacts.each { |git_artifact| layer_commit_file_path(git_artifact).write(layer_commit(git_artifact)) }
-        end
-
-        def layer_commit_file_path(git_artifact)
-          application.metadata_path git_artifact.filename ".#{name}.#{git_artifact.paramshash}.#{dependencies_checksum}.commit"
+        def ignore_log_commands?
+          true
         end
 
-        def dependencies_files_checksum(regs)
-          hashsum(regs.map { |reg| Dir[File.join(application.home_path, reg)].map { |f| File.read(f) if File.file?(f) } })
+        def apply_command_method
+          :apply_patch_command
         end
 
         private

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

@@ -0,0 +1,28 @@
+module Dapp
+  module Build
+    module Stage
+      # base of source dependencies stages
+      class SourceDependenciesBase < 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)
+            end
+          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 # SourceBase
+    end # Stage
+  end # Build
+end # Dapp