gitattributes 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2759e748dc351ded9388399184c90221e585fa4
-  data.tar.gz: e0806187ce98ed16a53d968ab396509c0d4b796c
+  metadata.gz: f126e35bb048a9aa68b62eba4593cc7a040aa0ec
+  data.tar.gz: 240a38cf94ba4d0797bfa5080c4a9cfc652c6e18
 SHA512:
-  metadata.gz: c97e8f630ef87a46056c906f655004c3ac15bbf5dd93e4e51eb3a2eb1f07ee8714935e881d7ff805e2b9f5ac8c7ed124af08e73229afa844f30ca6862fdedc36
-  data.tar.gz: a7163bb1a24119ebe960bbd902146b922da59bee50417259a139f8175d188e518f4cfa654bea741bdd8da4aea245a7115194b2b552336ede42cb2497e16834bf
+  metadata.gz: 117bc70ee90fb3158d36300516a8e6a8d3d1a6e30dd136de484e90c3f190f1cf3ee8a0039d4239ec02d70461e46a9d41f09980155cfa100aa8eaf67eb3b668f1
+  data.tar.gz: ae70b802be7c8a80edb5092606c75e394e1a6c9637404ea2e9ca2cd583c57ac6b8f1e54b5b78c4f87e1e743f93a771cc6c98a42785ebee6d5af444bab565d8a6

data/gitattributes.gemspec

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

data/lib/reality/git/attribute_rule.rb

@@ -19,7 +19,7 @@ module Reality #nodoc
       ATTR_ORDER = %w(text binary eol encoding eofnl)
 
       def initialize(pattern, attributes)
-        @pattern = pattern
+        @pattern = pattern.gsub('[[:space:]]', ' ')
         @attributes = {}
         @priority = 1
         attributes.each do |k, v|
@@ -36,7 +36,7 @@ module Reality #nodoc
       attr_reader :priority
 
       def to_s
-        rule = self.pattern
+        rule = self.pattern.gsub(' ','[[:space:]]')
 
         attributes = self.attributes.dup
         ATTR_ORDER.each do |key|

data/test/reality/git/test_attribute_rule.rb

@@ -18,6 +18,7 @@ class Reality::Git::TestAttributeRule < Reality::TestCase
   def test_basic_operation
     rule = Reality::Git::AttributeRule.new('*', 'text' => false)
     assert_equal({ 'text' => false }, rule.attributes)
+    assert_equal('*', rule.pattern)
     assert_equal('* -text', rule.to_s)
     assert_equal(1, rule.priority)
   end
@@ -26,15 +27,24 @@ class Reality::Git::TestAttributeRule < Reality::TestCase
     rule = Reality::Git::AttributeRule.new('*', 'text' => false, 'priority' => 3)
     assert_equal(3, rule.priority)
     assert_equal({ 'text' => false }, rule.attributes)
+    assert_equal('*', rule.pattern)
     assert_equal('* -text', rule.to_s)
   end
 
   def test_many_attributes
     rule = Reality::Git::AttributeRule.new('*.rdl', 'eofnl' => false, 'text' => true, 'crlf' => true, 'binary' => false, 'ms-file' => 'RPT', 'age' => '22')
     assert_equal({ 'eofnl' => false, 'text' => true, 'crlf' => true, 'binary' => false, 'ms-file' => 'RPT', 'age' => '22' }, rule.attributes)
+    assert_equal('*.rdl', rule.pattern)
     assert_equal('*.rdl text -binary -eofnl age=22 crlf ms-file=RPT', rule.to_s)
   end
 
+  def test_whitespace_pattern_convertee
+    rule = Reality::Git::AttributeRule.new('Read[[:space:]]Me.txt', 'text' => true, 'crlf' => true)
+    assert_equal({ 'text' => true, 'crlf' => true }, rule.attributes)
+    assert_equal('Read Me.txt', rule.pattern)
+    assert_equal('Read[[:space:]]Me.txt text crlf', rule.to_s)
+  end
+
   def test_sorting
     rule1 = Reality::Git::AttributeRule.new('*.a', 'priority' => 2, 'text' => true)
     rule2 = Reality::Git::AttributeRule.new('*.b', 'priority' => 2, 'text' => true)

data/test/reality/git/test_attributes.rb

@@ -29,6 +29,20 @@ TEXT
     assert_equal({ 'text' => false }, attributes.attributes('README.md'))
   end
 
+  def test_space_pattern_in_rule
+    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('Read Me.txt'))
+  end
+
   def test_gitattributes_in_non_standard_location
     content = <<TEXT
 * -text

metadata

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