dapp 0.26.8 → 0.26.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6efd6e4823be7cddb1e21d5a7ff7ac3faa5c6a3b
-  data.tar.gz: 5fd4fc5e3e92d5d3ca76a6755c43901741025637
+  metadata.gz: a68a90c93c0fb793ac7a2e9fcb8b0c71f5bf4169
+  data.tar.gz: 82533b89393ec86b2ba58f59740414bcf3003ccf
 SHA512:
-  metadata.gz: 544564aaa7da8b80e5476c77877a87ffa7766c002892da3299ac13295aa938d58b762cb1b415d8f28334a66a3c0478463895ab2abbfa33eab82f8721931d41a0
-  data.tar.gz: de71ce126fac80dde41218166e3c8034877f04c9d0448c8ad8db0c47fd18d6ec8033f95dcef5041d6911e509e2741d8d9ca7559a4a3acf668ef7f9caf08b8ced
+  metadata.gz: 6f7a1535aad1d2a404626e94eabff80e1589536dfa8c7e57ea3e5a1b29d15a3fa7f79aaa58f6fca599d19d5934c4880f1fb3b06944872071b3784f0d56de7444
+  data.tar.gz: cd73f8ce59fe326811f83617195b928e83e15190827a7834c81562c942667f7c873ea93189771747b32aa3bad54a310a85f62574a3a86e7ec39532a885c4ed3b

data/lib/dapp/dimg/config/directive/dimg/validation.rb

@@ -4,6 +4,8 @@ module Dapp
       module Directive
         class Dimg < Base
           module Validation
+            include Helper::Trivia
+
             def validate!
               directives_validate!
               validate_scratch!
@@ -139,29 +141,13 @@ module Dapp
             end
 
             def validate_artifact!(verifiable_artifact, artifact)
-              verifiable_artifact[:include_paths].each do |verifiable_path|
-                potential_conflicts = artifact[:include_paths].select { |path| path.start_with?(verifiable_path) }
-                validate_artifact_path!(verifiable_artifact, potential_conflicts)
-              end
-
-              if verifiable_artifact[:include_paths].empty?
-                if artifact[:include_paths].empty? || verifiable_artifact[:exclude_paths].empty?
-                  raise ::Dapp::Error::Config, code: :artifact_conflict
-                else
-                  validate_artifact_path!(verifiable_artifact, artifact[:include_paths])
-                end
+              cases = []
+              cases << verifiable_artifact[:include_paths].any? do |verifiable_path|
+                !ignore_path?(verifiable_path, paths: artifact[:include_paths], exclude_paths: artifact[:exclude_paths])
               end
-            end
+              cases << (verifiable_artifact[:include_paths].empty? && artifact[:include_paths].empty?)
 
-            def validate_artifact_path!(verifiable_artifact, potential_conflicts)
-              raise ::Dapp::Error::Config, code: :artifact_conflict unless begin
-                potential_conflicts.all? do |path|
-                  loop do
-                    break if verifiable_artifact[:exclude_paths].include?(path) || ((path = File.dirname(path)) == '.')
-                  end
-                  verifiable_artifact[:exclude_paths].include?(path)
-                end
-              end
+              raise ::Dapp::Error::Config, code: :artifact_conflict if cases.any?
             end
 
             def _associated_artifacts

data/lib/dapp/dimg/git_repo/base.rb

@@ -227,22 +227,6 @@ module Dapp
             paths.empty? || paths.any? { |p| check_path?(path, p) || check_subpath?(path, p) }
           end
         end
-
-        def ignore_path?(path, paths: [], exclude_paths: [])
-          ignore_path_base(path, exclude_paths: exclude_paths) do
-            paths.empty? ||
-              paths.any? do |p|
-                File.fnmatch?(p, path, File::FNM_PATHNAME|File::FNM_DOTMATCH) ||
-                  File.fnmatch?(File.join(p, '**', '*'), path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
-              end
-          end
-        end
-
-        def ignore_path_base(path, exclude_paths: [])
-          is_exclude_path = exclude_paths.any? { |p| check_path?(path, p) }
-          is_include_path = yield
-          is_exclude_path || !is_include_path
-        end
       end
     end
   end

data/lib/dapp/helper/trivia.rb

@@ -28,6 +28,22 @@ module Dapp
         Pathname.new(File.join(base.to_s, *path.compact.map(&:to_s)))
       end
 
+      def ignore_path?(path, paths: [], exclude_paths: [])
+        ignore_path_base(path, exclude_paths: exclude_paths) do
+          paths.empty? ||
+            paths.any? do |p|
+              File.fnmatch?(p, path, File::FNM_PATHNAME|File::FNM_DOTMATCH) ||
+                File.fnmatch?(File.join(p, '**', '*'), path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
+            end
+        end
+      end
+
+      def ignore_path_base(path, exclude_paths: [])
+        is_exclude_path = exclude_paths.any? { |p| check_path?(path, p) }
+        is_include_path = yield
+        is_exclude_path || !is_include_path
+      end
+
       def check_path?(path, format)
         path_checker(path) { |checking_path| File.fnmatch(format, checking_path, File::FNM_PATHNAME|File::FNM_DOTMATCH) }
       end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.26.8"
+  VERSION = "0.26.9"
   BUILD_CACHE_VERSION = 27
 end

metadata

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