dapp 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a647be59d32b6991038c53294f960aaf15030cb
-  data.tar.gz: 2eb63c5bd2b5e6a216a9d126265b5ce73787abc3
+  metadata.gz: 40169e89d8925c041d21e62f299117ae75974a75
+  data.tar.gz: 7967139ea2e4433fe4328e3567640fdf4bf2c4d4
 SHA512:
-  metadata.gz: e3c7db9cf1cb215c5b6971b2be5be767296d83c744c9b93bf749ec39c32b6035d13d460562f1fcd8ece95a6d23af3568080d8c81879450b8c21a966b530b48a6
-  data.tar.gz: 56e0c351bb05e9dce18598755a53f96f2f82784290fced28e0735d0e15da94a8bf943e1d04dcf16cfba555f2bedb4f728fb95246310c87f61a9a2194d10b49c6
+  metadata.gz: ad73a8b4e86664bb5b3751a0cb0e347c71ca3a0467621120dcd3ce55a01c70b1181fd8cfbc26cb8dec2307963e9a07e211d29aaf58351d0f443ab417385cad95
+  data.tar.gz: 9826816cb89d9d6b913f7e345f4f0d96cce6301eb0021954570230a6f7ff621f246d8e64ea92fdbc364fe659d5246544f8d7bbaf0e36e3ad08b1d1203b6d2b20

data/bin/dapp

@@ -8,11 +8,16 @@ require 'dapp'
 begin
   begin
     Dapp::CLI.new.run
+  rescue ::SystemExit
+    raise
   rescue ::Exception => e
-    ::File.open('/tmp/dapp-stacktrace.out', 'a') do |dapp_stacktrace|
-      dapp_stacktrace.write [*e.backtrace, "\n"].join("\n")
+    "/tmp/dapp-stacktrace-#{SecureRandom.uuid}.out".tap do |filename|
+      ::File.open(filename, 'w') do |dapp_stacktrace|
+        dapp_stacktrace.write "#{e.backtrace.join("\n")}\n"
+      end
+      $stderr.puts "\033[1m\033[31mStacktrace dumped to #{filename}\033[0m"
     end
-    $stderr.puts "\033[1m\033[31mStacktrace dumped to /tmp/dapp-stacktrace.out\033[0m"
+
     raise
   end
 rescue Dapp::Error::Shellout => e

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

@@ -82,8 +82,8 @@ module Dapp
           image.add_service_change_label 'dapp-cache-version'.to_sym => Dapp::BUILD_CACHE_VERSION
 
           if application.project.ssh_auth_sock
-            image.add_volume "#{application.project.ssh_auth_sock}:#{application.project.ssh_auth_sock}"
-            image.add_env 'SSH_AUTH_SOCK', application.project.ssh_auth_sock
+            image.add_volume "#{application.project.ssh_auth_sock}:/tmp/dapp-ssh-agent"
+            image.add_env 'SSH_AUTH_SOCK', '/tmp/dapp-ssh-agent'
           end
         end
 
@@ -112,10 +112,13 @@ module Dapp
           if empty?
             prev_stage.signature
           else
-            hashsum [prev_stage.signature, *dependencies.flatten]
+            hashsum [prev_stage.signature, builder_checksum, *dependencies.flatten]
           end
         end
 
+        def builder_checksum
+        end
+
         def dependencies
           []
         end

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

@@ -12,8 +12,12 @@ module Dapp
           super && !application.builder.before_install?
         end
 
+        def builder_checksum
+          application.builder.before_install_checksum
+        end
+
         def context
-          [application.builder.before_install_checksum]
+          [builder_checksum]
         end
 
         def prepare_image

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

@@ -12,8 +12,12 @@ module Dapp
           !application.builder.before_setup?
         end
 
+        def builder_checksum
+          application.builder.before_setup_checksum
+        end
+
         def context
-          [application.builder.before_setup_checksum]
+          [builder_checksum]
         end
 
         def prepare_image

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

@@ -12,8 +12,12 @@ module Dapp
           !application.builder.build_artifact?
         end
 
+        def builder_checksum
+          application.builder.build_artifact_checksum
+        end
+
         def context
-          [artifact_dependencies_files_checksum, application.builder.build_artifact_checksum]
+          [artifact_dependencies_files_checksum, builder_checksum]
         end
 
         def prepare_image

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

@@ -15,8 +15,12 @@ module Dapp
             !application.builder.install?
           end
 
+          def builder_checksum
+            application.builder.install_checksum
+          end
+
           def context
-            [install_dependencies_files_checksum, application.builder.install_checksum]
+            [install_dependencies_files_checksum, builder_checksum]
           end
 
           def prepare_image

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

@@ -15,8 +15,12 @@ module Dapp
             !application.builder.setup?
           end
 
+          def builder_checksum
+            application.builder.setup_checksum
+          end
+
           def context
-            [setup_dependencies_files_checksum, application.builder.setup_checksum]
+            [setup_dependencies_files_checksum, builder_checksum]
           end
 
           def prepare_image

data/lib/dapp/builder/chef.rb

@@ -251,9 +251,9 @@ module Dapp
              *berksfile.local_cookbooks
                        .values
                        .map { |cookbook| "--volume #{cookbook[:path]}:#{cookbook[:path]}" },
-             ("--volume #{application.project.ssh_auth_sock}:#{application.project.ssh_auth_sock}" if application.project.ssh_auth_sock),
+             ("--volume #{application.project.ssh_auth_sock}:/tmp/dapp-ssh-agent" if application.project.ssh_auth_sock),
              "--volume #{dest_path.tap(&:mkpath)}:#{dest_path}",
-             ("--env SSH_AUTH_SOCK=#{application.project.ssh_auth_sock}" if application.project.ssh_auth_sock),
+             ("--env SSH_AUTH_SOCK=/tmp/dapp-ssh-agent" if application.project.ssh_auth_sock),
              ('--env DAPP_CHEF_COOKBOOKS_VENDORING=1' if chef_cookbooks_stage),
              "dappdeps/berksdeps:0.1.0 #{application.project.bash_path} -ec '#{application.project.shellout_pack(vendor_commands.join(' && '))}'"].compact.join(' '),
              log_verbose: application.project.log_verbose?

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.6.9'.freeze
-  BUILD_CACHE_VERSION = 3
+  VERSION = '0.6.10'.freeze
+  BUILD_CACHE_VERSION = 4
 end

metadata

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