git_statistics 0.7.0 → 0.8.0

data/lib/git_statistics/formatters/console.rb

@@ -1,7 +1,6 @@
 module GitStatistics
   module Formatters
     class Console
-
       attr_reader :output
       attr_accessor :commits, :config
 
@@ -17,15 +16,15 @@ module GitStatistics
 
         # Acquire data based on sort type and top # to show
         data = @commits.author_top_n_type(sort.to_sym, top_n)
-        raise "Parameter for --sort is not valid" if data.nil?
+        raise 'Parameter for --sort is not valid' if data.nil?
 
         # Create config
-        @config = {:data => data,
-                  :author_length => Utilities.max_length_in_list(data.keys, 17),
-                  :language_length => Utilities.max_length_in_list(@commits.totals[:languages].keys, 8),
-                  :sort => sort,
-                  :email => email,
-                  :top_n => top_n}
+        @config = { data: data,
+                    author_length: Utilities.max_length_in_list(data.keys, 17),
+                    language_length: Utilities.max_length_in_list(@commits.totals[:languages].keys, 8),
+                    sort: sort,
+                    email: email,
+                    top_n: top_n }
 
         # Acquire formatting pattern for output
         @pattern = "| %-#{config[:author_length]}s | %-#{config[:language_length]}s | %7s | %9s | %9s | %7s | %7s | %7s | %6s | %6s |"
@@ -39,14 +38,19 @@ module GitStatistics
 
         # Print query/header information
         print_header
+
         # Print per author information
         config[:data].each do |name, commit_data|
           print_row(name, commit_data)
           print_language_data(commit_data)
         end
+
         add_row separator
-        print_row("Repository Totals", commit_totals)
+
+        print_row('Repository Totals', commit_totals)
         print_language_data(commit_totals)
+        add_row separator
+
         display!
       end
 
@@ -56,24 +60,24 @@ module GitStatistics
 
       def print_language_data(data)
         # Print information of each language for the data
-        data[:languages].each do |language, commit_data|
-          print_row("", commit_data, language)
+        data[:languages].sort.each do |language, commit_data|
+          print_row('', commit_data, language)
         end
         output
       end
 
       def print_row(name, commit_info, language = '')
         add_row format_for_row(name, language, commit_info[:commits],
-                        commit_info[:additions], commit_info[:deletions], commit_info[:added_files],
-                        commit_info[:deleted_files], commit_info[:renamed_files], commit_info[:copied_files], commit_info[:merges])
+                               commit_info[:additions], commit_info[:deletions], commit_info[:added_files],
+                               commit_info[:deleted_files], commit_info[:renamed_files], commit_info[:copied_files], commit_info[:merges])
       end
 
       def print_header
-        get_author_info(@commits.stats.size)
-        get_header_info
+        author_info(@commits.stats.size)
+        header_info
       end
 
-      def get_header_info
+      def header_info
         add_row separator
         add_row format_for_row('Name/Email', 'Language', 'Commits', 'Additions', 'Deletions', 'Creates', 'Deletes', 'Renames', 'Copies', 'Merges')
         add_row separator
@@ -84,10 +88,10 @@ module GitStatistics
       end
 
       def separator
-        ("-" * 89) + ("-" * config[:author_length]) + ("-" * config[:language_length])
+        ('-' * 89) + ('-' * config[:author_length]) + ('-' * config[:language_length])
       end
 
-      def get_author_info(total_authors)
+      def author_info(total_authors)
         if config[:top_n] > 0 && config[:top_n] < total_authors
           add_row "Top #{config[:top_n]} authors(#{total_authors}) sorted by #{config[:sort]}"
         else

data/lib/git_statistics/log.rb

@@ -8,7 +8,7 @@ module GitStatistics
     attr_accessor :logger, :base_directory, :debugging
 
     def initialize
-      @base_directory = File.expand_path("../..", __FILE__) + "/"
+      @base_directory = File.expand_path('../..', __FILE__) + '/'
       @debugging = false
       @logger = Logger.new(STDOUT)
       @logger.level = Logger::ERROR
@@ -29,8 +29,7 @@ module GitStatistics
       if /^(?<file>.+?):(?<line>\d+)(?::in `(?<method>.*)')?/ =~ message
         file = Regexp.last_match[:file]
         line = Regexp.last_match[:line]
-        method = Regexp.last_match[:method]
-        "#{file.sub(instance.base_directory, "")}:#{line}"
+        "#{file.sub(instance.base_directory, '')}:#{line}"
       end
     end
 
@@ -43,7 +42,7 @@ module GitStatistics
       end
     end
 
-    def self.respond_to_missing?(method, include_all=false)
+    def self.respond_to_missing?(method, include_all = false)
       if valid_method? method
         true
       else
@@ -54,6 +53,5 @@ module GitStatistics
     def self.valid_method?(method)
       instance.logger.respond_to? method
     end
-
   end
 end

data/lib/git_statistics/pipe.rb

@@ -19,7 +19,7 @@ module GitStatistics
     end
 
     def lines
-      io.map { |line| line.strip.force_encoding("iso-8859-1").encode("utf-8") }
+      io.map { |line| line.strip.force_encoding('iso-8859-1').encode('utf-8') }
     end
 
     def io

data/lib/git_statistics/utilities.rb

@@ -2,22 +2,21 @@ require 'rbconfig'
 
 module GitStatistics
   module Utilities
-
     def self.max_length_in_list(list, min_length = nil)
       list ||= []
       min_length = min_length.to_i
-      list_max = list.map { |k,_| k.length }.max || 0
+      list_max = list.map { |k, _| k.length }.max || 0
       list_max >= min_length ? list_max : min_length
     end
 
     COMMANDS = {
-      :windows => ->{ raise "`stat` is not supported on Windows" },
-      :mac =>     ->{ "-f %m" }
+      windows: -> { raise '`stat` is not supported on Windows' },
+      mac: -> { '-f %m' }
     }
-    COMMANDS.default = ->{ "-c %Y" }
+    COMMANDS.default = -> { '-c %Y' }
 
     def self.get_modified_time(file)
-      flags = COMMANDS[os].()
+      flags = COMMANDS[os].call
       time_at("stat #{flags} #{file}")
     end
 
@@ -31,12 +30,12 @@ module GitStatistics
       OPERATING_SYSTEMS.default = :unknown
 
       def self.determine(os_name)
-        OPERATING_SYSTEMS.select { |k,_| k =~ os_name }.first
+        OPERATING_SYSTEMS.find { |k, _| k =~ os_name }
       end
     end
 
     def self.time_at(cmd)
-      Time.at(%x{#{cmd}}.to_i)
+      Time.at(`#{cmd}`.to_i)
     end
 
     def self.os
@@ -49,6 +48,5 @@ module GitStatistics
       Log.error "No such directory #{File.expand_path(directory)}"
       0
     end
-
   end
 end

data/lib/git_statistics/version.rb

@@ -1,3 +1,3 @@
 module GitStatistics
-  VERSION = "0.7.0"
+  VERSION = '0.8.0'
 end

data/spec/collector_spec.rb

@@ -2,124 +2,127 @@ require 'spec_helper'
 include GitStatistics
 
 describe Collector do
-  let(:limit) {100}
-  let(:fresh) {true}
-  let(:pretty) {false}
+  let(:limit) { 100 }
+  let(:fresh) { true }
+  let(:pretty) { false }
   let(:repo) { GIT_REPO }
-  let(:collector) {Collector.new(repo, limit, fresh, pretty)}
-
-  describe "#collect" do
-    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 => branch, :time_since => time_since, :time_until => time_until})
+  let(:collector) { Collector.new(repo, limit, fresh, pretty) }
+
+  describe '#collect' do
+    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' }
+
+    subject do
+      collector.collect(branch: branch, time_since: time_since, time_until: time_until)
       collector.commits.calculate_statistics(email, merge)
-      @subject = collector.commits.stats[author]
-    }
-
-    context "with no merge commits" do
-      let(:merge) {false}
-      let(:time_since) {"Tue Sep 10 14:15:44 2012 -0400"}
-      let(:time_until) {"Tue Sep 11 14:45:05 2012 -0400"}
-
-      before(:all) { setup }
-
-      it{@subject[:additions].should == 276}
-      it{@subject[:deletions].should == 99}
-      it{@subject[:commits].should == 4}
-      it{@subject[:merges].should == 0}
-
-      it{@subject[:languages][:Ruby][:additions].should == 270}
-      it{@subject[:languages][:Ruby][:deletions].should == 99}
-      it{@subject[:languages][:Ruby][:added_files].should == 2}
-      it{@subject[:languages][:Text][:additions].should == 6}
-      it{@subject[:languages][:Text][:deletions].should == 0}
-      it{@subject[:languages][:Text][:added_files].should == 1}
+      collector.commits.stats[author]
     end
 
-    context "with merge commits and merge option" do
-      before(:all) { setup }
-
-      it{@subject[:additions].should == 1240}
-      it{@subject[:deletions].should == 934}
-      it{@subject[:commits].should == 9}
-      it{@subject[:merges].should == 1}
+    context 'with no merge commits' do
+      let(:merge) { false }
+      let(:time_since) { 'Tue Sep 10 14:15:44 2012 -0400' }
+      let(:time_until) { 'Tue Sep 11 14:45:05 2012 -0400' }
+
+      it do
+        expect(subject[:additions]).to eq(276)
+        expect(subject[:deletions]).to eq(99)
+        expect(subject[:commits]).to eq(4)
+        expect(subject[:merges]).to eq(0)
+
+        expect(subject[:languages][:Ruby][:additions]).to eq(270)
+        expect(subject[:languages][:Ruby][:deletions]).to eq(99)
+        expect(subject[:languages][:Ruby][:added_files]).to eq(2)
+        expect(subject[:languages][:Text][:additions]).to eq(6)
+        expect(subject[:languages][:Text][:deletions]).to eq(0)
+        expect(subject[:languages][:Text][:added_files]).to eq(1)
+      end
+    end
 
-      it{@subject[:languages][:Markdown][:additions].should == 1}
-      it{@subject[:languages][:Markdown][:deletions].should == 0}
-      it{@subject[:languages][:Ruby][:additions].should == 1227}
-      it{@subject[:languages][:Ruby][:deletions].should == 934}
-      it{@subject[:languages][:Unknown][:additions].should == 12}
-      it{@subject[:languages][:Unknown][:deletions].should == 0}
+    context 'with merge commits and merge option' do
+      it do
+        expect(subject[:additions]).to eq(1240)
+        expect(subject[:deletions]).to eq(934)
+        expect(subject[:commits]).to eq(9)
+        expect(subject[:merges]).to eq(1)
+
+        expect(subject[:languages][:Markdown][:additions]).to eq(1)
+        expect(subject[:languages][:Markdown][:deletions]).to eq(0)
+        expect(subject[:languages][:Ruby][:additions]).to eq(1227)
+        expect(subject[:languages][:Ruby][:deletions]).to eq(934)
+        expect(subject[:languages][:Unknown][:additions]).to eq(12)
+        expect(subject[:languages][:Unknown][:deletions]).to eq(0)
+      end
     end
 
-    context "with merge commits and no merge option" do
-      let(:merge) {false}
-      before(:all) { setup }
-
-      it{@subject[:additions].should == 581}
-      it{@subject[:deletions].should == 452}
-      it{@subject[:commits].should == 8}
-      it{@subject[:merges].should == 0}
-
-      it{@subject[:languages][:Markdown][:additions].should == 1}
-      it{@subject[:languages][:Markdown][:deletions].should == 0}
-      it{@subject[:languages][:Ruby][:additions].should == 574}
-      it{@subject[:languages][:Ruby][:deletions].should == 452}
-      it{@subject[:languages][:Unknown][:additions].should == 6}
-      it{@subject[:languages][:Unknown][:deletions].should == 0}
+    context 'with merge commits and no merge option' do
+      let(:merge) { false }
+
+      it do
+        expect(subject[:additions]).to eq(581)
+        expect(subject[:deletions]).to eq(452)
+        expect(subject[:commits]).to eq(8)
+        expect(subject[:merges]).to eq(0)
+
+        expect(subject[:languages][:Markdown][:additions]).to eq(1)
+        expect(subject[:languages][:Markdown][:deletions]).to eq(0)
+        expect(subject[:languages][:Ruby][:additions]).to eq(574)
+        expect(subject[:languages][:Ruby][:deletions]).to eq(452)
+        expect(subject[:languages][:Unknown][:additions]).to eq(6)
+        expect(subject[:languages][:Unknown][:deletions]).to eq(0)
+      end
     end
   end
 
-  describe "#extract_commit" do
-    let(:commit) {repo.lookup(sha)}
-    let(:data) {collector.extract_commit(commit, nil)}
-
-    context "with valid commit" do
-      let(:sha) {"260bc61e2c42930d91f3503c5849b0a2351275cf"}
-      it {data[:author].should == "Kevin Jalbert"}
-      it {data[:author_email].should == "kevin.j.jalbert@gmail.com"}
-      it {data[:time].should match /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-|+]\d{4}/}
-
-      it {data[:merge].should == false}
-      it {data[:additions].should == 30}
-      it {data[:deletions].should == 2}
-      it {data[:added_files].should == 1}
-      it {data[:deleted_files].should == 0}
-
-      it {data[:files][0][:filename].should == "Gemfile"}
-      it {data[:files][0][:additions].should == 0}
-      it {data[:files][0][:deletions].should == 1}
-      it {data[:files][0][:status].should.nil?}
-      it {data[:files][0][:language].should == "Ruby"}
-
-      it {data[:files][1][:filename].should == "Gemfile.lock"}
-      it {data[:files][1][:additions].should == 30}
-      it {data[:files][1][:deletions].should == 0}
-      it {data[:files][1][:status].should eq(:added)}
-      it {data[:files][1][:language].should == "Unknown"}
-
-      it {data[:files][2][:filename].should == "lib/git_statistics/initialize.rb"}
-      it {data[:files][2][:additions].should == 0}
-      it {data[:files][2][:deletions].should == 1}
-      it {data[:files][2][:status].should.nil?}
-      it {data[:files][2][:language].should == "Ruby"}
+  describe '#extract_commit' do
+    let(:commit) { repo.lookup(sha) }
+    let(:data) { collector.extract_commit(commit, nil) }
+
+    context 'with valid commit' do
+      let(:sha) { '260bc61e2c42930d91f3503c5849b0a2351275cf' }
+
+      it do
+        expect(data[:author]).to eq('Kevin Jalbert')
+        expect(data[:author_email]).to eq('kevin.j.jalbert@gmail.com')
+        expect(data[:time]).to match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-|+]\d{4}/)
+
+        expect(data[:merge]).to eq(false)
+        expect(data[:additions]).to eq(30)
+        expect(data[:deletions]).to eq(2)
+        expect(data[:added_files]).to eq(1)
+        expect(data[:deleted_files]).to eq(0)
+
+        expect(data[:files][0][:filename]).to eq('Gemfile')
+        expect(data[:files][0][:additions]).to eq(0)
+        expect(data[:files][0][:deletions]).to eq(1)
+        expect(data[:files][0][:status]).to eq(:modified)
+        expect(data[:files][0][:language]).to eq('Ruby')
+
+        expect(data[:files][1][:filename]).to eq('Gemfile.lock')
+        expect(data[:files][1][:additions]).to eq(30)
+        expect(data[:files][1][:deletions]).to eq(0)
+        expect(data[:files][1][:status]).to eq(:added)
+        expect(data[:files][1][:language]).to eq('Unknown')
+
+        expect(data[:files][2][:filename]).to eq('lib/git_statistics/initialize.rb')
+        expect(data[:files][2][:additions]).to eq(0)
+        expect(data[:files][2][:deletions]).to eq(1)
+        expect(data[:files][2][:status]).to eq(:modified)
+        expect(data[:files][2][:language]).to eq('Ruby')
+      end
     end
 
-    context "with invalid commit" do
-      let(:sha) {"111111aa111a11111a11aa11aaaa11a111111a11"}
-      it { expect {data}.to raise_error(Rugged::OdbError) }
+    context 'with invalid commit' do
+      let(:sha) { '111111aa111a11111a11aa11aaaa11a111111a11' }
+      it { expect { data }.to raise_error(Rugged::OdbError) }
     end
 
-    context "with invalid sha" do
-      let(:sha) {"invalid input"}
-      it { expect {data}.to raise_error(Rugged::InvalidError) }
+    context 'with invalid sha' do
+      let(:sha) { 'invalid input' }
+      it { expect { data }.to raise_error(Rugged::InvalidError) }
     end
   end
-
 end

data/spec/commit_summary_spec.rb

@@ -2,125 +2,151 @@ require 'spec_helper'
 include GitStatistics
 
 describe CommitSummary do
-
-  let(:sha) { "bf09a64b0e0f801d3e7fe4e002cbd1bf517340a7" }
+  let(:sha) { 'bf09a64b0e0f801d3e7fe4e002cbd1bf517340a7' }
   let(:repo) { GIT_REPO }
   subject(:commit) { CommitSummary.new(repo, repo.lookup(sha)) }
 
-  its(:__getobj__) { should be_a Rugged::Commit }
+  it { expect(subject.__getobj__).to be_a(Rugged::Commit) }
 
-  context "understands its files and languages" do
-    its(:filenames) { should have(3).items }
-    its(:languages) { should have(1).items }
+  context 'understands its files and languages' do
+    it do
+      expect(subject.filenames.size).to eq(3)
+      expect(subject.languages.size).to eq(1)
+    end
   end
 
-  context "language-specific changes" do
-    let(:name) { "Ruby" }
-    subject(:language) { commit.languages.detect { |lang| lang.name == name } }
-    context "for commit 2aa45e4ff23c1a558b127c06e95d313a56cc6890" do
-      let(:sha) { "2aa45e4ff23c1a558b127c06e95d313a56cc6890" }
-      context "language count" do
-        subject { commit }
-        its(:languages) { should have(2).items }
+  context 'language-specific changes' do
+    let(:name) { 'Ruby' }
+    subject(:language) { commit.languages.find { |lang| lang.name == name } }
+
+    context 'for commit 2aa45e4ff23c1a558b127c06e95d313a56cc6890' do
+      let(:sha) { '2aa45e4ff23c1a558b127c06e95d313a56cc6890' }
+
+      context 'language count' do
+        it { expect(commit.languages.size).to eq(2) }
       end
-      context "Ruby" do
-        let(:name) { "Ruby" }
-        its(:additions) { should == 14 }
-        its(:deletions) { should == 13 }
-        its(:net) { should == 1 }
+
+      context 'Ruby' do
+        let(:name) { 'Ruby' }
+        it do
+          expect(subject.additions).to eq(14)
+          expect(subject.deletions).to eq(13)
+          expect(subject.net).to eq(1)
+        end
       end
-      context "Text" do
-        let(:name) { "Text" }
-        its(:additions) { should == 7 }
-        its(:deletions) { should == 11 }
-        its(:net) { should == -4 }
+
+      context 'Text' do
+        let(:name) { 'Text' }
+        it do
+          expect(subject.additions).to eq(7)
+          expect(subject.deletions).to eq(11)
+          expect(subject.net).to eq(-4)
+        end
       end
     end
-    context "for commit bf09a64b" do
+
+    context 'for commit bf09a64b' do
       subject { commit.languages.first }
-      its(:name) { should == "Ruby" }
-      its(:additions) { should == 10 }
-      its(:deletions) { should == 27 }
-      its(:net) { should == -17 }
+      it do
+        expect(subject.name).to eq('Ruby')
+        expect(subject.additions).to eq(10)
+        expect(subject.deletions).to eq(27)
+        expect(subject.net).to eq(-17)
+      end
     end
   end
 
-  context "file-specific changes" do
-    let(:name) { "lib/git_statistics/formatters/console.rb" }
-    subject(:file) { commit.file_stats.detect { |file| file.filename == name } }
-    context "for commit ef9292a92467430e0061e1b1ad4cbbc3ad7da6fd" do
-      let(:sha) { "ef9292a92467430e0061e1b1ad4cbbc3ad7da6fd" }
-      context "file count" do
-        subject { commit }
-        its(:filenames) { should have(12).items }
+  context 'file-specific changes' do
+    let(:name) { 'lib/git_statistics/formatters/console.rb' }
+    subject(:file) { commit.file_stats.find { |file| file.filename == name } }
+
+    context 'for commit ef9292a92467430e0061e1b1ad4cbbc3ad7da6fd' do
+      let(:sha) { 'ef9292a92467430e0061e1b1ad4cbbc3ad7da6fd' }
+
+      context 'file count' do
+        it { expect(commit.filenames.size).to eq(12) }
       end
-      context "bin/git_statistics (new)" do
-        let(:name) { "bin/git_statistics" }
-        its(:language) { should == "Ruby" }
-        its(:additions) { should == 5 }
-        its(:deletions) { should == 0 }
-        its(:net) { should == 5 }
-        its(:status) { should == :added }
+
+      context 'bin/git_statistics (new)' do
+        let(:name) { 'bin/git_statistics' }
+        it do
+          expect(subject.language).to eq('Ruby')
+          expect(subject.additions).to eq(5)
+          expect(subject.deletions).to eq(0)
+          expect(subject.net).to eq(5)
+          expect(subject.status).to eq(:added)
+        end
       end
-      context "lib/initialize.rb (deleted)" do
-        let(:name) { "lib/initialize.rb" }
-        its(:language) { should == "Ruby" }
-        its(:additions) { should == 0 }
-        its(:deletions) { should == 4 }
-        its(:net) { should == -4 }
-        its(:status) { should == :deleted }
+
+      context 'lib/initialize.rb (deleted)' do
+        let(:name) { 'lib/initialize.rb' }
+        it do
+          expect(subject.language).to eq('Ruby')
+          expect(subject.additions).to eq(0)
+          expect(subject.deletions).to eq(4)
+          expect(subject.net).to eq(-4)
+          expect(subject.status).to eq(:deleted)
+        end
       end
-      context "lib/git_statistics.rb (modified)" do
-        let(:name) { "lib/git_statistics.rb" }
-        its(:language) { should == "Ruby" }
-        its(:additions) { should == 37 }
-        its(:deletions) { should == 30 }
-        its(:net) { should == 7 }
-        its(:status) { should == :modified }
+
+      context 'lib/git_statistics.rb (modified)' do
+        let(:name) { 'lib/git_statistics.rb' }
+        it do
+          expect(subject.language).to eq('Ruby')
+          expect(subject.additions).to eq(37)
+          expect(subject.deletions).to eq(30)
+          expect(subject.net).to eq(7)
+          expect(subject.status).to eq(:modified)
+        end
       end
     end
   end
 
-  context "with a removed file" do
-    let(:sha) { "4ce86b844458a1fd77c6066c9297576b9520f97e" }
-    its(:deleted_files) { should == 2 }
+  context 'with a removed file' do
+    let(:sha) { '4ce86b844458a1fd77c6066c9297576b9520f97e' }
+    it { expect(subject.deleted_files).to eq(2) }
   end
 
-  context "without a removed file" do
-    let(:sha) { "b808b3a9d4ce2d8a1d850f2c24d2d1fb00e67727" }
-    its(:deleted_files) { should == 0 }
+  context 'without a removed file' do
+    let(:sha) { 'b808b3a9d4ce2d8a1d850f2c24d2d1fb00e67727' }
+    it { expect(subject.deleted_files).to eq(0) }
   end
 
-  context "with a new file" do
-    let(:sha) { "8b1941437a0ff8cf6a35a46d4f5df8b6587c346f" }
-    its(:added_files) { should == 19 }
+  context 'with a new file' do
+    let(:sha) { '8b1941437a0ff8cf6a35a46d4f5df8b6587c346f' }
+    it { expect(subject.added_files).to eq(19) }
   end
 
-  context "without a new file" do
-    let(:sha) { "52f9f38cbe4ba90edd607298cb2f9b1aec26bcf1" }
-    its(:added_files) { should == 0 }
+  context 'without a new file' do
+    let(:sha) { '52f9f38cbe4ba90edd607298cb2f9b1aec26bcf1' }
+    it { expect(subject.added_files).to eq(0) }
   end
 
-  context "with a merge" do
-    let(:sha) { "9d31467f6759c92f8535038c470d24a37ae93a9d" }
+  context 'with a merge' do
+    let(:sha) { '9d31467f6759c92f8535038c470d24a37ae93a9d' }
+
     it { should be_a_merge }
-    context "statistics" do
-      its(:filenames) { should have(11).items }
-      its(:languages) { should have(1).items }
-      its(:additions) { should == 69 }
-      its(:deletions) { should == 68 }
-      its(:net) { should == 1 }
+
+    context 'statistics' do
+      it do
+        expect(subject.filenames.size).to eq(11)
+        expect(subject.languages.size).to eq(1)
+        expect(subject.additions).to eq(69)
+        expect(subject.deletions).to eq(68)
+        expect(subject.net).to eq(1)
+      end
     end
   end
 
-  context "without a merge" do
+  context 'without a merge' do
     it { should_not be_a_merge }
   end
 
-  context "net, additions, and deletions" do
-    its(:additions) { should == 10 }
-    its(:deletions) { should == 27 }
-    its(:net) { should == -17 }
+  context 'net, additions, and deletions' do
+    it do
+      expect(subject.additions).to eq(10)
+      expect(subject.deletions).to eq(27)
+      expect(subject.net).to eq(-17)
+    end
   end
-
 end