dapp 0.9.4 → 0.10.0

data/lib/dapp/dimg/image/stage.rb

@@ -71,7 +71,7 @@ module Dapp
         def run!
           raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
           dapp.shellout!("docker run #{prepared_options} #{from.built_id} -ec '#{prepared_bash_command}'", log_verbose: true)
-        rescue Error::Shellout => error
+        rescue ::Dapp::Error::Shellout => error
           dapp.log_warning(desc: { code: :launched_command, data: { command: prepared_commands.join(' && ') }, context: :container })
 
           raise unless dapp.introspect_error? || dapp.introspect_before_error?

data/lib/dapp/dimg/lock/file.rb

@@ -21,7 +21,7 @@ module Dapp
         protected
 
         def lock_file_path
-          lock_path.join(name.slice(0, 32))
+          lock_path.join(MurmurHash3::V32.str_hexdigest(name))
         end
 
         def _do_lock(timeout, on_wait, readonly)

data/lib/dapp/helper/cli.rb

@@ -9,8 +9,9 @@ module Dapp
 
       def cli_wrapper(cli)
         yield
-      rescue OptionParser::MissingArgument, OptionParser::InvalidOption, OptionParser::InvalidArgument => e
+      rescue OptionParser::MissingArgument, OptionParser::InvalidOption, OptionParser::InvalidArgument, OptionParser::AmbiguousOption => e
         STDERR.puts "Error: #{e.message}"
+        puts
         puts cli.opt_parser
         exit 1
       end

data/lib/dapp/helper/net_status.rb

@@ -1,9 +1,19 @@
 module Dapp
   module Helper
     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(': ')
+      class << self
+        def net_status(exception)
+          exception.net_status.net_status_normalize(context: exception.net_status.delete(:context))
+        end
+
+        def message(exception)
+          net_status = net_status(exception)
+          net_status[:message] || [net_status[:error], net_status[:code]].compact.join(': ')
+        end
+
+        def before_error_message(exception)
+          (net_status(exception)[:data][:before_error_messages] || []).join("\n")
+        end
       end
     end
   end # Helper

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.9.4'.freeze
+  VERSION = '0.10.0'.freeze
   BUILD_CACHE_VERSION = 7
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -152,6 +152,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.24.0
+- !ruby/object:Gem::Dependency
+  name: murmurhash3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -435,6 +449,7 @@ files:
 - lib/dapp/dimg/build/stage/install/ga_pre_install_patch.rb
 - lib/dapp/dimg/build/stage/install/ga_pre_install_patch_dependencies.rb
 - lib/dapp/dimg/build/stage/install/install.rb
+- lib/dapp/dimg/build/stage/mod/git_artifact_dependencies.rb
 - lib/dapp/dimg/build/stage/mod/group.rb
 - lib/dapp/dimg/build/stage/mod/logging.rb
 - lib/dapp/dimg/build/stage/setup/ga_post_setup_patch.rb
@@ -535,7 +550,6 @@ files:
 - lib/dapp/dimg/error/lock.rb
 - lib/dapp/dimg/error/registry.rb
 - lib/dapp/dimg/error/rugged.rb
-- lib/dapp/dimg/error/shellout.rb
 - lib/dapp/dimg/error/tar_writer.rb
 - lib/dapp/dimg/exception/base.rb
 - lib/dapp/dimg/exception/introspect_image.rb

data/lib/dapp/dimg/error/shellout.rb

@@ -1,7 +0,0 @@
-module Dapp
-  module Dimg
-    module Error
-      class Shellout < ::Dapp::Error::Shellout; end
-    end
-  end
-end