gitlab_git 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ce597843c96f522a4eeeb7b12834eb4a1c6ef9c
-  data.tar.gz: 9e421ac92c6bc6429dec0ebfbb13bb8e4cf2f8b4
+  metadata.gz: f27529cfedcde0463fd58df616dd0ccfc0f8d747
+  data.tar.gz: d9b76853f6e0ab13439e56fd8cc4c67c8d3b75ee
 SHA512:
-  metadata.gz: 1f57ab708782206339b826b8197af04bf5cb29e854668d57f4e92fcbfefdd70c24659663a9ba157ba28fde6fecd17ac21981bf5951b4d917d49c606bbeea811a
-  data.tar.gz: 849667367f90c41f2b0b92f9c55d6b10877cbd9a4a34771820c0d8fdf3cf6148c25ad26dddf7dfe8fc03e789f2c0bfc17178e1ed3a09b0ed1e6f34ec7e01e9bf
+  metadata.gz: bce2de00ee1416fd9fe88d3d8987df62f046ef0c4443df8e3c1a64a24d93ca194706bb4795635ff86e4d01ab5b3087954ee00ac480b0613e33099c92ab8f10b5
+  data.tar.gz: b0c00d55181cb8bd403322bae01bd5f73d73578a9cac7a1b110b81997ff85d81f95f5ed4ea3932519a07ad3f35510118a3b089608e559873a4337ea41e85137e

data/VERSION

@@ -0,0 +1 @@
+5.1.0

data/lib/gitlab_git.rb

@@ -6,6 +6,7 @@ require 'linguist'
 require 'active_support/core_ext/hash/keys'
 require 'grit'
 require 'grit_ext'
+require 'rugged'
 
 Grit::Blob.class_eval do
   include Linguist::BlobHelper
@@ -24,3 +25,6 @@ require_relative "gitlab_git/tree"
 require_relative "gitlab_git/blob_snippet"
 require_relative "gitlab_git/git_stats"
 require_relative "gitlab_git/log_parser"
+require_relative "gitlab_git/ref"
+require_relative "gitlab_git/branch"
+require_relative "gitlab_git/tag"

data/lib/gitlab_git/blob.rb

@@ -7,16 +7,22 @@ module Gitlab
 
       class << self
         def find(repository, sha, path)
-          commit = Commit.find(repository, sha)
-          grit_blob = commit.tree / path
+          commit = repository.lookup(sha)
+          root_tree = commit.tree
 
-          if grit_blob.kind_of?(Grit::Blob)
+          blob_entry = find_entry_by_path(repository, root_tree.oid, path)
+
+          return nil unless blob_entry
+
+          blob = repository.lookup(blob_entry[:oid])
+
+          if blob
             Blob.new(
-              id: grit_blob.id,
-              name: grit_blob.name,
-              size: grit_blob.size,
-              data: grit_blob.data,
-              mode: grit_blob.mode,
+              id: blob.oid,
+              name: blob_entry[:name],
+              size: blob.size,
+              data: blob.content,
+              mode: blob_entry[:mode],
               path: path,
               commit_id: sha,
             )
@@ -24,13 +30,49 @@ module Gitlab
         end
 
         def raw(repository, sha)
-          grit_blob = repository.grit.blob(sha)
+          blob = repository.lookup(sha)
+
           Blob.new(
-            id: grit_blob.id,
-            size: grit_blob.size,
-            data: grit_blob.data,
+            id: blob.oid,
+            size: blob.size,
+            data: blob.content,
           )
         end
+
+        # Recursive search of blob id by path
+        #
+        # Ex.
+        #   blog/            # oid: 1a
+        #     app/           # oid: 2a
+        #       models/      # oid: 3a
+        #       file.rb      # oid: 4a
+        #
+        #
+        # Blob.find_entry_by_path(repo, '1a', 'app/file.rb') # => '4a'
+        #
+        def find_entry_by_path(repository, root_id, path)
+          root_tree = repository.lookup(root_id)
+          path_arr = path.split('/')
+
+          entry = root_tree.find do |entry|
+            entry[:name] == path_arr[0]
+          end
+
+          return nil unless entry
+
+          if path_arr.size > 1
+            return nil unless entry[:type] == :tree
+          else
+            return nil unless entry[:type] == :blob
+          end
+
+          if path_arr.size > 1
+            path_arr.shift
+            find_entry_by_path(repository, entry[:oid], path_arr.join('/'))
+          else
+            entry
+          end
+        end
       end
 
       def initialize(options)

data/lib/gitlab_git/branch.rb

@@ -0,0 +1,6 @@
+module Gitlab
+  module Git
+    class Branch < Ref
+    end
+  end
+end

data/lib/gitlab_git/commit.rb

@@ -47,7 +47,7 @@ module Gitlab
           tag = repo.tags.find {|tag| tag.name == commit_id} if commit_id
 
           commit = if tag
-                     tag.commit
+                     repo.log(ref: tag.target).first
                    else
                      repo.log(ref: commit_id).first
                    end

data/lib/gitlab_git/ref.rb

@@ -0,0 +1,26 @@
+module Gitlab
+  module Git
+    class Ref
+      # Branch or tag name
+      # without "refs/tags|heads" prefix
+      attr_reader :name
+
+      # Target sha.
+      # Usually it is commit sha but in case
+      # when tag reference on other tag it can be tag sha
+      attr_reader :target
+
+      # Extract branch name from full ref path
+      #
+      # Ex.
+      #   Ref.extract_branch_name('refs/heads/master') #=> 'master'
+      def self.extract_branch_name(str)
+        str.gsub(/\Arefs\/heads\//, '')
+      end
+
+      def initialize(name, target)
+        @name, @target = name.gsub(/\Arefs\/(tags|heads)\//, ''), target
+      end
+    end
+  end
+end

data/lib/gitlab_git/repository.rb

@@ -20,8 +20,8 @@ module Gitlab
       # Grit repo object
       attr_reader :grit
 
-      # Alias to old method for compatibility
-      alias_method :raw, :grit
+      # Rugged repo object
+      attr_reader :rugged
 
       def initialize(path)
         @path = path
@@ -35,6 +35,17 @@ module Gitlab
         raise NoRepository.new('no repository for such path')
       end
 
+      # Alias to old method for compatibility
+      def raw
+        grit
+      end
+
+      def rugged
+        @rugged ||= Rugged::Repository.new(path)
+      rescue Rugged::RepositoryError, Rugged::OSError
+        raise NoRepository.new('no repository for such path')
+      end
+
       # Returns an Array of branch names
       # sorted by name ASC
       def branch_names
@@ -43,7 +54,11 @@ module Gitlab
 
       # Returns an Array of Branches
       def branches
-        grit.branches.sort_by(&:name)
+        rugged.refs.select do |ref|
+          ref.name =~ /\Arefs\/heads/
+        end.map do |rugged_ref|
+          Branch.new(rugged_ref.name, rugged_ref.target)
+        end.sort_by(&:name)
       end
 
       # Returns an Array of tag names
@@ -53,7 +68,11 @@ module Gitlab
 
       # Returns an Array of Tags
       def tags
-        grit.tags.sort_by(&:name).reverse
+        rugged.refs.select do |ref|
+          ref.name =~ /\Arefs\/tags/
+        end.map do |rugged_ref|
+          Tag.new(rugged_ref.name, rugged_ref.target)
+        end.sort_by(&:name)
       end
 
       # Returns an Array of branch and tag names
@@ -61,18 +80,21 @@ module Gitlab
         branch_names + tag_names
       end
 
+      # Deprecated. Will be removed in 5.2
       def heads
         @heads ||= grit.heads.sort_by(&:name)
       end
 
       def has_commits?
-        !!Gitlab::Git::Commit.last(self)
-      rescue Grit::NoSuchPathError
-        false
+        !empty?
       end
 
       def empty?
-        !has_commits?
+        rugged.empty?
+      end
+
+      def repo_exists?
+        !!rugged
       end
 
       # Discovers the default branch based on the repository's available branches
@@ -85,8 +107,8 @@ module Gitlab
           nil
         elsif branch_names.length == 1
           branch_names.first
-        elsif grit.head
-          grit.head.name
+        elsif rugged.head
+          Ref.extract_branch_name(rugged.head.name)
         elsif branch_names.include?("master")
           "master"
         elsif
@@ -103,11 +125,11 @@ module Gitlab
         ref = ref || self.root_ref
         commit = Gitlab::Git::Commit.find(self, ref)
         return nil unless commit
-        
+
         extension = nil
         git_archive_format = nil
         pipe_cmd = nil
-        
+
         case format
         when "tar.bz2", "tbz", "tbz2", "tb2", "bz2"
           extension = ".tar.bz2"
@@ -293,6 +315,11 @@ module Gitlab
         end
         @refs_hash
       end
+
+      # Lookup for rugged object by oid
+      def lookup(oid)
+        rugged.lookup(oid)
+      end
     end
   end
 end

data/lib/gitlab_git/tag.rb

@@ -0,0 +1,6 @@
+module Gitlab
+  module Git
+    class Tag < Ref
+    end
+  end
+end

data/lib/gitlab_git/tree.rb

@@ -1,35 +1,75 @@
 module Gitlab
   module Git
     class Tree
-      attr_accessor :id, :name, :path, :type, :mode, :commit_id, :submodule_url
+      attr_accessor :id, :root_id, :name, :path, :type,
+        :mode, :commit_id, :submodule_url
 
       class << self
-        def where(repository, sha, path = '/')
-          commit = Commit.find(repository, sha)
-          grit_tree = commit.tree / path
-
-          if grit_tree && grit_tree.respond_to?(:contents)
-            grit_tree.contents.map do |entry|
-              type = entry.class.to_s.split("::").last.downcase.to_sym
-
-              Tree.new(
-                id: entry.id,
-                name: entry.name,
-                type: type,
-                mode: entry.mode,
-                path: path == '/' ? entry.name : File.join(path, entry.name),
-                commit_id: sha,
-                submodule_url: (type == :submodule) ? entry.url(sha) : nil
-              )
-            end
+        # Get list of tree objects
+        # for repository based on commit sha and path
+        # Uses rugged for raw objects
+        def where(repository, sha, path = nil)
+          path = nil if path == '' || path == '/'
+
+          commit = repository.lookup(sha)
+          root_tree = commit.tree
+
+          tree = if path
+                   id = Tree.find_id_by_path(repository, root_tree.oid, path)
+                   if id
+                     repository.lookup(id)
+                   else
+                     []
+                   end
+                 else
+                   root_tree
+                 end
+
+          tree.map do |entry|
+            Tree.new(
+              id: entry[:oid],
+              root_id: root_tree.oid,
+              name: entry[:name],
+              type: entry[:type] || :submodule,
+              mode: entry[:filemode],
+              path: path ? File.join(path, entry[:name]) : entry[:name],
+              commit_id: sha,
+            )
+          end
+        end
+
+        # Recursive search of tree id for path
+        #
+        # Ex.
+        #   blog/            # oid: 1a
+        #     app/           # oid: 2a
+        #       models/      # oid: 3a
+        #       views/       # oid: 4a
+        #
+        #
+        # Tree.find_id_by_path(repo, '1a', 'app/models') # => '3a'
+        #
+        def find_id_by_path(repository, root_id, path)
+          root_tree = repository.lookup(root_id)
+          path_arr = path.split('/')
+
+          entry = root_tree.find do |entry|
+            entry[:name] == path_arr[0] && entry[:type] == :tree
+          end
+
+          return nil unless entry
+
+          if path_arr.size > 1
+            path_arr.shift
+            find_id_by_path(repository, entry[:oid], path_arr.join('/'))
           else
-            []
+            entry[:oid]
           end
         end
       end
 
       def initialize(options)
-        %w(id name path type mode commit_id submodule_url).each do |key|
+        %w(id root_id name path type mode commit_id).each do |key|
           self.send("#{key}=", options[key.to_sym])
         end
       end
@@ -52,4 +92,3 @@ module Gitlab
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.19.0
 description: GitLab wrapper around git objects
 email: dmitriy.zaporozhets@gmail.com
 executables: []
@@ -62,15 +76,19 @@ files:
 - lib/gitlab_git/blame.rb
 - lib/gitlab_git/blob.rb
 - lib/gitlab_git/blob_snippet.rb
+- lib/gitlab_git/branch.rb
 - lib/gitlab_git/commit.rb
 - lib/gitlab_git/compare.rb
 - lib/gitlab_git/diff.rb
 - lib/gitlab_git/git_stats.rb
 - lib/gitlab_git/log_parser.rb
 - lib/gitlab_git/popen.rb
+- lib/gitlab_git/ref.rb
 - lib/gitlab_git/repository.rb
 - lib/gitlab_git/stats.rb
+- lib/gitlab_git/tag.rb
 - lib/gitlab_git/tree.rb
+- VERSION
 homepage: http://rubygems.org/gems/gitlab_git
 licenses:
 - MIT