dapp 0.24.8 → 0.24.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06c42cce69580f08832c3a7e1bbcd1cf9e2eb8bc
-  data.tar.gz: 77449a953f827b4d6af23c7e6785e07ea7a3eb09
+  metadata.gz: 1b440e9acd2b5f064542280a357a1dec5a4ccd76
+  data.tar.gz: 2431741ec03503767ba515e97e942992f8eb0c9c
 SHA512:
-  metadata.gz: af7b59b06964e7395343e8d051664043f3cfa77f818b9e9feb9b362f86b74f0a8653d158d1aec754b6f0c403b79de73e2fb286e03565d7ad7e0e128950f105ad
-  data.tar.gz: 1062f6f13d694ceaa1523e4bba93a90e8b346437990664a84405eddc4623c18e550c96ec27bd6207ce576d77f4282d90b9da6bc8a64a0969d36d2aeef2cc6a58
+  metadata.gz: dfc8c4040ba9513c701f05a5a7143e7ee262516be2d09426f593b617c91085fc1dbf8c7f5a999f3d94ecbdf5ad45cda8ae563926b84f4172d52f3a831e64e833
+  data.tar.gz: 8629e9a015c15f89e67f6c11966c7a3498b17d2a7ce44feef1a368886b0b2c239ba6f8e9a2b545a971678b297a67e4b56e8cffa8839e8a2597dfe50bfe1b5263

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!
@@ -138,29 +140,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_artifact.rb

@@ -121,7 +121,7 @@ module Dapp
           last_part_path = path_parts.shift
           test_path      = [test_path, last_part_path].compact.join('/')
 
-          non_match    = !File.fnmatch(test_path, embedded_rel_path, File::FNM_PATHNAME)
+          non_match    = !File.fnmatch(test_path, embedded_rel_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
           part_for_all = (last_part_path == '**')
 
           if non_match || part_for_all

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.fnmatch?(File.join(p, '**', '*'), path, File::FNM_PATHNAME)
-              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,12 +28,28 @@ 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) }
+        path_checker(path) { |checking_path| File.fnmatch(format, checking_path, File::FNM_PATHNAME|File::FNM_DOTMATCH) }
       end
 
       def check_subpath?(path, format)
-        path_checker(format) { |checking_path| File.fnmatch(checking_path, path, File::FNM_PATHNAME) }
+        path_checker(format) { |checking_path| File.fnmatch(checking_path, path, File::FNM_PATHNAME|File::FNM_DOTMATCH) }
       end
 
       def path_checker(path)

data/lib/dapp/kube/dapp/command/render.rb

@@ -13,8 +13,8 @@ module Dapp
                       template_relative_path_pattern = Pathname(File.expand_path(template_path_pattern)).subpath_of(path('.helm'))
                       template_relative_path_pattern ||= template_path_pattern
 
-                      File.fnmatch?(template_relative_path_pattern, template_path_without_chart_name, File::FNM_PATHNAME) ||
-                        File.fnmatch?(template_relative_path_pattern, template_path, File::FNM_PATHNAME)
+                      File.fnmatch?(template_relative_path_pattern, template_path_without_chart_name, File::FNM_PATHNAME|File::FNM_DOTMATCH) ||
+                        File.fnmatch?(template_relative_path_pattern, template_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
                     end
                   end
                 else

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.24.8"
-  BUILD_CACHE_VERSION = 26
+  VERSION = "0.24.9"
+  BUILD_CACHE_VERSION = 26.1
 end

metadata

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