dapp 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebbc168a681eb7fc65bdca3360e6f96065e385f9
-  data.tar.gz: 41f8060f05490a079acf426cf56f0a5d745af5fb
+  metadata.gz: ee54d245eb6039c4a5b4b85400e14465de04fe39
+  data.tar.gz: a0f918bc07b0f95ae5d0517cbc9ce9f9df49ab2b
 SHA512:
-  metadata.gz: 012d735a9cd29a12364a179d1603d1262b4d5dfddd0dd07c1ef6686e5ae838fdb4fa402709c6a5f9554081a32ca53e4c273978dc4b8cf498217f8bfdc344d61f
-  data.tar.gz: b79fff7ff0fe614e67831dccdfd81bf22ac7fccf0af0231b8ce6bbbd4f72f22671980cfd7f5261e97ff6688701b37dda8b9f7476b48c3b18eb04384550e3cea6
+  metadata.gz: 777933444ad6170a2ae0bb670749f6123b3357910e620b5990007c32009b78ae02ddf54c587aa57349e66f07017eef89000e853b8631aaeb2f289e738e6723ef
+  data.tar.gz: 7c91130885e79371ee6a1cc5b4d334b96cf6e5a016597c6c73ba6e50fd4c6a5030f79cafd6a313169b6ba8c8bbdd97e4b9a74342573bdde2a90401050ac2c389

data/lib/dapp/application.rb

@@ -137,11 +137,9 @@ module Dapp
     rescue Exception::IntrospectImage => e
       data = e.net_status[:data]
       cmd = "docker run -ti --rm --entrypoint #{project.bash_path} #{data[:options]} #{data[:built_id]}"
-      system(cmd).tap do |res|
-        project.shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
-        res || raise(Error::Application, code: :application_not_run)
-      end
-      exit 0
+      system(cmd)
+      project.shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
+      raise data[:error]
     end
   end # Application
 end # Dapp

data/lib/dapp/artifact.rb

@@ -9,10 +9,6 @@ module Dapp
       false
     end
 
-    def with_introspection
-      yield
-    end
-
     protected
 
     def last_stage

data/lib/dapp/image/stage.rb

@@ -61,10 +61,13 @@ module Dapp
       def run!
         raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
         project.shellout!("docker run #{prepared_options} #{from.built_id} -ec '#{prepared_bash_command}'", log_verbose: true)
-      rescue Error::Shellout => _e
+      rescue Error::Shellout => error
         raise unless project.introspect_error? || project.introspect_before_error?
         built_id = project.introspect_error? ? commit! : from.built_id
-        raise Exception::IntrospectImage, data: { built_id: built_id, options: prepared_options, rmi: project.introspect_error? }
+        raise Exception::IntrospectImage, data: { built_id: built_id,
+                                                  options: prepared_options,
+                                                  rmi: project.introspect_error?,
+                                                  error: error }
       end
 
       def commit!

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.6.5'.freeze
+  VERSION = '0.6.6'.freeze
   BUILD_CACHE_VERSION = 3
 end

metadata

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