git_stats 1.0.11 → 1.0.12

data/lib/git_stats/stats_view/view.rb

@@ -55,7 +55,8 @@ module GitStats
             activity: 'activity/by_date.html',
             authors: 'authors/best_authors.html',
             files: 'files/by_date.html',
-            lines: 'lines/by_date.html'
+            lines: 'lines/by_date.html',
+            comments: 'comments/by_date.html'
         }
       end
 

data/lib/git_stats/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module GitStats
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

data/spec/factories.rb

@@ -7,6 +7,9 @@ FactoryGirl.define do
     factory :test_repo do
       path 'spec/integration/test_repo'
     end
+    factory :test_repo_tree do
+      path 'spec/integration/test_repo_tree'
+    end
   end
 
   factory :author, class: GitStats::GitData::Author do
@@ -22,4 +25,9 @@ FactoryGirl.define do
     association :repo, strategy: :build
     association :author, strategy: :build
   end
+
+  factory :tree, class: GitStats::GitData::Tree do
+    association :repo, strategy: :build
+  end
+
 end

data/spec/git_data/commit_range_spec.rb

@@ -28,12 +28,12 @@ describe GitStats::GitData::Repo do
       let(:repo) { build(:repo, first_commit_sha: 'abc', last_commit_sha: 'def') }
 
       it 'should affect authors command' do
-        repo.should_receive(:run).with('git shortlog -se abc..def').and_return("")
+        repo.should_receive(:run).with('git shortlog -se abc..def .').and_return("")
         repo.authors
       end
 
       it 'should affect commits command' do
-        repo.should_receive(:run).with("git rev-list --pretty=format:'%h|%at|%ai|%aE' abc..def | grep -v commit").and_return("")
+        repo.should_receive(:run).with("git rev-list --pretty=format:'%h|%at|%ai|%aE' abc..def . | grep -v commit").and_return("")
         repo.commits
       end
 

data/spec/git_data/commit_spec.rb

@@ -7,7 +7,7 @@ describe GitStats::GitData::Commit do
   describe 'git output parsing' do
     context 'parsing git ls-tree output' do
       before {
-        commit.repo.should_receive(:run).with('git ls-tree -r abc').and_return("100644 blob 5ade7ad51a75ee7db4eb06cecd3918d38134087d	lib/git_stats/git_data/commit.rb
+        commit.repo.should_receive(:run).with('git ls-tree -r abc -- .').and_return("100644 blob 5ade7ad51a75ee7db4eb06cecd3918d38134087d	lib/git_stats/git_data/commit.rb
 100644 blob db01e94677a8f72289848e507a52a43de2ea109a	lib/git_stats/git_data/repo.rb
 100644 blob 1463eacb3ac9f95f21f360f1eb935a84a9ee0895	templates/index.haml
 100644 blob 31d8b960a67f195bdedaaf9e7aa70b2389f3f1a8	templates/assets/bootstrap/css/bootstrap.min.css

data/spec/git_data/generator_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 describe GitStats::Generator do
   let(:repo_path) { 'repo_path' }
   let(:out_path) { 'out_path' }
-  let(:generator) { GitStats::Generator.new(repo_path, out_path) }
+  let(:generator) { GitStats::Generator.new(path: repo_path, out_path: out_path) }
 
-  before { Dir.stub!(:exists? => true) }
+  before { Dir.stub(:exists? => true) }
 
   it 'should raise exception if given repo path is not a git repository' do
     Dir.should_receive(:exists?).with("#{repo_path}/.git").and_return(false)
@@ -15,10 +15,8 @@ describe GitStats::Generator do
 
   it 'should pass command observer to repo' do
     repo = double('repo')
-    GitStats::GitData::Repo.should_receive(:new).with(path: repo_path, first_commit_sha: nil, last_commit_sha: "HEAD").and_return(repo)
-
-    generator = GitStats::Generator.new(repo_path, out_path)
-
+    GitStats::GitData::Repo.should_receive(:new).with(path: repo_path, out_path: out_path).and_return(repo)
+    
     observer = double('observer')
     repo.should_receive(:add_command_observer).with(observer)
 
@@ -27,7 +25,7 @@ describe GitStats::Generator do
 
   it 'should render all templates with view data for this repo' do
     repo = double('repo')
-    GitStats::GitData::Repo.should_receive(:new).with(path: repo_path, first_commit_sha: nil, last_commit_sha: "HEAD").and_return(repo)
+    GitStats::GitData::Repo.should_receive(:new).with(path: repo_path, out_path: out_path).and_return(repo)
 
     view_data = double('view_data')
     GitStats::StatsView::ViewData.should_receive(:new).with(repo).and_return(view_data)

data/spec/git_data/repo_spec.rb

@@ -7,7 +7,7 @@ describe GitStats::GitData::Repo do
   describe 'git output parsing' do
     context 'invoking authors command' do
       before do
-        repo.should_receive(:run).with('git shortlog -se HEAD').and_return("   156	John Doe <john.doe@gmail.com>
+        repo.should_receive(:run).with('git shortlog -se HEAD .').and_return("   156	John Doe <john.doe@gmail.com>
     53	Joe Doe <joe.doe@gmail.com>
 ")
       end
@@ -19,7 +19,7 @@ describe GitStats::GitData::Repo do
       end
 
       it 'should parse git revlist output to date sorted commits array' do
-        repo.should_receive(:run).with("git rev-list --pretty=format:'%h|%at|%ai|%aE' HEAD | grep -v commit").and_return(
+        repo.should_receive(:run).with("git rev-list --pretty=format:'%h|%at|%ai|%aE' HEAD . | grep -v commit").and_return(
             "e4412c3|1348603824|2012-09-25 22:10:24 +0200|john.doe@gmail.com
 ce34874|1347482927|2012-09-12 22:48:47 +0200|joe.doe@gmail.com
 5eab339|1345835073|2012-08-24 21:04:33 +0200|john.doe@gmail.com
@@ -28,13 +28,13 @@ ce34874|1347482927|2012-09-12 22:48:47 +0200|joe.doe@gmail.com
         repo.commits.should == [
             GitStats::GitData::Commit.new(
                 repo: repo, sha: "5eab339", stamp: "1345835073", date: DateTime.parse("2012-08-24 21:04:33 +0200"),
-                author: repo.authors.by_email("john.doe@gmail.com")),
+                author: repo.authors.first! { |a| a.email == "john.doe@gmail.com" }),
             GitStats::GitData::Commit.new(
                 repo: repo, sha: "ce34874", stamp: "1347482927", date: DateTime.parse("2012-09-12 22:48:47 +0200"),
-                author: repo.authors.by_email("joe.doe@gmail.com")),
+                author: repo.authors.first! { |a| a.email == "joe.doe@gmail.com" }),
             GitStats::GitData::Commit.new(
                 repo: repo, sha: "e4412c3", stamp: "1348603824", date: DateTime.parse("2012-09-25 22:10:24 +0200"),
-                author: repo.authors.by_email("john.doe@gmail.com"))
+                author: repo.authors.first! { |a| a.email == "john.doe@gmail.com" })
         ]
       end
     end

data/spec/git_data/short_stat_spec.rb

@@ -14,7 +14,7 @@ describe GitStats::GitData::ShortStat do
           {content: '', expect: [0, 0, 0]},
       ].each do |test|
         it "#{test[:content]} parsing" do
-          commit.repo.should_receive(:run).with("git show --shortstat --oneline abc").and_return("abc some commit\n#{test[:content]}")
+          commit.repo.should_receive(:run).with("git show --shortstat --oneline abc -- .").and_return("abc some commit\n#{test[:content]}")
 
 
           commit.short_stat.should be_a(GitStats::GitData::ShortStat)

data/spec/git_data/tree_spec.rb

@@ -0,0 +1,41 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe GitStats::GitData::Tree do
+  let(:repo) { build(:test_repo_tree, tree_path: '.') }
+  let(:repo_tree) { build(:test_repo_tree, tree_path: './subdir_with_1_commit') }
+  let(:tree) { build(:tree, repo: repo_tree, relative_path: './subdir_with_1_commit') }
+
+  describe 'tree git output parsing' do
+    it 'should return . by default' do
+      repo.tree.should == GitStats::GitData::Tree.new(repo: repo, relative_path: '.')
+    end
+
+    it 'should return relative_path given by parameter' do
+      repo_tree.tree.should == GitStats::GitData::Tree.new(repo: repo, relative_path: './subdir_with_1_commit')
+      repo_tree.tree.relative_path.should == './subdir_with_1_commit'
+      tree.relative_path.should == './subdir_with_1_commit'
+    end
+
+    context 'invoking authors command' do
+      before do
+        repo_tree.should_receive(:run).with('git shortlog -se HEAD ./subdir_with_1_commit').and_return("	3	Israel Revert <israelrevert@gmail.com>
+")
+      end
+
+      it 'should parse git shortlog output to authors hash' do
+        repo_tree.authors.should == [ build(:author, repo: repo_tree, name: "Israel Revert", email:"israelrevert@gmail.com") ]
+      end
+
+      it 'should parse git revlist output to date sorted commits array' do
+        repo_tree.should_receive(:run).
+          with("git rev-list --pretty=format:'%h|%at|%ai|%aE' HEAD ./subdir_with_1_commit | grep -v commit").
+          and_return("10d1814|1395407506|2014-03-21 14:11:46 +0100|israelrevert@gmail.com")
+        repo_tree.commits.should ==
+          [ GitStats::GitData::Commit.new( repo: repo, sha: "10d1814", stamp: "1395407506",
+                                           date: DateTime.parse("2014-03-21 14:11:46 +0100"),
+                                           author: repo.authors.first! { |a| a.email == "israelrevert@gmail.com" })]
+      end
+    end
+  end
+end

data/spec/integration/author_spec.rb

@@ -4,8 +4,8 @@ require 'integration/shared'
 describe GitStats::GitData::Activity do
   include_context "shared"
 
-  let(:tg) { repo.authors.by_email('tomasz.gieniusz@gmail.com') }
-  let(:jd) { repo.authors.by_email('john.doe@gmail.com') }
+  let(:tg) { repo.authors.first! { |a| a.email == 'tomasz.gieniusz@gmail.com' } }
+  let(:jd) { repo.authors.first! { |a| a.email == 'john.doe@gmail.com' } }
 
   it 'should filter commits to author' do
     tg.commits.map(&:sha).should =~ %w(b3b4f81 d60b5ec ab47ef8 2c11f5e c87ecf9 b621a5d 4e7d0e9 872955c)

data/spec/integration/file_spec.rb

@@ -9,7 +9,7 @@ describe GitStats::GitData::Repo do
   end
 
   it 'should retrieve correct file content for old file' do
-    repo.commits.by_sha('c87ecf9').files.by_filename('test.txt').content.should == "bb
+    repo.commits.first! { |c| c.sha == 'c87ecf9' }.files.first! { |f| f.filename == 'test.txt' }.content.should == "bb
 
 
 
@@ -18,7 +18,7 @@ test
   end
 
   it 'should retrieve correct file content for the newest file' do
-    file = repo.files.by_filename('test.txt')
+    file = repo.files.first! { |f| f.filename == 'test.txt' }
     file.content.should == "bb
 
 testtest

data/spec/integration/shared.rb

@@ -44,3 +44,94 @@ shared_context "shared" do
       build(:author, repo: repo, name: "John Doe", email: "john.doe@gmail.com"),
   ] }
 end
+
+
+shared_context "tree_subdir_with_1_commit" do
+  let(:repo) { build(:test_repo_tree, last_commit_sha: 'HEAD', tree_path: './subdir_with_1_commit') }
+  let(:commit_dates) { [
+      DateTime.parse('2014-03-21 14:11:46 +0100'),
+      DateTime.parse('2014-03-21 14:12:23 +0100'),
+      DateTime.parse('2014-03-21 14:12:47 +0100'),
+  ] }
+  let(:commit_dates_with_empty) {[
+      Date.new(2014, 03, 21),
+      Date.new(2014, 03, 21),
+      Date.new(2014, 03, 21),
+  ]}
+  let(:tg_commit_dates) { [
+      DateTime.parse('2014-03-21 14:11:46 +0100'),
+      DateTime.parse('2014-03-21 14:12:23 +0100'),
+      DateTime.parse('2014-03-21 14:12:47 +0100'),
+  ] }
+  let(:jd_commit_dates) { [
+      DateTime.parse('2014-03-21 14:11:46 +0100'),
+      DateTime.parse('2014-03-21 14:12:23 +0100'),
+      DateTime.parse('2014-03-21 14:12:47 +0100'),
+  ] }
+
+  let(:expected_authors) { [
+      build(:author, repo: repo, name: "Israel Revert", email: "israelrevert@gmail.com"),
+  ] }
+end
+
+shared_context "tree_subdir_with_2_commit" do
+  let(:repo) { build(:test_repo_tree, last_commit_sha: 'HEAD', tree_path: './subdir_with_2_commits') }
+  let(:commit_dates) { [
+      DateTime.parse('2014-03-21 14:11:46 +0100'),
+      DateTime.parse('2014-03-21 14:12:23 +0100'),
+      DateTime.parse('2014-03-21 14:12:47 +0100'),
+  ] }
+  let(:commit_dates_with_empty) {[
+      Date.new(2014, 03, 21),
+      Date.new(2014, 03, 21),
+      Date.new(2014, 03, 21),
+  ]}
+  let(:tg_commit_dates) { [
+      DateTime.parse('2014-03-21 14:11:46 +0100'),
+      DateTime.parse('2014-03-21 14:12:23 +0100'),
+      DateTime.parse('2014-03-21 14:12:47 +0100'),
+  ] }
+  let(:jd_commit_dates) { [
+      DateTime.parse('2014-03-21 14:11:46 +0100'),
+      DateTime.parse('2014-03-21 14:12:23 +0100'),
+      DateTime.parse('2014-03-21 14:12:47 +0100'),
+  ] }
+
+  let(:expected_authors) { [
+      build(:author, repo: repo, name: "Israel Revert", email: "israelrevert@gmail.com"),
+  ] }
+end
+
+
+
+# 5fd0f5e|1395407567|2014-03-21 14:12:47 +0100|israelrevert@gmail.com
+# 435e0ef|1395407543|2014-03-21 14:12:23 +0100|israelrevert@gmail.com
+# 10d1814|1395407506|2014-03-21 14:11:46 +0100|israelrevert@gmail.com
+
+shared_context "tree" do
+  let(:repo) { build(:test_repo_tree, last_commit_sha: 'HEAD') }
+  let(:commit_dates) { [
+      DateTime.parse('2014-03-21 14:11:46 +0100'),
+      DateTime.parse('2014-03-21 14:12:23 +0100'),
+      DateTime.parse('2014-03-21 14:12:47 +0100'),
+  ] }
+  let(:commit_dates_with_empty) {[
+      Date.new(2014, 03, 21),
+      Date.new(2014, 03, 21),
+      Date.new(2014, 03, 21),
+  ]}
+  let(:tg_commit_dates) { [
+      DateTime.parse('2014-03-21 14:11:46 +0100'),
+      DateTime.parse('2014-03-21 14:12:23 +0100'),
+      DateTime.parse('2014-03-21 14:12:47 +0100'),
+  ] }
+  let(:jd_commit_dates) { [
+      DateTime.parse('2014-03-21 14:11:46 +0100'),
+      DateTime.parse('2014-03-21 14:12:23 +0100'),
+      DateTime.parse('2014-03-21 14:12:47 +0100'),
+  ] }
+
+  let(:expected_authors) { [
+      build(:author, repo: repo, name: "Israel Revert", email: "israelrevert@gmail.com"),
+  ] }
+end

data/spec/integration/tree_spec.rb

@@ -0,0 +1,197 @@
+# -*- encoding : utf-8 -*-
+require 'integration/shared'
+
+describe GitStats::GitData::Tree do
+  include_context "tree"
+
+  it 'should gather all authors' do
+    repo.authors.should =~ expected_authors
+  end
+
+  it 'should calculate correct commits period' do
+    repo.commits_period.should == [DateTime.parse('2014-03-21 14:11:46 +0100'),
+                                   DateTime.parse('2014-03-21 14:12:47 +0100')]
+  end
+
+  it 'should gather all commits sorted by date' do
+    repo.commits.map(&:sha).should =~ %w(10d1814 435e0ef 5fd0f5e)
+  end
+
+  it 'should return project name from dir' do
+    repo.project_name.should == 'test_repo_tree'
+  end
+
+  it 'should return project version as last commit hash' do
+    repo.project_version.should == '5fd0f5e'
+  end
+
+  it 'should count files in repo' do
+    repo.files_count.should == 4
+  end
+
+  it 'should count files by date' do
+    repo.files_count_by_date.keys == Hash[commit_dates_with_empty.zip [2, 3, 4]]
+  end
+
+  it 'should count lines by date' do
+    repo.files_count_by_date.values == Hash[commit_dates_with_empty.zip [1, 2, 2]]
+  end
+
+  it 'should count all lines in repo' do
+    repo.lines_count.should == 0
+  end
+
+  it 'should count files by extension in repo' do
+    repo.files_by_extension_count.should == {'' => 4}
+  end
+
+  it 'should count lines by extension in repo' do
+    repo.lines_by_extension.should == {}
+  end
+
+  it 'should count commits_count_by_author' do
+    repo.commits_count_by_author.keys.should == expected_authors
+    repo.commits_count_by_author.values.should == [3]
+  end
+
+  it 'should count lines_added_by_author' do
+    repo.insertions_by_author.keys.should == expected_authors
+    repo.insertions_by_author.values.should == [0]
+  end
+
+  it 'should count lines_deleted_by_author' do
+    repo.deletions_by_author.keys.should == expected_authors
+    repo.deletions_by_author.values.should == [0]
+  end
+
+end
+
+describe GitStats::GitData::Tree do
+  include_context "tree_subdir_with_1_commit"
+
+  it 'should gather all authors' do
+    repo.authors.should =~ expected_authors
+  end
+
+  it 'should calculate correct commits period' do
+    repo.commits_period.should == [DateTime.parse('2014-03-21 14:11:46 +0100'),
+                                   DateTime.parse('2014-03-21 14:11:46 +0100')]
+  end
+
+  it 'should gather all commits sorted by date' do
+    repo.commits.map(&:sha).should =~ %w(10d1814)
+  end
+
+  it 'should return project name from dir' do
+    repo.project_name.should == 'test_repo_tree/subdir_with_1_commit'
+  end
+
+  it 'should return project version as last commit hash' do
+    repo.project_version.should == '5fd0f5e'
+  end
+
+  it 'should count files in repo' do
+    repo.files_count.should == 2
+  end
+
+  it 'should count files by date' do
+    repo.files_count_by_date.keys == Hash[commit_dates_with_empty.zip [2]]
+  end
+
+  it 'should count lines by date' do
+    repo.files_count_by_date.values == Hash[commit_dates_with_empty.zip [1]]
+  end
+
+  it 'should count all lines in repo' do
+    repo.lines_count.should == 0
+  end
+
+  it 'should count files by extension in repo' do
+    repo.files_by_extension_count.should == {'' => 2}
+  end
+
+  it 'should count lines by extension in repo' do
+    repo.lines_by_extension.should == {}
+  end
+
+  it 'should count commits_count_by_author' do
+    repo.commits_count_by_author.keys.should == expected_authors
+    repo.commits_count_by_author.values.should == [1]
+  end
+
+  it 'should count lines_added_by_author' do
+    repo.insertions_by_author.keys.should == expected_authors
+    repo.insertions_by_author.values.should == [0]
+  end
+
+  it 'should count lines_deleted_by_author' do
+    repo.deletions_by_author.keys.should == expected_authors
+    repo.deletions_by_author.values.should == [0]
+  end
+
+end
+
+describe GitStats::GitData::Tree do
+  include_context "tree_subdir_with_2_commit"
+
+  it 'should gather all authors' do
+    repo.authors.should =~ expected_authors
+  end
+
+  it 'should calculate correct commits period' do
+    repo.commits_period.should == [DateTime.parse('2014-03-21 14:12:23 +0100'),
+                                   DateTime.parse('2014-03-21 14:12:47 +0100')]
+  end
+
+  it 'should gather all commits sorted by date' do
+    repo.commits.map(&:sha).should =~ %w(435e0ef 5fd0f5e)
+  end
+
+  it 'should return project name from dir' do
+    repo.project_name.should == 'test_repo_tree/subdir_with_2_commits'
+  end
+
+  it 'should return project version as last commit hash' do
+    repo.project_version.should == '5fd0f5e'
+  end
+
+  it 'should count files in repo' do
+    repo.files_count.should == 2
+  end
+
+  it 'should count files by date' do
+    repo.files_count_by_date.keys == Hash[commit_dates_with_empty.zip [1, 2]]
+  end
+
+  it 'should count lines by date' do
+    repo.files_count_by_date.values == Hash[commit_dates_with_empty.zip [2, 2]]
+  end
+
+  it 'should count all lines in repo' do
+    repo.lines_count.should == 0
+  end
+
+  it 'should count files by extension in repo' do
+    repo.files_by_extension_count.should == {'' => 2}
+  end
+
+  it 'should count lines by extension in repo' do
+    repo.lines_by_extension.should == {}
+  end
+
+  it 'should count commits_count_by_author' do
+    repo.commits_count_by_author.keys.should == expected_authors
+    repo.commits_count_by_author.values.should == [2]
+  end
+
+  it 'should count lines_added_by_author' do
+    repo.insertions_by_author.keys.should == expected_authors
+    repo.insertions_by_author.values.should == [0]
+  end
+
+  it 'should count lines_deleted_by_author' do
+    repo.deletions_by_author.keys.should == expected_authors
+    repo.deletions_by_author.values.should == [0]
+  end
+
+end