fast_ignore 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45d98b9329a3cf9935ad9bda95f89ffcea7776c19acde46b4f758cf03bad654b
-  data.tar.gz: ec33228d9d25f5e82a8deed045c5dc2f1885e7fcf05779e079ab4a1460f981f2
+  metadata.gz: e68a04cc6c34d7f72a6049beb86c9808c43bae4e712a1e9e8462e8e18f331bf0
+  data.tar.gz: 3c015e68f03e9d387064a68d42fe6f367e60894e1a20f02945af2c6669ddcebb
 SHA512:
-  metadata.gz: 6d03cc0337b2b5bb4b7f90adaeedf645e6fcc01a299c873cbdec743f2d13a7a6820c2269a4193d1723907e3f7de00ec4aa76d90a52efba9c022462edb5e129fe
-  data.tar.gz: 9771665b209531cd704c8603b9791755e054f5a3f72214ef43d23dfb403263f5c00f5ebe9be27b94a63503c85e35dc3d6c4293822cf93bd8ef4dc60b6b2b7715
+  metadata.gz: 047ec0c2f7fe90a3bf9a23b01ec3aa054bd7770e2f3b9d38dae8e77704ef8dd7d8d1449633faa3c7aae9ecc7b4d236f8b3442e5b3dcf489cf825da85efce19e5
+  data.tar.gz: d9fa32ba54a4268ce530556767972fd60dbf04a24ec8a890110fd084675611721244cbdf1f1722bfc70fe41794458a7fe6a0ecbde388149308ff710e76610a43

data/.simplecov

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SimpleCov.start do
   add_filter '/backports'
   add_filter '/spec/'

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.12.1
+- Reads all relevant git config files when finding a global .gitignore
+
 # v0.12.0
 - Reads all relevant gitignore files (nested .gitignore files, global .gitignore referred to in .gitconfig, and .git/info/exclude)
 

data/lib/fast_ignore/rule_set_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class FastIgnore
-  module RuleSetBuilder
+  module RuleSetBuilder # rubocop:disable Metrics/ModuleLength
     class << self
       # :nocov:
       using ::FastIgnore::Backports::DeletePrefixSuffix if defined?(::FastIgnore::Backports::DeletePrefixSuffix)
@@ -70,30 +70,45 @@ class FastIgnore
         return unless gitignore
 
         gi = ::FastIgnore::RuleSet.new([], false, true)
-        gi << from_gitignore_file(gitconfig_global_gitignore_path || default_global_gitignore_path)
-        gi << from_gitignore_file(::File.join(project_root, '.git/info/exclude'))
-        gi << from_gitignore_file(::File.join(project_root, '.gitignore'), soft: gitignore == :auto)
+        gi << from_root_gitignore_file(global_gitignore_path(root: project_root))
+        gi << from_root_gitignore_file(::File.join(project_root, '.git/info/exclude'))
+        gi << from_root_gitignore_file(::File.join(project_root, '.gitignore'), soft: gitignore == :auto)
         gi
       end
 
-      def from_gitignore_file(path, soft: true)
+      def from_root_gitignore_file(path, soft: true)
         return if soft && !::File.exist?(path)
 
         build_rule_set(::File.readlines(path), false, file_root: '', gitignore: true)
       end
 
-      def gitconfig_global_gitignore_path
-        config_path = ::File.expand_path('~/.gitconfig')
+      def global_gitignore_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') ||
+          default_global_gitignore_path
+      end
+
+      def gitconfig_gitignore_path(config_path)
+        return unless config_path
         return unless ::File.exist?(config_path)
 
-        ignore_path = ::File.readlines(config_path).find { |l| l.start_with?("\texcludesfile = ") }
+        ignore_path = ::File.readlines(config_path).find { |l| l.sub!(/\A\s*excludesfile\s*=/, '') }
         return unless ignore_path
 
-        ignore_path.delete_prefix!("\texcludesfile = ")
         ignore_path.strip!
+        return ignore_path if ignore_path.empty? # don't expand path in this case
+
         ::File.expand_path(ignore_path)
       end
 
+      def xdg_config_path
+        return unless ENV['XDG_CONFIG_HOME'] && !ENV['XDG_CONFIG_HOME'].empty?
+
+        ::File.expand_path('git/config', ENV['XDG_CONFIG_HOME'])
+      end
+
       def default_global_gitignore_path
         if ENV['XDG_CONFIG_HOME'] && !ENV['XDG_CONFIG_HOME'].empty?
           ::File.expand_path('git/ignore', ENV['XDG_CONFIG_HOME'])

data/lib/fast_ignore/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_ignore
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Dana Sherson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler