dapp 0.31.14 → 0.31.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81e7efe28f6b62a181ec00ce109dd383b8d695ee054dd32945b271682df67284
-  data.tar.gz: 64d5840ef6985750b91cb1e7849db0d3879910b98bed488dfa4e951c827a4698
+  metadata.gz: 7c8038323b15eae4d8ca002fe75314d1ec15c6399af305442e7d8a163a981013
+  data.tar.gz: f22e2c78582d721b9b1aec1d1db953d3188c49eaea75d7de6183eccdc24028a6
 SHA512:
-  metadata.gz: a404ae91e5b71dfabad3124a60598bd19b2a6f90c764d58b166a6afe9c9831d330f9a674b2601526cd92f77af7cb94682359a2a7474a0f43c83f13aa8cfb3299
-  data.tar.gz: 4f76565042e428820592f7d7fd017a5a6401a72c70e4dff636cd7da25a52025886c8364e1d711bf56eff37ea90c3a84eed166b0c32eba5d7a5d9b4a129862ce3
+  metadata.gz: 5cbdef16dd8859b9b1df96a5b5edb62d561f039515366508ec3ae6e2c333b811ab0e08eda0cb6ed6cb675f30f51485cae754c84dc13f7ca7828ec3ae7e53efbd
+  data.tar.gz: eca193fd863de5c8386656c13bcf44f1d5b8c3dc81617c0f8e8fe35621160ba9c96d5eb18514300085c749af127ab4ca4533ba577f2339c6fe5621f314f28f61

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

@@ -62,10 +62,11 @@ module Dapp
           stream = Stream.new
           if verbose && !quiet
             kwargs[:live_stream] = Proxy::Base.new(stream, STDOUT, with_time: time)
+            kwargs[:live_stderr] = Proxy::Error.new(stream, STDERR, with_time: time)
           else
             kwargs[:live_stdout] = Proxy::Base.new(stream, with_time: time)
+            kwargs[:live_stderr] = Proxy::Error.new(stream, with_time: time)
           end
-          kwargs[:live_stderr] = Proxy::Error.new(stream, with_time: time)
 
           shellout(*args, **kwargs).tap(&:error!)
         rescue ::Mixlib::ShellOut::ShellCommandFailed => e

data/lib/dapp/dimg/builder/ansible.rb

@@ -155,7 +155,6 @@ module Dapp
             image.add_env('PYTHONPATH', container_workdir.join('lib'))
             image.add_env('PYTHONIOENCODING', 'utf-8')
             image.add_env('ANSIBLE_PREPEND_SYSTEM_PATH', dimg.dapp.dappdeps_base_path)
-            image.add_env('LC_ALL', 'C.UTF-8')
             image.add_volumes_from("#{ansible_container}:rw")
             image.add_volume "#{host_workdir(stage)}:#{container_workdir}:ro"
             image.add_volume "#{host_tmpdir(stage)}:#{container_tmpdir}:rw"

data/lib/dapp/dimg/git_artifact.rb

@@ -108,7 +108,7 @@ module Dapp
           options[:owner]               = owner
           options[:group]               = group
 
-          options[:ignore_signature_auto_calculation]= ignore_signature_auto_calculation
+          options[:ignore_signature_auto_calculation] = ignore_signature_auto_calculation
         end
       end
 
@@ -130,15 +130,20 @@ module Dapp
           test_path         = [test_path, current_path_part].compact.join('/')
 
           match = File.fnmatch(test_path, embedded_rel_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
-          break unless match || File.fnmatch(File.join(test_path, '**'), embedded_rel_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
+          break unless match ||
+            File.fnmatch(File.join(test_path, '**'), embedded_rel_path, File::FNM_PATHNAME|File::FNM_DOTMATCH) ||
+            check_subpath?(test_path, embedded_rel_path)
 
           any = (current_path_part == '**')
 
           if any
             inherited_paths << [current_path_part, path_parts].flatten.join('/')
             inherited_paths << path_parts.join('/') unless path_parts.empty?
-          elsif match
-            inherited_paths << (path_parts.empty? ? '**' : path_parts.join('/'))
+          elsif match && !path_parts.empty?
+            inherited_paths << path_parts.join('/')
+            break
+          elsif path_parts.empty?
+            inherited_paths << '**'
             break
           end
         end
@@ -305,9 +310,9 @@ module Dapp
             else
               repo.head_commit
             end
-          end.tap do |c|
-            repo.dapp.log_info("Repository `#{repo.name}`: latest commit `#{c}` to `#{to}`") unless ignore_signature_auto_calculation
           end
+        end.tap do |c|
+          repo.dapp.log_info("Repository `#{repo.name}`: latest commit `#{c}` to `#{to}`") unless ignore_signature_auto_calculation
         end
       end
 
@@ -369,10 +374,11 @@ module Dapp
       def archive_file_with_tar_writer(stage, commit)
         tar_write(dimg.tmp_path('archives', archive_file_name(commit))) do |tar|
           each_archive_entry(stage, commit) do |path, content, mode|
+            relative_path = path[1..-1]
             if mode == 0o120000 # symlink
-              tar.add_symlink path, content, mode
+              tar.add_symlink relative_path, content, mode
             else
-              tar.add_file path, mode do |tf|
+              tar.add_file relative_path, mode do |tf|
                 tf.write content
               end
             end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.14"
+  VERSION = "0.31.15"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.31.14
+  version: 0.31.15
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout