dapp 0.1.5 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQ5NzZmNDM5NTE5OWU5ZDcyMmRkZWE4YzU1MDZhNDVkYzI0ZmFlNA==
+    NWVjYjY0MmM4ZDBlYzIyMDJmNWM0YjkxNDY0ZmUxN2VhZDZhNzZjMw==
   data.tar.gz: !binary |-
-    ZjFlYjI4ZTNmZWY4ODU1ZTcxZTYxYWRlNDhjNTc5ZGQzMzk2NGE1Yw==
+    MjBiNDMyMmQ1NmY5MTQxMTU0YWQ3NWI5OWEyNjNlMDM2OTc4YzhlYw==
 SHA512:
   metadata.gz: !binary |-
-    MDEzNmU1NDY0MmIyZGVkYzViNjg5ZGM0YzYyYTU0N2U3NGNiYjA1NmQyNzIy
-    Zjg0NGQyN2Y3ODdlY2RjNTdmNDA4ODdiMDUzZmJkMzEyMTM0MjQ0ZDY4N2Q0
-    MTZmOTkzMDQxMTA5OWQ1ZWNlOWFhY2Y1MjI1MWE5N2VlNDA5ZTI=
+    ZjE4Y2ZlNDI1ZjU3MzczMTQ0NzJlNjI1NWYzMGNlZjI1ZTMyYTBlNjk0NDAw
+    OWE5OTExYjIxODU3Y2Q3YzMzMjRmN2FlYzJmMTYwMzcyYzdlMDc1NWQzNDcx
+    YWZmN2E4MTgwZjIxOTllYTU1Nzk5MDk4OWRhZTY0M2Y4YzYxZTI=
   data.tar.gz: !binary |-
-    Yjc0ZDI5NDhmNDRlMTU2ZjMwZmFiODYzZDk3NjBjYzRkYjMwNTQ0MGRiYTIx
-    MDZlZTcwZDYxMDZmMGI0ZjEzMzQzZTNlM2IwOTFmNWIwNmEyOTE2MzI3YWQ3
-    Y2VhMmI5NzdmN2JkZDA2MjczYjQ4NTJkY2JjNDE5NWRjZmZhNmI=
+    NzVmY2ZlNjdmMzVjZmI0Y2FhNzdhZTY2OGM5NDljOGQ1NDZlMmFiYzNiYzk5
+    NWIyMWI1MWU3MDllMjY2YjUyOTRlZjAyM2JhZmMxZWI1YmQ2NWY2NmU5MjNi
+    ZjI4ZTNkYjE1ZTdkNWMzMzU5ODA2MTE4YmE0MjhmZTgzYTJlYzg=

data/bin/dapp

@@ -5,18 +5,13 @@
 require 'rubygems'
 require 'dapp'
 
-def net_status_message(exception)
-  net_status = exception.net_status.net_status_normalize(context: exception.net_status.delete(:context))
-  net_status[:message] || [net_status[:error], net_status[:code]].compact.join(': ')
-end
-
 begin
   Dapp::CLI.new.run
 rescue Dapp::Error::Shellout => e
-  $stderr.puts(net_status_message(e))
+  $stderr.puts(Dapp::Helper::NetStatus.message(e))
   exit 1
 rescue Dapp::Error::Base => e
-  $stderr.puts(Dapp::Helper::Paint.paint_string(net_status_message(e), :warning))
+  $stderr.puts(Dapp::Helper::Paint.paint_string(Dapp::Helper::NetStatus.message(e), :warning))
   exit 1
 rescue Interrupt => _e
   $stderr.puts(Dapp::Helper::Paint.paint_string('Interrupted', :warning))

data/config/en/common.yml

@@ -21,3 +21,6 @@ en:
     state:
       using_cache: '[USING CACHE]'
       build: '[BUILD]'
+      push: '[PUSH]'
+    introspect:
+      stage: "Introspect stage '%{name}'"

data/config/en/net_status.yml

@@ -11,7 +11,7 @@ en:
       from_image_required: 'Missing from_image!'
       image_already_untagged: "Image `%{name}` already untagged!"
       image_not_exist: "Image `%{name}` not exist!"
-      image_already_tagged: 'Image with other id already tagged!'
+      another_image_already_tagged: 'Image with other id already tagged!'
       built_id_not_defined: '`from.built_id` not defined!'
     controller:
       push_command_unexpected_apps: "Push command can process only one application!"

data/lib/dapp.rb

@@ -24,6 +24,7 @@ require 'dapp/helper/log'
 require 'dapp/helper/paint'
 require 'dapp/helper/streaming'
 require 'dapp/helper/shellout'
+require 'dapp/helper/net_status'
 require 'dapp/cli'
 require 'dapp/cli/base'
 require 'dapp/cli/build'
@@ -71,6 +72,8 @@ require 'dapp/git_repo/base'
 require 'dapp/git_repo/own'
 require 'dapp/git_repo/remote'
 require 'dapp/git_artifact'
+require 'dapp/exception/base'
+require 'dapp/exception/introspect_image'
 require 'dapp/error/base'
 require 'dapp/error/application'
 require 'dapp/error/build'

data/lib/dapp/application.rb

@@ -32,15 +32,15 @@ module Dapp
     end
 
     def export!(repo)
-      fail Error::Application, code: :application_not_built unless last_stage.image.tagged? || dry_run?
+      raise Error::Application, code: :application_not_built unless last_stage.image.tagged? || dry_run?
 
       tags.each do |tag|
         image_name = [repo, tag].join(':')
         if dry_run?
-          log_state(image_name, state: 'PUSH', styles: { status: :success })
+          log_state(image_name, state: t(code: 'state.push'), styles: { status: :success })
         else
           log_process(image_name, process: t(code: 'status.process.pushing')) do
-            last_stage.image.export!(image_name, log_verbose: log_verbose?, log_time: log_time?)
+            last_stage.image.export!(image_name, log_verbose: log_verbose?, log_time: log_time?, force: cli_options[:force])
           end
         end
       end

data/lib/dapp/application/logging.rb

@@ -66,7 +66,7 @@ module Dapp
         process         = paint_string(rjust(process, message), style[:process])
         info            = paint_string(message, style[:message]) + process
         success_message = paint_string(slice(message), style[:message]) +
-          paint_string(rjust(t(code: 'status.success.default'), message), style[:success])
+                          paint_string(rjust(t(code: 'status.success.default'), message), style[:success])
         failed_message  = paint_string(slice(message) +
           rjust(t(code: 'status.failed.default'), message), style[:failed])
         log_process_default(info, success_message, failed_message, &blk)
@@ -84,7 +84,7 @@ module Dapp
         message = success_message
         start = Time.now
         yield
-      rescue Error::Base, SignalException, StandardError => _e
+      rescue Exception::Base, Error::Base, SignalException, StandardError => _e
         message = failed_message
         raise
       ensure

data/lib/dapp/application/path.rb

@@ -3,12 +3,6 @@ module Dapp
   class Application
     # Path
     module Path
-      def build_cache_path(*path)
-        make_path(@build_cache_path, *path).expand_path.tap do |p|
-          FileUtils.mkdir_p p.parent
-        end
-      end
-
       def home_path(*path)
         make_path(config._home_path, *path).expand_path
       end
@@ -17,6 +11,10 @@ module Dapp
         make_path(@build_path, *path).expand_path.tap { |p| FileUtils.mkdir_p p.parent }
       end
 
+      def build_cache_path(*path)
+        make_path(@build_cache_path, *path).expand_path.tap { |p| FileUtils.mkdir_p p.parent }
+      end
+
       def container_build_path(*path)
         make_path('/.build', *path)
       end

data/lib/dapp/application/tags.rb

@@ -21,7 +21,7 @@ module Dapp
 
       def branch_tags
         return [] unless cli_options[:tag_branch]
-        fail Error::Application, code: :git_branch_without_name if (branch = git_repo.branch) == 'HEAD'
+        raise Error::Application, code: :git_branch_without_name if (branch = git_repo.branch) == 'HEAD'
         [branch]
       end
 
@@ -39,7 +39,7 @@ module Dapp
         elsif ENV['TRAVIS']
           build_id = ENV['TRAVIS_BUILD_NUMBER']
         else
-          fail Error::Application, code: :ci_environment_required
+          raise Error::Application, code: :ci_environment_required
         end
 
         [build_id]
@@ -55,7 +55,7 @@ module Dapp
           branch = ENV['TRAVIS_BRANCH']
           tag = ENV['TRAVIS_TAG']
         else
-          fail Error::Application, code: :ci_environment_required
+          raise Error::Application, code: :ci_environment_required
         end
 
         [branch, tag].compact

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

@@ -16,9 +16,9 @@ module Dapp
           @next_stage.prev_stage = self
         end
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def build!
-          return if image.tagged? && !application.log_verbose?
+          return if should_be_skipped?
           prev_stage.build! if prev_stage
           begin
             if image.tagged?
@@ -33,8 +33,11 @@ module Dapp
           ensure
             log_build
           end
+          raise Exception::IntrospectImage,
+                message: application.t(code: 'introspect.stage', data: { name: name }),
+                data: { built_id: image.built_id, options: image.send(:prepared_options) } if should_be_introspected?
         end
-        # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
         def save_in_cache!
           return if image.tagged?
@@ -65,13 +68,24 @@ module Dapp
           image.send(:bash_commands).empty?
         end
 
+        def should_be_skipped?
+          image.tagged? && !application.log_verbose? && application.cli_options[:introspect_stage].nil?
+        end
+
+        def should_be_introspected?
+          application.cli_options[:introspect_stage] == name && !application.dry_run?
+        end
+
         def image_build!
-          image.build!(log_verbose: application.log_verbose?, log_time: application.log_time?)
+          image.build!(log_verbose: application.log_verbose?,
+                       log_time: application.log_time?,
+                       introspect_error: application.cli_options[:introspect_error],
+                       introspect_before_error: application.cli_options[:introspect_before_error])
         end
 
         def from_image
           prev_stage.image if prev_stage || begin
-            fail Error::Build, code: :from_image_required
+            raise Error::Build, code: :from_image_required
           end
         end
 
@@ -87,12 +101,13 @@ module Dapp
 
         def format_image_info
           date, bytesize = image_info
-          application.t(code: 'image.info', data: { date: Time.parse(date).localtime, size: to_mb(bytesize.to_i)})
+          application.t(code: 'image.info', data: { date: Time.parse(date).localtime, size: to_mb(bytesize.to_i) })
         end
 
+        # rubocop:disable Metrics/AbcSize
         def log_build
           application.with_log_indent do
-            application.log_info application.t(code: 'image.signature', data: { signature: image_name})
+            application.log_info application.t(code: 'image.signature', data: { signature: image_name })
             application.log_info format_image_info if image.tagged?
             unless (bash_commands = image.send(:bash_commands)).empty?
               application.log_info application.t(code: 'image.commands')

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

@@ -17,7 +17,7 @@ module Dapp
         protected
 
         def image_build!
-          from_image.pull!(log_verbose: application.log_verbose?, log_time: application.log_time?)
+          from_image.pull!(log_time: application.log_time?)
           super
         end
 
@@ -28,7 +28,7 @@ module Dapp
         end
 
         def from_image
-          StageImage.new(name: from_image_name)
+          @from_image ||= StageImage.new(name: from_image_name)
         end
 
         def image_info

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

@@ -17,29 +17,22 @@ module Dapp
         end
 
         def signature
-          hashsum [super, *exposes]
+          hashsum [super, change_options]
         end
 
         def image
           super do |image|
-            image.add_expose(exposes)  unless exposes.empty?
-            image.add_env(envs)        unless envs.empty?
-            image.add_workdir(workdir) unless workdir.nil?
+            change_options.each do |k, v|
+              next if v.nil? || v.empty?
+              image.public_send("add_change_#{k}", v)
+            end
           end
         end
 
         protected
 
-        def exposes
-          application.config._docker._expose
-        end
-
-        def envs
-          application.config._docker._env
-        end
-
-        def workdir
-          application.config._docker._workdir
+        def change_options
+          application.config._docker._change_options
         end
 
         def layers_commits_write!

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

@@ -26,14 +26,17 @@ module Dapp
 
         def image
           super do |image|
-            if application.git_artifacts.any?
-              image.add_volumes_from(gitartifact_container)
-              image.add_commands 'export PATH=/.dapp/deps/gitartifact/bin:$PATH'
+            bash_commands = []
+            volumes = []
+            application.git_artifacts.each do |git_artifact|
+              volumes << "#{git_artifact.repo.dir_path}:#{git_artifact.repo.container_build_dir_path}"
+              bash_commands.concat(git_artifact.send(apply_command_method, self))
             end
 
-            application.git_artifacts.each do |git_artifact|
-              image.add_volume "#{git_artifact.repo.dir_path}:#{git_artifact.repo.container_build_dir_path}"
-              image.add_commands git_artifact.send(apply_command_method, self)
+            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
             end
             yield image if block_given?
           end
@@ -61,7 +64,7 @@ module Dapp
 
         def gitartifact_container
           @gitartifact_container ||= begin
-            if application.shellout("docker inspect #{gitartifact_container_name}").exitstatus != 0
+            if application.shellout("docker inspect #{gitartifact_container_name}").exitstatus.nonzero?
               application.log_secondary_process(application.t(code: 'process.git_artifact_loading'), short: true) do
                 application.shellout ['docker run',
                                       '--restart=no',

data/lib/dapp/builder/base.rb

@@ -9,35 +9,35 @@ module Dapp
       end
 
       def infra_install(_image)
-        fail
+        raise
       end
 
       def infra_install_checksum
-        fail
+        raise
       end
 
       def infra_setup(_image)
-        fail
+        raise
       end
 
       def infra_setup_checksum
-        fail
+        raise
       end
 
       def app_install(_image)
-        fail
+        raise
       end
 
       def app_install_checksum
-        fail
+        raise
       end
 
       def app_setup(_image)
-        fail
+        raise
       end
 
       def app_setup_checksum
-        fail
+        raise
       end
     end # Base
   end # Builder

data/lib/dapp/cli/build.rb

@@ -4,6 +4,8 @@ module Dapp
   class CLI
     # CLI build subcommand
     class Build < Base
+      include Dapp::Helper::Shellout
+
       banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 
@@ -26,6 +28,31 @@ BANNER
       option :git_artifact_branch,
              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',
+             proc: proc { |v| v.to_sym },
+             in: [nil, :from, :infra_install, :source_1_archive, :source_1, :app_install,
+                  :source_2, :infra_setup, :source_3, :app_setup, :source_4, :source_5]
+
+      def run(*args)
+        super
+      rescue Exception::IntrospectImage => e
+        $stderr.puts(e.net_status[:message])
+        data = e.net_status[:data]
+        system("docker run -ti --rm #{data[:options]} #{data[:built_id]} bash")
+        shellout("docker rmi #{data[:built_id]}") if data[:rmi]
+      end
     end
   end
 end

data/lib/dapp/cli/push.rb

@@ -49,6 +49,12 @@ BANNER
              description: 'Tag by git commit',
              boolean: true
 
+      option :force,
+             long: '--force',
+             description: 'Override existing image',
+             default: false,
+             boolean: true
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         repo = self.class.required_argument(self)

data/lib/dapp/config/application.rb

@@ -33,12 +33,12 @@ module Dapp
       end
 
       def chef
-        fail Error::Config, code: :builder_type_conflict unless _builder == :chef
+        raise Error::Config, code: :builder_type_conflict unless _builder == :chef
         @_chef ||= Chef.new
       end
 
       def shell
-        fail Error::Config, code: :builder_type_conflict unless _builder == :shell
+        raise Error::Config, code: :builder_type_conflict unless _builder == :shell
         @_shell ||= Shell.new
       end
 
@@ -51,7 +51,7 @@ module Dapp
       end
 
       def builder(type)
-        fail Error::Config, code: :builder_type_unsupported, data: { type: type } unless [:chef, :shell].include?((type = type.to_sym))
+        raise Error::Config, code: :builder_type_unsupported, data: { type: type } unless [:chef, :shell].include?((type = type.to_sym))
         another_builder = [:chef, :shell].find { |t| t != type }
         instance_variable_set(:"@_#{another_builder}", Config.const_get(another_builder.capitalize).new)
         @_builder = type

data/lib/dapp/config/docker.rb

@@ -2,12 +2,16 @@ module Dapp
   module Config
     # Docker
     class Docker
-      attr_reader :_expose, :_workdir, :_env
+      attr_reader :_volume, :_expose, :_env, :_label, :_cmd, :_onbuild, :_workdir, :_user, :_entrypoint
       attr_reader :_from_cache_version
 
       def initialize
+        @_volume = []
         @_expose = []
         @_env = []
+        @_label = []
+        @_cmd = []
+        @_onbuild = []
       end
 
       def from(image_name, cache_version: nil)
@@ -15,20 +19,58 @@ module Dapp
         @_from_cache_version = cache_version
       end
 
-      def expose(*args)
-        @_expose.concat(args)
+      def volume(*args)
+        @_volume.concat(args)
       end
 
-      def workdir(path)
-        @_workdir = path
+      def expose(*args)
+        @_expose.concat(args)
       end
 
       def env(*args)
         @_env.concat(args)
       end
 
+      def label(*args)
+        @_label.concat(args)
+      end
+
+      def cmd(*args)
+        @_cmd.concat(args)
+      end
+
+      def onbuild(*args)
+        @_onbuild.concat(args)
+      end
+
+      def workdir(val)
+        @_workdir = val
+      end
+
+      def user(val)
+        @_user = val
+      end
+
+      def entrypoint(*cmd_with_args)
+        @_entrypoint = cmd_with_args.flatten
+      end
+
       def _from
-        @_from || fail(Error::Config, code: :docker_from_not_defined)
+        @_from || raise(Error::Config, code: :docker_from_not_defined)
+      end
+
+      def _change_options
+        {
+          volume: _volume,
+          expose: _expose,
+          env: _env,
+          label: _label,
+          cmd: _cmd,
+          onbuild: _onbuild,
+          workdir: _workdir,
+          user: _user,
+          entrypoint: _entrypoint
+        }
       end
 
       def clone

data/lib/dapp/config/git_artifact.rb

@@ -31,8 +31,8 @@ module Dapp
           @_where_to_add = where_to_add
 
           options.each do |k, v|
-            respond_to?("_#{k}=") ? send(:"_#{k}=", v) : fail(Error::Config, code: :git_artifact_unexpected_attribute,
-                                                                             data: { type: object_name, attr: k })
+            respond_to?("_#{k}=") ? send(:"_#{k}=", v) : raise(Error::Config, code: :git_artifact_unexpected_attribute,
+                                                                              data: { type: object_name, attr: k })
           end
         end
 

data/lib/dapp/controller.rb

@@ -6,7 +6,7 @@ module Dapp
 
     attr_reader :cli_options, :patterns
 
-    def initialize(cli_options:, patterns: nil)
+    def initialize(cli_options: {}, patterns: nil)
       @cli_options = cli_options
       @cli_options[:log_indent] = 0
 
@@ -19,25 +19,25 @@ module Dapp
     end
 
     def build
-      @build_confs.each do |build_conf|
+      build_confs.each do |build_conf|
         log_step(build_conf._name)
         with_log_indent { Application.new(config: build_conf, cli_options: cli_options).build! }
       end
     end
 
     def list
-      @build_confs.each do |build_conf|
+      build_confs.each do |build_conf|
         log(build_conf._name)
       end
     end
 
     def push(repo)
-      fail Error::Controller, code: :push_command_unexpected_apps unless @build_confs.one?
+      raise Error::Controller, code: :push_command_unexpected_apps unless @build_confs.one?
       Application.new(config: @build_confs.first, cli_options: cli_options, ignore_git_fetch: true).export!(repo)
     end
 
     def smartpush(repo_prefix)
-      @build_confs.each do |build_conf|
+      build_confs.each do |build_conf|
         log_step(build_conf._name)
         repo = File.join(repo_prefix, build_conf._name)
         with_log_indent { Application.new(config: build_conf, cli_options: cli_options, ignore_git_fetch: true).export!(repo) }
@@ -45,7 +45,7 @@ module Dapp
     end
 
     def flush_build_cache
-      @build_confs.each do |build_conf|
+      build_confs.each do |build_conf|
         log(build_conf._name)
         app = Application.new(config: build_conf, cli_options: cli_options, ignore_git_fetch: true)
         FileUtils.rm_rf app.build_cache_path
@@ -61,17 +61,13 @@ module Dapp
 
     def build_confs
       @build_confs ||= begin
-        dappfiles = []
         if File.exist? dappfile_path
-          dappfiles << dappfile_path
-        elsif File.exist? dapps_path
-          dappfiles += Dir.glob(File.join([dapps_path, '*', 'Dappfile'].compact))
-        else
-          fail Error::Controller, code: :dappfile_not_found
+          dappfiles = dappfile_path
+        elsif (dappfiles = dapps_dappfiles_pathes).empty? && (dappfiles = search_dappfile_up).nil?
+          raise Error::Controller, code: :dappfile_not_found
         end
-        dappfiles.flatten.uniq!
-        dappfiles.map { |dappfile| apps(dappfile, app_filters: patterns) }.flatten.tap do |apps|
-          fail Error::Controller, code: :no_such_app, data: { path: dappfile_path, patterns: patterns.join(', ') } if apps.empty?
+        Array(dappfiles).map { |dappfile| apps(dappfile, app_filters: patterns) }.flatten.tap do |apps|
+          raise Error::Controller, code: :no_such_app, data: { path: dappfile_path, patterns: patterns.join(', ') } if apps.empty?
         end
       end
     end
@@ -84,11 +80,19 @@ module Dapp
     end
 
     def dappfile_path
-      @dappfile_path ||= File.join [cli_options[:dir], 'Dappfile'].compact
+      File.join [cli_options[:dir], 'Dappfile'].compact
     end
 
-    def dapps_path
-      @dapps_path ||= File.join [cli_options[:dir], '.dapps'].compact
+    def dapps_dappfiles_pathes
+      Dir.glob(File.join([cli_options[:dir], '.dapps', '*', 'Dappfile'].compact))
+    end
+
+    def search_dappfile_up
+      cdir = Pathname(File.expand_path(cli_options[:dir] || Dir.pwd))
+      until (cdir = cdir.parent).root?
+        next unless (path = cdir.join('Dappfile')).exist?
+        return path.to_s
+      end
     end
 
     def paint_initialize
@@ -96,7 +100,7 @@ module Dapp
                    when 'auto' then STDOUT.tty? ? 8 : 0
                    when 'on'   then 8
                    when 'off'  then 0
-                   else fail
+                   else raise
                    end
     end
   end # Controller

data/lib/dapp/docker_image.rb

@@ -20,12 +20,12 @@ module Dapp
     end
 
     def untag!
-      fail Error::Build, code: :image_already_untagged, data: { name: name } unless tagged?
+      raise Error::Build, code: :image_already_untagged, data: { name: name } unless tagged?
       shellout!("docker rmi #{name}")
     end
 
     def push!(log_verbose: false, log_time: false)
-      fail Error::Build, code: :image_not_exist, data: { name: name } unless tagged?
+      raise Error::Build, code: :image_not_exist, data: { name: name } unless tagged?
       shellout!("docker push #{name}", log_verbose: log_verbose, log_time: log_time)
     end
 
@@ -44,7 +44,7 @@ module Dapp
     end
 
     def info
-      fail Error::Build, code: :image_not_exist, data: { name: name } unless tagged?
+      raise Error::Build, code: :image_not_exist, data: { name: name } unless tagged?
       shellout!("docker inspect --format='{{.Created}} {{.Size}}' #{name}").stdout.strip.split
     end
   end # DockerImage

data/lib/dapp/exception/base.rb

@@ -0,0 +1,10 @@
+module Dapp
+  module Exception
+    # Base
+    class Base < NetStatus::Exception
+      def initialize(net_status = {})
+        super(net_status.merge(context: self.class.to_s.split('::').last.downcase))
+      end
+    end
+  end
+end

data/lib/dapp/exception/introspect_image.rb

@@ -0,0 +1,6 @@
+module Dapp
+  module Exception
+    # IntrospectImage
+    class IntrospectImage < Base; end
+  end
+end

data/lib/dapp/helper/net_status.rb

@@ -0,0 +1,11 @@
+module Dapp
+  module Helper
+    # NetStatus
+    module NetStatus
+      def self.message(exception)
+        net_status = exception.net_status.net_status_normalize(context: exception.net_status.delete(:context))
+        net_status[:message] || [net_status[:error], net_status[:code]].compact.join(': ')
+      end
+    end
+  end # Helper
+end # Dapp

data/lib/dapp/helper/paint.rb

@@ -13,7 +13,7 @@ module Dapp
 
       def paint_style(name)
         FORMAT[name].tap do |format|
-          fail if format.nil?
+          raise if format.nil?
         end
       end
 

data/lib/dapp/stage_image.rb

@@ -4,56 +4,87 @@ module Dapp
     def initialize(name:, built_id: nil, from: nil)
       @bash_commands = []
       @options = {}
+      @change_options = {}
       @container_name = SecureRandom.hex
       @built_id = built_id
       super(name: name, from: from)
     end
 
-    def add_expose(value)
-      add_option(:expose, value)
+    def add_change_volume(value)
+      add_change_option(:volume, value)
     end
 
-    def add_volume(value)
-      add_option(:volume, value)
+    def add_change_expose(value)
+      add_change_option(:expose, value)
     end
 
-    def add_volumes_from(value)
-      add_option(:'volumes-from', value)
+    def add_change_env(value)
+      add_change_option(:env, value)
+    end
+
+    def add_change_label(value)
+      add_change_option(:label, value)
+    end
+
+    def add_change_cmd(value)
+      add_change_option(:cmd, value)
+    end
+
+    def add_change_onbuild(value)
+      add_change_option(:onbuild, value)
+    end
+
+    def add_change_workdir(value)
+      add_change_option(:workdir, value)
+    end
+
+    def add_change_entrypoint(value)
+      add_change_option(:entrypoint, value)
+    end
+
+    def add_change_user(value)
+      add_change_option(:user, value)
     end
 
-    def add_env(value)
-      add_option(:env, value)
+    def add_volume(value)
+      add_option(:volume, value)
     end
 
-    def add_workdir(value)
-      add_option(:workdir, value)
+    def add_volumes_from(value)
+      add_option(:'volumes-from', value)
     end
 
     def add_commands(*commands)
-      @bash_commands += commands.flatten
+      @bash_commands.concat(commands.flatten)
     end
 
     def built_id
       @built_id ||= id
     end
 
-    def build!(log_verbose: false, log_time: false)
-      run!(log_verbose: log_verbose, log_time: log_time)
-      @built_id = commit!
-    ensure
-      shellout("docker rm #{container_name}")
+    def build!(**kvargs)
+      @built_id = if should_be_built?
+                    begin
+                      run!(**kvargs)
+                      commit!
+                    ensure
+                      shellout("docker rm #{container_name}")
+                    end
+                  else
+                    from.built_id
+                  end
     end
 
-    def export!(name, log_verbose: false, log_time: false)
+    def export!(name, log_verbose: false, log_time: false, force: false)
       image = self.class.new(built_id: built_id, name: name)
-      image.tag!(log_verbose: log_verbose, log_time: log_time)
+      image.tag!(log_verbose: log_verbose, log_time: log_time, force: force)
       image.push!(log_verbose: log_verbose, log_time: log_time)
       image.untag!
     end
 
-    def tag!(log_verbose: false, log_time: false)
-      unless (existed_id = id).nil?
-        fail Error::Build, code: :image_already_tagged if built_id != existed_id
+    def tag!(log_verbose: false, log_time: false, force: false)
+      if !(existed_id = id).nil? && !force
+        raise Error::Build, code: :another_image_already_tagged if built_id != existed_id
         return
       end
       shellout!("docker tag #{built_id} #{name}", log_verbose: log_verbose, log_time: log_time)
@@ -63,34 +94,61 @@ module Dapp
 
     attr_reader :container_name
     attr_reader :bash_commands
-    attr_reader :options
+    attr_reader :options, :change_options
 
     def add_option(key, value)
-      options[key] = (options[key].nil? ? value : (Array(options[key]) << value).flatten)
+      add_option_default(options, key, value)
+    end
+
+    def add_change_option(key, value)
+      add_option_default(change_options, key, value)
+    end
+
+    def add_option_default(hash, key, value)
+      hash[key] = (hash[key].nil? ? value : (Array(hash[key]) << value).flatten)
     end
 
-    def run!(log_verbose: false, log_time: false)
-      fail Error::Build, code: :built_id_not_defined if from.built_id.nil?
+    def run!(log_verbose: false, log_time: false, introspect_error: false, introspect_before_error: false)
+      raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
       shellout!("docker run #{prepared_options} --name=#{container_name} #{from.built_id} #{prepared_bash_command}",
                 log_verbose: log_verbose, log_time: log_time)
+    rescue Error::Shellout => e
+      raise unless introspect_error || introspect_before_error
+      built_id = introspect_error ? commit! : from.built_id
+      raise Exception::IntrospectImage, message: Dapp::Helper::NetStatus.message(e),
+                                        data: { built_id: built_id, options: prepared_options, rmi: introspect_error }
     end
 
     def commit!
-      shellout!("docker commit #{container_name}").stdout.strip
+      shellout!("docker commit #{prepared_change} #{container_name}").stdout.strip
+    end
+
+    def should_be_built?
+      !(bash_commands.empty? && change_options.empty?)
     end
 
     def prepared_options
-      options.map { |k, vals| Array(vals).map { |v| "--#{k}=#{v}" }.join(' ') }.join(' ')
+      prepared_options_default(options) { |k, vals| Array(vals).map { |v| "--#{k}=#{v}" }.join(' ') }
     end
 
-    def prepared_bash_command
-      if bash_commands.empty?
-        'true'
-      else
-        "bash -ec 'eval $(echo #{Base64.strict_encode64(prepared_commands.join(' && '))} | base64 --decode)'"
+    def prepared_change
+      prepared_options_default(change_options) do |k, vals|
+        if [:cmd, :entrypoint].include? k
+          %(-c '#{k.to_s.upcase} #{Array(vals)}')
+        else
+          Array(vals).map { |v| %(-c "#{k.to_s.upcase} #{v}") }.join(' ')
+        end
       end
     end
 
+    def prepared_options_default(hash)
+      hash.map { |k, vals| yield(k, vals) }.join(' ')
+    end
+
+    def prepared_bash_command
+      "bash -ec 'eval $(echo #{Base64.strict_encode64(prepared_commands.join(' && '))} | base64 --decode)'"
+    end
+
     def prepared_commands
       bash_commands.map { |command| command.gsub(/^[\ |;]*|[\ |;]*$/, '') } # strip [' ', ';']
     end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.2.4'.freeze
   BUILD_CACHE_VERSION = 1
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.4
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -373,6 +373,8 @@ files:
 - lib/dapp/error/config.rb
 - lib/dapp/error/controller.rb
 - lib/dapp/error/shellout.rb
+- lib/dapp/exception/base.rb
+- lib/dapp/exception/introspect_image.rb
 - lib/dapp/filelock.rb
 - lib/dapp/git_artifact.rb
 - lib/dapp/git_repo/base.rb
@@ -381,6 +383,7 @@ files:
 - lib/dapp/helper/cli.rb
 - lib/dapp/helper/i18n.rb
 - lib/dapp/helper/log.rb
+- lib/dapp/helper/net_status.rb
 - lib/dapp/helper/paint.rb
 - lib/dapp/helper/sha256.rb
 - lib/dapp/helper/shellout.rb