gitlab_git 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb27fdbe97e58c0c68ac78da7daacdf65f255a38
-  data.tar.gz: d2a1029af718f1fdfdac16c0269b8993c4a2a876
+  metadata.gz: e1c33717978708a9c7bfd0e2f85847cb558d94f0
+  data.tar.gz: 2604d9e922980d00bcc6b9dfae9a7def3493f0dc
 SHA512:
-  metadata.gz: 69057ad30cad8f6460f3dc1c0004fc9a2c0fe04e0b700e0bd7f3e2d2498ca4c91f89d2f97b6803db244818268bdd21af7475b7417eeac8b3b27fc0290228e294
-  data.tar.gz: 57c18ebb56693cc919b712e5d62547cf8b8a51e3a7734f18e4718e4137bbd507680faae2cabc05595283dc9e5ce8ced7bbad2a5cf93bd0794bc0ae534bff89bd
+  metadata.gz: ac05b8e0f12b2d1591e753d1b0587c2d5da95593c67e16a1afda31c8f00ddc9e07dc42c41607fb5248eaa75e35b5f9f7a3d7d0e147272a0c99e81a0323ac613d
+  data.tar.gz: 8a73a2d71cce28ccca47274a4c8a3d5aaa3c28ec3b52efa4daa78029d2abf1b27fca6a3b8f2ab1dea00d8febd810b19ca1f48fd86095ae31d2bd885259ca1d76

data/lib/gitlab_git.rb

@@ -22,3 +22,5 @@ require_relative "gitlab_git/repository"
 require_relative "gitlab_git/stats"
 require_relative "gitlab_git/tree"
 require_relative "gitlab_git/blob_snippet"
+require_relative "gitlab_git/git_stats"
+require_relative "gitlab_git/log_parser"

data/lib/gitlab_git/commit.rb

@@ -4,10 +4,14 @@
 module Gitlab
   module Git
     class Commit
-      attr_accessor :raw_commit, :head, :refs,
-        :id, :authored_date, :committed_date, :message,
-        :author_name, :author_email, :parent_ids,
-        :committer_name, :committer_email
+      attr_accessor :raw_commit, :head, :refs
+
+      SERIALIZE_KEYS = [
+        :id, :message, :parent_ids,
+        :authored_date, :author_name, :author_email,
+        :committed_date, :committer_name, :committer_email
+      ]
+      attr_accessor *SERIALIZE_KEYS
 
       def initialize(raw_commit, head = nil)
         raise "Nil as raw commit passed" unless raw_commit
@@ -21,10 +25,6 @@ module Gitlab
         @head = head
       end
 
-      def serialize_keys
-        @serialize_keys ||= %w(id authored_date committed_date author_name author_email committer_name committer_email message parent_ids).map(&:to_sym)
-      end
-
       def sha
         id
       end
@@ -78,15 +78,9 @@ module Gitlab
       end
 
       def to_hash
-        hash = {}
-
-        keys = serialize_keys
-
-        keys.each do |key|
+        serialize_keys.map.with_object({}) do |key, hash|
           hash[key] = send(key)
         end
-
-        hash
       end
 
       def date
@@ -132,9 +126,13 @@ module Gitlab
         raw_commit = hash.symbolize_keys
 
         serialize_keys.each do |key|
-          send(:"#{key}=", raw_commit[key.to_sym])
+          send("#{key}=", raw_commit[key])
         end
       end
+
+      def serialize_keys
+        SERIALIZE_KEYS
+      end
     end
   end
 end

data/lib/gitlab_git/git_stats.rb

@@ -0,0 +1,24 @@
+require_relative 'log_parser'
+
+module Gitlab
+  module Git
+    class GitStats
+      attr_accessor :repo, :ref
+
+      def initialize repo, ref
+        @repo, @ref = repo, ref
+      end
+
+      def log
+        args = ['--format=%aN%x0a%ad', '--date=short', '--shortstat', '--no-merges']
+        repo.git.run(nil, 'log', nil, {}, args)
+      rescue Grit::Git::GitTimeout
+        nil
+      end
+
+      def parsed_log
+        LogParser.parse_log(log)
+      end
+    end
+  end
+end

data/lib/gitlab_git/log_parser.rb

@@ -0,0 +1,36 @@
+module Gitlab
+  module Git
+    class LogParser
+      # Parses the log file into a collection of commits
+      # Data model: {author, date, additions, deletions}
+      def self.parse_log log_from_git
+        log = log_from_git.split("\n")
+
+        i = 0
+        collection = []
+        entry = {}
+
+        while i <= log.size do
+          pos = i % 4
+          case pos
+          when 0
+            unless i == 0
+              collection.push(entry)
+              entry = {}
+            end
+            entry[:author] = log[i].to_s
+          when 1
+            entry[:date] = log[i].to_s
+          when 3
+            changes = log[i].split(",")
+            entry[:additions] = changes[1].to_i unless changes[1].nil?
+            entry[:deletions] = changes[2].to_i unless changes[2].nil?
+          end
+          i += 1
+        end
+
+        collection
+      end
+    end
+  end
+end

data/lib/gitlab_git/repository.rb

@@ -111,7 +111,7 @@ module Gitlab
 
       # Returns an Array of tag names
       def tag_names
-        repo.tags.collect(&:name).sort.reverse
+        tags.map(&:name)
       end
 
       # Returns an Array of Tags
@@ -121,7 +121,7 @@ module Gitlab
 
       # Returns an Array of branch and tag names
       def ref_names
-        [branch_names + tag_names].flatten
+        branch_names + tag_names
       end
 
       def heads

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
@@ -65,6 +65,8 @@ files:
 - 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/repository.rb
 - lib/gitlab_git/stats.rb