gitlab_git 7.0.0.rc2 → 7.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8663d6a95fd1eac86893a44bd52f930722519c49
-  data.tar.gz: f9c7a84ec37a3090261764c4c25acd5cc1cecb3c
+  metadata.gz: ff461d9ee572c8e82ed303b222d4719bce93dcc5
+  data.tar.gz: 16c2b9ada62bb3452b237ef921bfc004ac2aaaa6
 SHA512:
-  metadata.gz: 43057a9d17dedbec4c797e89e54e35df0971aa583d3441e46ad2e63472731edb4296b56ed1d9e3c1d58ba7c340e2f0025f2f1a7022e55286e39674d9c6f1670e
-  data.tar.gz: b6ac8df1d9ee7bc266d9cfe624353046b5e345172a819aa6dffbc40fea291b187215e7afffd2dcb1ed2583df5f6aab6253ee4315ca6e7a3f2159fe956684b649
+  metadata.gz: a2cf2dceb0d689ee5489724ffb920cc61605de1728ba00fb9168e136a9f262c8d75cdcedc19a4605e420b3b2ba0cce8bd643d46424a05ad77926fcd3e63bdcdd
+  data.tar.gz: c55192100961a6311fc981b240fec387bc87faeefb1ec637f608c0e9008e67bbe32055f694b2fe325a23f2e361637e1fe3d7d8482008738b9c17c2c94cb69ed1

data/VERSION

@@ -1 +1 @@
-7.0.0.rc2
+7.0.0.rc3

data/lib/gitlab_git.rb

@@ -18,11 +18,8 @@ require_relative "gitlab_git/commit_stats"
 require_relative "gitlab_git/compare"
 require_relative "gitlab_git/diff"
 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"
 require_relative "gitlab_git/ref"
 require_relative "gitlab_git/branch"
 require_relative "gitlab_git/tag"

data/lib/gitlab_git/repository.rb

@@ -198,7 +198,8 @@ module Gitlab
           offset: 0,
           path: nil,
           ref: root_ref,
-          follow: false
+          follow: false,
+          skip_merges: false
         }
 
         options = default_options.merge(options)
@@ -737,11 +738,17 @@ module Gitlab
 
         limit = options[:limit].to_i
         offset = options[:offset].to_i
+        skip_merges = options[:skip_merges]
 
         walker.sorting(Rugged::SORT_DATE)
         walker.each do |c|
           break if limit > 0 && commits.length >= limit
 
+          if skip_merges
+            # Skip merge commits
+            next if c.parents.length > 1
+          end
+
           if !current_path ||
             commit_touches_path?(c, current_path, options[:follow])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc2
+  version: 7.0.0.rc3
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
@@ -97,12 +97,9 @@ files:
 - lib/gitlab_git/compare.rb
 - lib/gitlab_git/diff.rb
 - lib/gitlab_git/encoding_helper.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
 homepage: http://rubygems.org/gems/gitlab_git

data/lib/gitlab_git/git_stats.rb

@@ -1,75 +0,0 @@
-require_relative 'log_parser'
-
-module Gitlab
-  module Git
-    class GitStats
-      attr_accessor :repo, :ref, :timeout
-
-      def initialize(repo, ref, timeout = 30)
-        @repo, @ref, @timeout = repo, ref, timeout
-      end
-
-      # Returns a string of log information; equivalent to running 'git log`
-      # with these options:
-      #
-      # -6000
-      # --format=%aN%x0a%aE%x0a%cd
-      # --date=short
-      # --shortstat
-      # --no-merges
-      # --diff-filter=ACDM
-      def log
-        commit_strings = []
-        walker = Rugged::Walker.new(repo.rugged)
-        walker.push(repo.lookup(ref))
-        walker.each(limit: 6000) do |commit|
-          # Skip merge commits
-          next if commit.parents.length > 1
-
-          g_commit = Gitlab::Git::Commit.new(commit)
-
-          commit_strings << [
-            g_commit.author_name,
-            g_commit.author_email,
-            g_commit.committed_date.strftime("%Y-%m-%d"),
-            "",
-            status_string(g_commit)
-          ].join("\n")
-        end
-
-        commit_strings.join("\n")
-      end
-
-      def parsed_log
-        LogParser.parse_log(log)
-      end
-
-      private
-
-      # Returns a string describing the files changed, additions and deletions
-      # for +commit+
-      def status_string(commit)
-        stats = commit.stats
-
-        status = "#{num_files_changed(commit)} files changed"
-        status << ", #{stats.additions} insertions" if stats.additions > 0
-        status << ", #{stats.deletions} deletions" if stats.deletions > 0
-        status
-      end
-
-      # Returns the number of files that were either added, copied, deleted, or
-      # modified by +commit+
-      def num_files_changed(commit)
-        count = 0
-
-        diff = commit.diff_from_parent
-        diff.find_similar!
-        diff.each_delta do |d|
-          count += 1 if d.added? || d.copied? || d.deleted? || d.modified?
-        end
-
-        count
-      end
-    end
-  end
-end

data/lib/gitlab_git/log_parser.rb

@@ -1,31 +0,0 @@
-module Gitlab
-  module Git
-    class LogParser
-      # Parses the log file into a collection of commits
-      # Data model:
-      #   {author_name, author_email, date, additions, deletions}
-      def self.parse_log(log_from_git)
-        log = log_from_git.split("\n")
-        collection = []
-
-        log.each_slice(5) do |slice|
-          entry = {}
-          entry[:author_name] = slice[0].force_encoding('UTF-8')
-          entry[:author_email] = slice[1].force_encoding('UTF-8')
-          entry[:date] = slice[2]
-
-          if slice[4]
-            changes = slice[4]
-
-            entry[:additions] = $1.to_i if changes =~ /(\d+) insertion/
-            entry[:deletions] = $1.to_i if changes =~ /(\d+) deletion/
-          end
-
-          collection.push(entry)
-        end
-
-        collection
-      end
-    end
-  end
-end

data/lib/gitlab_git/stats.rb

@@ -1,80 +0,0 @@
-module Gitlab
-  module Git
-    class Stats
-      attr_accessor :repo, :ref
-
-      def initialize repo, ref
-        @repo, @ref = repo, ref
-      end
-
-      def authors
-        @authors ||= collect_authors
-      end
-
-      def commits_count
-        @commits_count ||= repo.commit_count(ref)
-      end
-
-      def files_count
-        index = repo.rugged.index
-        index.read_tree(repo.rugged.head.target.tree)
-        index.count
-      end
-
-      def authors_count
-        authors.size
-      end
-
-      def graph
-        @graph ||= build_graph
-      end
-
-      protected
-
-      def collect_authors
-        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 = []
-        author_stats.each do |author_name, info|
-          authors << OpenStruct.new(
-            name: author_name,
-            email: info[:email],
-            commits: info[:count]
-          )
-        end
-
-        authors.sort_by(&:commits).reverse
-      end
-
-      def build_graph(n = 4)
-        from, to = (Date.today.prev_day(n*7)), Date.today
-        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 }
-
-        commits_per_day = from.upto(to).map do |day|
-          commits_dates.count(day.to_date.to_s)
-        end
-
-        OpenStruct.new(
-          labels: from.upto(to).map { |day| day.strftime('%b %d') },
-          commits: commits_per_day,
-          weeks: n
-        )
-      end
-    end
-  end
-end