gitattributes 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81ece9154359b604cf544524240a1609ea5e12bd
-  data.tar.gz: 58c24e2789f447f2bf8d441a9acf8af07c447b92
+  metadata.gz: b782ca7bbdcc120c34494e2db3887dcf25d7a9fa
+  data.tar.gz: 02120c50fa900d5893c20964c6e931b228ef97e3
 SHA512:
-  metadata.gz: 6dca0f325ef2196258736282be45ee3725b836e9e943b0a313a7021bc76c1894eb8ef1fd709ebad7377ffd13d6d52e2676c3fd0e1ba9d1a66b7b11b3a389891f
-  data.tar.gz: 7bf684386e42d0239cb0ebfb6d9485b6e766d43c4dbd7a2c0bca9699891df808300176ad068d096732f43c47b600204ca2f544bf93b22eef51932295328451f8
+  metadata.gz: 4b441a8a54c939961406cbb9307ce6e00ca9d7124ee003d2428a358a315257c005176f19b4f519296fb74c9875229b2d65628c67cd08c5d21a7078ca8f5cd938
+  data.tar.gz: ec1bd6314c6296a962fc140f6d0587da069292ba019f9280178aeae8473832e5cc6351c6ceb1d396f8e71ee77926b6151dc3a0d3499c3c7bb6b4aabd72e8fc25

data/gitattributes.gemspec

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

data/lib/reality/git/attributes.rb

@@ -34,6 +34,10 @@ module Reality #nodoc
         @attributes_file = attributes_file || "#{@path}/.gitattributes"
         @relative_path = relative_path || File.dirname(@attributes_file)
         @rules = rules
+        @rule_map = {}
+        rules.each do |rule|
+          cache_rule(rule)
+        end
       end
 
       attr_reader :attributes_file
@@ -42,7 +46,7 @@ module Reality #nodoc
       def attributes(path)
         full_path = File.join(@path, path)
 
-        @rules.reverse.each do |rule|
+        self.rules.reverse.each do |rule|
           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
@@ -52,14 +56,17 @@ module Reality #nodoc
 
       def write_to(filename, options = {})
         prefix = options[:prefix].nil? ? '' : "#{options[:prefix]}\n"
-        rules = options[:normalize] ? @rules.dup.sort.uniq : @rules
+        rules = self.rules
+        rules = rules.dup.sort.uniq if options[:normalize]
         content = rules.collect {|r| r.to_s}.join("\n")
         content += "\n" unless content.empty?
         IO.write(filename, prefix + content)
       end
 
       def rule(pattern, attributes)
-        @rules << AttributeRule.new(pattern, attributes)
+        rule = AttributeRule.new(pattern, attributes)
+        @rules << rule
+        cache_rule(rule)
       end
 
       # Adds a rule for pattern that sets the text attribute.
@@ -90,6 +97,20 @@ module Reality #nodoc
       def rules
         @rules.dup
       end
+
+      def rules_by_pattern(pattern)
+        @rule_map[pattern].nil? ? [] : @rule_map[pattern].dup
+      end
+
+      def rules_by_pattern?(pattern)
+        !rules_by_pattern(pattern).empty?
+      end
+
+      private
+
+      def cache_rule(rule)
+        (@rule_map[rule.pattern] ||= []) << rule
+      end
     end
   end
 end

data/test/reality/git/test_attributes.rb

@@ -27,6 +27,24 @@ TEXT
     assert_equal(['* -text'], attributes.rules.collect {|p| p.to_s})
 
     assert_equal({ 'text' => false }, attributes.attributes('README.md'))
+    assert_equal(['* -text'], attributes.rules_by_pattern('*').collect {|p| p.to_s})
+    assert_equal(true, attributes.rules_by_pattern?('*'))
+    assert_equal(false, attributes.rules_by_pattern?('XXX'))
+  end
+
+  def test_multiple_rules_with_same_pattern
+    content = <<TEXT
+* -text
+* binary
+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(['* -text', '* binary -diff'], attributes.rules_by_pattern('*').collect {|p| p.to_s})
+    assert_equal(true, attributes.rules_by_pattern?('*'))
+    assert_equal(false, attributes.rules_by_pattern?('XXX'))
   end
 
   def test_space_pattern_in_rule
@@ -41,6 +59,9 @@ TEXT
     assert_equal(['Read[[:space:]]Me.txt text crlf'], attributes.rules.collect {|p| p.to_s})
 
     assert_equal({ 'text' => true, 'crlf' => true }, attributes.attributes('Read Me.txt'))
+    assert_equal(['Read[[:space:]]Me.txt text crlf'], attributes.rules_by_pattern('Read Me.txt').collect {|p| p.to_s})
+    assert_equal(true, attributes.rules_by_pattern?('Read Me.txt'))
+    assert_equal(false, attributes.rules_by_pattern?('XXX'))
   end
 
   def test_exact_match_in_subdirectory
@@ -70,6 +91,9 @@ TEXT
 
     assert_equal({ 'text' => true  }, attributes.attributes('bin/doc/README.md'))
     assert_equal({ }, attributes.attributes('not/matching/bin/doc/README.md'))
+    assert_equal(['/bin/doc/README.md text'], attributes.rules_by_pattern('/bin/doc/README.md').collect {|p| p.to_s})
+    assert_equal(true, attributes.rules_by_pattern?('/bin/doc/README.md'))
+    assert_equal(false, attributes.rules_by_pattern?('XXX'))
   end
 
   def test_gitattributes_in_non_standard_location

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitattributes
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest