fast_ignore 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c81966a545152071086c49d90057bc1950731affd0abdaabfe622c1b357d78
-  data.tar.gz: 312e624e3a542e3ee179d02f11070fe2a78d43cf7304b92a8420071ffdde75aa
+  metadata.gz: 9218ac549a0d5f73ff24a656320561307b89c7137f105e2921d4adb81074bcd8
+  data.tar.gz: 6ed5b5a316d48e7a10bd87b3159fa61f750154c7614c9ad11a1ceb992df0bace
 SHA512:
-  metadata.gz: 98af14403dd1ba3dd9ac4800077324ed21d00a0a57e9761e3e720fe81e723de589e016ae78696c8ce173ab60e027361a37181c61492fbd8240a85657612b13ad
-  data.tar.gz: df3f1d628a6f42b8630ee6c8aacc23722720e88e782001809bb4106da68853e365f573b4796b3e0fa828fc640428ac7e820ab6b0eade1a8eee1affbea605118d
+  metadata.gz: 366a9500c6a9e1b725bb7fcb691040bbd0385b20f4e8e496f7199f4640c05bbc51de4593a634f82166ec81d5c9a1fd2251c38a1bfc37a5bacf06934154965c94
+  data.tar.gz: 11b0afcc962cd225be140384dd3dc3e61c4006c699b22b1016e6b339b11fae26f30a59f4f98740ad46769653761850b4385b04e9c62b53457a1244075dec8dbe

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.8.3
+- fix `ignore_rules` not matching directories when using `include_shebangs:`
+
 # v0.8.2
 - fix `include_rules` not matching filenames with no extension when using `include_shebangs:`
 

data/lib/fast_ignore/version.rb

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

data/lib/fast_ignore.rb

@@ -35,7 +35,7 @@ class FastIgnore
     @root_trailing_slash = "#{@root}/"
     @shebang_pattern = prepare_shebang_pattern(include_shebangs)
 
-    @rule_sets = ::FastIgnore::RuleSetBuilder.from_args(
+    rule_sets = ::FastIgnore::RuleSetBuilder.from_args(
       root: @root,
       ignore_rules: ignore_rules,
       ignore_files: ignore_files,
@@ -45,7 +45,7 @@ class FastIgnore
       argv_rules: argv_rules
     )
 
-    @include_rule_sets, @ignore_rule_sets = @rule_sets.partition(&:allow?)
+    @include_rule_sets, @ignore_rule_sets = rule_sets.partition(&:allow?)
     @has_include_rule_sets = !@include_rule_sets.empty?
     @relative = relative
   end
@@ -85,13 +85,13 @@ class FastIgnore
         child = path + basename
         dir = ::File.stat(child).directory? # equivalent to directory? and exist?
 
+        next unless @ignore_rule_sets.all? { |r| r.allowed_unrecursive?(child, dir) }
+
         if dir
-          next unless @shebang_pattern || @rule_sets.all? { |r| r.allowed_unrecursive?(child, dir) }
+          next unless @shebang_pattern || @include_rule_sets.all? { |r| r.allowed_unrecursive?(child, dir) }
 
           each_allowed("#{child}/", &block)
         else
-          next unless @ignore_rule_sets.all? { |r| r.allowed_unrecursive?(child, dir) }
-
           if @shebang_pattern
             unless (@has_include_rule_sets &&
                 @include_rule_sets.all? { |r| r.allowed_unrecursive?(child, dir) }) ||

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_ignore
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Dana Sherson