code_manifest 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85dc605af26d3707bb98d61bf27ff898bb8582c5a11220b3b5d54bf17fc1f824
-  data.tar.gz: 856aa8f8a5e703e076aedfa4c4676245e6786eaa7ad834f967bfa8864b00ecee
+  metadata.gz: 57ebc00567f59f24c5be818a88ecb8d117175474290653d734a311d7718802de
+  data.tar.gz: b7a582abfe21b8f1eaf5beed11fe1244c43307d9e034c9a68da64ab4e9ff53b5
 SHA512:
-  metadata.gz: d36a050c65f13dac20af4a540007ad8ef5c8c396492c93a51541bcdffee3ec8413ce0e78d8b62e2c9c821f7a073817bad96f380058c4f5c2f02cc507c60269b0
-  data.tar.gz: 597149b71d2a7514989de7843e75621124b15e883a7d5e8bb62e935b3a834f514fedb2cf00f78b13fcfa86790efa6c1e8dd428dd0f50ddbd92c12ead27a8c560
+  metadata.gz: 6793af62e46f89a33aed509ef44c9bccfd4e280ec483a1a39ec405d2145112ae8ff5531c7bd4e197f45e6b1973901182327eda7ea54f922930c172b63d21a083
+  data.tar.gz: 88387c161220a1142bbd69a8d6811fe8de84d8bdb8a7381db027c76f193e5461f34bdc5fda4b9b802e5d0fc3b7202329d015c942703236e5c0d386b14b2bb2eb

data/lib/code_manifest/manifest.rb

@@ -16,7 +16,13 @@ module CodeManifest
     end
 
     def files
-      @files ||= (inclusion_files - exclusion_files).sort!.freeze
+      @files ||= begin
+        inclusion_files = Dir.glob(inclusion_rules.map(&:glob), GLOB_OPTIONS)
+        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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CodeManifest
-  VERSION = '1.4.0'
+  VERSION = '1.5.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.5.0
 platform: ruby
 authors:
 - Gusto Engineers