dapp 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d92ae2acd1b2b9398e83d79445241ac190a6855d
-  data.tar.gz: 489ae183ac1cc60b312f9827d1b8c89ca18654e2
+  metadata.gz: 344169cb4810496ce7bdffabb39b0e0d67d922be
+  data.tar.gz: 80300942c9abcfd25956099e7680d06c980deba1
 SHA512:
-  metadata.gz: 3e3ce3bbd3155ae5b3e9c43c737cb190218fce09cb1fc9f2c67495a3c1cf630cbb9e717a60ff04fee89bc34fa4ef2da3cc18c48fdbba130a14eeb513526cfb2a
-  data.tar.gz: 1c0fccb84466f1fce3700a8bdeceb040fed68f723d4ab3ef8ac0a98d9c724167efa1a8f07e82b9b5d2cecfb83ac47568cd61a3977f6728683ed1295e5a3b0444
+  metadata.gz: 6c9f6344686884f6be5132acad1e4be8a433dbdc7362b07a0e9cdede2d45aeebf699536d4860e7b82d69c060ffee7c52c796488181cd0c2fba140817ed3ae592
+  data.tar.gz: d7ec6ba5e7adcaa342c64cb5258e1cb74a6a4579d522e13c863dee0e24a0c9fdb4df04fcc80cbd463ad5a7c6a0c54206017da8e8421775a5d2ba402a1cd952a9

data/config/en/common.yml

@@ -28,4 +28,5 @@ en:
       using_cache: '[USING CACHE]'
       not_present: '[NOT PRESENT]'
       build: '[BUILD]'
+      empty: '[EMPTY]'
       push: '[PUSH]'

data/config/en/net_status.yml

@@ -8,6 +8,8 @@ en:
       application_not_run: "Application run failed!"
       git_branch_without_name: "Application has specific revision that isn't associated with a branch name!"
       ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
+    dappfile:
+      incorrect: "Dappfile '%{path}' with '%{error}':\n%{message}"
     build:
       from_image_required: 'Missing from_image!'
       image_already_untagged: "Image `%{name}` already untagged!"
@@ -24,8 +26,6 @@ en:
       builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
       docker_from_not_defined: "Docker `from` not defined!"
       artifact_unexpected_attribute: "Artifact doesn't has attribute '%{attr}'!"
-      stage_artifact_not_associated: "Artifact not associated with any stage!"
-      stage_artifact_incorrect_associated_value: "Artifact option '%{option}' has incorrect value '%{value}'!"
       git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't has attribute '%{attr}'!"
     chef:
       stage_path_overlap: "Cannot install '%{cookbook}' cookbook's path %{from} into %{to}: already exists"

data/lib/dapp.rb

@@ -27,6 +27,7 @@ require 'dapp/helper/shellout'
 require 'dapp/helper/net_status'
 require 'dapp/error/base'
 require 'dapp/error/application'
+require 'dapp/error/dappfile'
 require 'dapp/error/build'
 require 'dapp/error/config'
 require 'dapp/error/controller'
@@ -37,8 +38,6 @@ require 'dapp/cli/build'
 require 'dapp/cli/push'
 require 'dapp/cli/smartpush'
 require 'dapp/cli/list'
-require 'dapp/cli/metadata'
-require 'dapp/cli/metadata/flush'
 require 'dapp/cli/stages'
 require 'dapp/cli/stages/flush'
 require 'dapp/cli/stages/cleanup'
@@ -61,18 +60,26 @@ require 'dapp/build/stage/mod/artifact'
 require 'dapp/build/stage/mod/logging'
 require 'dapp/build/stage/base'
 require 'dapp/build/stage/source_base'
+require 'dapp/build/stage/source_dependencies_base'
 require 'dapp/build/stage/from'
 require 'dapp/build/stage/infra_install'
 require 'dapp/build/stage/infra_setup'
 require 'dapp/build/stage/install'
+require 'dapp/build/stage/artifact'
 require 'dapp/build/stage/setup'
 require 'dapp/build/stage/chef_cookbooks'
 require 'dapp/build/stage/source_1_archive'
+require 'dapp/build/stage/source_1_archive_dependencies'
 require 'dapp/build/stage/source_1'
+require 'dapp/build/stage/source_1_dependencies'
 require 'dapp/build/stage/source_2'
+require 'dapp/build/stage/source_2_dependencies'
 require 'dapp/build/stage/source_3'
+require 'dapp/build/stage/source_3_dependencies'
 require 'dapp/build/stage/source_4'
+require 'dapp/build/stage/source_4_dependencies'
 require 'dapp/build/stage/source_5'
+require 'dapp/build/stage/docker_instructions'
 require 'dapp/controller'
 require 'dapp/application/git_artifact'
 require 'dapp/application/logging'

data/lib/dapp/application.rb

@@ -16,17 +16,14 @@ module Dapp
     attr_reader :ignore_git_fetch
     attr_reader :is_artifact
 
-    STAGES = [:from, :infra_install, :source_1_archive, :source_1, :install, :source_2,
-              :infra_setup, :source_3, :chef_cookbooks, :setup, :source_4, :source_5].freeze
-
     def initialize(config:, cli_options:, ignore_git_fetch: false, is_artifact: false)
       @config = config
       @cli_options = cli_options
 
       @tmp_path = Dir.mktmpdir(cli_options[:tmp_dir_prefix] || 'dapp-')
-      @metadata_path = cli_options[:metadata_dir] || home_path('.dapps-metadata')
+      @build_path = cli_options[:build_dir] || home_path('.dapps-build')
 
-      @last_stage = Build::Stage::Source5.new(self)
+      @last_stage = Build::Stage::DockerInstructions.new(self)
       @ignore_git_fetch = ignore_git_fetch
       @is_artifact = is_artifact
     end

data/lib/dapp/application/path.rb

@@ -8,11 +8,11 @@ module Dapp
       end
 
       def tmp_path(*path)
-        make_path(@tmp_path, *path).expand_path.tap { |p| FileUtils.mkdir_p p.parent }
+        make_path(@tmp_path, *path).expand_path.tap { |p| p.parent.mkpath }
       end
 
-      def metadata_path(*path)
-        make_path(@metadata_path, home_path.basename, *path).expand_path.tap { |p| FileUtils.mkdir_p p.parent }
+      def build_path(*path)
+        make_path(@build_path, home_path.basename, *path).expand_path.tap { |p| p.parent.mkpath }
       end
 
       def container_dapp_path(*path)

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

@@ -0,0 +1,35 @@
+module Dapp
+  module Build
+    module Stage
+      # Artifact
+      class Artifact < Base
+        include Mod::Artifact
+
+        def initialize(application, next_stage)
+          @prev_stage = Install.new(application, self)
+          super
+        end
+
+        def dependencies
+          artifacts_signatures
+        end
+
+        def image
+          super do |image|
+            artifacts.each { |artifact| apply_artifact(artifact, image) }
+          end
+        end
+
+        protected
+
+        def should_be_not_detailed?
+          true
+        end
+
+        def ignore_log_commands?
+          true
+        end
+      end # Artifact
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -5,7 +5,6 @@ module Dapp
       class Base
         include Helper::Sha256
         include Helper::Trivia
-        include Mod::Artifact
         include Mod::Logging
 
         attr_accessor :prev_stage, :next_stage
@@ -21,41 +20,56 @@ module Dapp
         def build!
           return if should_be_skipped?
           prev_stage.build! if prev_stage
-          image_build
+          image_build unless empty? && !application.log_verbose?
           raise Exception::IntrospectImage, data: { built_id: image.built_id, options: image.send(:prepared_options) } if should_be_introspected?
         end
 
         def save_in_cache!
-          return if image.tagged?
-          prev_stage.save_in_cache!                                                          if prev_stage
+          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?
         end
 
-        def signature
-          hashsum [prev_stage.signature, artifacts_signatures]
-        end
-
         def image
           @image ||= begin
-            Image::Stage.new(name: image_name, from: from_image).tap do |image|
-              image.add_volume "#{application.tmp_path}:#{application.container_tmp_path}"
-              image.add_change_label dapp: application.config._basename
-              before_artifacts.each { |artifact| apply_artifact(artifact, image) }
-              yield image if block_given?
-              after_artifacts.each { |artifact| apply_artifact(artifact, image) }
+            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
+                yield image if block_given?
+              end
             end
           end
         end
 
-        protected
+        def empty?
+          dependencies_empty?
+        end
 
-        def name
-          class_to_lowercase.to_sym
+        def dependencies_empty?
+          dependencies.flatten.compact.delete_if { |val| val.respond_to?(:empty?) && val.empty? }.empty?
+        end
+
+        def signature
+          if empty?
+            prev_stage.signature
+          else
+            hashsum [prev_stage.signature, *dependencies.flatten]
+          end
+        end
+
+        def dependencies
+          []
         end
 
+        protected
+
         # rubocop:disable Metrics/AbcSize
         def image_build
-          if image.tagged?
+          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'))
@@ -78,14 +92,22 @@ module Dapp
                        introspect_before_error: application.cli_options[:introspect_before_error])
         end
 
+        def should_be_tagged?
+          !(image.tagged? || empty?)
+        end
+
+        def image_name
+          "#{application.config._basename}-dappstage:#{signature}"
+        end
+
         def from_image
           prev_stage.image if prev_stage || begin
             raise Error::Build, code: :from_image_required
           end
         end
 
-        def image_name
-          "#{application.config._basename}-dappstage:#{signature}"
+        def name
+          class_to_lowercase.to_sym
         end
       end # Base
     end # Stage

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

@@ -8,8 +8,8 @@ module Dapp
           super
         end
 
-        def signature
-          hashsum [super, *application.builder.chef_cookbooks_checksum]
+        def dependencies
+          [application.builder.chef_cookbooks_checksum]
         end
 
         def image
@@ -17,6 +17,16 @@ module Dapp
             application.builder.chef_cookbooks(image)
           end
         end
+
+        protected
+
+        def should_be_not_detailed?
+          true
+        end
+
+        def ignore_log_commands?
+          true
+        end
       end # ChefCookbooks
     end # Stage
   end # Build

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

@@ -0,0 +1,31 @@
+module Dapp
+  module Build
+    module Stage
+      # DockerInstructions
+      class DockerInstructions < Base
+        def initialize(application)
+          @prev_stage = Source5.new(application, self)
+          @application = application
+        end
+
+        def dependencies
+          [change_options]
+        end
+
+        def image
+          super do |image|
+            change_options.each do |k, v|
+              image.public_send("add_change_#{k}", v)
+            end
+          end
+        end
+
+        private
+
+        def change_options
+          @change_options ||= application.config._docker._change_options.delete_if { |_, val| val.nil? || (val.respond_to?(:empty?) && val.empty?) }
+        end
+      end # DockerInstructions
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -4,10 +4,11 @@ module Dapp
       # From
       class From < Base
         def signature
-          hashsum [from_image_name,
-                   artifacts_signatures,
-                   application.config._docker._from_cache_version,
-                   Dapp::BUILD_CACHE_VERSION]
+          hashsum [*dependencies.flatten]
+        end
+
+        def dependencies
+          [from_image_name, application.config._docker._from_cache_version, Dapp::BUILD_CACHE_VERSION]
         end
 
         def save_in_cache!

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

@@ -8,8 +8,12 @@ module Dapp
           super
         end
 
-        def signature
-          hashsum [super, *application.builder.infra_install_checksum]
+        def empty?
+          super && !application.builder.infra_install?
+        end
+
+        def dependencies
+          [application.builder.infra_install_checksum]
         end
 
         def image

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

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

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

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

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

@@ -5,25 +5,19 @@ module Dapp
       module Mod
         # Artifact
         module Artifact
-          def before_artifacts
-            @before_artifacts ||= do_artifacts(application.config._artifact.select { |artifact| artifact._before == name })
-          end
-
-          def after_artifacts
-            @after_artifacts ||= do_artifacts(application.config._artifact.select { |artifact| artifact._after == name })
-          end
-
-          def do_artifacts(artifacts)
-            verbose = application.log_verbose?
-            artifacts.map do |artifact|
-              process = application.t(code: 'process.artifact_building', data: { name: artifact._config._name })
-              application.log_secondary_process(process, short: !verbose) do
-                application.with_log_indent do
-                  {
-                    name: artifact._config._name,
-                    options: artifact._artifact_options,
-                    app: Application.new(artifact_app_options(artifact, verbose)).tap(&:build!)
-                  }
+          def artifacts
+            @artifacts ||= begin
+              verbose = application.log_verbose?
+              application.config._artifact.map do |artifact|
+                process = application.t(code: 'process.artifact_building', data: { name: artifact._config._name })
+                application.log_secondary_process(process, short: !verbose) do
+                  application.with_log_indent do
+                    {
+                      name: artifact._config._name,
+                      options: artifact._artifact_options,
+                      app: Application.new(artifact_app_options(artifact, verbose)).tap(&:build!)
+                    }
+                  end
                 end
               end
             end
@@ -39,7 +33,7 @@ module Dapp
           end
 
           def artifacts_signatures
-            (before_artifacts + after_artifacts).map { |artifact| hashsum [artifact[:app].signature, artifact[:options]] }
+            artifacts.map { |artifact| hashsum [artifact[:app].signature, artifact[:options]] }
           end
 
           # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
@@ -63,7 +57,8 @@ module Dapp
             end
 
             commands = safe_cp(application.container_tmp_path('artifact', artifact_name), where_to_add, owner, group, cwd, paths)
-            image.add_commands commands
+            image.add_command commands
+            image.add_volume "#{application.tmp_path('artifact', artifact_name)}:#{application.container_tmp_path('artifact', artifact_name)}:ro"
           end
           # rubocop:enable Metrics/AbcSize, Metrics/MethodLength