fast_ignore 0.14.0 → 0.16.0

data/lib/fast_ignore/rule_set.rb

@@ -6,9 +6,9 @@ class FastIgnore
     alias_method :gitignore?, :gitignore
     undef :gitignore
 
-    def initialize(rules, allow, gitignore)
-      @dir_rules = squash_rules(rules.reject(&:file_only?)).freeze
-      @file_rules = squash_rules(rules.reject(&:dir_only?)).freeze
+    def initialize(rules, allow, gitignore, squash = true)
+      @dir_rules = (squash ? squash_rules(rules.reject(&:file_only?)) : rules.reject(&:file_only?)).freeze
+      @file_rules = (squash ? squash_rules(rules.reject(&:dir_only?)) : rules.reject(&:dir_only?)).freeze
       @has_shebang_rules = rules.any?(&:shebang?)
 
       @allowed_recursive = { '.' => true }
@@ -42,8 +42,16 @@ class FastIgnore
       not @allow
     end
 
-    def squash_rules(rules)
-      rules.chunk_while { |a, b| a.squashable_type == b.squashable_type }.map do |chunk|
+    def squash_rules(rules) # rubocop:disable Metrics/MethodLength
+      running_component_rule_size = rules.first&.component_rules_count || 0
+      rules.chunk_while do |a, b|
+        # a.squashable_type == b.squashable_type
+        next true if a.squashable_type == b.squashable_type &&
+          (running_component_rule_size + b.component_rules_count <= 40)
+
+        running_component_rule_size = b.component_rules_count
+        false
+      end.map do |chunk| # rubocop:disable Style/MultilineBlockChain
         first = chunk.first
         next first if chunk.length == 1
 
@@ -61,6 +69,8 @@ class FastIgnore
 
     protected
 
-    attr_reader :dir_rules, :file_rules, :has_shebang_rules
+    attr_reader :dir_rules
+    attr_reader :file_rules
+    attr_reader :has_shebang_rules
   end
 end

data/lib/fast_ignore/rule_sets.rb

@@ -35,13 +35,16 @@ class FastIgnore
       @array.all? { |r| r.allowed_unrecursive?(relative_path, dir, full_path, filename, nil) }
     end
 
-    def append_subdir_gitignore(relative_path:, check_exists: true)
-      new_gitignore = build_set_from_file(relative_path, gitignore: true, check_exists: check_exists)
-      return if !new_gitignore || new_gitignore.empty?
-
+    def append_subdir_gitignore(relative_path:, check_exists: true) # rubocop:disable Metrics/MethodLength
       if @gitignore_rule_set
+        new_gitignore = build_set_from_file(relative_path, gitignore: true, check_exists: check_exists, squash: false)
+        return if !new_gitignore || new_gitignore.empty?
+
         @gitignore_rule_set << new_gitignore
       else
+        new_gitignore = build_set_from_file(relative_path, gitignore: true, check_exists: check_exists)
+        return if !new_gitignore || new_gitignore.empty?
+
         @array << new_gitignore
         @gitignore_rule_set = new_gitignore
         @array.sort_by!(&:weight) && @array.freeze
@@ -75,23 +78,21 @@ class FastIgnore
       build_rule_set(::File.readlines(path), false, gitignore: true)
     end
 
-    def build_rule_set(rules, allow, expand_path_with: nil, file_root: nil, gitignore: false)
+    def build_rule_set(rules, allow, expand_path_with: nil, file_root: nil, gitignore: false, squash: true) # rubocop:disable Metrics/ParameterLists
       rules = rules.flat_map do |rule|
         ::FastIgnore::RuleBuilder.build(rule, allow, expand_path_with, file_root)
       end
 
-      ::FastIgnore::RuleSet.new(rules, allow, gitignore)
+      ::FastIgnore::RuleSet.new(rules, allow, gitignore, squash)
     end
 
-    def build_set_from_file(filename, allow: false, file_root: nil, gitignore: false, check_exists: false)
+    def build_set_from_file(filename, allow: false, gitignore: false, check_exists: false, squash: true)
       filename = ::File.expand_path(filename, @project_root)
       return if check_exists && !::File.exist?(filename)
-      unless file_root || filename.start_with?(@project_root)
-        raise ::FastIgnore::Error, "#{filename} is not within #{@project_root}"
-      end
+      raise ::FastIgnore::Error, "#{filename} is not within #{@project_root}" unless filename.start_with?(@project_root)
 
-      file_root ||= "#{::File.dirname(filename)}/".delete_prefix(@project_root)
-      build_rule_set(::File.readlines(filename), allow, file_root: file_root, gitignore: gitignore)
+      file_root = ::FastIgnore::FileRoot.build(filename, @project_root)
+      build_rule_set(::File.readlines(filename), allow, file_root: file_root, gitignore: gitignore, squash: squash)
     end
 
     def append_sets_from_files(files, allow: false)

data/lib/fast_ignore/shebang_rule.rb

@@ -8,17 +8,24 @@ class FastIgnore
 
     attr_reader :rule
 
+    attr_reader :file_path_pattern
+
     attr_reader :squashable_type
 
     def squash(rules)
-      ::FastIgnore::ShebangRule.new(::Regexp.union(rules.map(&:rule)).freeze, negation?)
+      ::FastIgnore::ShebangRule.new(::Regexp.union(rules.map(&:rule)).freeze, negation?, file_path_pattern)
+    end
+
+    def component_rules_count
+      1
     end
 
-    def initialize(rule, negation)
+    def initialize(rule, negation, file_path_pattern)
       @rule = rule
       @negation = negation
+      @file_path_pattern = file_path_pattern
 
-      @squashable_type = negation ? 3 : 2
+      @squashable_type = (negation ? 13 : 12) + file_path_pattern.object_id
 
       freeze
     end
@@ -33,12 +40,15 @@ class FastIgnore
 
     # :nocov:
     def inspect
-      "#<ShebangRule #{'allow ' if @negation}#!:#{@rule.to_s[15..-4]}>"
+      allow_fragment = 'allow ' if @negation
+      in_fragment = " in #{@file_path_pattern}" if @file_path_pattern
+      "#<ShebangRule #{allow_fragment}#!:#{@rule.to_s[15..-4]}#{in_fragment}>"
     end
     # :nocov:
 
-    def match?(_, full_path, filename, content)
+    def match?(relative_path, full_path, filename, content)
       return false if filename.include?('.')
+      return false unless (not @file_path_pattern) || @file_path_pattern.match?(relative_path)
 
       (content || first_line(full_path))&.match?(@rule)
     end

data/lib/fast_ignore/unmatchable_rule.rb

@@ -11,6 +11,10 @@ class FastIgnore
         5
       end
 
+      def component_rules_count
+        1
+      end
+
       def dir_only?
         false
       end
@@ -29,7 +33,7 @@ class FastIgnore
       end
       # :nocov:
 
-      def match?(_, _, _, _)
+      def match?(_relative_path, _full_path, _filename, _content)
         false
       end
     end

data/lib/fast_ignore/version.rb

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

data/lib/fast_ignore.rb

@@ -4,18 +4,24 @@ require_relative './fast_ignore/backports'
 
 require 'set'
 require 'strscan'
-require_relative './fast_ignore/rule_sets'
-require_relative './fast_ignore/rule_set'
-require_relative './fast_ignore/global_gitignore'
-require_relative './fast_ignore/rule_builder'
-require_relative './fast_ignore/gitignore_rule_builder'
-require_relative './fast_ignore/rule'
-require_relative './fast_ignore/unmatchable_rule'
-require_relative './fast_ignore/shebang_rule'
 
 class FastIgnore
   class Error < StandardError; end
 
+  require_relative './fast_ignore/rule_sets'
+  require_relative './fast_ignore/rule_set'
+  require_relative './fast_ignore/global_gitignore'
+  require_relative './fast_ignore/rule_builder'
+  require_relative './fast_ignore/gitignore_rule_builder'
+  require_relative './fast_ignore/gitignore_include_rule_builder'
+  require_relative './fast_ignore/gitignore_rule_regexp_builder'
+  require_relative './fast_ignore/gitignore_rule_scanner'
+  require_relative './fast_ignore/file_root'
+  require_relative './fast_ignore/rule'
+  require_relative './fast_ignore/unmatchable_rule'
+  require_relative './fast_ignore/shebang_rule'
+  require_relative './fast_ignore/gitconfig_parser'
+
   include ::Enumerable
 
   # :nocov:
@@ -82,7 +88,7 @@ class FastIgnore
     @loaded_gitignore_files << parent_path
   end
 
-  def each_recursive(parent_full_path, parent_relative_path, &block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  def each_recursive(parent_full_path, parent_relative_path, &block) # rubocop:disable Metrics/MethodLength
     children = ::Dir.children(parent_full_path)
     load_gitignore(parent_relative_path, check_exists: false) if @gitignore_enabled && children.include?('.gitignore')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_ignore
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Dana Sherson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.93.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.93.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.44.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.44.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.5
+- !ruby/object:Gem::Dependency
+  name: simplecov-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: spellr
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +156,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.3
-description: 
+description:
 email:
 - robot@dana.sh
 executables: []
@@ -148,7 +168,12 @@ files:
 - README.md
 - lib/fast_ignore.rb
 - lib/fast_ignore/backports.rb
+- lib/fast_ignore/file_root.rb
+- lib/fast_ignore/gitconfig_parser.rb
+- lib/fast_ignore/gitignore_include_rule_builder.rb
 - lib/fast_ignore/gitignore_rule_builder.rb
+- lib/fast_ignore/gitignore_rule_regexp_builder.rb
+- lib/fast_ignore/gitignore_rule_scanner.rb
 - lib/fast_ignore/global_gitignore.rb
 - lib/fast_ignore/rule.rb
 - lib/fast_ignore/rule_builder.rb
@@ -163,24 +188,24 @@ licenses:
 metadata:
   homepage_uri: https://github.com/robotdana/fast_ignore
   source_code_uri: https://github.com/robotdana/fast_ignore
-  changelog_uri: https://github.com/robotdana/fast_ignore/blob/master/CHANGELOG.md
-post_install_message: 
+  changelog_uri: https://github.com/robotdana/fast_ignore/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Parse gitignore files, quickly
 test_files: []