dapp 0.21.13 → 0.21.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ce5005fb6e0eb05a281c35ea110b15cf00fd663e
-  data.tar.gz: fceb0e4c395aef5bf854a76bb7f041bde0b1f65d
+SHA256:
+  metadata.gz: f28c3e192eccbff3666e393d68fd873bd15399bfe67f13f9796b9d61b4341073
+  data.tar.gz: 222f635d8f20ef23bccf30551cc55f6838e42dfa7c97f3002e8bf9369f407268
 SHA512:
-  metadata.gz: 64714ff2147d0b123e3b2bdbdfb84a47db6fe140e47a272ae3fbcd5c7ecd408ae348a0b322b83e4bbcc0b2de082ba9be6f1ea9a41d352c2f4fc28f543653df57
-  data.tar.gz: 3485853cc5256deb0e044c29ba8ce931bd460db0c47776125bf95a8805cbfb0cd35fd5dca51e5df1916abf2d09d14bdb4bf4580729de441c2d1be85df68b1f9e
+  metadata.gz: a0e9b4d7a79ca9ed9dc34a180fb9640c094326b35277fae1ac678d39fd6179e462280ce4289439a7234967d4410a65087057dc1bb6fa6725fc175ba9c60a95ff
+  data.tar.gz: bf3cb068a94e4dd3d28faecc9731ee54064c3c918b4f4904714c07973531af215b99356a2f26acf85a22a65aacec1302eb7903ddc02cf420f52726e499619d5a

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!
@@ -140,29 +142,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 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 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 Error::Config, code: :artifact_conflict if cases.any?
             end
 
             def _associated_artifacts

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

@@ -3,6 +3,8 @@ module Dapp
     module GitRepo
       # Base class for any Git repo (remote, gitkeeper, etc)
       class Base
+        include Helper::Trivia
+
         attr_reader :name
 
         def initialize(manager, name)
@@ -127,32 +129,6 @@ module Dapp
         def git(**kwargs)
           @git ||= Rugged::Repository.new(path.to_s, **kwargs)
         end
-
-        private
-
-        def ignore_path?(path, paths: [], exclude_paths: [])
-          is_exclude_path = exclude_paths.any? { |p| check_path?(path, p) }
-          is_include_path = begin
-            paths.empty? ||
-              paths.any? do |p|
-                File.fnmatch?(p, path, File::FNM_PATHNAME) ||
-                  File.fnmatch?(File.join(p, '**', '*'), path, File::FNM_PATHNAME)
-              end
-          end
-
-          is_exclude_path || !is_include_path
-        end
-
-        def check_path?(path, format)
-          path_parts = path.split('/')
-          checking_path = nil
-
-          until path_parts.empty?
-            checking_path = [checking_path, path_parts.shift].compact.join('/')
-            return true if File.fnmatch?(format, checking_path, File::FNM_PATHNAME)
-          end
-          false
-        end
       end
     end
   end

data/lib/dapp/helper/trivia.rb

@@ -28,6 +28,41 @@ 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
+
+      def check_subpath?(path, format)
+        path_checker(format) { |checking_path| File.fnmatch(checking_path, path, File::FNM_PATHNAME|File::FNM_DOTMATCH) }
+      end
+
+      def path_checker(path)
+        path_parts = path.split('/')
+        checking_path = nil
+
+        until path_parts.empty?
+          checking_path = [checking_path, path_parts.shift].compact.join('/')
+          return true if yield checking_path
+        end
+        false
+      end
+
       def self.class_to_lowercase(class_name = self)
         class_name.to_s.split('::').last.split(/(?=[[:upper:]]|[0-9])/).join('_').downcase.to_s
       end

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.21.13'.freeze
-  BUILD_CACHE_VERSION = 24.1
+  VERSION = '0.21.14'.freeze
+  BUILD_CACHE_VERSION = 24.2
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.21.13
+  version: 0.21.14
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-21 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -711,7 +711,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell