dapp 0.25.4 → 0.25.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f8b94dc2665bba6934c39813848595c8db31bce
-  data.tar.gz: 255de6fe504d56d652d80556116d1bc8a67a7572
+  metadata.gz: d74d1fab60b30763f46d622690469bb1d8c6e5f8
+  data.tar.gz: b5ec340a6983661f871768b0165011ad5917d949
 SHA512:
-  metadata.gz: ed0477eb868084bddad54194e4d34951c8fcb1695c68505f79f9916f0e846f3ca51cdd943cffa55f8806506b106ef08f10816351a5c1cbb7845d92da779689aa
-  data.tar.gz: a41ec7cf277d2522b530fc3d573cb122d1a207a4ff46d82c5f7ff7cfeaf87f4b2f99d3218b7b64611aaeb1c6eee51a29799ae4a58dd3431930958b50dd0766b3
+  metadata.gz: 079d63476a6cdd1fb18b250c5f5d70be7bf407b189f04b7ef75e3db816e0912e192288a2b038fc17e4dcbc27e1f25b8d8c56df120a3abd5382cc2dba8b5fe86a
+  data.tar.gz: 56103601183838829b6fa8297f9dd7d3572201a7e4800aef8c55ed696b18951c4839d07970192966be288a9f2e77a5c3b5e3b53181e6a6a994578265bf1a15c4

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.25.4"
-  BUILD_CACHE_VERSION = 26
+  VERSION = "0.25.5"
+  BUILD_CACHE_VERSION = 26.1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.25.4
+  version: 0.25.5
 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