gitattributes 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9dbc9ae3068f89180ecfd208254dd413a358d01
-  data.tar.gz: 8557715a83892b0f361ffa162f10e7491074034c
+  metadata.gz: 74e12406eeb9e2147d5f85a1c3b3bbcec0d00413
+  data.tar.gz: 01349400936be63156845c7f40f527c032f127b8
 SHA512:
-  metadata.gz: 1fd79ddde7dceeded25c2f00eca18afc99559a388c043073a78cede9da31f55cd79c8fb2ac673d1db85bbda1b34f56de4bd5387bed4510388f03687a6933354d
-  data.tar.gz: 793d06a6b3a86d5a03a8f13d844bf8abd3844aecbca5d910cb4599a3eee232297c838a3d43ee2e613160fab8e72105aa47f020dff30f961ec697b43eb44ddbf5
+  metadata.gz: dfa70d0473d6a1daacd5a11207b53da1e9d84b411c5f7ab4bd490338a8493e0ff70da2dfa0003b0e33b3434f727daff36aa7268686a6f23ab86179e5960268b2
+  data.tar.gz: f4098c940c647c8ff44ffaa4fe75caebd74228486d61a3a81334ad51a41178ea6b0cc63079b4fc110e944ca07790d52ec2bfbc745d079ed31b370a053ef0eca3

data/gitattributes.gemspec

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

data/lib/reality/git/attribute_rule.rb

@@ -36,7 +36,7 @@ module Reality #nodoc
       attr_reader :priority
 
       def to_s
-        rule = self.pattern.gsub(' ','[[:space:]]')
+        rule = self.pattern.gsub(' ', '[[:space:]]')
 
         attributes = self.attributes.dup
         ATTR_ORDER.each do |key|
@@ -80,6 +80,66 @@ module Reality #nodoc
           to_s <=> other.to_s
         end
       end
+
+      class << self
+        def parse_line(line)
+          line = line.strip
+          return nil if line.start_with?('#') || line.empty?
+          pattern, attrs = line.strip.split(/\s+/, 2)
+          AttributeRule.new(pattern, attrs ? parse_attributes(attrs) : {})
+        end
+
+        private
+
+        # Parses an attribute string.
+        #
+        # These strings can be in the following formats:
+        #
+        #     text      # => { "text" => true }
+        #     -text     # => { "text" => false }
+        #     key=value # => { "key" => "value" }
+        #
+        # string - The string to parse.
+        #
+        # Returns a Hash containing the attributes and their values.
+        def parse_attributes(string)
+          values = {}
+          dash = '-'
+          equal = '='
+          binary = 'binary'
+
+          string.split(/\s+/).each do |chunk|
+            # Data such as "foo = bar" should be treated as "foo" and "bar" being
+            # separate boolean attributes.
+            next if chunk == equal
+
+            key = chunk
+
+            # Input: "-foo"
+            if chunk.start_with?(dash)
+              key = chunk.byteslice(1, chunk.length - 1)
+              value = false
+
+              # Input: "foo=bar"
+            elsif chunk.include?(equal)
+              key, value = chunk.split(equal, 2)
+
+              # Input: "foo"
+            else
+              value = true
+            end
+
+            values[key] = value
+
+            # When the "binary" option is set the "diff" option should be set to
+            # the inverse. If "diff" is later set it should overwrite the
+            # automatically set value.
+            values['diff'] = false if key == binary && value
+          end
+
+          values
+        end
+      end
     end
   end
 end

data/lib/reality/git/attributes.rb

@@ -24,9 +24,22 @@ module Reality #nodoc
         def parse(repository_path, attributes_file = nil, relative_path = nil)
           path = File.expand_path(repository_path)
           attributes_file ||= "#{path}/.gitattributes"
-          rules = File.exist?(attributes_file) ? Reality::Git::AttributesParser.parse_file(attributes_file) : []
+          rules = File.exist?(attributes_file) ? parse_file(attributes_file) : []
           Attributes.new(repository_path, attributes_file, relative_path, rules)
         end
+
+        private
+
+        def parse_file(filename)
+          rules = []
+
+          IO.readlines(filename).each do |line|
+            rule = AttributeRule.parse_line(line)
+            rules << rule if rule
+          end
+
+          rules
+        end
       end
 
       def initialize(repository_path, attributes_file = nil, relative_path = nil, rules = [])

data/lib/reality/gitattributes.rb

@@ -13,5 +13,4 @@
 #
 
 require 'reality/git/attribute_rule'
-require 'reality/git/attributes_parser'
 require 'reality/git/attributes'

data/test/reality/git/test_attribute_rule.rb

@@ -66,4 +66,20 @@ class Reality::Git::TestAttributeRule < Reality::TestCase
     assert_equal(false, rule1.eql?(rule2))
     assert_not_equal(rule1.hash, rule2.hash)
   end
+
+  def test_parse_line_comment
+    rule = Reality::Git::AttributeRule.parse_line('# This is a comment')
+    assert_equal nil, rule
+  end
+
+  def test_parse_line_empty
+    rule = Reality::Git::AttributeRule.parse_line(' ')
+    assert_equal nil, rule
+  end
+
+  def test_parse_line
+    rule = Reality::Git::AttributeRule.parse_line('*.rdl text')
+    assert_equal '*.rdl', rule.pattern
+    assert_equal({ 'text' => true }, rule.attributes)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitattributes
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Peter Donald
@@ -56,7 +56,6 @@ files:
 - gitattributes.gemspec
 - lib/reality/git/attribute_rule.rb
 - lib/reality/git/attributes.rb
-- lib/reality/git/attributes_parser.rb
 - lib/reality/gitattributes.rb
 - test/helper.rb
 - test/reality/git/test_attribute_rule.rb

data/lib/reality/git/attributes_parser.rb

@@ -1,104 +0,0 @@
-# Copyright (c) 2017 Peter Donald
-# Copyright (c) 2013 Dmitriy Zaporozhets
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# These classes were extracted from the https://gitlab.com/ben.boeckel/gitlab_git repository
-# with the gitattribtues code originally authored by Douwe Maan. Credit to the original authors.
-
-module Reality #nodoc
-  module Git
-    # Parse the Git attribute file extracting the attributes for file patterns.
-    module AttributesParser
-      class << self
-
-        # Parses the specified Git attributes file.
-        def parse_file(filename)
-          rules = []
-          comment = '#'
-
-          IO.readlines(filename).each do |line|
-            next if line.start_with?(comment) || line.empty?
-
-            pattern, attrs = line.split(/\s+/, 2)
-
-            parsed_attributes = attrs ? parse_attributes(attrs) : {}
-
-            rules << AttributeRule.new(pattern, parsed_attributes)
-          end
-
-          # Newer entries take precedence over older entries.
-          rules
-        end
-
-        private
-
-        # Parses an attribute string.
-        #
-        # These strings can be in the following formats:
-        #
-        #     text      # => { "text" => true }
-        #     -text     # => { "text" => false }
-        #     key=value # => { "key" => "value" }
-        #
-        # string - The string to parse.
-        #
-        # Returns a Hash containing the attributes and their values.
-        def parse_attributes(string)
-          values = {}
-          dash = '-'
-          equal = '='
-          binary = 'binary'
-
-          string.split(/\s+/).each do |chunk|
-            # Data such as "foo = bar" should be treated as "foo" and "bar" being
-            # separate boolean attributes.
-            next if chunk == equal
-
-            key = chunk
-
-            # Input: "-foo"
-            if chunk.start_with?(dash)
-              key = chunk.byteslice(1, chunk.length - 1)
-              value = false
-
-              # Input: "foo=bar"
-            elsif chunk.include?(equal)
-              key, value = chunk.split(equal, 2)
-
-              # Input: "foo"
-            else
-              value = true
-            end
-
-            values[key] = value
-
-            # When the "binary" option is set the "diff" option should be set to
-            # the inverse. If "diff" is later set it should overwrite the
-            # automatically set value.
-            values['diff'] = false if key == binary && value
-          end
-
-          values
-        end
-      end
-    end
-  end
-end
-