code_manifest 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1933fca25570b9db88c444401b2be9ebac5f75550959af0afdcfd0df1c94dd2
-  data.tar.gz: a4372d5d3bc2ebbc1e0373636a23e5b974af6a24dc5f64f496a3794715f93809
+  metadata.gz: 57ebc00567f59f24c5be818a88ecb8d117175474290653d734a311d7718802de
+  data.tar.gz: b7a582abfe21b8f1eaf5beed11fe1244c43307d9e034c9a68da64ab4e9ff53b5
 SHA512:
-  metadata.gz: c848fc474a9a5f59e3e4d55588d1781b2d4a1834314a4a0bf511779046ae7a020635f233e77502fb32f852d58af817fce07ccd3159b8bedc2d4f58f6543495cd
-  data.tar.gz: 52ebaf7b9d59a2546112f9c5180f3add24cc7ae28c5022db26160a27ff0ee4e1f42c09f8ba49cafcaae733d730799d8215f82f8f4e9731fd06a5d95269e8692d
+  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
@@ -27,11 +33,11 @@ module CodeManifest
     end
 
     def matches(paths)
-      result_paths = paths.select do |path|
+      result_paths = Array(paths).select do |path|
         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,29 +45,22 @@ 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
 
     def files_with_relative_path(files)
-      files.map do |file|
-        pathname = Pathname.new(file)
-        next if pathname.directory?
+      prefix = File.join(CodeManifest.root, "/")
+
+      files.filter_map do |file|
+        next if File.directory?(file)
 
-        pathname.relative_path_from(CodeManifest.root).to_s
-      end.compact
+        file.delete_prefix(prefix)
+      end
     end
   end
 end

data/lib/code_manifest/rule.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'pathname'
-
 module CodeManifest
   class Rule
     attr_reader :exclude, :glob
@@ -26,10 +24,9 @@ module CodeManifest
     end
 
     def match?(file)
-      file = Pathname.new(file)
-      file = @root.join(file) unless file.absolute?
+      file = File.join(@root, file) unless File.absolute_path?(file)
 
-      File.fnmatch?(glob, file.to_s, Manifest::GLOB_OPTIONS)
+      File.fnmatch?(glob, file, Manifest::GLOB_OPTIONS)
     end
   end
 end

data/lib/code_manifest/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_manifest
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -41,7 +41,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/rubyatscale/code_manifest
   source_code_uri: https://github.com/rubyatscale/code_manifest
-  changelog_uri: https://github.com/rubyatscale/code_manifest/blob/main/releases
+  changelog_uri: https://github.com/rubyatscale/code_manifest/releases
 post_install_message: 
 rdoc_options: []
 require_paths: