dapp 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36e8983506fe61c327ea8fda9cd52cab355b65cd
-  data.tar.gz: 8f19a707066d6e0be1613c5260d2539d69979c4f
+  metadata.gz: 47d4ca61c72282976ce1a025dbc00af3ce9ae5dd
+  data.tar.gz: 7ba0e4bb0f8aba250d4df9b9e16101883ca46ef2
 SHA512:
-  metadata.gz: dc2b15d20bfc7a5e34c3138c8552c06a1b43a4d16a5882adc7f46f771455230fb0456689a0eae7556784ab0eb4397a4be57c0978fa0eeb78320896db46ee704e
-  data.tar.gz: 1691cd707bc1ab86d32465d287a08b26efc2a8198bebf7dc0074d3b797b01ebaf17beb3ddf5cbd998a802c77703ab3840e551cdb3a9dcb3c7497ec9607524182
+  metadata.gz: a923babf8d0a05ee8e5772408e2cbf115c203df9305a2bff11ccba6e367d9d973d02fe29296dd9d1d799d0091ff96a60384d84ce6bbb497d29608d6bb22acda4
+  data.tar.gz: 2aed90c824516ad48148ef8b6e6af4b8c1b697a1f06c8a1102467eeda6452afc0b507c372459e06927d9794e7831d039c3c1a461a0df89e95841f8b1d5222e96

data/config/en/net_status.yml

@@ -3,12 +3,13 @@ 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!"
       git_branch_without_name: "Application has specific revision that isn't associated with a branch name!"
       ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
-      cookbooks_stage_checksum_not_calculated: "Cookbooks checksum not calculated for stage '%{stage}', run build first"
+      chef_stage_checksum_not_calculated: "Chef stage '%{stage}' checksum is not calculated yet, run build first"
     dappfile:
       incorrect: "Dappfile with '%{error}':\n%{message}"
     build:

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

@@ -40,7 +40,7 @@ module Dapp
             cwd_ = File.expand_path(File.join('/', cwd_))
             "#{application.project.find_path} #{File.join(from_, cwd_, path_)} #{excludes} -type f -exec " \
             "#{application.project.bash_path} -ec '#{application.project.install_path} -D #{credentials} {} " \
-            "#{File.join(to, "$(#{application.project.echo_path} {} | " \
+            "#{File.join(to, "$(echo {} | " \
             "#{application.project.sed_path} -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\;"
           end
 

data/lib/dapp/builder/chef.rb

@@ -50,8 +50,10 @@ module Dapp
         super
 
         %i(before_install install before_setup setup chef_cookbooks).each do |stage|
-          raise ::Dapp::Error::Application, code: :cookbooks_stage_checksum_not_calculated,
-                                            data: { stage: stage } unless stage_cookbooks_checksum_path(stage).exist?
+          unless stage_empty?(stage) or stage_cookbooks_checksum_path(stage).exist?
+            raise ::Dapp::Error::Application, code: :chef_stage_checksum_not_calculated,
+                                              data: { stage: stage }
+          end
         end
       end
 
@@ -198,7 +200,7 @@ module Dapp
             unless application.project.cli_options[:dev] || chef_cookbooks_stage
               commands.push(
                 ['if [ ! -f Berksfile.lock ] ; then ',
-                 "#{application.project.echo_path} \"Berksfile.lock not found\" 1>&2 ; ",
+                 "echo \"Berksfile.lock not found\" 1>&2 ; ",
                  'exit 1 ; ',
                  'fi'].join
               )
@@ -216,7 +218,7 @@ module Dapp
               commands.push(
                 "export LOCKDIFF=$(#{application.project.diff_path} -u1 Berksfile.lock #{berksfile_lock_path})",
                 ['if [ "$LOCKDIFF" != "" ] ; then ',
-                 "#{application.project.echo_path} -e \"Bad Berksfile.lock\n$LOCKDIFF\" 1>&2 ; ",
+                 "echo -e \"Bad Berksfile.lock\n$LOCKDIFF\" 1>&2 ; ",
                  'exit 1 ; ',
                  'fi'].join
               )
@@ -225,8 +227,8 @@ module Dapp
 
           vendor_commands = [
             "#{application.project.mkdir_path} -p ~/.ssh",
-            "#{application.project.echo_path} \"Host *\" >> ~/.ssh/config",
-            "#{application.project.echo_path} \"    StrictHostKeyChecking no\" >> ~/.ssh/config",
+            "echo \"Host *\" >> ~/.ssh/config",
+            "echo \"    StrictHostKeyChecking no\" >> ~/.ssh/config",
             *berksfile.local_cookbooks
                       .values
                       .map { |cookbook| "#{application.project.rsync_path} --archive --relative #{cookbook[:path]} /tmp/local_cookbooks" },
@@ -236,10 +238,10 @@ module Dapp
             *after_vendor_commands,
             ["#{application.project.find_path} /tmp/cookbooks -type d -exec #{application.project.bash_path} -ec '",
              "#{application.project.install_path} -o #{Process.uid} -g #{Process.gid} --mode $(#{application.project.stat_path} -c %a {}) -d ",
-             "#{dest_path}/$(#{application.project.echo_path} {} | #{application.project.sed_path} -e \"s/^\\/tmp\\/cookbooks//\")' \\;"].join,
+             "#{dest_path}/$(echo {} | #{application.project.sed_path} -e \"s/^\\/tmp\\/cookbooks//\")' \\;"].join,
             ["#{application.project.find_path} /tmp/cookbooks -type f -exec #{application.project.bash_path} -ec '",
              "#{application.project.install_path} -o #{Process.uid} -g #{Process.gid} --mode $(#{application.project.stat_path} -c %a {}) {} ",
-             "#{dest_path}/$(#{application.project.echo_path} {} | #{application.project.sed_path} -e \"s/\\/tmp\\/cookbooks//\")' \\;"].join,
+             "#{dest_path}/$(echo {} | #{application.project.sed_path} -e \"s/\\/tmp\\/cookbooks//\")' \\;"].join,
             "#{application.project.install_path} -o #{Process.uid} -g #{Process.gid} --mode 0644 <(#{application.project.date_path} +%s.%N) #{dest_path.join('.created_at')}"
           ]
 

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

@@ -4,7 +4,7 @@ module Dapp
       # Error
       class Error < ::Dapp::Error::Base
         def initialize(**net_status)
-          super(context: :chef, **net_status)
+          super(context: 'chef', **net_status)
         end
       end
     end # Chef

data/lib/dapp/project.rb

@@ -50,9 +50,11 @@ module Dapp
 
     def name
       @name ||= begin
-        system_shellout!("#{git_path} -C #{path} config --get remote.origin.url").stdout.strip.split('/').last[/.*(?=.git)/]
-      rescue Error::Shellout
-        File.basename(path)
+        if File.exist? File.join(path, '.git')
+          system_shellout("#{git_path} -C #{path} config --get remote.origin.url").stdout.strip.split('/').last[/.*(?=.git)/] rescue File.basename(path)
+        else
+          File.basename(path)
+        end
       end
     end
 

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

@@ -36,7 +36,7 @@ module Dapp
         end
 
         def shellout_pack(command)
-          "eval $(#{echo_path} #{Base64.strict_encode64(command)} | base64 --decode)"
+          "eval $(echo #{Base64.strict_encode64(command)} | base64 --decode)"
         end
 
         class << self
@@ -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 }
+            raise Error::Shellout, code: class_to_lowercase(e.class), data: { stream: stream.show, backtrace: e.backtrace.join("\n") }
           end
         end
       end

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

@@ -39,19 +39,29 @@ module Dapp
           end
         end
 
-        def system_shellout(command, **kwargs)
-          shellout _to_system_shellout_command(command), **kwargs
+        def system_shellout(command, raise_error: false, **kwargs)
+          if raise_error
+            shellout! _to_system_shellout_command(command), **kwargs
+          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)
-          shellout! _to_system_shellout_command(command), **kwargs
+          system_shellout(command, raise_error: true, **kwargs)
         end
 
         private
 
         def _to_system_shellout_command(command)
           cmd = shellout_pack ["cd #{Dir.pwd}", command].join(' && ')
-          "docker exec #{system_shellout_container} chroot /.system_shellout_root bash -ec '#{[
+          "docker exec #{system_shellout_container} chroot /.system_shellout_root #{bash_path} -ec '#{[
             *System.default_env_keys.map do |env_key|
               env_key = env_key.to_s.upcase
               "export #{env_key}=#{ENV[env_key]}"

data/lib/dapp/version.rb

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