dapp 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d4ca61c72282976ce1a025dbc00af3ce9ae5dd
-  data.tar.gz: 7ba0e4bb0f8aba250d4df9b9e16101883ca46ef2
+  metadata.gz: 4a647be59d32b6991038c53294f960aaf15030cb
+  data.tar.gz: 2eb63c5bd2b5e6a216a9d126265b5ce73787abc3
 SHA512:
-  metadata.gz: a923babf8d0a05ee8e5772408e2cbf115c203df9305a2bff11ccba6e367d9d973d02fe29296dd9d1d799d0091ff96a60384d84ce6bbb497d29608d6bb22acda4
-  data.tar.gz: 2aed90c824516ad48148ef8b6e6af4b8c1b697a1f06c8a1102467eeda6452afc0b507c372459e06927d9794e7831d039c3c1a461a0df89e95841f8b1d5222e96
+  metadata.gz: e3c7db9cf1cb215c5b6971b2be5be767296d83c744c9b93bf749ec39c32b6035d13d460562f1fcd8ece95a6d23af3568080d8c81879450b8c21a966b530b48a6
+  data.tar.gz: 56e0c351bb05e9dce18598755a53f96f2f82784290fced28e0735d0e15da94a8bf943e1d04dcf16cfba555f2bedb4f728fb95246310c87f61a9a2194d10b49c6

data/bin/dapp

@@ -6,7 +6,15 @@ require 'rubygems'
 require 'dapp'
 
 begin
-  Dapp::CLI.new.run
+  begin
+    Dapp::CLI.new.run
+  rescue ::Exception => e
+    ::File.open('/tmp/dapp-stacktrace.out', 'a') do |dapp_stacktrace|
+      dapp_stacktrace.write [*e.backtrace, "\n"].join("\n")
+    end
+    $stderr.puts "\033[1m\033[31mStacktrace dumped to /tmp/dapp-stacktrace.out\033[0m"
+    raise
+  end
 rescue Dapp::Error::Shellout => e
   $stderr.puts(Dapp::Helper::NetStatus.message(e))
   exit 1

data/config/en/net_status.yml

@@ -3,7 +3,6 @@ en:
     missing_translation: "Missing translation for code: '%{code}'!"
     shellout:
       shell_command_failed: ">>> START STREAM\n%{stream}\n>>> END STREAM"
-      system_shell_command_failed: ">>> START STREAM\n%{stream}\n>>> END STREAM%{backtrace}"
     application:
       application_not_built: "Application hasn't been built yet!"
       application_not_run: "Application run failed!"

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

@@ -10,7 +10,7 @@ module Dapp
             parse
           end
 
-          def cookbook(name, path: nil, **_kwargs)
+          def cookbook(name, *_args, path: nil, **_kwargs)
             @berksfile.add_local_cookbook_path(name, path) if path
           end
 

data/lib/dapp/project/shellout/base.rb

@@ -65,7 +65,7 @@ module Dapp
 
             yield(**kwargs)
           rescue ::Mixlib::ShellOut::ShellCommandFailed => e
-            raise Error::Shellout, code: class_to_lowercase(e.class), data: { stream: stream.show, backtrace: e.backtrace.join("\n") }
+            raise Error::Shellout, code: class_to_lowercase(e.class), data: { stream: stream.show }
           end
         end
       end

data/lib/dapp/project/shellout/system.rb

@@ -15,6 +15,8 @@ module Dapp
         end
 
         def system_shellout_container
+          do_livecheck = false
+
           @system_shellout_container ||= begin
             lock(system_shellout_container_name) do
               if shellout("docker inspect #{system_shellout_container_name}").exitstatus.nonzero?
@@ -35,8 +37,13 @@ module Dapp
               end
             end
 
+            do_livecheck = true
             system_shellout_container_name
           end
+
+          system_shellout_livecheck! if do_livecheck
+
+          @system_shellout_container
         end
 
         def system_shellout(command, raise_error: false, **kwargs)
@@ -45,12 +52,6 @@ module Dapp
           else
             shellout _to_system_shellout_command(command), **kwargs
           end
-        rescue Error::Shellout => err
-          $stderr.puts "\033[1m\033[31mWARNING: System shellout container failure, " +
-                       "try to remove if error persists: " +
-                       "docker rm -f #{system_shellout_container_name}\033[0m"
-
-          raise Error::Shellout.new(code: :system_shell_command_failed, **err.net_status)
         end
 
         def system_shellout!(command, **kwargs)
@@ -59,6 +60,16 @@ module Dapp
 
         private
 
+        def system_shellout_livecheck!
+          # This is stupid container "live check" for now
+          system_shellout! 'true'
+        rescue Error::Shellout
+          $stderr.puts "\033[1m\033[31mSystem shellout container failure, " +
+                       "try to remove if error persists: " +
+                       "docker rm -f #{system_shellout_container_name}\033[0m"
+          raise
+        end
+
         def _to_system_shellout_command(command)
           cmd = shellout_pack ["cd #{Dir.pwd}", command].join(' && ')
           "docker exec #{system_shellout_container} chroot /.system_shellout_root #{bash_path} -ec '#{[

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.6.8'.freeze
+  VERSION = '0.6.9'.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.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout