code_manifest 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85dc605af26d3707bb98d61bf27ff898bb8582c5a11220b3b5d54bf17fc1f824
-  data.tar.gz: 856aa8f8a5e703e076aedfa4c4676245e6786eaa7ad834f967bfa8864b00ecee
+  metadata.gz: 211b0ae49d5f5dce85d9f53d13c20c27e6d1cb00a57a6a74dc7ac2a2382531e7
+  data.tar.gz: 112bd81d18216f690854b91959fcd0b8751f1920c0c91a6f4f04e7d1a6966456
 SHA512:
-  metadata.gz: d36a050c65f13dac20af4a540007ad8ef5c8c396492c93a51541bcdffee3ec8413ce0e78d8b62e2c9c821f7a073817bad96f380058c4f5c2f02cc507c60269b0
-  data.tar.gz: 597149b71d2a7514989de7843e75621124b15e883a7d5e8bb62e935b3a834f514fedb2cf00f78b13fcfa86790efa6c1e8dd428dd0f50ddbd92c12ead27a8c560
+  metadata.gz: 91c7488e0b6f981f86b7abd43528c5c6f042092f8fa5ae48719aa4ebb8a2185c5119e638b48d7b07f716a77391da126bdbd152288b1a930d03dc9d60117067a4
+  data.tar.gz: 4c95aaa6414587ff839299847a3e583808fb98538ba378a0b90aae29660362082cbfc5912f6dad70d3a594d37f6aadb5fd7ee7dc351faa0b6dd992df9c92d999

data/lib/code_manifest/manifest.rb

@@ -11,12 +11,18 @@ module CodeManifest
 
     def initialize(patterns)
       @rules ||= Array(patterns).map do |pattern|
-        Rule.new(CodeManifest.root, pattern)
+        Rule.new(pattern)
       end
     end
 
     def files
-      @files ||= (inclusion_files - exclusion_files).sort!.freeze
+      @files ||= begin
+        inclusion_files = Dir.glob(inclusion_rules.map(&:glob), GLOB_OPTIONS, base: CodeManifest.root)
+        inclusion_files.delete_if do |file|
+          exclusion_rules.any? { |rule| rule.match?(file) }
+        end
+        files_with_relative_path(inclusion_files).sort!.freeze
+      end
     end
 
     def digest
@@ -31,7 +37,7 @@ module CodeManifest
         inclusion_rules.any? { |rule| rule.match?(path) }
       end
       result_paths.reject! do |path|
-        exclusion_files.any? { |rule| rule.match?(path) }
+        exclusion_rules.any? { |rule| rule.match?(path) }
       end
 
       result_paths.sort!
@@ -39,18 +45,10 @@ module CodeManifest
 
     private
 
-    def inclusion_files
-      @inclusion_files ||= files_with_relative_path(Dir.glob(inclusion_rules.map(&:glob), GLOB_OPTIONS))
-    end
-
     def inclusion_rules
       @inclusion_rules ||= rules.reject(&:exclude)
     end
 
-    def exclusion_files
-      @exclusion_files ||= files_with_relative_path(Dir.glob(exclusion_rules.map(&:glob), GLOB_OPTIONS))
-    end
-
     def exclusion_rules
       @exclusion_rules ||= rules.select(&:exclude)
     end

data/lib/code_manifest/rule.rb

@@ -4,27 +4,27 @@ module CodeManifest
   class Rule
     attr_reader :exclude, :glob
 
-    def initialize(root, pattern)
-      @root = root
+    def initialize(pattern)
       @exclude = false
-      @glob = @root
+      @glob = pattern
 
-      if pattern.start_with?('!')
+      if glob.start_with?("!")
         @exclude = true
-        pattern = pattern[1..-1]
+        @glob = glob.delete_prefix("!")
       end
 
-      if pattern.start_with?('/')
-        pattern = pattern[1..-1]
+      if File.absolute_path?(glob)
+        @glob = glob.delete_prefix(File::SEPARATOR)
       else
-        @glob = @glob.join('**')
+        @glob = File.join("**", glob)
       end
-
-      @glob = @glob.join(pattern).to_s
     end
 
     def match?(file)
-      file = File.join(@root, file) unless File.absolute_path?(file)
+      if File.absolute_path?(file)
+        prefix = File.join(CodeManifest.root, "/")
+        file = file.delete_prefix(prefix)
+      end
 
       File.fnmatch?(glob, file, Manifest::GLOB_OPTIONS)
     end

data/lib/code_manifest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CodeManifest
-  VERSION = '1.4.0'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code_manifest
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Gusto Engineers