dapp 0.26.7 → 0.26.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3505e2ebea991db664abc4a23e66afdf07fa6c6
-  data.tar.gz: 078351c116d7f94b585559db68303cd888ae1d3b
+  metadata.gz: 6efd6e4823be7cddb1e21d5a7ff7ac3faa5c6a3b
+  data.tar.gz: 5fd4fc5e3e92d5d3ca76a6755c43901741025637
 SHA512:
-  metadata.gz: 8eed4a2a01192400a139947f5d56d546f0c4c24825d948e13bbcd670576106461ce56771241da1a05a52051b2cdd0e9cdbaa89c86548e651a8b7f633af4a61a2
-  data.tar.gz: f32334d18d707b91c5c92e890f13aea5e883691fed3b31b87dc9db931be7fb673257057349a5c28acdf5327564a50354cad1e0ed80814e213850abd154e449eb
+  metadata.gz: 544564aaa7da8b80e5476c77877a87ffa7766c002892da3299ac13295aa938d58b762cb1b415d8f28334a66a3c0478463895ab2abbfa33eab82f8721931d41a0
+  data.tar.gz: de71ce126fac80dde41218166e3c8034877f04c9d0448c8ad8db0c47fd18d6ec8033f95dcef5041d6911e509e2741d8d9ca7559a4a3acf668ef7f9caf08b8ced

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

@@ -4,8 +4,6 @@ module Dapp
       module Directive
         class Dimg < Base
           module Validation
-            include Helper::Trivia
-
             def validate!
               directives_validate!
               validate_scratch!
@@ -141,13 +139,29 @@ module Dapp
             end
 
             def validate_artifact!(verifiable_artifact, artifact)
-              cases = []
-              cases << verifiable_artifact[:include_paths].any? do |verifiable_path|
-                !ignore_path?(verifiable_path, paths: artifact[:include_paths], exclude_paths: artifact[:exclude_paths])
+              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
               end
-              cases << verifiable_artifact[:include_paths].empty? && artifact[:include_paths].empty?
+            end
 
-              raise ::Dapp::Error::Config, code: :artifact_conflict if cases.any?
+            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
             end
 
             def _associated_artifacts

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

@@ -227,6 +227,22 @@ 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,22 +28,6 @@ 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.7"
+  VERSION = "0.26.8"
   BUILD_CACHE_VERSION = 27
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.26.7
+  version: 0.26.8
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout