dapp 0.31.16 → 0.31.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 006840d395cb3bbe50c14ed013d13900d248b792a47a736225c4c76cad7cbf89
-  data.tar.gz: b2b562cd536848897deb0a4a5ee5e52dd39eac404f69a2446137d50354624489
+  metadata.gz: 56078669b17f0c4c260030c78d1e5bab8d685932b57dda8dbcbb846e3dd713c1
+  data.tar.gz: 1ced7dac48869994788448b826a6cb6dd19e032f617b023bc27d8e28bf7d4298
 SHA512:
-  metadata.gz: 4fafadbb602e99b7a0d3bafb6f01baa5735e244326d113fce719da93f092b33e787581f8844fe3c81b44dc397fba9d0b4b02a7ea5fb809834b106dafcbd2bf42
-  data.tar.gz: babf779c57652dfc0e1b632e093674b555520fb4b9ced2ff9131ea65045db4f666a3e60a22b48c4c3e168bab7d87989c97790c0097f524540af5f56761bd8e9d
+  metadata.gz: 937f880fdccf900637b9b2e008fbc3822c3411f082739863d40cd123736a91dfefa254d952602778a2ea95856cd8872f122e96540167811cd2b5ad4e88f998ce
+  data.tar.gz: 1c07196e67f4e0e5ee3917f8d2742df31e81d04fefeeba9fe2873071b1e4e188e8d9c7bb4ff6a81774cc364e6480d0a10078a2ff03d293b99ede4a1b3b5b65ce

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,18 @@ 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)
 
           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 +308,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,7 +372,7 @@ 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]
+            relative_path = path.reverse.chomp('/').reverse
             if mode == 0o120000 # symlink
               tar.add_symlink relative_path, content, mode
             else

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.16"
-  BUILD_CACHE_VERSION = 30
+  VERSION = "0.31.17"
+  BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.31.16
+  version: 0.31.17
 platform: ruby
 authors:
 - Dmitry Stolyarov