gitattributes 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f126e35bb048a9aa68b62eba4593cc7a040aa0ec
-  data.tar.gz: 240a38cf94ba4d0797bfa5080c4a9cfc652c6e18
+  metadata.gz: 81ece9154359b604cf544524240a1609ea5e12bd
+  data.tar.gz: 58c24e2789f447f2bf8d441a9acf8af07c447b92
 SHA512:
-  metadata.gz: 117bc70ee90fb3158d36300516a8e6a8d3d1a6e30dd136de484e90c3f190f1cf3ee8a0039d4239ec02d70461e46a9d41f09980155cfa100aa8eaf67eb3b668f1
-  data.tar.gz: ae70b802be7c8a80edb5092606c75e394e1a6c9637404ea2e9ca2cd583c57ac6b8f1e54b5b78c4f87e1e743f93a771cc6c98a42785ebee6d5af444bab565d8a6
+  metadata.gz: 6dca0f325ef2196258736282be45ee3725b836e9e943b0a313a7021bc76c1894eb8ef1fd709ebad7377ffd13d6d52e2676c3fd0e1ba9d1a66b7b11b3a389891f
+  data.tar.gz: 7bf684386e42d0239cb0ebfb6d9485b6e766d43c4dbd7a2c0bca9699891df808300176ad068d096732f43c47b600204ca2f544bf93b22eef51932295328451f8

data/gitattributes.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{gitattributes}
-  s.version            = '2.3.0'
+  s.version            = '2.4.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']

data/lib/reality/git/attributes.rb

@@ -43,7 +43,8 @@ module Reality #nodoc
         full_path = File.join(@path, path)
 
         @rules.reverse.each do |rule|
-          return rule.attributes if File.fnmatch?(File.join(@relative_path, rule.pattern), full_path)
+          full_pattern = rule.pattern[0] == '/' ? "#{@relative_path}#{rule.pattern}" : "#{@relative_path}/**/#{rule.pattern}"
+          return rule.attributes if File.fnmatch?(full_pattern, full_path, File::FNM_PATHNAME | File::FNM_DOTMATCH)
         end
 
         {}

data/test/reality/git/test_attributes.rb

@@ -43,6 +43,35 @@ TEXT
     assert_equal({ 'text' => true, 'crlf' => true }, attributes.attributes('Read Me.txt'))
   end
 
+  def test_exact_match_in_subdirectory
+    content = <<TEXT
+Read[[:space:]]Me.txt text crlf
+TEXT
+    dir = "#{working_dir}/#{::SecureRandom.hex}"
+    write_standard_file(dir, content)
+
+    attributes = Reality::Git::Attributes.parse(dir)
+    assert_equal("#{dir}/.gitattributes", attributes.attributes_file)
+    assert_equal(['Read[[:space:]]Me.txt text crlf'], attributes.rules.collect {|p| p.to_s})
+
+    assert_equal({ 'text' => true, 'crlf' => true }, attributes.attributes('customer/notes/Read Me.txt'))
+  end
+
+  def test_absolute_pattern
+    content = <<TEXT
+/bin/doc/README.md text
+TEXT
+    dir = "#{working_dir}/#{::SecureRandom.hex}"
+    write_standard_file(dir, content)
+
+    attributes = Reality::Git::Attributes.parse(dir)
+    assert_equal("#{dir}/.gitattributes", attributes.attributes_file)
+    assert_equal(['/bin/doc/README.md text'], attributes.rules.collect {|p| p.to_s})
+
+    assert_equal({ 'text' => true  }, attributes.attributes('bin/doc/README.md'))
+    assert_equal({ }, attributes.attributes('not/matching/bin/doc/README.md'))
+  end
+
   def test_gitattributes_in_non_standard_location
     content = <<TEXT
 * -text

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitattributes
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Peter Donald