Optimize and release 1.6.0

Author: ngan

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code_manifest (1.5.0)
+    code_manifest (1.6.0)
 
 GEM
   remote: https://rubygems.org/

lib/code_manifest/manifest.rb

@@ -11,13 +11,13 @@ class Manifest
 
     def initialize(patterns)
       @rules ||= Array(patterns).map do |pattern|
-        Rule.new(CodeManifest.root, pattern)
+        Rule.new(pattern)
       end
     end
 
     def files
       @files ||= begin
-        inclusion_files = Dir.glob(inclusion_rules.map(&:glob), GLOB_OPTIONS)
+        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

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

lib/code_manifest/version.rb

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

spec/lib/code_manifest/rule_spec.rb

@@ -6,9 +6,9 @@
 require 'tmpdir'
 
 RSpec.describe CodeManifest::Rule do
-  let(:root) { Pathname.new('tmp/rule_spec').expand_path }
+  let(:root) { CodeManifest.root }
   let(:pattern) { '**/*' }
-  let(:rule) { described_class.new(root, pattern) }
+  let(:rule) { described_class.new(pattern) }
 
   describe '#exclude' do
     context 'when exclude pattern' do
@@ -31,15 +31,15 @@
       let(:pattern) { '/foo' }
 
       it 'returns rooted glob' do
-        expect(rule.glob).to eq(root.join('foo').to_s)
+        expect(rule.glob).to eq('foo')
       end
     end
 
     context 'when pattern is not rooted' do
       let(:pattern) { 'foo' }
 
       it 'returns non-rooted glob' do
-        expect(rule.glob).to eq(root.join('**/foo').to_s)
+        expect(rule.glob).to eq('**/foo')
       end
     end
   end