gitlab_git 10.5.0 → 10.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5186b04c57f9ce96224e1ce5b567a935d3f87937
-  data.tar.gz: edd381e264f533ebfd893e3be1c1b53f4f09bf91
+  metadata.gz: 55838a68588d3d13baf3b25006303104097c90f0
+  data.tar.gz: 7851cc80bdabd78e1883d4db0fecec5e1cba5e8d
 SHA512:
-  metadata.gz: a07ce78888f76148a23822e49dd79707d47d0cb9f7ce1ae4f14b3053ad124865a7ddcd6089419ecab7524ae24e76e39a95a620cfa3ec75f2098ffb19bceafc0d
-  data.tar.gz: b8721276ada106d0da73fce92d27f67e4004cf994f32d691d10e239ad898c52b4cd5a2f367948ca7da6ca4f41c1a839829879f67b1452964a6d65abca6f0368f
+  metadata.gz: be8c4fe7d0dcdfe967ffdeed219b2b5237580ce0bdf0ad863757783233984e748ecf3b83ad7ef87102076b7fb5a076446532225d58e6342809a3152ba6061f5c
+  data.tar.gz: 6b12bdfb2628285e9f3430fa1d7594fcae55160e700abc7a805f9f28a3e1592eb112527b85e1606a1eb94c296857e4f6073efaefdf6210d3f30e17851f8dfce6

data/VERSION

@@ -1 +1 @@
-10.5.0
+10.6.0

data/lib/gitlab_git.rb

@@ -25,3 +25,4 @@ require_relative "gitlab_git/ref"
 require_relative "gitlab_git/branch"
 require_relative "gitlab_git/tag"
 require_relative "gitlab_git/util"
+require_relative "gitlab_git/attributes"

data/lib/gitlab_git/attributes.rb

@@ -0,0 +1,116 @@
+module Gitlab
+  module Git
+    # Class for parsing Git attribute files and extracting the attributes for
+    # file patterns.
+    #
+    # Unlike Rugged this parser only needs a single IO call (a call to `open`),
+    # vastly reducing the time spent in extracting attributes.
+    #
+    # This class _only_ supports parsing the attributes file located at
+    # `$GIT_DIR/info/attributes` as GitLab doesn't use any other files
+    # (`.gitattributes` is copied to this particular path).
+    #
+    # Basic usage:
+    #
+    #     attributes = Gitlab::Git::Attributes.new(some_repo.path)
+    #
+    #     attributes.attributes('README.md') # => { "eol" => "lf }
+    class Attributes
+      # path - The path to the Git repository.
+      def initialize(path)
+        @path = path
+        @patterns = nil
+      end
+
+      # Returns all the Git attributes for the given path.
+      #
+      # path - A path to a file for which to get the attributes.
+      #
+      # Returns a Hash.
+      def attributes(path)
+        patterns.each do |pattern, attrs|
+          return attrs if File.fnmatch(pattern, path)
+        end
+
+        {}
+      end
+
+      # Returns a Hash containing the file patterns and their attributes.
+      def patterns
+        @patterns ||= parse_file
+      end
+
+      # 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 = '='
+
+        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
+
+          # Input: "-foo"
+          if chunk.start_with?(dash)
+            key = chunk.byteslice(1, chunk.length - 1)
+
+            values[key] = false
+
+          # Input: "foo=bar"
+          elsif chunk.include?(equal)
+            key, value = chunk.split(equal, 2)
+
+            values[key] = value
+
+          # Input: "foo"
+          else
+            values[chunk] = true
+          end
+        end
+
+        values
+      end
+
+      # Iterates over every line in the attributes file.
+      def each_line
+        full_path = File.join(@path, 'info/attributes')
+
+        File.open(full_path, 'r') do |handle|
+          handle.each_line do |line|
+            yield line.strip
+          end
+        end
+      end
+
+      private
+
+      # Parses the Git attributes file.
+      def parse_file
+        pairs = []
+        comment = '#'
+
+        each_line do |line|
+          next if line.start_with?(comment) || line.empty?
+
+          pattern, attrs = line.split(/\s+/, 2)
+
+          pairs << [pattern, parse_attributes(attrs)]
+        end
+
+        # Newer entries take precedence over older entries.
+        pairs.reverse.to_h
+      end
+    end
+  end
+end

data/lib/gitlab_git/repository.rb

@@ -27,14 +27,12 @@ module Gitlab
       # Rugged repo object
       attr_reader :rugged
 
-      # Define a delegator for the rugged attributes
-      def_delegator :rugged, :attributes
-
       # 'path' must be the path to a _bare_ git repository, e.g.
       # /path/to/my-repo.git
       def initialize(path)
         @path = path
         @name = path.split("/").last
+        @attributes = Attributes.new(path)
       end
 
       # Default branch in the repository
@@ -978,8 +976,14 @@ module Gitlab
 
       # Checks if the blob should be diffable according to its attributes
       def diffable?(blob)
-        blob_attributes = attributes(blob.path).to_h
-        blob_attributes.fetch('diff', blob.text?)
+        attributes(blob.path).fetch('diff') { blob.text? }
+      end
+
+      # Returns the Git attributes for the given file path.
+      #
+      # See `Gitlab::Git::Attributes` for more information.
+      def attributes(path)
+        @attributes.attributes(path)
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.5.0
+  version: 10.6.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
@@ -88,6 +88,7 @@ extra_rdoc_files: []
 files:
 - VERSION
 - lib/gitlab_git.rb
+- lib/gitlab_git/attributes.rb
 - lib/gitlab_git/blame.rb
 - lib/gitlab_git/blob.rb
 - lib/gitlab_git/blob_snippet.rb
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library