dapp 0.26.6 → 0.26.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cf103585b6af6f69328db17a5361fb4af9c78f4
-  data.tar.gz: f2602f349771558cfcad3320b758f1fbbaa9e766
+  metadata.gz: c3505e2ebea991db664abc4a23e66afdf07fa6c6
+  data.tar.gz: 078351c116d7f94b585559db68303cd888ae1d3b
 SHA512:
-  metadata.gz: 707366341a8cd92b8c1ca5d20d33c1bc48df7924d14d0af49a2939aa5927be075c2dbad3582ea35ea19f65f475ed5f9d2201b17c2cfb92a08bdc410c62ba5bc4
-  data.tar.gz: d86ff224672bb834c6076c3066b3245cf0917e0b9473bfe5aba3aebea5a9de346b74f02686540c05b2ef1f9f01acd02e33eb6470af1abb44d6649b2b7c7bd66e
+  metadata.gz: 8eed4a2a01192400a139947f5d56d546f0c4c24825d948e13bbcd670576106461ce56771241da1a05a52051b2cdd0e9cdbaa89c86548e651a8b7f633af4a61a2
+  data.tar.gz: f32334d18d707b91c5c92e890f13aea5e883691fed3b31b87dc9db931be7fb673257057349a5c28acdf5327564a50354cad1e0ed80814e213850abd154e449eb

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.6"
+  VERSION = "0.26.7"
   BUILD_CACHE_VERSION = 27
 end

metadata

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