dapp 0.9.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ca14f07b8e2971cc7bdbb6777171d187814a5a
-  data.tar.gz: 2d24f78202c74b7da5e94ff052b841ef2efa09db
+  metadata.gz: 6ad43a1b900c01b03836a4856a0ea69070bec9a7
+  data.tar.gz: 6b178ca3754198f17e378b3b1ff489bc893e7b41
 SHA512:
-  metadata.gz: 6602da6be978f09efd3eead028827fe0d5cd7ab24af73e9fc92d263ff559c70e46876ab086b4d54f6e23813fd5b836ad1f14dd53bde4a21a90d4f54f30795a43
-  data.tar.gz: 4b18317cefa95594d33aff7c7ff2812c93fde137648bd67de046a35b611fd915cebe1955ae287179238ef585f500b9e5c7dae205d4729fafebe25a0329f70668
+  metadata.gz: 90cbe4a4cbced7f1bc8a5c0140227693740c940b8192664ec1bb85c0220946955402d638d6ea549eab0bdc4f8e19bdeda4058fb94deae3648f91a895c0fe4360
+  data.tar.gz: ccd71154c84ba441339fdfd078edfae8ba2ef41f846017c0a764e2df88f2badcf388d7db1394f5dc666e7ba30665d8fe07bbb400793fe82ecd51e189763187f9

data/bin/dapp

@@ -20,7 +20,15 @@ begin
   check_docker_version
 
   begin
-    Dapp::CLI.new.run
+    begin
+      Dapp::CLI.new.run
+    rescue Dapp::Error::Base => e
+      unless (message = Dapp::Helper::NetStatus.before_error_message(e)).empty?
+        $stderr.puts(message)
+      end
+
+      raise
+    end
   rescue ::SystemExit
     raise
   rescue ::Exception => e

data/config/en/net_status.yml

@@ -8,7 +8,6 @@ en:
       dimg_not_run: "Dimg run failed!"
       git_branch_without_name: "Dimg has specific revision that isn't associated with a branch name!"
       ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
-      chef_stage_checksum_not_calculated: "Chef stage `%{stage}` checksum is not calculated yet, run build first"
     dappfile:
       incorrect: "Dappfile with `%{error}`:\n%{message}"
     build:
@@ -34,7 +33,9 @@ en:
     config:
       dimg_name_required: 'Dimg name required!'
       dimg_name_incorrect: "Dimg has incorrect name `%{name}`: doesn't match regex `%{reg}`!"
+      mount_from_required: "Mount: `from` directive required!"
       export_to_required: "Export: `to` directive required!"
+      add_to_required: "Add: `to` directive required!"
       export_cwd_absolute_path_required: "Export: given cwd path must be absolute!"
       export_to_absolute_path_required: "Export: given `to` path must be absolute!"
       export_include_paths_relative_path_required: "Export: given `include_paths` path must be relative!"
@@ -45,7 +46,7 @@ en:
       builder_type_conflict: 'Conflict between builder types!'
       builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
       docker_from_incorrect: "`docker.from` has incorrect value `%{name}`!"
-      docker_from_without_tag: "`docker.from`: image `%{name}` without !"
+      docker_from_without_tag: "`docker.from`: image `%{name}` without tag!"
       stage_artifact_not_associated: "Artifact not associated with any stage: expected `before` or `after` attribute!"
       stage_artifact_double_associate: "Cannot use `%{stage}` stage for artifact, already used in `%{conflict_stage}` stage!"
       stage_artifact_not_supported_associated_stage: "Bad artifact stage `%{stage}`!"
@@ -57,6 +58,7 @@ en:
       scratch_artifact_associated: "Scratch artifact cannot be associated: not expected `before`/`after` attribute!"
       scratch_artifact_docker_from: "Scratch artifact must have directive `docker.from`!"
     chef:
+      stage_checksum_not_calculated: "Chef stage `%{stage}` checksum is not calculated yet, run build first"
       stage_path_overlap: "Cannot install `%{cookbook}` cookbook's path %{from} into %{to}: already exists"
       builder_cookbook_not_found: "Dapp cookbook directory not found at %{path}"
       berksfile_absolute_path_forbidden: "Absolute paths in Berksfile are not allowed (cookbook `%{cookbook}`, path: `%{path}`)"
@@ -66,6 +68,7 @@ en:
       page_not_found: "Registry `%{registry}`: page `%{url}` not found!"
       user_not_authorized: 'Registry `%{registry}`: user not authorized!'
     rugged:
+      git_repository_reference_error: "Git repo `%{name}`: %{message}!"
       rugged_remote_error: "Remote git repo `%{url}`: `%{message}`!"
       local_git_repository_does_not_exist: "Local git repo: doesn't exist!"
       commit_not_found_in_local_git_repository: "Local git repo: commit `%{commit}` not found!\nIf commit has been rebased: run command `dapp dimg stages cleanup local --improper-git-commit`!"

data/lib/dapp.rb

@@ -17,6 +17,7 @@ require 'paint'
 require 'inifile'
 require 'rugged'
 require 'rubygems/package'
+require 'murmurhash3'
 
 require 'net_status'
 
@@ -63,6 +64,7 @@ require 'dapp/dimg/builder/shell'
 require 'dapp/dimg/builder/none'
 require 'dapp/dimg/build/stage/mod/logging'
 require 'dapp/dimg/build/stage/mod/group'
+require 'dapp/dimg/build/stage/mod/git_artifact_dependencies'
 require 'dapp/dimg/build/stage/base'
 require 'dapp/dimg/build/stage/ga_base'
 require 'dapp/dimg/build/stage/ga_dependencies_base'
@@ -170,7 +172,6 @@ require 'dapp/dimg/error/tar_writer'
 require 'dapp/dimg/error/rugged'
 require 'dapp/dimg/error/registry'
 require 'dapp/dimg/error/chef'
-require 'dapp/dimg/error/shellout'
 require 'dapp/dimg/error/lock'
 require 'dapp/dimg/error/config'
 require 'dapp/dimg/error/command'

data/lib/dapp/config/base.rb

@@ -10,6 +10,11 @@ module Dapp
 
       attr_reader :dapp
 
+      def directive_eval(directive, &blk)
+        directive.instance_eval(&blk) if block_given?
+        directive
+      end
+
       def ref_variables
         [:@dapp]
       end

data/lib/dapp/config/directive/base.rb

@@ -2,14 +2,15 @@ module Dapp
   module Config
     module Directive
       class Base < Config::Base
-        protected
-
         def clone
           _clone
         end
 
-        def clone_to_artifact
-          clone
+        protected
+
+        def sub_directive_eval
+          yield if block_given?
+          self
         end
 
         def path_format(path)

data/lib/dapp/dapp.rb

@@ -78,7 +78,7 @@ module Dapp
 
     def local_git_artifact_exclude_paths(&blk)
       super do |exclude_paths|
-        build_path_relpath = Pathname.new(build_path).subpath_of(path)
+        build_path_relpath = Pathname.new(build_path).subpath_of(File.dirname(git_path))
         exclude_paths << build_path_relpath.to_s if build_path_relpath
 
         yield exclude_paths if block_given?

data/lib/dapp/dapp/deps/base.rb

@@ -2,7 +2,7 @@ module Dapp
   class Dapp
     module Deps
       module Base
-        BASE_VERSION = '0.1.14'.freeze
+        BASE_VERSION = '0.1.15'.freeze
 
         def base_container_name # FIXME: hashsum(image) or dockersafe()
           "dappdeps_base_#{BASE_VERSION}"
@@ -24,7 +24,7 @@ module Dapp
         end
 
         %w(rm rsync diff date cat
-           stat sleep mkdir find
+           stat test sleep mkdir find
            install sed cp true
            bash tar sudo).each do |cmd|
           define_method("#{cmd}_bin") { "/.dapp/deps/base/#{BASE_VERSION}/bin/#{cmd}" }

data/lib/dapp/dapp/logging/paint.rb

@@ -13,7 +13,7 @@ module Dapp
 
         def self.initialize(mode)
           ::Paint.mode = case mode
-                         when 'auto' then STDOUT.tty? ? 8 : 0
+                         when 'auto' then (ENV['TRAVIS'] || ENV['GITLAB_CI'] || STDOUT.tty?) ? 8 : 0
                          when 'on'   then 8
                          when 'off'  then 0
                          else raise

data/lib/dapp/dapp/logging/process.rb

@@ -2,6 +2,7 @@ module Dapp
   class Dapp
     module Logging
       module Process
+        DEFAULT_TERMINAL_WIDTH = 120
         DEFAULT_STYLE = {
           message: :step,
           process: :secondary,
@@ -25,8 +26,6 @@ module Dapp
 
         # rubocop:disable Metrics/ParameterLists
         def log_process(message, process: nil, short: false, quiet: false, style: {}, status: {}, &blk)
-          return yield if quiet
-
           style[:message] ||= DEFAULT_STYLE[:message]
           style[:process] ||= DEFAULT_STYLE[:process]
           style[:failed] ||= DEFAULT_STYLE[:failed]
@@ -35,7 +34,9 @@ module Dapp
           status[:success] ||= t(code: 'status.success.default')
           status[:failed] ||= t(code: 'status.failed.default')
 
-          if log_verbose? && !short
+          if quiet
+            log_process_quiet(message.to_s, style: style, status: status, &blk)
+          elsif log_verbose? && !short
             process ||= t(code: 'status.process.default')
             log_process_verbose(message.to_s, process: process, style: style, status: status, &blk)
           else
@@ -50,6 +51,15 @@ module Dapp
 
         protected
 
+        def log_process_quiet(message, style: {}, status: {})
+          yield
+        rescue Error::Base => e
+          info                  = paint_string(slice(message), style[:message])
+          failed_message        = paint_string(rjust(status[:failed], info), style[:failed])
+          before_error_messages = [log_indent + info + failed_message, e.net_status[:data][:before_error_messages]].flatten
+          raise e.class, **e.net_status.merge(data: e.net_status[:data].merge(before_error_messages: before_error_messages))
+        end
+
         def log_process_verbose(message, process:, style: {}, status: {}, &blk)
           process         = paint_string(rjust(process, message), style[:process])
           info            = paint_string(message, style[:message]) + process
@@ -71,7 +81,7 @@ module Dapp
           message = success_message
           start = Time.now
           yield
-        rescue Exception::Base, Error::Base, SignalException, StandardError => _e
+        rescue Error::Base, SignalException, StandardError => _e
           message = failed_message
           raise
         ensure
@@ -100,7 +110,10 @@ module Dapp
         end
 
         def terminal_width
-          @terminal_width ||= `tput cols`.strip.to_i
+          @terminal_width ||= begin
+            tputs_cols = `tput cols`.strip.to_i
+            (tputs_cols == 0) ? DEFAULT_TERMINAL_WIDTH : tputs_cols
+          end
         end
       end
     end # Logging

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

@@ -22,14 +22,14 @@ module Dapp
             return yield if dimg.dapp.dry_run?
 
             try_lock = proc do
-              next yield unless should_be_tagged?
+              next yield unless image_should_be_locked?
 
               no_lock = false
 
               dimg.dapp.lock("#{dimg.dapp.name}.image.#{image.name}") do
                 image.cache_reset
 
-                if should_be_tagged?
+                if image_should_be_locked?
                   yield
                 else
                   no_lock = true
@@ -52,7 +52,7 @@ module Dapp
             return if build_should_be_skipped?
             prev_stage.build! if prev_stage
             if image_should_be_build?
-              prepare_image if !image.built? && !should_be_not_present?
+              prepare_image if !image.built? && !should_be_not_present? || should_be_introspected?
               log_image_build(&method(:image_build))
             end
             dimg.introspect_image!(image: image.built_id, options: image.send(:prepared_options)) if should_be_introspected?
@@ -156,7 +156,19 @@ module Dapp
           end
 
           def git_artifacts_dependencies
-            dimg.git_artifacts.map { |git_artifact| git_artifact.stage_dependencies_checksums(self) }
+            local_git_artifacts_dependencies + remote_git_artifacts_dependencies
+          end
+
+          def local_git_artifacts_dependencies
+            default_git_artifacts_dependencies(dimg.local_git_artifacts)
+          end
+
+          def remote_git_artifacts_dependencies
+            default_git_artifacts_dependencies(dimg.remote_git_artifacts)
+          end
+
+          def default_git_artifacts_dependencies(git_artifacts)
+            git_artifacts.map { |git_artifact| git_artifact.stage_dependencies_checksums(self) }
           end
 
           def dependencies
@@ -167,6 +179,24 @@ module Dapp
             false
           end
 
+          def g_a_stage?
+            false
+          end
+
+          def prev_g_a_stage
+            stage = self
+            until (stage = stage.prev_stage).nil?
+              return stage if stage.g_a_stage?
+            end
+          end
+
+          def next_g_a_stage
+            stage = self
+            until (stage = stage.next_stage).nil?
+              return stage if stage.g_a_stage?
+            end
+          end
+
           protected
 
           def image_build
@@ -178,7 +208,11 @@ module Dapp
           end
 
           def should_be_tagged?
-            !(empty? || image.tagged? || should_be_not_present?) && image.built?
+            image.built? && !image.tagged?
+          end
+
+          def image_should_be_locked?
+            !(empty? || image.tagged? || should_be_not_present?)
           end
 
           def should_be_not_present?

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

@@ -3,6 +3,8 @@ module Dapp
     module Build
       module Stage
         class BeforeSetup < Base
+          include Mod::GitArtifactsDependencies
+
           def initialize(dimg, next_stage)
             @prev_stage = AfterInstallArtifact.new(dimg, self)
             super

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

@@ -3,6 +3,8 @@ module Dapp
     module Build
       module Stage
         class BuildArtifact < Base
+          include Mod::GitArtifactsDependencies
+
           def initialize(dimg)
             @prev_stage = GAArtifactPatch.new(dimg, self)
             @dimg = dimg

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

@@ -26,8 +26,8 @@ module Dapp
             [:tmp_dir, :build_dir].map { |type| config_mounts_by_type(type) }.flatten.uniq
           end
 
-          def adding_mounts_by_type(type)
-            labels_mounts_by_type(type)
+          def adding_mounts_by_type(_type)
+            []
           end
 
           def should_not_be_detailed?

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

@@ -8,14 +8,6 @@ module Dapp
             super
           end
 
-          def prev_g_a_stage
-            nil
-          end
-
-          def next_g_a_stage
-            next_stage.next_stage # GAPreInstallPatch
-          end
-
           protected
 
           def apply_command_method

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

@@ -9,11 +9,7 @@ module Dapp
           end
 
           def dependencies
-            next_stage.context # BuildArtifact
-          end
-
-          def prev_g_a_stage
-            super.prev_stage # GAPreSetupPatch
+            dimg.stage_by_name(:build_artifact).context
           end
         end # GAArtifactPatch
       end # Stage

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

@@ -3,16 +3,6 @@ module Dapp
     module Build
       module Stage
         class GABase < Base
-          attr_accessor :prev_g_a_stage, :next_g_a_stage
-
-          def prev_g_a_stage
-            dependencies_stage.prev_stage.prev_stage
-          end
-
-          def next_g_a_stage
-            next_stage.next_stage.next_stage
-          end
-
           def dependencies_stage
             prev_stage
           end
@@ -44,6 +34,10 @@ module Dapp
             dependencies_stage.empty?
           end
 
+          def g_a_stage?
+            true
+          end
+
           def layer_commit(git_artifact)
             commits[git_artifact] ||= begin
               if dependencies_stage && dependencies_stage.image.tagged?

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

@@ -8,14 +8,6 @@ module Dapp
             super
           end
 
-          def prev_g_a_stage
-            prev_stage.prev_stage
-          end
-
-          def next_g_a_stage
-            nil
-          end
-
           def dependencies_stage
             nil
           end

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

@@ -10,10 +10,6 @@ module Dapp
               @prev_stage = GAPostInstallPatchDependencies.new(dimg, self)
               super
             end
-
-            def next_g_a_stage
-              super.next_stage.next_stage # GAPreSetupPatch
-            end
           end # GAPostInstallPatch
         end
       end # Stage

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

@@ -12,7 +12,7 @@ module Dapp
             end
 
             def dependencies
-              next_stage.next_stage.next_stage.context # BeforeSetup
+              dimg.stage_by_name(:before_setup).context
             end
           end # GAPostInstallPatchDependencies
         end

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

@@ -10,10 +10,6 @@ module Dapp
               @prev_stage = GAPreInstallPatchDependencies.new(dimg, self)
               super
             end
-
-            def prev_g_a_stage
-              dependencies_stage.prev_stage # GAArchive
-            end
           end # GAPostInstallPatch
         end
       end # Stage