git_statistics 0.6.0 → 0.7.0

data/spec/commit_summary_spec.rb

@@ -0,0 +1,126 @@
+require 'spec_helper'
+include GitStatistics
+
+describe CommitSummary do
+
+  let(:sha) { "bf09a64b0e0f801d3e7fe4e002cbd1bf517340a7" }
+  let(:repo) { GIT_REPO }
+  subject(:commit) { CommitSummary.new(repo, repo.lookup(sha)) }
+
+  its(:__getobj__) { should be_a Rugged::Commit }
+
+  context "understands its files and languages" do
+    its(:filenames) { should have(3).items }
+    its(:languages) { should have(1).items }
+  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 }
+      end
+      context "Ruby" do
+        let(:name) { "Ruby" }
+        its(:additions) { should == 14 }
+        its(:deletions) { should == 13 }
+        its(:net) { should == 1 }
+      end
+      context "Text" do
+        let(:name) { "Text" }
+        its(:additions) { should == 7 }
+        its(:deletions) { should == 11 }
+        its(:net) { should == -4 }
+      end
+    end
+    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 }
+    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 }
+      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 }
+      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 }
+      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 }
+      end
+    end
+  end
+
+  context "with a removed file" do
+    let(:sha) { "4ce86b844458a1fd77c6066c9297576b9520f97e" }
+    its(:deleted_files) { should == 2 }
+  end
+
+  context "without a removed file" do
+    let(:sha) { "b808b3a9d4ce2d8a1d850f2c24d2d1fb00e67727" }
+    its(:deleted_files) { should == 0 }
+  end
+
+  context "with a new file" do
+    let(:sha) { "8b1941437a0ff8cf6a35a46d4f5df8b6587c346f" }
+    its(:added_files) { should == 19 }
+  end
+
+  context "without a new file" do
+    let(:sha) { "52f9f38cbe4ba90edd607298cb2f9b1aec26bcf1" }
+    its(:added_files) { should == 0 }
+  end
+
+  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 }
+    end
+  end
+
+  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 }
+  end
+
+end

data/spec/commits_spec.rb

@@ -6,7 +6,8 @@ describe Commits do
   let(:limit) {100}
   let(:fresh) {true}
   let(:pretty) {false}
-  let(:collector) {Collector.new(limit, fresh, pretty)}
+  let(:repo) { GIT_REPO }
+  let(:collector) {Collector.new(repo, limit, fresh, pretty)}
 
   let(:commits) {collector.commits}
 
@@ -24,16 +25,15 @@ describe Commits do
   describe "#files_in_path" do
     let(:path) { '/tmp/example' }
     subject { commits.files_in_path }
-    before do
-      FileUtils.mkdir_p(path)
-      Dir.chdir(path) do
-        FileUtils.touch '0.json'
-        FileUtils.touch '1.json'
+    around do |example|
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          FileUtils.touch '0.json'
+          FileUtils.touch '1.json'
+          commits.stub(:path) { dir }
+          example.run
+        end
       end
-      commits.stub(:path) { path }
-    end
-    after do
-      FileUtils.rm_rf(path)
     end
     its(:count) { should == 2 }
     it { should_not include '.' }
@@ -45,7 +45,7 @@ describe Commits do
 
     def commit_size_changes_from(beginning, opts = {})
       commits.size.should == beginning
-      commits.flush_commits(opts[:force] || false)
+      commits.flush_commits
       commits.size.should == opts[:to]
     end
 
@@ -63,11 +63,6 @@ describe Commits do
       let(:limit) {5}
       it { commit_size_changes_from(3, to: 3) }
     end
-
-    context "with commits less than limit but forced" do
-      let(:limit) {5}
-      it { commit_size_changes_from(3, to: 0, force: true) }
-    end
   end
 
   describe "#process_commits" do
@@ -87,15 +82,15 @@ describe Commits do
         it {subject[:additions].should == 153}
         it {subject[:deletions].should == 5}
         it {subject[:commits].should == 2}
-        it {subject[:create].should == 3}
+        it {subject[:added_files].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][:Markdown][:added_files].should == 1}
         it {subject[:languages][:Ruby][:additions].should == 135}
         it {subject[:languages][:Ruby][:deletions].should == 4}
-        it {subject[:languages][:Ruby][:create].should == 2}
+        it {subject[:languages][:Ruby][:added_files].should == 2}
       end
 
       context "on second author" do
@@ -106,7 +101,7 @@ describe Commits do
 
         it {subject[:languages][:Ruby][:additions].should == 64}
         it {subject[:languages][:Ruby][:deletions].should == 16}
-        it {subject[:languages][:Ruby][:create].should == 0}
+        it {subject[:languages][:Ruby][:added_files].should == 0}
       end
     end
 
@@ -118,14 +113,14 @@ describe Commits do
         it {subject[:additions].should == 73}
         it {subject[:deletions].should == 0}
         it {subject[:commits].should == 1}
-        it {subject[:create].should == 2}
+        it {subject[:added_files].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][:Markdown][:added_files].should == 1}
         it {subject[:languages][:Ruby][:additions].should == 62}
         it {subject[:languages][:Ruby][:deletions].should == 0}
-        it {subject[:languages][:Ruby][:create].should == 1}
+        it {subject[:languages][:Ruby][:added_files].should == 1}
       end
 
       context "on second author" do
@@ -162,14 +157,14 @@ describe Commits do
         it {subject[:commits].should == 1}
         it {subject[:additions].should == 73}
         it {subject[:deletions].should == 0}
-        it {subject[:create].should == 2}
+        it {subject[:added_files].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][:Markdown][:added_files].should== 1}
         it {subject[:languages][:Ruby][:additions].should == 62}
         it {subject[:languages][:Ruby][:deletions].should == 0}
-        it {subject[:languages][:Ruby][:create].should == 1}
+        it {subject[:languages][:Ruby][:added_files].should == 1}
       end
     end
 
@@ -196,36 +191,35 @@ describe Commits do
       it {subject[:commits].should == 1}
       it {subject[:additions].should == 73}
       it {subject[:deletions].should == 0}
-      it {subject[:create].should == 2}
+      it {subject[:added_files].should == 2}
 
       it {subject[:languages][:Markdown][:additions].should == 11}
       it {subject[:languages][:Markdown][:deletions].should == 0}
       it {subject[:languages][:Ruby][:additions].should == 62}
       it {subject[:languages][:Ruby][:deletions].should == 0}
-      it {subject[:languages][:Ruby][:create].should == 1}
+      it {subject[:languages][:Ruby][:added_files].should == 1}
     end
 
     context "with merge" do
       let(:merge) {true}
-      let(:author) { 'Kevin Jalbert' }
+      let(:author) { "Kevin Jalbert" }
 
       it {stats.has_key?(author).should be_true}
       it {subject[:commits].should == 2}
       it {subject[:additions].should == 153}
       it {subject[:deletions].should == 5}
-      it {subject[:create].should == 3}
+      it {subject[:added_files].should == 3}
       it {subject[:merges].should == 1}
 
       it {subject[:languages][:Markdown][:additions].should == 18}
       it {subject[:languages][:Markdown][:deletions].should == 1}
       it {subject[:languages][:Ruby][:additions].should == 135}
       it {subject[:languages][:Ruby][:deletions].should == 4}
-      it {subject[:languages][:Ruby][:create].should == 2}
+      it {subject[:languages][:Ruby][:added_files].should == 2}
     end
   end
 
   describe "#add_language_stats" do
-
     context "with file language" do
       let(:data) {
         data = Hash.new(0)
@@ -276,6 +270,8 @@ describe Commits do
       let(:data) {
         commit = {:additions => 10,
                   :deletions => 5,
+                  :new_files => 0,
+                  :removed_files => 0,
                   :merge => false}
 
         data = Hash.new(0)
@@ -292,6 +288,8 @@ describe Commits do
       let(:data) {
         commit = {:additions => 10,
                   :deletions => 5,
+                  :new_files => 0,
+                  :removed_files => 0,
                   :merge => false}
 
         data = Hash.new(0)
@@ -312,10 +310,8 @@ describe Commits do
       let(:data) {
         commit = {:additions => 10,
                   :deletions => 5,
-                  :create => 1,
-                  :delete => 2,
-                  :rename => 3,
-                  :copy => 4,
+                  :added_files => 1,
+                  :deleted_files => 2,
                   :merge => false}
 
         data = Hash.new(0)
@@ -325,41 +321,39 @@ describe Commits do
       it {data[:commits].should == 1}
       it {data[:additions].should == 10}
       it {data[:deletions].should == 5}
-      it {data[:create].should == 1}
-      it {data[:delete].should == 2}
-      it {data[:rename].should == 3}
-      it {data[:copy].should == 4}
+      it {data[:added_files].should == 1}
+      it {data[:deleted_files].should == 2}
     end
   end
 
   describe "#save and #load" do
-    context "with pretty" do
-      let(:fixture_file) {"single_author_pretty.json"}
-      let(:pretty) {true}
+    let(:fixture_contents) { fixture(fixture_file).io.join("\n") }
+    let(:tmpfile_contents) { File.read("tmp.json") }
 
-      it do
-        commits.load(fixture(fixture_file).file)
-        commits.save("tmp.json", pretty)
+    before do
+      commits.load(fixture(fixture_file).file)
+      commits.save("tmp.json", pretty)
+    end
 
-        same = FileUtils.compare_file("tmp.json", fixture(fixture_file).file)
-        FileUtils.remove_file("tmp.json")
+    after do
+      FileUtils.remove_file("tmp.json")
+    end
 
-        same.should be_true
+    context "with pretty" do
+      let(:fixture_file) { "single_author_pretty.json" }
+      let(:pretty) { true }
+
+      it do
+        JSON.parse(fixture_contents).should == JSON.parse(tmpfile_contents)
       end
     end
 
     context "with no pretty" do
-      let(:fixture_file) {"multiple_authors.json"}
-      let(:pretty) {false}
+      let(:fixture_file) { "multiple_authors.json" }
+      let(:pretty) { false }
 
       it do
-        commits.load(fixture(fixture_file).file)
-        commits.save("tmp.json", pretty)
-
-        same = FileUtils.compare_file("tmp.json", fixture(fixture_file).file)
-        FileUtils.remove_file("tmp.json")
-
-        same.should be_true
+        JSON.parse(fixture_contents).should == JSON.parse(tmpfile_contents)
       end
     end
   end

data/spec/formatters/console_spec.rb

@@ -6,7 +6,8 @@ describe Console do
   let(:limit) {100}
   let(:fresh) {true}
   let(:pretty) {false}
-  let(:collector) {Collector.new(limit, fresh, pretty)}
+  let(:repo) { GIT_REPO }
+  let(:collector) {Collector.new(repo, limit, fresh, pretty)}
 
   let(:commits) {collector.commits}
 
@@ -42,14 +43,14 @@ describe Console do
         it {subject[:commits].should == 1}
         it {subject[:additions].should == 73}
         it {subject[:deletions].should == 0}
-        it {subject[:create].should == 2}
+        it {subject[:added_files].should == 2}
 
         it {subject[:languages][:Ruby][:additions].should == 62}
         it {subject[:languages][:Ruby][:deletions].should == 0}
-        it {subject[:languages][:Ruby][:create].should == 1}
+        it {subject[:languages][:Ruby][:added_files].should == 1}
         it {subject[:languages][:Markdown][:additions].should == 11}
         it {subject[:languages][:Markdown][:deletions].should == 0}
-        it {subject[:languages][:Markdown][:create].should == 1}
+        it {subject[:languages][:Markdown][:added_files].should == 1}
       end
 
       context "on second author" do
@@ -86,14 +87,14 @@ describe Console do
         it {subject[:commits].should == 1}
         it {subject[:additions].should == 73}
         it {subject[:deletions].should == 0}
-        it {subject[:create].should == 2}
+        it {subject[:added_files].should == 2}
 
         it {subject[:languages][:Ruby][:additions].should == 62}
         it {subject[:languages][:Ruby][:deletions].should == 0}
-        it {subject[:languages][:Ruby][:create].should == 1}
+        it {subject[:languages][:Ruby][:added_files].should == 1}
         it {subject[:languages][:Markdown][:additions].should == 11}
         it {subject[:languages][:Markdown][:deletions].should == 0}
-        it {subject[:languages][:Markdown][:create].should == 1}
+        it {subject[:languages][:Markdown][:added_files].should == 1}
       end
 
       context "on second author" do
@@ -128,14 +129,14 @@ describe Console do
       it {subject[:commits].should == 1}
       it {subject[:additions].should == 73}
       it {subject[:deletions].should == 0}
-      it {subject[:create].should == 2}
+      it {subject[:added_files].should == 2}
 
       it {subject[:languages][:Ruby][:additions].should == 62}
       it {subject[:languages][:Ruby][:deletions].should == 0}
-      it {subject[:languages][:Ruby][:create].should == 1}
+      it {subject[:languages][:Ruby][:added_files].should == 1}
       it {subject[:languages][:Markdown][:additions].should == 11}
       it {subject[:languages][:Markdown][:deletions].should == 0}
-      it {subject[:languages][:Markdown][:create].should == 1}
+      it {subject[:languages][:Markdown][:added_files].should == 1}
 
       it {config[:sort].should == sort}
       it {config[:email].should == email}

data/spec/utilities_spec.rb

@@ -3,38 +3,18 @@ include GitStatistics
 
 describe Utilities do
 
-  describe "#get_repository" do
-    subject { Utilities.get_repository(dir) }
-
-    context "with root directory" do
-      let(:dir) { Dir.pwd } # git_statistics/
-      it { should be_a Grit::Repo }
-    end
-
-    context "with sub directory" do
-      let(:dir) { File.dirname(__FILE__) } # git_statistics/spec/
-      it { should be_a Grit::Repo }
-    end
-
-    context "when not in a repository directory" do
-      before { Utilities.should_receive(:exit) }
-      let(:dir) { Dir.home } # /Users/username/
-      it { should be_nil }
-    end
-  end
-
   describe "#max_length_in_list" do
-    let(:max) {nil}
-    let(:list) {[]}
+    let(:max) { nil }
+    let(:list) { [] }
     subject(:results) {Utilities.max_length_in_list(list, max)}
 
     context "with empty list" do
-      it { should be_nil }
+      it { should == 0 }
     end
 
     context "with nil list" do
-      let(:list) {nil}
-      it { should be_nil }
+      let(:list) { nil }
+      it { should == 0 }
     end
 
     context "with empty list and zero max" do
@@ -44,17 +24,17 @@ describe Utilities do
     end
 
     context "with preset minimum length" do
-      let(:max) {10}
+      let(:max) { 10 }
       it { should == 10 }
     end
 
     context "with valid list" do
-      let(:list) {["abc", "a", "ab"]}
+      let(:list) { ["abc", "a", "ab"] }
       it { should == 3 }
     end
 
     context "with valid hash" do
-      let(:list) {{"a" => "word_a", "ab" => "word_b", "abc" => "word_c"}}
+      let(:list) { {"a" => "word_a", "ab" => "word_b", "abc" => "word_c"} }
       it { should == 3 }
     end
   end
@@ -76,125 +56,32 @@ describe Utilities do
     end
   end
 
-  describe "#split_old_new_file" do
-    let(:files) {Utilities.split_old_new_file(old, new)}
-    context "with a change in middle" do
-      let(:old) {"lib/{old_dir"}
-      let(:new) {"new_dir}/file.rb"}
-      it {files[:new_file].should == "lib/new_dir/file.rb"}
-    end
-
-    context "with a change at beginning" do
-      let(:old) {"{src/dir/lib"}
-      let(:new) {"lib/dir}/file.rb"}
-      it {files[:old_file].should == "src/dir/lib/file.rb"}
-      it {files[:new_file].should == "lib/dir/file.rb"}
-    end
-
-    context "with a change at beginning, alternative" do
-      let(:old) {"src/{"}
-      let(:new) {"dir}/file.rb"}
-      it {files[:old_file].should == "src/file.rb"}
-      it {files[:new_file].should == "src/dir/file.rb"}
-    end
-
-    context "with a change at ending" do
-      let(:old) {"lib/dir/{old_file.rb"}
-      let(:new) {"new_file.rb}"}
-      it {files[:old_file].should == "lib/dir/old_file.rb"}
-      it {files[:new_file].should == "lib/dir/new_file.rb"}
-    end
-
-    context "with a simple complete change" do
-      let(:old) {"file.rb"}
-      let(:new) {"lib/dir/file.rb}"}
-      it {files[:old_file].should == "file.rb"}
-      it {files[:new_file].should == "lib/dir/file.rb"}
-    end
-  end
-
-  describe "#find_blob_in_tree" do
-    let(:sha) {"7d6c29f0ad5860d3238debbaaf696e361bf8c541"}  # Commit within repository
-    let(:tree) {Utilities.get_repository(Dir.pwd).tree(sha)}
-    let(:file) {nil}
-    let(:blob) {Utilities.find_blob_in_tree(tree, file.split(File::Separator))}
-    subject { blob }
-
-    context "blob on root tree" do
-      let(:file) {"Gemfile"}
-      it { should be_instance_of Grit::Blob }
-      its(:name) { should == file }
-    end
-
-    context "blob down tree" do
-      let(:file) {"lib/git_statistics/collector.rb"}
-      it { should be_instance_of Grit::Blob }
-      its(:name) { should == File.basename(file) }
-    end
-
-    context "file is nil" do
-      subject {Utilities.find_blob_in_tree(tree, nil)}
-      it { should be_nil }
-    end
-
-    context "file is empty" do
-      let(:file) {""}
-      it { should be_nil }
-    end
-
-    context "file is submodule" do
-      let(:sha) {"1940ef1c613a04f855d3867b874a4267d3e2c011"}
-      let(:file) {"Spoon-Knife"}
-      it { should be_instance_of Grit::Submodule }
-      its(:name) { should == file }
-    end
-  end
-
   describe "#number_of_matching_files" do
-    let(:directory) { File.join(Dir.pwd, "tmp_dir_for_spec") }
     let(:pattern) { (/\d+\.json/) }
-    subject {Utilities.number_of_matching_files(directory, pattern)}
+    subject {Utilities.number_of_matching_files(Dir.pwd, pattern)}
 
     around do |example|
-      FileUtils.mkdir_p(directory)
-      Dir.chdir(directory) do
-        example.run
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          example.run
+        end
       end
-      FileUtils.rmdir(directory)
     end
 
     context "with missing directory" do
-      before do
-        subject.class.stub(:warn)
-        FileUtils.rmdir(directory)
-      end
       it { should == 0 }
     end
 
     context "with valid files" do
       before do
-        FileUtils.touch("0.json")
-        FileUtils.touch("1.json")
-        FileUtils.touch("2.json")
-      end
-      after do
-        FileUtils.rm("0.json")
-        FileUtils.rm("1.json")
-        FileUtils.rm("2.json")
+        FileUtils.touch(["0.json", "1.json", "2.json"])
       end
       it { should == 3 }
     end
 
     context "with invalid files" do
       before do
-        FileUtils.touch("0.json")
-        FileUtils.touch("incorrect.json")
-        FileUtils.touch("1.json")
-      end
-      after do
-        FileUtils.rm("0.json")
-        FileUtils.rm("incorrect.json")
-        FileUtils.rm("1.json")
+        FileUtils.touch(["0.json", "incorrect.json", "1.json"])
       end
       it { should == 2 }
     end