dapp 0.31.15 → 0.31.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c8038323b15eae4d8ca002fe75314d1ec15c6399af305442e7d8a163a981013
-  data.tar.gz: f22e2c78582d721b9b1aec1d1db953d3188c49eaea75d7de6183eccdc24028a6
+  metadata.gz: 006840d395cb3bbe50c14ed013d13900d248b792a47a736225c4c76cad7cbf89
+  data.tar.gz: b2b562cd536848897deb0a4a5ee5e52dd39eac404f69a2446137d50354624489
 SHA512:
-  metadata.gz: 5cbdef16dd8859b9b1df96a5b5edb62d561f039515366508ec3ae6e2c333b811ab0e08eda0cb6ed6cb675f30f51485cae754c84dc13f7ca7828ec3ae7e53efbd
-  data.tar.gz: eca193fd863de5c8386656c13bcf44f1d5b8c3dc81617c0f8e8fe35621160ba9c96d5eb18514300085c749af127ab4ca4533ba577f2339c6fe5621f314f28f61
+  metadata.gz: 4fafadbb602e99b7a0d3bafb6f01baa5735e244326d113fce719da93f092b33e787581f8844fe3c81b44dc397fba9d0b4b02a7ea5fb809834b106dafcbd2bf42
+  data.tar.gz: babf779c57652dfc0e1b632e093674b555520fb4b9ced2ff9131ea65045db4f666a3e60a22b48c4c3e168bab7d87989c97790c0097f524540af5f56761bd8e9d

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,20 +130,15 @@ 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) ||
-            check_subpath?(test_path, embedded_rel_path)
+          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 && !path_parts.empty?
-            inherited_paths << path_parts.join('/')
-            break
-          elsif path_parts.empty?
-            inherited_paths << '**'
+          elsif match
+            inherited_paths << (path_parts.empty? ? '**' : path_parts.join('/'))
             break
           end
         end
@@ -310,9 +305,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
 

data/lib/dapp/version.rb

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

metadata

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