fast_ignore 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3cffbf805ab15bbbfe22e5e4afb0462ada58ec1baaf6281e9bb8ef5d80697a
-  data.tar.gz: 81a228932c87cc9fbec0a21562b6a6d295a3f45aed8502f9bb38dd4237a826f9
+  metadata.gz: 35a905f9dd8c28df7b46d6c0c61ad1fcaf44a9566c19b704a88584668f49ba20
+  data.tar.gz: 620917002cd9696bb5787819675034d6b5269d70812f0e5247523b10091d37b9
 SHA512:
-  metadata.gz: 24adff6dfcc51add546f9f7ed2e67eee3e71ef574f449f834161d642426e019095394f73733d5cd29a4f0b3db40b7b845cb024a3958b2b6ca8ef27490023e51f
-  data.tar.gz: cac2c9eea6dbcce19adbe0ed7c2c0c332e8453e3ff25f0124e2f7850133cec84fdd977c7e24d931654d9150d2b808dd91f7ad43639b9bc9ce7bb133ba58ff2fd
+  metadata.gz: 6406dd9e6998fb9a3345981239e7fa0046f1356852a599f2c347d4b7bec4654069ac5704351c3079ce79c0965925a601dbcf56990ac6850aefef5f3a109793fa
+  data.tar.gz: 83a7aacfd25b3350a4100d6247c683f6b4f1754c6311d9b6064631e5033890ea2fcc0c8dd5b5757f8f0e9a39af55cfc3f7560918813e69ab6e9139734abc4fa1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.5.2
+- performance improvements
+
 # v0.5.1
 - restore `.allowed?`. now i have tests for it. oops
 

data/lib/fast_ignore/rule.rb

@@ -20,5 +20,9 @@ class FastIgnore
     def inspect
       "#<Rule #{'!' if negation?}#{rule}#{'/' if dir_only?}>"
     end
+
+    def match?(path)
+      ::File.fnmatch?(@rule, path, 14)
+    end
   end
 end

data/lib/fast_ignore/rule_set.rb

@@ -10,31 +10,29 @@ class FastIgnore
       @rules = []
       @non_dir_only_rules = []
       @project_root = project_root
-      @allowed_unrecursive = { @project_root => true }
-      @allowed_recursive = { @project_root => true }
+
       @any_not_anchored = false
       @empty = true
       @allow = allow
     end
 
-    def allowed_unrecursive?(path, dir)
-      @allowed_unrecursive.fetch(path) do
-        (dir ? @rules : @non_dir_only_rules).reverse_each do |rule|
-          # 14 = Rule::FNMATCH_OPTIONS
-          return @allowed_unrecursive[path] = rule.negation? if ::File.fnmatch?(rule.rule, path, 14)
-        end
-
-        @allowed_unrecursive[path] = default?(dir)
-      end
-    end
-
     def allowed_recursive?(path, dir)
+      @allowed_recursive ||= { @project_root => true }
       @allowed_recursive.fetch(path) do
         @allowed_recursive[path] =
           allowed_recursive?(::File.dirname(path), true) && allowed_unrecursive?(path, dir)
       end
     end
 
+    def allowed_unrecursive?(path, dir)
+      (dir ? @rules : @non_dir_only_rules).reverse_each do |rule|
+        # 14 = Rule::FNMATCH_OPTIONS
+        return rule.negation? if ::File.fnmatch?(rule.rule, path, 14)
+      end
+
+      default?(dir)
+    end
+
     def parse_rules(rule_line, root: @root, expand_path: false)
       ::FastIgnore::RuleParser.new_rule(rule_line, rule_set: self, allow: @allow, root: root, expand_path: expand_path)
     end
@@ -49,8 +47,7 @@ class FastIgnore
     end
 
     def clear_cache
-      @allowed_unrecursive = { @project_root => true }
-      @allowed_recursive = { @project_root => true }
+      @allowed_recursive = nil
     end
 
     private

data/lib/fast_ignore/rule_set_builder.rb

@@ -4,7 +4,7 @@ require_relative 'rule_set'
 
 class FastIgnore
   class RuleSetBuilder
-    attr_reader :rules
+    attr_reader :rule_set
 
     def initialize(root:, allow: false)
       @rule_set = RuleSet.new(project_root: root, allow: allow)
@@ -33,13 +33,5 @@ class FastIgnore
 
       @rule_set.clear_cache
     end
-
-    def allowed_unrecursive?(path, dir)
-      @rule_set.allowed_unrecursive?(path, dir)
-    end
-
-    def allowed_recursive?(path, dir)
-      @rule_set.allowed_recursive?(path, dir)
-    end
   end
 end

data/lib/fast_ignore/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class FastIgnore
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/lib/fast_ignore.rb

@@ -15,7 +15,7 @@ class FastIgnore
     using ::FastIgnore::Backports::DirEachChild
   end
 
-  def initialize( # rubocop:disable Metrics/ParameterLists
+  def initialize( # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength, Metrics/AbcSize
     relative: false,
     root: ::Dir.pwd,
     ignore_rules: nil,
@@ -24,24 +24,27 @@ class FastIgnore
     include_rules: nil,
     include_files: nil
   )
-    @ignore = ::FastIgnore::RuleSetBuilder.new(root: root)
-    @only = ::FastIgnore::RuleSetBuilder.new(allow: true, root: root)
-    @only.add_files(Array(include_files))
-    @only.add_rules(Array(include_rules), expand_path: true)
+    @root = root.delete_suffix('/')
+    @root_trailing_slash = "#{@root}/"
+    ignore = ::FastIgnore::RuleSetBuilder.new(root: @root)
+    only = ::FastIgnore::RuleSetBuilder.new(allow: true, root: @root)
+    only.add_files(Array(include_files))
+    only.add_rules(Array(include_rules), expand_path: true)
+    @only = only.rule_set
 
-    @ignore.add_rules(['.git'])
-    @ignore.add_files([gitignore]) if gitignore && ::File.exist?(gitignore)
-    @ignore.add_files(Array(ignore_files))
-    @ignore.add_rules(Array(ignore_rules))
+    ignore.add_rules(['.git'])
+    ignore.add_files([gitignore]) if gitignore && ::File.exist?(gitignore)
+    ignore.add_files(Array(ignore_files))
+    ignore.add_rules(Array(ignore_rules))
+    @ignore = ignore.rule_set
     @relative = relative
-    @root = root
   end
 
   def each(&block)
     if block_given?
-      all_allowed.each(&block)
+      all_allowed(&block)
     else
-      all_allowed.each
+      enum_for(:all_allowed)
     end
   end
 
@@ -52,33 +55,32 @@ class FastIgnore
   end
 
   def all_allowed
-    allowed = []
-    find_children(@root) do |path, dir|
+    find_children(@root_trailing_slash) do |path, dir|
       next false unless @ignore.allowed_unrecursive?(path, dir)
       next false unless @only.allowed_unrecursive?(path, dir)
       next true if dir
-      next false unless ::File.readable?(path)
 
-      allowed << prepare_path(path)
+      yield prepare_path(path)
 
       false
     end
-    allowed
   end
 
   private
 
   def prepare_path(path)
-    @relative ? path.delete_prefix("#{@root}/") : path
+    @relative ? path.delete_prefix(@root_trailing_slash) : path
   end
 
-  def find_children(path, &block)
+  def find_children(path, &block) # rubocop:disable Metrics/MethodLength
     Dir.each_child(path) do |child|
       begin
-        child = ::File.join(path, child)
-        dir = ::File.directory?(child)
-        look_at_children = block.call child, dir
-        find_children(child, &block) if look_at_children
+        child = path + child
+        stat = ::File.stat(child)
+        next unless stat.readable?
+
+        look_at_children = block.call child, stat.directory?
+        find_children("#{child}/", &block) if look_at_children
       rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
         nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_ignore
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Dana Sherson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler