dapp 0.13.3 → 0.13.4

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

@@ -11,14 +11,14 @@ module Dapp
           end
 
           def dependencies
-            [dimg.git_artifacts.map(&:paramshash).join, reset_commits.sort.uniq.compact]
+            @dependencies ||= [dimg.git_artifacts.map(&:paramshash).join, reset_commits]
           end
 
           protected
 
           def reset_commits
             regex = Regexp.union(RESET_COMMIT_MESSAGES)
-            dimg.git_artifacts.map { |git_artifact| git_artifact.repo.find_commit_id_by_message(regex) }
+            dimg.git_artifacts.map { |git_artifact| git_artifact.repo.find_commit_id_by_message(regex) }.sort.uniq.compact
           end
         end # GAArchiveDependencies
       end # Stage

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

@@ -8,12 +8,8 @@ module Dapp
             super
           end
 
-          def empty?
-            dimg.git_artifacts.empty? || dependencies_empty?
-          end
-
           def dependencies
-            dimg.stage_by_name(:build_artifact).context
+            @dependencies ||= dimg.stage_by_name(:build_artifact).context
           end
         end # GAArtifactPatch
       end # Stage

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

@@ -13,23 +13,10 @@ module Dapp
               image.add_volume "#{dimg.tmp_path('archives')}:#{dimg.container_tmp_path('archives')}:ro"
               image.add_volume "#{dimg.tmp_path('patches')}:#{dimg.container_tmp_path('patches')}:ro"
 
-              prepare_local_git_artifacts_command
-              prepare_remote_git_artifacts_command
+              dimg.git_artifacts.each { |git_artifact| image.add_command git_artifact.send(apply_command_method, self) }
             end
           end
 
-          def prepare_local_git_artifacts_command
-            prepare_base_git_artifacts_command(dimg.local_git_artifacts)
-          end
-
-          def prepare_remote_git_artifacts_command
-            prepare_base_git_artifacts_command(dimg.remote_git_artifacts)
-          end
-
-          def prepare_base_git_artifacts_command(git_artifacts)
-            git_artifacts.each { |git_artifact| image.add_command git_artifact.send(apply_command_method, self) }
-          end
-
           def empty?
             dependencies_stage.empty?
           end

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

@@ -13,50 +13,26 @@ module Dapp
           end
 
           def dependencies
-            [].tap do |dependencies|
-              dependencies << commit_list
-              dependencies << dimg.local_git_artifacts.map { |git_artifact| git_artifact.dev_patch_hash(self) } if dimg.dev_mode?
-            end
-          end
-
-          def prepare_local_git_artifacts_command
-            return super unless dimg.dev_mode?
-            dimg.local_git_artifacts.each { |git_artifact| image.add_command git_artifact.apply_dev_patch_command(self) }
+            @dependencies ||= [commit_list, git_artifacts_dev_patch_hashes]
           end
 
           def layer_commit(git_artifact)
-            commits[git_artifact] ||= begin
-              git_artifact.latest_commit
-            end
+            commits[git_artifact] ||= git_artifact.latest_commit
           end
 
           def empty?
-            dependencies_empty? || git_artifacts_without_changes?
+            dimg.git_artifacts.empty? || dependencies_empty?
           end
 
           private
 
-          def git_artifacts_without_changes?
-            local_git_artifacts_without_changes? && remote_git_artifacts_without_changes?
-          end
-
-          def local_git_artifacts_without_changes?
-            dimg.local_git_artifacts.all? do |git_artifact|
-              from_commit = prev_g_a_stage.layer_commit(git_artifact)
-              to_commit = dimg.dev_mode? ? nil : layer_commit(git_artifact)
-              !git_artifact.any_changes?(from_commit, to_commit)
-            end
-          end
-
-          def remote_git_artifacts_without_changes?
-            dimg.remote_git_artifacts.all? do |git_artifact|
-              !git_artifact.any_changes?(prev_g_a_stage.layer_commit(git_artifact), layer_commit(git_artifact))
-            end
-          end
-
           def commit_list
             dimg.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
           end
+
+          def git_artifacts_dev_patch_hashes
+            dimg.git_artifacts.map(&:dev_patch_hash)
+          end
         end # GALatestPatch
       end # Stage
     end # Build

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

@@ -0,0 +1,21 @@
+module Dapp
+  module Dimg
+    module Build
+      module Stage
+        class GARelatedDependenciesBase < GADependenciesBase
+          def dependencies
+            @dependencies ||= dimg.stage_by_name(related_stage_name).context
+          end
+
+          def empty?
+            dimg.stage_by_name(related_stage_name).empty? || super
+          end
+
+          def related_stage_name
+            raise
+          end
+        end # GARelatedDependenciesBase
+      end # Stage
+    end # Build
+  end # Dimg
+end # Dapp

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

@@ -15,7 +15,7 @@ module Dapp
             @image ||= Image::Scratch.new(name: image_name, dapp: dimg.dapp)
           end
 
-          def image_add_volumes
+          def image_add_mounts
           end
 
           def prepare_image
@@ -33,6 +33,7 @@ module Dapp
             artifact_name = artifact[:name]
             artifact_dimg = artifact[:dimg]
             cwd = artifact[:options][:cwd]
+            to = artifact[:options][:to]
             include_paths = artifact[:options][:include_paths]
             owner = artifact[:options][:owner]
             group = artifact[:options][:group]
@@ -51,12 +52,18 @@ module Dapp
             include_paths = include_paths.empty? ? [File.join(cwd, '*')] : include_paths.map { |path| File.join(cwd, path, '*') }
             include_paths.map! { |path| path[1..-1] } # relative path
 
-            command = "#{sudo} #{dimg.dapp.tar_bin} -czf #{container_archive_path} #{exclude_paths} #{include_paths.join(' ')} #{credentials}"
+            command = "#{sudo} #{dimg.dapp.tar_bin} #{tar_option_transform(cwd, to)} -czf #{container_archive_path} #{exclude_paths} #{include_paths.join(' ')} #{credentials}"
             run_artifact_dimg(artifact_dimg, artifact_name, command)
 
             image.add_archive archive_path
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+          private
+
+          def tar_option_transform(cwd, to)
+            format = proc { |path| path.chomp('/').reverse.chomp('/').reverse }
+            "--transform \"s/^#{format.call(cwd)}/#{format.call(to)}/\""
+          end
         end # ImportArtifact
       end # Stage
     end # Build

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

@@ -3,7 +3,7 @@ module Dapp
     module Build
       module Stage
         module Install
-          class GAPostInstallPatchDependencies < GADependenciesBase
+          class GAPostInstallPatchDependencies < GARelatedDependenciesBase
             include Mod::Group
 
             def initialize(dimg, next_stage)
@@ -11,8 +11,8 @@ module Dapp
               super
             end
 
-            def dependencies
-              dimg.stage_by_name(:before_setup).context
+            def related_stage_name
+              :before_setup
             end
           end # GAPostInstallPatchDependencies
         end

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

@@ -3,7 +3,7 @@ module Dapp
     module Build
       module Stage
         module Install
-          class GAPreInstallPatchDependencies < GADependenciesBase
+          class GAPreInstallPatchDependencies < GARelatedDependenciesBase
             include Mod::Group
 
             def initialize(dimg, next_stage)
@@ -11,8 +11,8 @@ module Dapp
               super
             end
 
-            def dependencies
-              dimg.stage_by_name(:install).context
+            def related_stage_name
+              :install
             end
           end # GAPreInstallPatchDependencies
         end

data/lib/dapp/dimg/build/stage/mod/group.rb

@@ -5,7 +5,6 @@ module Dapp
         module Mod
           module Group
             def log_image_build
-              return super if should_be_quiet?
               log_group_name if group_should_be_opened?
               dimg.dapp.with_log_indent { super }
             end
@@ -19,18 +18,31 @@ module Dapp
             end
 
             def group_should_be_opened?
-              !group_opened? && image_should_be_build?
-            end
-
-            def group_opened?
-              return false if prev_group_stage.nil?
-              prev_group_stage.group_opened? || prev_group_stage.image_should_be_build?
+              @group_should_be_opened ||= begin
+                if empty?
+                  false
+                elsif prev_group_stage.nil?
+                  true
+                else
+                  prev_group_stages.all? { |s| !s.group_should_be_opened? }
+                end
+              end
             end
 
             def prev_group_stage
               prev_stage if prev_stage.respond_to?(:group_name) && prev_stage.group_name == group_name
             end
 
+            def prev_group_stages
+              @prev_group_stages ||= begin
+                if prev_group_stage.nil?
+                  []
+                else
+                  prev_group_stage.prev_group_stages + [prev_group_stage]
+                end
+              end
+            end
+
             def log_name_context
               [super, group_name].join('.')
             end

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

@@ -4,19 +4,18 @@ module Dapp
       module Stage
         module Mod
           module Logging
-            def log_image_build(&image_build)
-              if empty?                    then log_state(:empty)
-              elsif image.built?           then log_state(:using_cache)
-              elsif should_be_not_present? then log_state(:not_present)
-              elsif dimg.dapp.dry_run?     then log_state(:build, styles: { status: :success })
-              else log_image_build_process(&image_build)
+            def log_image_build
+              case
+              when image.built?           then log_state(:using_cache)
+              when should_be_not_present? then log_state(:not_present)
+              when dimg.dapp.dry_run?     then log_state(:build, styles: { status: :success })
+              else yield
               end
             ensure
               log_build
             end
 
             def log_build
-              return unless dimg.dapp.log_verbose? && !should_be_quiet?
               dimg.dapp.with_log_indent do
                 dimg.dapp.log_info dimg.dapp.t(code: 'image.signature', data: { signature: image_name })
                 log_image_details unless empty?
@@ -69,17 +68,9 @@ module Dapp
             end
 
             def log_state(state_code, styles: {})
-              return if should_be_quiet?
               dimg.dapp.log_state(log_name, state: dimg.dapp.t(code: state_code, context: 'state'), styles: styles)
             end
 
-            def log_image_build_process
-              dimg.dapp.log_process(log_name,
-                                    process: dimg.dapp.t(code: 'status.process.building'),
-                                    short: should_not_be_detailed?,
-                                    quiet: should_be_quiet?) { yield }
-            end
-
             def ignore_log_commands?
               false
             end
@@ -88,13 +79,9 @@ module Dapp
               image.send(:bash_commands).empty?
             end
 
-            def should_be_introspected?
+            def image_should_be_introspected?
               dimg.stage_should_be_introspected?(name) && !dimg.dapp.dry_run?
             end
-
-            def should_be_quiet?
-              dimg.artifact? && !dimg.dapp.log_verbose?
-            end
           end
         end # Mod
       end # Stage

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

@@ -14,7 +14,7 @@ module Dapp
             end
 
             def dependencies
-              [(changes_size_since_g_a_pre_setup_patch / MAX_PATCH_SIZE).to_i]
+              @dependencies ||= [(changes_size_since_g_a_pre_setup_patch / MAX_PATCH_SIZE).to_i]
             end
 
             private

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

@@ -3,7 +3,7 @@ module Dapp
     module Build
       module Stage
         module Setup
-          class GAPreSetupPatchDependencies < GADependenciesBase
+          class GAPreSetupPatchDependencies < GARelatedDependenciesBase
             include Mod::Group
 
             def initialize(dimg, next_stage)
@@ -11,8 +11,8 @@ module Dapp
               super
             end
 
-            def dependencies
-              dimg.stage_by_name(:setup).context
+            def related_stage_name
+              :setup
             end
           end # GAPreSetupPatchDependencies
         end

data/lib/dapp/dimg/builder/chef.rb

@@ -54,10 +54,10 @@ module Dapp
 
       def chefdk_container
         @chefdk_container ||= begin
-          if dimg.dapp.shellout("docker inspect #{chefdk_container_name}").exitstatus.nonzero?
+          if dimg.dapp.shellout("#{dimg.dapp.host_docker_bin} inspect #{chefdk_container_name}").exitstatus.nonzero?
             dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.chefdk_container_creating'), short: true) do
               dimg.dapp.shellout!(
-                ['docker create',
+                ["#{dimg.dapp.host_docker_bin} create",
                  "--name #{chefdk_container_name}",
                  "--volume /.dapp/deps/chefdk #{chefdk_image}"].join(' ')
               )

data/lib/dapp/dimg/builder/chef/cookbook.rb

@@ -107,7 +107,7 @@ module Dapp
           ]
 
           builder.dimg.dapp.shellout!(
-            [ 'docker run --rm',
+            [ "#{builder.dimg.dapp.host_docker_bin} run --rm",
               volumes_from.map {|container| "--volumes-from #{container}"}.join(' '),
               *local_paths.map {|path| "--volume #{path}:#{path}"},
               "--volume #{builder.dimg.tmp_path}:#{builder.dimg.tmp_path}",
@@ -118,7 +118,7 @@ module Dapp
                 cmd << "dappdeps/berksdeps:0.1.0 #{builder.dimg.dapp.bash_bin}"
                 cmd << " -ec '#{builder.dimg.dapp.shellout_pack(vendor_commands.join(' && '))}'"
               end ].compact.join(' '),
-            log_verbose: builder.dimg.dapp.log_verbose?
+            verbose: true
           )
         end
       end

data/lib/dapp/dimg/cli/command/dimg.rb

@@ -4,7 +4,7 @@ module Dapp::Dimg::CLI
       SUBCOMMANDS = ['build', 'push', 'spush', 'list', 'run', 'stages', 'cleanup', 'bp', 'mrproper', 'stage image', 'tag', 'build-context'].freeze
 
       banner <<BANNER.freeze
-Usage: dapp dimg [options] sub-command [sub-command options]
+Usage: dapp dimg [options] subcommand [subcommand options]
 
 Available subcommands: (for details, dapp dimg SUB-COMMAND --help)
 

data/lib/dapp/dimg/cli/command/dimg/build.rb

@@ -11,6 +11,17 @@ Usage:
 
 Options:
 BANNER
+        introspected_stages = [
+          :from, :before_install, :before_install_artifact, :g_a_archive, :g_a_pre_install_patch, :install,
+          :g_a_post_install_patch, :after_install_artifact, :before_setup, :before_setup_artifact,
+          :g_a_pre_setup_patch, :setup, :g_a_post_setup_patch, :after_setup_artifact, :g_a_latest_patch, :docker_instructions
+        ]
+        artifact_introspected_stages = [
+          :from, :before_install, :before_install_artifact, :g_a_archive, :g_a_pre_install_patch, :install,
+          :g_a_post_install_patch, :after_install_artifact, :before_setup, :before_setup_artifact,
+          :g_a_pre_setup_patch, :setup, :after_setup_artifact, :g_a_artifact_patch, :build_artifact
+        ]
+
         option :tmp_dir_prefix,
                long: '--tmp-dir-prefix PREFIX',
                description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
@@ -36,17 +47,13 @@ BANNER
 
         option :introspect_stage,
                long: '--introspect-stage STAGE',
-               proc: proc { |v| v.to_sym },
-               in: [nil, :from, :before_install, :before_install_artifact, :g_a_archive, :g_a_pre_install_patch, :install,
-                    :g_a_post_install_patch, :after_install_artifact, :before_setup, :before_setup_artifact, :g_a_pre_setup_patch,
-                    :setup, :g_a_post_setup_patch, :after_setup_artifact, :g_a_latest_patch, :docker_instructions]
+               description: "Introspect one of the following stages (#{list_msg_format(introspected_stages)})",
+               proc: proc { |val| val.to_sym.tap { |v| in_validate!(v, introspected_stages) } }
 
         option :introspect_artifact_stage,
                long: '--introspect-artifact-stage STAGE',
-               proc: proc { |v| v.to_sym },
-               in: [nil, :from, :before_install, :before_install_artifact, :g_a_archive, :g_a_pre_install_patch, :install,
-                    :g_a_post_install_patch, :after_install_artifact, :before_setup, :before_setup_artifact, :g_a_pre_setup_patch,
-                    :setup, :after_setup_artifact, :g_a_artifact_patch, :build_artifact]
+               description: "Introspect one of the following stages (#{list_msg_format(artifact_introspected_stages)})",
+               proc: proc { |val| val.to_sym.tap { |v| in_validate!(v, artifact_introspected_stages) } }
 
         option :ssh_key,
                long: '--ssh-key SSH_KEY',

data/lib/dapp/dimg/config/directive/artifact_base.rb

@@ -18,7 +18,7 @@ module Dapp
             sub_directive_eval { @_group = group }
           end
 
-          def export(absolute_dir_path = '/', &blk)
+          def export(absolute_dir_path = nil, &blk)
             self.class.const_get('Export').new(absolute_dir_path, dapp: dapp, &blk).tap do |export|
               @_export << export
             end
@@ -36,9 +36,8 @@ module Dapp
           class Export < Directive::Base
             attr_accessor :_cwd, :_to, :_include_paths, :_exclude_paths, :_owner, :_group
 
-            def initialize(cwd = '/', **kwargs, &blk)
-              raise Error::Config, code: :export_cwd_absolute_path_required unless Pathname(cwd).absolute?
-              @_cwd = path_format(cwd)
+            def initialize(cwd, **kwargs, &blk)
+              self._cwd = cwd
               @_include_paths ||= []
               @_exclude_paths ||= []
 
@@ -56,6 +55,16 @@ module Dapp
               }
             end
 
+            def _cwd
+              @_cwd ||= _to
+            end
+
+            def _cwd=(value)
+              return if value.nil?
+              raise Error::Config, code: :export_cwd_absolute_path_required unless Pathname(value).absolute?
+              @_cwd = path_format(value)
+            end
+
             def to(absolute_path)
               sub_directive_eval do
                 raise Error::Config, code: :export_to_absolute_path_required unless Pathname(absolute_path).absolute?