Adjust branch option to specify the branch to collect statistics on

Change: * The function of the branch CLI flag to specify the specific branch we want to collect statistics on. This differs from the original function since we use to be able to collect all commits on a set of branches. Rugged only allows us to walk through from the HEAD of one branch at a time (we might be able to expand on this by doing multiple walks from the HEAD of each branch). Refactor: * spec_helper to require git_statistics since it will include CLI class and by default it will also include the initialize file * The way we pass the branch into the collection method (pass it within the options hash) Add: * Default branch constant in CLI class

Author: kevinjalbert

lib/git_statistics.rb

@@ -4,6 +4,8 @@ module GitStatistics
  class CLI
  attr_reader :repository, :options
 
+ DEFAULT_BRANCH = "master"
+
  def initialize(dir)
  repository_location = dir.nil? ? Rugged::Repository.discover(Dir.pwd) : Rugged::Repository.discover(dir)
  @repository = Rugged::Repository.new(repository_location)
@@ -16,7 +18,7 @@ def initialize(dir)
  update: false,
  sort: "commits",
  top: 0,
- branch: false,
+ branch: DEFAULT_BRANCH,
  verbose: false,
  debug: false,
  limit: 100
@@ -42,7 +44,7 @@ def collect_and_only_update
 
  if file_count >= 0
  time_since = Utilities.get_modified_time(commits_directory + "#{file_count}.json").to_s
- @collector.collect(options.branch, {:time_since => time_since})
+ @collector.collect({:branch => options.branch, :time_since => time_since})
  @collected = true
  end
  end
@@ -59,7 +61,7 @@ def output_results
 
  def fresh_collect!
  @collector = Collector.new(repository, options.limit, true, options.pretty)
- @collector.collect(options.branch)
+ @collector.collect({:branch => options.branch})
  end
 
  def parse_options
@@ -83,8 +85,8 @@ def parse_options
  opt.on "-t", "--top N", Float,"Show the top N authors in results" do |value|
  options.top = value
  end
- opt.on "-b", "--branch", "Use current branch for statistics (otherwise all branches)" do
- options.branch = true
+ opt.on "-b", "--branch BRANCH", "Use the specified branch for statistics (otherwise the master branch is used)" do |branch|
+ options.branch = branch
  end
  opt.on "-v", "--verbose", "Verbose output (shows INFO level log statements)" do
  options.verbose = true

lib/git_statistics/collector.rb

@@ -9,11 +9,13 @@ def initialize(repo, limit, fresh, pretty)
  @commits = Commits.new(@commits_path, fresh, limit, pretty)
  end
 
- def collect(branch, options = {})
+ def collect(options = {})
+ branch = options[:branch] ? options[:branch] : CLI::DEFAULT_BRANCH
+ branch_head = Rugged::Branch.lookup(repo, branch).tip
+
  walker = Rugged::Walker.new(repo)
- master_head = Rugged::Branch.lookup(repo, "master").tip
+ walker.push(branch_head)
 
- walker.push(master_head)
  walker.each_with_index do |commit, count|
  if valid_commit?(commit, options)
  extract_commit(commit, count + 1)

spec/collector_spec.rb

@@ -9,15 +9,15 @@
  let(:collector) {Collector.new(repo, limit, fresh, pretty)}
 
  describe "#collect" do
- let(:branch) {""}
+ let(:branch) {CLI::DEFAULT_BRANCH}
  let(:email) {false}
  let(:merge) {true}
  let(:time_since) {"Tue Sep 24 14:15:44 2012 -0400"}
  let(:time_until) {"Tue Sep 26 14:45:05 2012 -0400"}
  let(:author) {"Kevin Jalbert"}
 
  let(:setup) {
- collector.collect(branch, {:time_since => time_since, :time_until => time_until})
+ collector.collect({:branch => branch, :time_since => time_since, :time_until => time_until})
  collector.commits.calculate_statistics(email, merge)
  @subject = collector.commits.stats[author]
  }

spec/spec_helper.rb

@@ -11,12 +11,12 @@
 
 Dir.glob(spec_dir + 'support/**/*.rb') {|file| require file}
 
-require 'git_statistics/initialize'
+require 'git_statistics'
 
 GIT_REPO = Rugged::Repository.new(Rugged::Repository.discover(home_dir.to_s))
 
 def fixture(file)
- GitStatistics::PipeStub.new(file)
+ PipeStub.new(file)
 end
 
 def setup_commits(commits, file_load, file_save, pretty)
@@ -30,7 +30,7 @@ def setup_commits(commits, file_load, file_save, pretty)
 RSpec.configure do |config|
  config.before do
  %w[debug info warn error fatal].each do |level|
- GitStatistics::Log.stub(level)
+ Log.stub(level)
  end
  end
 end