gitlab_git 6.3.0 → 7.0.0.rc1

data/lib/gitlab_git/stats.rb

@@ -16,8 +16,9 @@ module Gitlab
       end
 
       def files_count
-        args = [ref, '-r', '--name-only' ]
-        repo.git.native(:ls_tree, {}, args).split("\n").count
+        index = repo.rugged.index
+        index.read_tree(repo.rugged.head.target.tree)
+        index.count
       end
 
       def authors_count
@@ -31,21 +32,26 @@ module Gitlab
       protected
 
       def collect_authors
-        shortlog = repo.git.shortlog({e: true, s: true }, ref)
+        commits = repo.log(ref: ref, limit: 0)
+
+        author_stats = {}
+        commits.each do |commit|
+          if author_stats.key?(commit.author[:name])
+            author_stats[commit.author[:name]][:count] += 1
+          else
+            author_stats[commit.author[:name]] = {
+              email: commit.author[:email],
+              count: 1
+            }
+          end
+        end
 
         authors = []
-
-        lines = shortlog.split("\n")
-
-        lines.each do |line|
-          data = line.split("\t")
-          commits = data.first
-          author = Grit::Actor.from_string(data.last)
-
+        author_stats.each do |author_name, info|
           authors << OpenStruct.new(
-            name: author.name,
-            email: author.email,
-            commits: commits.to_i
+            name: author_name,
+            email: info[:email],
+            commits: info[:count]
           )
         end
 
@@ -54,8 +60,7 @@ module Gitlab
 
       def build_graph(n = 4)
         from, to = (Date.today.prev_day(n*7)), Date.today
-        args = ['--all', "--since=#{from.to_s}", '--format=%ad' ]
-        rev_list = repo.git.native(:rev_list, {}, args).split("\n")
+        rev_list = repo.commits_since(from)
 
         commits_dates = rev_list.values_at(* rev_list.each_index.select {|i| i.odd?})
         commits_dates = commits_dates.map { |date_str| Time.parse(date_str).to_date.to_s }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 7.0.0.rc1
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist
@@ -25,61 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: gitlab-grit
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
-  name: rugged
+  name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: charlock_holmes
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.1'
 description: GitLab wrapper around git objects
 email: dmitriy.zaporozhets@gmail.com
 executables: []
@@ -93,6 +93,7 @@ files:
 - lib/gitlab_git/blob_snippet.rb
 - lib/gitlab_git/branch.rb
 - lib/gitlab_git/commit.rb
+- lib/gitlab_git/commit_stats.rb
 - lib/gitlab_git/compare.rb
 - lib/gitlab_git/diff.rb
 - lib/gitlab_git/encoding_helper.rb
@@ -119,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2