dapp 0.24.6 → 0.24.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8630679f0871a4ccaeac1b38cac8eb0f11d1edba
-  data.tar.gz: 2fd12efa60bf0ba421ff7937951b365749b81ec5
+  metadata.gz: 0073271a0411a76dde658c5b3e5b44d5da2a1ede
+  data.tar.gz: 3817ba7a0bb6d5bb1fdb9f8e4ada6ecfe01eac64
 SHA512:
-  metadata.gz: 6d1680150539d937f9d6f456ef048cabba7fa3756b7514a83368c06db6955df01e930cab51ac3d1e9c191b448c09c3aaa8729f6ac5fb4c451154756702b47f09
-  data.tar.gz: 0b6340a981b36e91900961f91c6b433fea925f17f0806c2b4c8983442e39c4dc0482ab12d3304868e873ee464a753596891b35474567ac782e461e87e58f8a76
+  metadata.gz: a56c7b2ef49a8288ec40d23748e700dcd33cabf2e31af4c57541857ca6a505c337800612486cc4c7907a2e49e06dd90e2970df16b98429dca3fac013b50b0467
+  data.tar.gz: 78f8f794c7935074c852edb90bf521e3207e9cf82aeee2df9dcccd98b617182992e9bc108e72f2d55ee0e0445b17b99c3b6e361b8d890669b50a7d4ab2f7e511

data/lib/dapp/dapp.rb

@@ -35,6 +35,8 @@ module Dapp
       Logging::I18n.initialize
       validate_config_options!
       Logging::Paint.initialize(option_color)
+
+      @_call_before_terminate = []
     end
 
     def options
@@ -120,6 +122,7 @@ module Dapp
     end
 
     def terminate
+      @_call_before_terminate.each {|on_terminate| on_terminate.call(self)}
       FileUtils.rmtree(host_docker_tmp_config_dir)
     end
 

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

@@ -12,7 +12,7 @@ module Dapp
           @base_container ||= begin
             is_container_exist = proc{shellout("#{host_docker} inspect #{base_container_name}").exitstatus.zero?}
             if !is_container_exist.call
-              lock("dappdeps.container.#{base_container_name}", default_timeout: 120) do
+              lock("dappdeps.container.#{base_container_name}", default_timeout: 600) do
                 if !is_container_exist.call
                   log_secondary_process(t(code: 'process.base_container_creating', data: {name: base_container_name}), short: true) do
                     shellout!(

data/lib/dapp/dapp/deps/gitartifact.rb

@@ -12,7 +12,7 @@ module Dapp
           @gitartifact_container ||= begin
             is_container_exist = proc{shellout("#{host_docker} inspect #{gitartifact_container_name}").exitstatus.zero?}
             if !is_container_exist.call
-              lock("dappdeps.container.#{gitartifact_container_name}", default_timeout: 120) do
+              lock("dappdeps.container.#{gitartifact_container_name}", default_timeout: 600) do
                 if !is_container_exist.call
                   log_secondary_process(t(code: 'process.gitartifact_container_creating', data: {name: gitartifact_container_name}), short: true) do
                     shellout!(

data/lib/dapp/dapp/deps/toolchain.rb

@@ -12,7 +12,7 @@ module Dapp
           @toolchain_container ||= begin
             is_container_exist = proc {shellout("#{host_docker} inspect #{toolchain_container_name}").exitstatus.zero?}
             if !is_container_exist.call
-              lock("dappdeps.container.#{toolchain_container_name}", default_timeout: 300) do
+              lock("dappdeps.container.#{toolchain_container_name}", default_timeout: 600) do
                 if !is_container_exist.call
                   log_secondary_process(t(code: 'process.toolchain_container_creating', data: {name: toolchain_container_name}), short: true) do
                     shellout!(

data/lib/dapp/dapp/lock.rb

@@ -10,7 +10,8 @@ module Dapp
         @_locks[name] ||= ::Dapp::Dimg::Lock::File.new(locks_dir, name)
       end
 
-      def lock(name, *_args, default_timeout: 300, **kwargs, &blk)
+      # default_timeout 24 hours
+      def lock(name, *_args, default_timeout: 86400, **kwargs, &blk)
         if dry_run?
           yield if block_given?
         else

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

@@ -64,7 +64,7 @@ module Dapp
         @chefdk_container ||= begin
           is_container_exist = proc{dimg.dapp.shellout("#{dimg.dapp.host_docker} inspect #{chefdk_container_name}").exitstatus.zero?}
           if !is_container_exist.call
-            dimg.dapp.lock("dappdeps.container.#{chefdk_container_name}", default_timeout: 120) do
+            dimg.dapp.lock("dappdeps.container.#{chefdk_container_name}", default_timeout: 600) do
               if !is_container_exist.call
                 dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.chefdk_container_creating', data: {name: chefdk_container_name}), short: true) do
                   dimg.dapp.shellout!(

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

@@ -66,7 +66,7 @@ module Dapp
       end
 
       def vendor_path
-        builder.dimg.dapp.lock(_vendor_lock_name, default_timeout: 120) do
+        builder.dimg.dapp.lock(_vendor_lock_name, default_timeout: 600) do
           vendor! unless _vendor_path.join('.created_at').exist?
         end
         _vendor_path

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

@@ -12,25 +12,81 @@ Usage:
 
 Options:
 BANNER
+
+        # build options
+
+        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.'
+              long: '--tmp-dir-prefix PREFIX',
+              description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
 
         option :lock_timeout,
-               long: '--lock-timeout TIMEOUT',
-               description: 'Redefine resource locking timeout (in seconds)',
-               proc: ->(v) { v.to_i }
+              long: '--lock-timeout TIMEOUT',
+              description: 'Redefine resource locking timeout (in seconds)',
+              proc: ->(v) { v.to_i }
 
         option :git_artifact_branch,
-               long: '--git-artifact-branch BRANCH',
-               description: 'Default branch to archive artifacts from'
+              long: '--git-artifact-branch BRANCH',
+              description: 'Default branch to archive artifacts from'
+
+        option :introspect_error,
+              long: '--introspect-error',
+              boolean: true,
+              default: false
+
+        option :introspect_before_error,
+              long: '--introspect-before-error',
+              boolean: true,
+              default: false
+
+        option :introspect_stage,
+              long: '--introspect-stage STAGE',
+              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',
+              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',
-               description: ['Enable only specified ssh keys ',
-                             '(use system ssh-agent by default)'].join,
-               default: nil,
-               proc: ->(v) { composite_options(:ssh_key) << v }
+              long: '--ssh-key SSH_KEY',
+              description: ['Enable only specified ssh keys ',
+                            '(use system ssh-agent by default)'].join,
+              default: nil,
+              proc: ->(v) { composite_options(:ssh_key) << v }
+
+        option :build_context_directory,
+              long: '--build-context-directory DIR_PATH',
+              default: nil
+
+        option :use_system_tar,
+              long: '--use-system-tar',
+              boolean: true,
+              default: false
+
+        option :force_save_cache,
+              long: '--force-save-cache',
+              boolean: true,
+              default: false
+
+        # push options
+
+        extend ::Dapp::CLI::Command::Options::Tag
+
+        option :with_stages,
+               long: '--with-stages',
+               boolean: true
 
         option :registry_username,
                long: '--registry-username USERNAME'

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

@@ -6,8 +6,6 @@ module Dapp
           def bp
             bp_step(:build)
             bp_step(:push)
-            bp_step(:stages_cleanup_by_repo)
-            bp_step(:cleanup)
           end
 
           def bp_step(step, *args)

data/lib/dapp/dimg/dapp/dimg.rb

@@ -9,6 +9,10 @@ module Dapp
         def artifact_dimg(config:, **kwargs)
           (@artifacts_dimgs ||= {})[config._name] ||= ::Dapp::Dimg::Artifact.new(config: config, dapp: self, **kwargs)
         end
+
+        def _terminate_dimg_on_terminate(dimg)
+          @_call_before_terminate << proc{dimg.terminate}
+        end
       end # Dimg
     end # Dapp
   end # Dimg

data/lib/dapp/dimg/dimg.rb

@@ -20,9 +20,15 @@ module Dapp
         @ignore_git_fetch = ignore_git_fetch
         @should_be_built = should_be_built
 
+        @dapp._terminate_dimg_on_terminate(self)
+
         raise Error::Dimg, code: :dimg_not_built if should_be_built?
       end
 
+      def terminate
+        cleanup_tmp
+      end
+
       def build!
         with_introspection do
           dapp.lock("#{dapp.name}.images", readonly: true) do
@@ -36,8 +42,6 @@ module Dapp
             end
           end
         end
-      ensure
-        cleanup_tmp
       end
 
       def after_stages_build!
@@ -196,8 +200,6 @@ module Dapp
           cmd << " rm -rf #{tmp_path}"
         end
         dapp.shellout! cmd
-
-        artifacts.each(&:cleanup_tmp)
       end
 
       def stage_should_be_introspected?(name)

data/lib/dapp/dimg/git_repo/remote.rb

@@ -49,7 +49,7 @@ module Dapp
         end
 
         def _with_lock(&blk)
-          dapp.lock("remote_git_artifact.#{name}", default_timeout: 120, &blk)
+          dapp.lock("remote_git_artifact.#{name}", default_timeout: 600, &blk)
         end
 
         def _rugged_credentials

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.24.6"
+  VERSION = "0.24.7"
   BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.24.6
+  version: 0.24.7
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout