fast_ignore 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88d6249cc842976d1b5c0e984816cfc260cc3edcbe4774ea4580e934bedcf925
-  data.tar.gz: 3ab13efc019bee9b5cadcb45f485021132f07787bce73d66bb9ef63b76bc51ca
+  metadata.gz: 7952045a743c12fa1963ffba7aa81a8ca3cc81aec40b0bfc9c0e6bb6424e9433
+  data.tar.gz: dcacd0bdd1873638156c9b2323263cf1ee7fc349b012f40c28caa4fe10d82f91
 SHA512:
-  metadata.gz: 853124ae1ddf1fc599e8a422580ee84ff705907a70c7ece17db72502a4468ca0d5479f918c175f91dc1915c7cccb5ad4cd7eaa956adf2d7b0a5e2fa024821c3d
-  data.tar.gz: b90c827caa6c24c3491237ec5fb538b828b2daea879a4d94d6bc3ac4368807c7040bc0d6ea6405b8e9712483d00fddfb6d43e1a970786f374144a4d6165f59ee
+  metadata.gz: 35c9fedb895b3e30632b29aab2eba3369ec6512bd6c5b9cfa563156c4c0c291b5c7854877aa4c8da063b54ed97a6f132c5d903622d2a6e2fc69c57c708150c33
+  data.tar.gz: ca894c9a8e11471d3c1f81f959862cd16a60db784898ef0d0e4da880e063257334fdf6aad061d95c23850c726ffde781076e6c248ebecfa808701d0731fbb125

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.16.1
+- respect GIT_CONFIG_SYSTEM, GIT_CONFIG_NOSYSTEM and GIT_CONFIG_GLOBAL env vars the same way git does
+- make the tests more resilient to whatever global config is going on.
+
 # v0.16.0
 - Entirely rewrite the way that git config files are read. previously it was just a regexp. now we actually parse git config files according to the same rules as git.
 - Add ruby 3 to the test matrix

data/README.md

@@ -309,6 +309,7 @@ This is not required, and if FastIgnore does have to go to the filesystem for th
   (It does handle changing the current working directory between [`FastIgnore#allowed?`](#allowed) calls)
 - FastIgnore always matches patterns case-insensitively. (git varies by filesystem).
 - FastIgnore always outputs paths as literal UTF-8 characters. (git depends on your core.quotepath setting but by default outputs non ascii paths with octal escapes surrounded by quotes).
+- git has a system-wide config file installed at `$(prefix)/etc/gitconfig`, where `prefix` is defined for git at install time. FastIgnore assumes that it will always be `/usr/local/etc/gitconfig`. if it's important your system config file is looked at, as that's where you have the core.excludesfile defined, use git's built-in way to override this by adding `export GIT_CONFIG_SYSTEM='/the/actual/location'` to your shell profile.
 - Because git looks at its own index objects and FastIgnore looks at the file system there may be some differences between FastIgnore and `git ls-files`. To avoid these differences you may want to use the [`git_ls`](https://github.com/robotdana/git_ls) gem instead
   - Tracked files that were committed before the matching ignore rule was committed will be returned by `git ls-files`, but not by FastIgnore.
   - Untracked files will be returned by FastIgnore, but not by `git ls-files`

data/lib/fast_ignore/global_gitignore.rb

@@ -4,15 +4,23 @@ class FastIgnore
   module GlobalGitignore
     class << self
       def path(root:)
-        gitconfig_gitignore_path(::File.expand_path('.git/config', root)) ||
-          gitconfig_gitignore_path(::File.expand_path('~/.gitconfig')) ||
-          gitconfig_gitignore_path(xdg_config_path) ||
-          gitconfig_gitignore_path('/etc/gitconfig') ||
+        ignore_path = gitconfigs_gitignore_path(root) ||
           default_global_gitignore_path
+
+        ignore_path unless ignore_path.empty?
       end
 
       private
 
+      def gitconfigs_gitignore_path(root)
+        gitconfig_gitignore_path(repo_config_path(root)) ||
+          gitconfig_gitignore_path(global_config_path) ||
+          gitconfig_gitignore_path(default_user_config_path) ||
+          gitconfig_gitignore_path(system_config_path)
+      rescue ::FastIgnore::GitconfigParseError
+        ''
+      end
+
       def gitconfig_gitignore_path(config_path)
         return unless config_path
         return unless ::File.readable?(config_path)
@@ -26,24 +34,54 @@ class FastIgnore
         ::File.expand_path(ignore_path)
       end
 
-      def xdg_config_path
-        xdg_config_home? && ::File.expand_path('git/config', xdg_config_home)
+      def default_user_config_path
+        return if env('GIT_CONFIG_GLOBAL')
+
+        ::File.expand_path('git/config', default_config_home)
       end
 
       def default_global_gitignore_path
-        if xdg_config_home?
-          ::File.expand_path('git/ignore', xdg_config_home)
+        ::File.expand_path('git/ignore', default_config_home)
+      end
+
+      def repo_config_path(root)
+        ::File.expand_path('.git/config', root)
+      end
+
+      def global_config_path
+        ::File.expand_path(env('GIT_CONFIG_GLOBAL', '~/.gitconfig'))
+      end
+
+      def system_config_path
+        return if env?('GIT_CONFIG_NOSYSTEM')
+
+        ::File.expand_path(env('GIT_CONFIG_SYSTEM', '/usr/local/etc/gitconfig'))
+      end
+
+      def default_config_home
+        env('XDG_CONFIG_HOME', '~/.config')
+      end
+
+      def env(env_var, default = nil)
+        value = ::ENV[env_var]
+
+        if value && (not value.empty?)
+          value
         else
-          ::File.expand_path('~/.config/git/ignore')
+          default
         end
       end
 
-      def xdg_config_home
-        ::ENV['XDG_CONFIG_HOME']
-      end
+      def env?(env_var)
+        value = ::ENV[env_var]
 
-      def xdg_config_home?
-        xdg_config_home && (not xdg_config_home.empty?)
+        if value&.match?(/\A(yes|on|true|1)\z/i)
+          true
+        elsif !value || value.match?(/\A(no|off|false|0|)\z/i)
+          false
+        else
+          raise ::FastIgnore::GitconfigParseError
+        end
       end
     end
   end

data/lib/fast_ignore/rule_sets.rb

@@ -73,7 +73,7 @@ class FastIgnore
     end
 
     def build_from_root_gitignore_file(path)
-      return unless ::File.exist?(path)
+      return unless path && ::File.exist?(path)
 
       build_rule_set(::File.readlines(path), false, gitignore: true)
     end

data/lib/fast_ignore/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_ignore
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Dana Sherson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  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-rspec
   requirement: !ruby/object:Gem::Requirement