Merge pull request #63 from kevinjalbert/fix-rugged-and-other-updates

Fix Rugged and other updates

Author: kevinjalbert

.rubocop.yml

@@ -3,6 +3,9 @@ AllCops:
  - '**/Rakefile'
  - '**/*.rake'
 
+AbcSize:
+ Enabled: false
+
 ClassLength:
  Enabled: false
 
@@ -18,6 +21,9 @@ EmptyLineBetweenDefs:
 Encoding:
  EnforcedStyle: when_needed
 
+FileName:
+ Enabled: false
+
 LineLength:
  Enabled: false
 

.ruby-version

@@ -4,20 +4,25 @@ rvm:
  - 1.9.3
  - 2.0.0
  - 2.1.0
+ - 2.2.0
+
+# Tests are ran against the repos early history
+git:
+ depth: 10000
 
 bundler_args: --without darwin debug
 
 notifications:
  email: false
 
 before_script:
- # Grit's Commit.find_all(...) requires the master branch to be present
- - git remote add master git://github.com/kevinjalbert/git_statistics.git
- - git fetch master
+ # Tests requires the master branch to be present
+ - git fetch origin
  - git checkout master
  - git checkout -
 
- # Tests are ran against the repos early history
- - git pull origin -q --depth=1000000
+script: bundle exec rspec
 
-script: bundle exec rspec spec
+before_install:
+ - gem update --system
+ - gem install bundler

.travis.yml

@@ -1,24 +1,20 @@
 source 'https://rubygems.org'
 
+gemspec
+
 group :test do
- gem 'rspec'
- gem "simplecov"
- gem 'coveralls', require: false
+ gem 'rspec', '~> 3.4'
+ gem 'simplecov', '~> 0.11'
+ gem 'coveralls', '~> 0.8', require: false
 end
 
 group :development do
- gem "guard-rspec"
- gem "rubocop"
- gem "pry-debugger"
- gem "pry-stack_explorer"
+ gem 'guard-rspec', '~> 4.6'
+ gem 'rubocop', '~> 0.35'
+ gem 'pry-stack_explorer', '~> 0.4'
 end
 
 group :darwin do
- gem "rb-fsevent"
- gem "terminal-notifier-guard"
+ gem 'rb-fsevent', '~> 0.9'
+ gem 'terminal-notifier-guard', '~> 1.6'
 end
-
-gem 'rake'
-gem 'json'
-gem 'rugged'
-gem 'language_sniffer'

Gemfile

@@ -1,6 +1,5 @@
 # Git Statistics
 
-[![Gitter Chat](http://img.shields.io/badge/chat-gitter-brightgreen.svg)](https://gitter.im/kevinjalbert/git_statistics)
 [![Gem Version](https://badge.fury.io/rb/git_statistics.svg)](http://badge.fury.io/rb/git_statistics)
 [![Build Status](https://travis-ci.org/kevinjalbert/git_statistics.svg?branch=master)](http://travis-ci.org/kevinjalbert/git_statistics)
 [![Coverage Status](https://img.shields.io/coveralls/kevinjalbert/git_statistics.svg)](https://coveralls.io/r/kevinjalbert/git_statistics)

README.md

@@ -7,7 +7,7 @@ require 'rubocop/rake_task'
 
 CLOBBER.include('coverage')
 
-Rubocop::RakeTask.new
+RuboCop::RakeTask.new
 
 desc 'Run all specs'
 RSpec::Core::RakeTask.new do |t|

Rakefile

@@ -1,18 +1,25 @@
 # -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
+$:.unshift File.expand_path('../lib', __FILE__)
 require 'git_statistics/version'
 
 Gem::Specification.new do |gem|
  gem.homepage = 'https://github.com/kevinjalbert/git_statistics'
- gem.authors = ["Kevin Jalbert"]
- gem.email = ["kevin.j.jalbert@gmail.com"]
+ gem.authors = ['Kevin Jalbert']
+ gem.email = ['kevin.j.jalbert@gmail.com']
  gem.name = 'git_statistics'
  gem.version = GitStatistics::VERSION
- gem.summary = "Gem that provides the ability to gather detailed git statistics"
- gem.description = "git_statistics is a gem that provides detailed git statistics"
- gem.require_paths = ["lib"]
+ gem.summary = 'Gem that provides the ability to gather detailed git statistics'
+ gem.description = 'git_statistics is a gem that provides detailed git statistics'
+ gem.require_paths = ['lib']
  gem.files = Dir['lib/**/*']
  gem.test_files = Dir['spec/**/*_spec.rb']
- gem.executables = %w[ git_statistics git-statistics ]
+ gem.executables = %w(git_statistics git-statistics)
  gem.required_ruby_version = '>= 1.9.3'
+
+ gem.add_development_dependency 'bundler', '>= 1.6.0'
+ gem.add_development_dependency 'rake', '~> 10.0'
+
+ gem.add_runtime_dependency 'json', '~> 1.8.3'
+ gem.add_runtime_dependency 'rugged', '~> 0.23.3'
+ gem.add_runtime_dependency 'language_sniffer', '~> 1.0.2'
 end

git_statistics.gemspec

@@ -7,8 +7,7 @@ class CLI
  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)
+ @repository = dir.nil? ? Rugged::Repository.discover(Dir.pwd) : Rugged::Repository.discover(dir)
  @collected = false
  @collector = nil
  @options = OpenStruct.new(

lib/git_statistics.rb

@@ -9,11 +9,10 @@ def initialize(repo, limit, fresh, pretty)
  end
 
  def collect(options = {})
- branch = options[:branch] ? options[:branch] : CLI::DEFAULT_BRANCH
- branch_head = Rugged::Branch.lookup(repo, branch).tip
+ branch_name = options[:branch] ? options[:branch] : CLI::DEFAULT_BRANCH
 
  walker = Rugged::Walker.new(repo)
- walker.push(branch_head)
+ walker.push(repo.branches[branch_name].target)
 
  walker.each_with_index do |commit, count|
  next unless valid_commit?(commit, options)
@@ -51,7 +50,7 @@ def acquire_commit_meta(commit_summary)
  data[:added_files] = commit_summary.added_files
  data[:deleted_files] = commit_summary.deleted_files
  data[:modified_files] = commit_summary.modified_files
- data[:files] = commit_summary.file_stats.map { |file| file.to_json }
+ data[:files] = commit_summary.file_stats.map(&:to_json)
 
  data
  end

lib/git_statistics/collector.rb

@@ -16,17 +16,17 @@ def merge?
 
  # How many files were removed in this commit
  def deleted_files
- file_stats.select { |file| file.status == :deleted }.count
+ file_stats.count { |file| file.status == :deleted }
  end
 
  # How many files were added in this commit
  def added_files
- file_stats.select { |file| file.status == :added }.count
+ file_stats.count { |file| file.status == :added }
  end
 
  # How many files were modified (not added/deleted) in this commit
  def modified_files
- file_stats.select { |file| file.status == :modified }.count
+ file_stats.count { |file| file.status == :modified }
  end
 
  # How many total additions in this commit?