gitlab_git 6.2.2 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94dbbdaea6c14edfa048c5930d03fbdebc4d1b0
-  data.tar.gz: 31dbfbc4ea14ba40215166478e1d8faa818ec6fb
+  metadata.gz: f512e6aa7aeac3ab0fd43175bc3d53e50f510776
+  data.tar.gz: 4949e60987b1dbe296a97d0a041a09091cd1cf44
 SHA512:
-  metadata.gz: b7053dab7208ea7d2495c7d88cd7a018494fc55a493315cc2e4f5a99582f774265a22bc5991a4a2153127a7ad3f1f9d788eb15f2677948e543cd1100cab173d1
-  data.tar.gz: 5ae987f97a3bf7cedbc4b833785bddbf57dac8385d54267c085a293019853d979936403bbc3e9d58ca1915e7c62822f9ae1e0ec94dcbc21e649f84bf3cfbac7d
+  metadata.gz: 9b4d0e7beb1942463241b37cee1e02c719a0a8cbfca5f5d5a1920d91b47ab4f2be781dd0f33e33ff312b31154162cc3219e465375ee6c56fa0242b5b32980eaf
+  data.tar.gz: a370d903817cfc3f8893741ddd042cee6d74482cfcfaed36d35e257223bf7efa846104c2fd5da75a84da2a737140b482debed0b79a4f76a34eb44f1339d44a08

data/VERSION

@@ -1 +1 @@
-6.2.2
+6.3.0

data/lib/gitlab_git.rb

@@ -16,7 +16,7 @@ end
 
 # Gitlab::Git
 require_relative "gitlab_git/popen"
-require_relative "gitlab_git/encoding_herlper"
+require_relative 'gitlab_git/encoding_helper'
 require_relative "gitlab_git/blame"
 require_relative "gitlab_git/blob"
 require_relative "gitlab_git/commit"

data/lib/gitlab_git/blame.rb

@@ -1,20 +1,22 @@
 module Gitlab
   module Git
     class Blame
-      attr_accessor :repository, :sha, :path
 
       def initialize(repository, sha, path)
-        @repository, @sha, @path = repository, sha, path
+        @repo = repository.rugged
+        @blame = Rugged::Blame.new(@repo, path)
+        @blob = @repo.blob_at(sha, path)
+        @lines = @blob.content.split("\n")
       end
 
       def each
-        raw_blame = Grit::Blob.blame(repository.raw, sha, path)
+        @blame.each do |blame|
+          from = blame[:final_start_line_number] - 1
+          commit = @repo.lookup(blame[:final_commit_id])
 
-        raw_blame.each do |commit, lines|
-          next unless commit
-
-          commit = Gitlab::Git::Commit.new(commit)
-          yield(commit, lines)
+          yield(Gitlab::Git::Commit.new(commit),
+              @lines[from, blame[:lines_in_hunk]] || [],
+              blame[:final_start_line_number])
         end
       end
     end

data/lib/gitlab_git/commit.rb

@@ -95,6 +95,8 @@ module Gitlab
 
         if raw_commit.is_a?(Hash)
           init_from_hash(raw_commit)
+        elsif raw_commit.is_a?(Rugged::Commit)
+          init_from_rugged(raw_commit)
         else
           init_from_grit(raw_commit)
         end
@@ -225,6 +227,19 @@ module Gitlab
         end
       end
 
+      def init_from_rugged(commit)
+        @raw_commit = commit
+        @id = commit.oid
+        @message = commit.message
+        @authored_date = commit.author[:time]
+        @committed_date = commit.committer[:time]
+        @author_name = commit.author[:name]
+        @author_email = commit.author[:email]
+        @committer_name = commit.committer[:name]
+        @committer_email = commit.committer[:email]
+        @parent_ids = commit.parents.map(&:oid)
+      end
+
       def serialize_keys
         SERIALIZE_KEYS
       end

data/lib/gitlab_git/ref.rb

@@ -24,6 +24,8 @@ module Gitlab
                     target.oid
                   elsif target.respond_to?(:name)
                     target.name
+                  elsif target.is_a? String
+                    target
                   else
                     nil
                   end

data/lib/gitlab_git/repository.rb

@@ -1,7 +1,7 @@
-# Gitlab::Git::Commit is a wrapper around native Grit::Repository object
+# Gitlab::Git::Repository is a wrapper around native Grit::Repository object
 # We dont want to use grit objects inside app/
 # It helps us easily migrate to rugged in future
-require_relative 'encoding_herlper'
+require_relative 'encoding_helper'
 require 'tempfile'
 
 module Gitlab
@@ -72,7 +72,15 @@ module Gitlab
         rugged.refs.select do |ref|
           ref.name =~ /\Arefs\/tags/
         end.map do |rugged_ref|
-          Tag.new(rugged_ref.name, rugged_ref.target)
+          target = rugged_ref.target
+          message = nil
+          if rugged_ref.target.is_a?(Rugged::Tag::Annotation) &&
+             rugged_ref.target.target.is_a?(Rugged::Commit)
+            unless rugged_ref.target.target.message == rugged_ref.target.message
+              message = rugged_ref.target.message.chomp
+            end
+          end
+          Tag.new(rugged_ref.name, target, message)
         end.sort_by(&:name)
       end
 

data/lib/gitlab_git/tag.rb

@@ -1,6 +1,12 @@
 module Gitlab
   module Git
     class Tag < Ref
+      attr_reader :message
+
+      def initialize(name, target, message = nil)
+        super(name, target)
+        @message = message
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 6.2.2
+  version: 6.3.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ files:
 - lib/gitlab_git/commit.rb
 - lib/gitlab_git/compare.rb
 - lib/gitlab_git/diff.rb
-- lib/gitlab_git/encoding_herlper.rb
+- lib/gitlab_git/encoding_helper.rb
 - lib/gitlab_git/git_stats.rb
 - lib/gitlab_git/log_parser.rb
 - lib/gitlab_git/popen.rb