fast_ignore 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88853f2613fe610772a13666845d500a4b377bbf5606e3fba3bd8842d66c17a2
-  data.tar.gz: c158117c0234816a067b3e68d7686e247bf18ea81e39b3c339fcf06ecc4026ae
+  metadata.gz: 56582bce9b3eae6e761585c77846530bb96b287c2d6938dd7213c31b84567560
+  data.tar.gz: c2aabc49876831524acc8f14bc483aa8ec44ec715941a562bf4a6d5c4ac76b5c
 SHA512:
-  metadata.gz: a409a69b31021dedca95858ebed16abb4a36efbb758067dcab41bd6cbeb988acf0a62d4324f31cbb68ba4787efca4564cfc51721a50dc710f3357923775cc6e2
-  data.tar.gz: 4f0e0a8f900d6c0d008850eb8899c1c4446914149697539b9f708620054b614b310305e83df8743a3d5fb558a82ac08f0d48e44450486ad5de966943916a6ac2
+  metadata.gz: bc5e6b69f903bf2bb0beed6001bfa01bfa2f8b7e452eca9270884a38a1924649e336866d94085bd59ff72549d495d3857035227a7b3b0cf22859fd939c1e32ac
+  data.tar.gz: e286d5802e0a0857552b9c9dbe03999546817478f2960fdbd057709485a862e876e3e9328a12fafc34388ba1aad0893f10ea318e7bdff728fb3ef41facc1568a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.17.2
+- Remove unnecessary backport code that was leftover when support for 2.4 was dropped
+- Tiny performance improvements from rubocop-performance's suggestions
+
 # v0.17.1
 - fix handling of backward character classes `[z-a]`
   previously this raised a RegexpError, but git just considered it to be identical to `[z]`, now we match the git behaviour (but why would you ever do this?, i only found it because of the fuzz spec in the `leftovers` gem)

data/lib/fast_ignore/file_root.rb

@@ -2,10 +2,6 @@
 
 class FastIgnore
   class FileRoot
-    # :nocov:
-    using ::FastIgnore::Backports::DeletePrefixSuffix if defined?(::FastIgnore::Backports::DeletePrefixSuffix)
-    # :nocov:
-
     def self.build(file_path, project_root)
       file_root = "#{::File.dirname(file_path)}/".delete_prefix(project_root)
 

data/lib/fast_ignore/gitconfig_parser.rb

@@ -100,9 +100,8 @@ class FastIgnore
 
     def on_branch?(branch_pattern)
       branch_pattern += '**' if branch_pattern.end_with?('/')
-      current_branch = ::File.readable?("#{root}/.git/HEAD") && ::File.read("#{root}/.git/HEAD").sub!(
-        %r{\Aref: refs/heads/}, ''
-      )
+      current_branch = ::File.readable?("#{root}/.git/HEAD") &&
+        ::File.read("#{root}/.git/HEAD").delete_prefix('ref: refs/heads/')
       return unless current_branch
 
       # goddamit git what does 'a pattern with standard globbing wildcards' mean

data/lib/fast_ignore/gitignore_include_rule_builder.rb

@@ -2,10 +2,6 @@
 
 class FastIgnore
   class GitignoreIncludeRuleBuilder < GitignoreRuleBuilder
-    # :nocov:
-    using ::FastIgnore::Backports::DeletePrefixSuffix if defined?(::FastIgnore::Backports::DeletePrefixSuffix)
-    # :nocov:
-
     def initialize(rule, file_path, expand_path_from = nil)
       super(rule, file_path)
 
@@ -15,7 +11,7 @@ class FastIgnore
     end
 
     def expand_rule_path
-      anchored! unless @s.match?(/\*/)
+      anchored! unless @s.match?(/\*/) # rubocop:disable Performance/StringInclude # it's StringScanner#match?
       return unless @s.match?(%r{(?:[~/]|\.{1,2}/|.*/\.\./)})
 
       dir_only! if @s.match?(%r{.*/\s*\z})

data/lib/fast_ignore/rule_builder.rb

@@ -3,10 +3,6 @@
 class FastIgnore
   module RuleBuilder
     class << self
-      # :nocov:
-      using ::FastIgnore::Backports::DeletePrefixSuffix if defined?(::FastIgnore::Backports::DeletePrefixSuffix)
-      # :nocov:
-
       def build(rule, allow, expand_path_with, file_root)
         if rule.delete_prefix!('#!:')
           shebang_rules(rule, allow, file_root)
@@ -23,7 +19,7 @@ class FastIgnore
         rule = ::FastIgnore::ShebangRule.new(pattern, allow, file_root&.shebang_path_pattern)
         return rule unless allow
 
-        rules = gitignore_rules('*/'.dup, allow, file_root)
+        rules = gitignore_rules(+'*/', allow, file_root)
         rules.pop # don't want the include all children one.
         rules << rule
         rules

data/lib/fast_ignore/rule_sets.rb

@@ -2,10 +2,6 @@
 
 class FastIgnore
   class RuleSets
-    # :nocov:
-    using ::FastIgnore::Backports::DeletePrefixSuffix if defined?(::FastIgnore::Backports::DeletePrefixSuffix)
-    # :nocov:
-
     def initialize( # rubocop:disable Metrics/ParameterLists
       root:,
       ignore_rules: nil,

data/lib/fast_ignore/shebang_rule.rb

@@ -63,7 +63,7 @@ class FastIgnore
       file = ::File.new(path)
       first_line = file.sysread(64)
       if first_line.start_with?('#!')
-        first_line += file.readline unless first_line.match?(/\n/)
+        first_line += file.readline unless first_line.include?("\n")
       else
         file.close
         return

data/lib/fast_ignore/version.rb

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

data/lib/fast_ignore.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative './fast_ignore/backports'
-
 require 'set'
 require 'strscan'
 
@@ -24,11 +22,6 @@ class FastIgnore
 
   include ::Enumerable
 
-  # :nocov:
-  using ::FastIgnore::Backports::DeletePrefixSuffix if defined?(::FastIgnore::Backports::DeletePrefixSuffix)
-  using ::FastIgnore::Backports::DirEachChild if defined?(::FastIgnore::Backports::DirEachChild)
-  # :nocov:
-
   def initialize(relative: false, root: nil, gitignore: :auto, follow_symlinks: false, **rule_set_builder_args)
     @relative = relative
     @follow_symlinks_method = ::File.method(follow_symlinks ? :stat : :lstat)
@@ -41,7 +34,7 @@ class FastIgnore
   end
 
   def each(&block)
-    return enum_for(:each) unless block_given?
+    return enum_for(:each) unless block
 
     dir_pwd = ::Dir.pwd
     root_from_pwd = @root.start_with?(dir_pwd) ? ".#{@root.delete_prefix(dir_pwd)}" : @root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_ignore
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Dana Sherson
@@ -100,6 +100,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +195,6 @@ files:
 - LICENSE.txt
 - 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

data/lib/fast_ignore/backports.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-class FastIgnore
-  module Backports
-    ruby_major, ruby_minor = ::RUBY_VERSION.split('.', 2)
-    unless ruby_major.to_i > 2 || ruby_major.to_i == 2 && ruby_minor.to_i > 5
-      module DirEachChild
-        refine ::Dir.singleton_class do
-          def children(path)
-            ::Dir.entries(path) - ['.', '..']
-          end
-        end
-      end
-
-      module DeletePrefixSuffix
-        refine ::String do
-          # delete_prefix!(prefix) -> self or nil
-          # Deletes leading prefix from str, returning nil if no change was made.
-          #
-          #   "hello".delete_prefix!("hel") #=> "lo"
-          #   "hello".delete_prefix!("llo") #=> nil
-          def delete_prefix!(str)
-            return unless start_with?(str)
-
-            slice!(0..(str.length - 1))
-            self
-          end
-
-          # delete_suffix!(suffix) -> self or nil
-          # Deletes trailing suffix from str, returning nil if no change was made.
-          #
-          #   "hello".delete_suffix!("llo") #=> "he"
-          #   "hello".delete_suffix!("hel") #=> nil
-          def delete_suffix!(str)
-            return unless end_with?(str)
-
-            slice!(-str.length..-1)
-            self
-          end
-
-          # delete_prefix(prefix) -> new_str click to toggle source
-          # Returns a copy of str with leading prefix deleted.
-          #
-          #   "hello".delete_prefix("hel") #=> "lo"
-          #   "hello".delete_prefix("llo") #=> "hello"
-          def delete_prefix(str)
-            s = dup
-            s.delete_prefix!(str)
-            s
-          end
-
-          # delete_suffix(suffix) -> new_str
-          # Returns a copy of str with trailing suffix deleted.
-          #
-          #   "hello".delete_suffix("llo") #=> "he"
-          #   "hello".delete_suffix("hel") #=> "hello"
-          def delete_suffix(str) # leftovers:allowed
-            s = dup
-            s.delete_suffix!(str)
-            s
-          end
-        end
-      end
-    end
-  end
-end