git_statistics 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # CHANGELOG
 
+* [0.4.1 - October 9, 2012](https://github.com/kevinjalbert/git_statistics/compare/v0.4.0...v0.4.1)
 * [0.4.0 - September 25, 2012](https://github.com/kevinjalbert/git_statistics/compare/v0.3.0...v0.4.0)
 * [0.3.0 - September 12, 2012](https://github.com/kevinjalbert/git_statistics/compare/v0.2.0...v0.3.0)
 * [0.2.0 - September 6, 2012](https://github.com/kevinjalbert/git_statistics/compare/v0.1.2...v0.2.0)

data/lib/git_statistics/collector.rb

@@ -40,8 +40,8 @@ module GitStatistics
         # Extract the buffer (commit) when we match ','x5 in the log format (delimeter)
         if line.split(',').size == 5
 
-          # Sometimes 'git log' doesn't populate the buffer, try fallback option if so
-          buffer = fall_back_collect_commit(line.split(',').first) if buffer.size == 1
+          # Sometimes 'git log' doesn't populate the buffer (i.e., merges), try fallback option if so
+          buffer = fall_back_collect_commit(buffer[0].split(',').first) if buffer.size == 1
 
           extract_commit(buffer) if not buffer.empty?
           buffer = []

data/lib/git_statistics/version.rb

@@ -1,3 +1,3 @@
 module GitStatistics
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/collector_spec.rb

@@ -8,6 +8,83 @@ describe Collector do
   let(:pretty) {false}
   let(:collector) {Collector.new(verbose, limit, fresh, pretty)}
 
+  # Create buffer which is an array of cleaned lines
+  let(:buffer) {
+    buffer = []
+    fixture(fixture_file).readlines.each do |line|
+      buffer << Utilities.clean_string(line)
+    end
+    buffer
+  }
+
+  describe "#collect" do
+    let(:branch) {""}
+    let(:email) {false}
+    let(:merge) {true}
+    let(:time_since) {"--since \"Tue Sep 25 14:15:44 2012 -0400\""}
+    let(:time_until) {"--until \"Tue Sep 25 14:45:05 2012 -0400\""}
+    let(:author) {"Kevin Jalbert"}
+
+    let(:setup) {
+      collector.collect(branch, time_since, 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) {"--since \"Tue Sep 10 14:15:44 2012 -0400\""}
+      let(:time_until) {"--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][:create].should == 2}
+      it{@subject[:languages][:Unknown][:additions].should == 6}
+      it{@subject[:languages][:Unknown][:deletions].should == 0}
+      it{@subject[:languages][:Unknown][:create].should == 1}
+    end
+
+    context "with merge commits and merge option" do
+      before(:all) {setup}
+
+      it{@subject[:additions].should == 667}
+      it{@subject[:deletions].should == 483}
+      it{@subject[:commits].should == 3}
+      it{@subject[:merges].should == 1}
+
+      it{@subject[:languages][:Markdown][:additions].should == 1}
+      it{@subject[:languages][:Markdown][:deletions].should == 0}
+      it{@subject[:languages][:Ruby][:additions].should == 654}
+      it{@subject[:languages][:Ruby][:deletions].should == 483}
+      it{@subject[:languages][:Unknown][:additions].should == 12}
+      it{@subject[:languages][:Unknown][:deletions].should == 0}
+    end
+
+    context "with merge commits and no merge option" do
+      let(:merge) {false}
+      before(:all) {setup}
+
+      it{@subject[:additions].should == 8}
+      it{@subject[:deletions].should == 1}
+      it{@subject[:commits].should == 2}
+      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 == 1}
+      it{@subject[:languages][:Ruby][:deletions].should == 1}
+      it{@subject[:languages][:Unknown][:additions].should == 6}
+      it{@subject[:languages][:Unknown][:deletions].should == 0}
+    end
+  end
+
   describe "#collect_branches" do
     let(:branches) {collector.collect_branches(fixture(fixture_file))}
 
@@ -122,6 +199,7 @@ describe Collector do
 
   describe "#identify_changed_files" do
     let(:files) {collector.identify_changed_files(buffer)}
+    let(:fixture_file) {"commit_buffer_changes.txt"}
 
     context "with no changes" do
       let(:buffer) {[]}
@@ -130,15 +208,6 @@ describe Collector do
     end
 
     context "with all types (create,delete,rename,copy) of files" do
-      # Create buffer which is an array of cleaned lines
-      let(:buffer) {
-        buffer = []
-        fixture("commit_buffer_changes.txt").readlines.each do |line|
-          buffer << Utilities.clean_string(line)
-        end
-        buffer
-      }
-
       it {files.size.should == 5}
 
       it {files[0][:additions].should == 45}
@@ -170,14 +239,6 @@ describe Collector do
   end
 
   describe "#extract_commit" do
-    # Create buffer which is an array of cleaned lines
-    let(:buffer) {
-      buffer = []
-      fixture(fixture_file).readlines.each do |line|
-        buffer << Utilities.clean_string(line)
-      end
-      buffer
-    }
     let(:data) {collector.extract_commit(buffer)}
 
     context "with valid buffer" do
@@ -235,24 +296,16 @@ describe Collector do
   end
 
   describe "#fall_back_collect_commit" do
-    let(:buffer) {collector.fall_back_collect_commit(sha)}
+    let(:results) {collector.fall_back_collect_commit(sha)}
     context "with valid sha" do
-      # Create buffer which is an array of cleaned lines
-      let(:expected) {
-        expected = []
-        fixture("commit_buffer_whole.txt").readlines.each do |line|
-          expected << Utilities.clean_string(line)
-        end
-        expected
-      }
+      let(:fixture_file) {"commit_buffer_whole.txt"}
       let(:sha) {"260bc61e2c42930d91f3503c5849b0a2351275cf"}
-
-      it {buffer.should == expected}
+      it {results.should == buffer}
     end
 
     context "with invalid sha" do
       let(:sha) {"111111aa111a11111a11aa11aaaa11a111111a11"}
-      it {buffer.should == nil}
+      it {results.should == nil}
     end
   end
 

data/spec/commits_spec.rb

@@ -61,6 +61,79 @@ describe Commits do
     end
   end
 
+  describe "#process_commits" do
+    let(:commits) {collector.commits.load(fixture(fixture_file))}
+    let(:type) {:author}
+
+    context "with merge" do
+      let(:merge) {true}
+      subject {
+        commits.process_commits(type, merge)
+        commits.stats[author_name]
+      }
+
+      context "on first author" do
+        let(:author_name) {"Kevin Jalbert"}
+        it {subject[:additions].should == 153}
+        it {subject[:deletions].should == 5}
+        it {subject[:commits].should == 2}
+        it {subject[:create].should == 3}
+        it {subject[:merges].should == 1}
+
+        it {subject[:languages][:Markdown][:additions].should == 18}
+        it {subject[:languages][:Markdown][:deletions].should == 1}
+        it {subject[:languages][:Markdown][:create].should == 1}
+        it {subject[:languages][:Ruby][:additions].should == 135}
+        it {subject[:languages][:Ruby][:deletions].should == 4}
+        it {subject[:languages][:Ruby][:create].should == 2}
+      end
+
+      context "on second author" do
+        let(:author_name) {"John Smith"}
+        it {subject[:additions].should == 64}
+        it {subject[:deletions].should == 16}
+        it {subject[:commits].should == 1}
+
+        it {subject[:languages][:Ruby][:additions].should == 64}
+        it {subject[:languages][:Ruby][:deletions].should == 16}
+        it {subject[:languages][:Ruby][:create].should == 0}
+      end
+    end
+
+    context "without merge" do
+      let(:merge) {false}
+      subject {
+        commits.process_commits(type, merge)
+        commits.stats[author_name]
+      }
+
+      context "on first author" do
+        let(:author_name) {"Kevin Jalbert"}
+        it {subject[:additions].should == 73}
+        it {subject[:deletions].should == 0}
+        it {subject[:commits].should == 1}
+        it {subject[:create].should == 2}
+
+        it {subject[:languages][:Markdown][:additions].should == 11}
+        it {subject[:languages][:Markdown][:deletions].should == 0}
+        it {subject[:languages][:Markdown][:create].should == 1}
+        it {subject[:languages][:Ruby][:additions].should == 62}
+        it {subject[:languages][:Ruby][:deletions].should == 0}
+        it {subject[:languages][:Ruby][:create].should == 1}
+      end
+
+      context "on second author" do
+        let(:author_name) {"John Smith"}
+        it {subject[:additions].should == 64}
+        it {subject[:deletions].should == 16}
+        it {subject[:commits].should == 1}
+
+        it {subject[:languages][:Ruby][:additions].should == 64}
+        it {subject[:languages][:Ruby][:deletions].should == 16}
+      end
+    end
+  end
+
   describe "#author_top_n_type" do
     let(:sort) {:deletions}
 

data/spec/utilities_spec.rb

@@ -24,10 +24,10 @@ describe Utilities do
 
   describe "#find_longest_length" do
     let(:max) {nil}
+    let(:list) {[]}
     let(:results) {Utilities.find_longest_length(list, max)}
 
     context "with empty list" do
-      let(:list) {[]}
       it {results.should == nil}
     end
 
@@ -37,7 +37,6 @@ describe Utilities do
     end
 
     context "with preset minimum length" do
-      let(:list) {[]}
       let(:max) {10}
       it {results.should == 10}
     end
@@ -202,9 +201,7 @@ describe Utilities do
     end
 
     context "with no files" do
-      it do
-        files.should == 0
-      end
+      it {files.should == 0}
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_statistics
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json