git_statistics 0.5.1 → 0.6.0

data/spec/formatters/console_spec.rb

@@ -3,16 +3,15 @@ include GitStatistics
 include GitStatistics::Formatters
 
 describe Console do
-  let(:verbose) {false}
   let(:limit) {100}
   let(:fresh) {true}
   let(:pretty) {false}
-  let(:collector) {Collector.new(verbose, limit, fresh, pretty)}
+  let(:collector) {Collector.new(limit, fresh, pretty)}
 
   let(:commits) {collector.commits}
 
   let(:fixture_file) {"multiple_authors.json"}
-  let(:save_file) {collector.commits_path + "0.json"}
+  let(:save_file) { File.join(collector.commits_path, "0.json") }
   let(:email) {false}
   let(:merge) {false}
   let(:sort) {:commits}
@@ -29,6 +28,8 @@ describe Console do
     results.prepare_result_summary(sort, email, top_n)
   }
 
+  before { config }
+
   describe "#prepare_result_summary" do
     context "with email and sorting" do
       context "on first author" do
@@ -36,7 +37,7 @@ describe Console do
         author = "Kevin Jalbert"
         subject {data[author]}
 
-        it {data.has_key?(author).should be_true}
+        it {data.should have_key author}
 
         it {subject[:commits].should == 1}
         it {subject[:additions].should == 73}
@@ -144,24 +145,30 @@ describe Console do
     end
   end
 
-  describe "#print_summary" do
-    context "with valid data" do
-      let(:language_data) {results.print_summary(sort, email)}
-      it {language_data.should == fixture("summary_output.txt").read}
+  describe "output" do
+    let(:output) { fixture(file).file.read }
+    describe "#print_summary" do
+      context "with valid data" do
+        let(:file) { "summary_output.txt" }
+        subject {results.print_summary(sort, email)}
+        it { should == output.chomp }
+      end
     end
-  end
 
-  describe "#print_language_data" do
-    context "with valid data" do
-      let(:language_data) {results.print_language_data(config[:pattern], config[:data]["Kevin Jalbert"])}
-      it {language_data.should == fixture("language_data_output.txt").read}
+    describe "#print_language_data" do
+      context "with valid data" do
+        let(:file) { "language_data_output.txt" }
+        subject {results.print_language_data(config[:data]["Kevin Jalbert"])}
+        it {should == output.split("\n")}
+      end
     end
-  end
 
-  describe "#print_header" do
-    context "with valid data" do
-      let(:header) {results.print_header(config)}
-      it {header.should == fixture("header_output.txt").read}
+    describe "#print_header" do
+      context "with valid data" do
+        let(:file) { "header_output.txt" }
+        subject { results.print_header.join("\n") }
+        it {should == output.chomp}
+      end
     end
   end
 

data/spec/log_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+include GitStatistics
+
+describe Log do
+
+  let(:log) { Class.new(Log) }
+
+  context "initializes instance" do
+    it "should acts as singleton" do
+      log.instance.should == log.instance
+    end
+
+    it "should have a logger" do
+      log.instance.logger.should be_a Logger
+    end
+
+    it "should be a Log (FakeLog)" do
+      log.class.should eq Log.class
+    end
+
+    it "should react to Logger methods" do
+      Logger.public_instance_methods.each do |method|
+        log.valid_method?(method).should be_true
+      end
+    end
+  end
+
+  context "#use_debug" do
+    it "logger's progname before" do
+      log.progname.should be_nil
+    end
+
+    it "logger's progname after" do
+      log.use_debug
+      log.progname.should_not be_nil
+    end
+  end
+
+  context "#parse_caller" do
+    context "with nothing" do
+      it {log.parse_caller(nil).should be_nil}
+    end
+
+    context "with jumble (random text)" do
+      it {log.parse_caller("asdaacsdc").should be_nil}
+    end
+
+    context "with valid caller" do
+      it {log.parse_caller("git_statistics/lib/git_statistics/log.rb:45:in `respond_to_missing?'").should eq "git_statistics/lib/git_statistics/log.rb:45"}
+    end
+  end
+
+end

data/spec/pipe_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+include GitStatistics
+
+describe Pipe do
+  let(:command) { 'git' }
+  let(:line)    { "" }
+  let(:pipe)    { Pipe.new(command) }
+
+  context "initializes correctly" do
+    context "with pipe character" do
+      let(:command) { '|git log --oneline' }
+      it { expect(pipe.command).to eq 'git log --oneline'}
+    end
+    context "without pipe character" do
+      let(:command) { 'stat something else' }
+      it { expect(pipe.command).to eq 'stat something else'}
+    end
+  end
+
+  context "#empty?" do
+    before { pipe.stub(:lines) { lines } }
+    context "with empty lines" do
+      let(:lines) { [] }
+      it { pipe.should be_empty }
+    end
+    context "with a single line" do
+      let(:lines) { [stub] }
+      it { pipe.should_not be_empty }
+    end
+  end
+
+  context "#each" do
+    before do
+      pipe.stub(:lines) { [line, line] }
+    end
+    it "should delegate to the lines" do
+      line.should_receive(:call).twice
+      pipe.each(&:call)
+    end
+  end
+
+  context "#lines" do
+    before do
+      line.should_receive(:strip).twice.and_call_original
+      pipe.stub(:io) { [line, line] }
+    end
+    it { pipe.lines }
+  end
+
+  context "#io" do
+    it "should call #open and pass the command through" do
+      pipe.should_receive(:open).with(/\A|#{command}/)
+      pipe.io
+    end
+    it { pipe.io.should be_an IO }
+  end
+
+end

data/spec/utilities_spec.rb

@@ -4,76 +4,74 @@ include GitStatistics
 describe Utilities do
 
   describe "#get_repository" do
-    let(:repo) {Utilities.get_repository(dir)}
+    subject { Utilities.get_repository(dir) }
 
     context "with root directory" do
-      let(:dir) {Dir.pwd} # git_statistics/
-      it {repo.instance_of?(Grit::Repo).should be_true}
+      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 {repo.instance_of?(Grit::Repo).should be_true}
+      let(:dir) { File.dirname(__FILE__) } # git_statistics/spec/
+      it { should be_a Grit::Repo }
     end
 
     context "when not in a repository directory" do
-      let(:dir) {Dir.pwd + "../"} # git_statistics/../
-      it {repo.should.nil?}
+      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(:results) {Utilities.max_length_in_list(list, max)}
+    subject(:results) {Utilities.max_length_in_list(list, max)}
 
     context "with empty list" do
-      it {results.should.nil?}
+      it { should be_nil }
     end
 
     context "with nil list" do
       let(:list) {nil}
-      it {results.should.nil?}
+      it { should be_nil }
+    end
+
+    context "with empty list and zero max" do
+      let(:list) { [] }
+      let(:max) { 0 }
+      it { should == 0 }
     end
 
     context "with preset minimum length" do
       let(:max) {10}
-      it {results.should == 10}
+      it { should == 10 }
     end
 
     context "with valid list" do
       let(:list) {["abc", "a", "ab"]}
-      it {results.should == 3}
+      it { should == 3 }
     end
 
     context "with valid hash" do
       let(:list) {{"a" => "word_a", "ab" => "word_b", "abc" => "word_c"}}
-      it {results.should == 3}
-    end
-  end
-
-  describe "#clean_string" do
-    let(:unclean) {"  master   "}
-    let(:clean) {unclean.clean_for_authors}
-
-    context "with trailling spaces" do
-      it {clean.should == "master"}
+      it { should == 3 }
     end
   end
 
   describe "#get_modified_time" do
     let(:file) { 'file' }
-    before do
-      OS.stub(:mac?) { false }
-      OS.stub(:linux?) { false }
-    end
     after { Utilities.get_modified_time(file) }
     context "on a Mac" do
-      before { OS.stub(:mac?) { true } }
+      before { Utilities.stub(:os) { :mac } }
       it { Utilities.should_receive(:time_at).with(%[stat -f %m file]) { 10 } }
     end
     context "on a Linux" do
-      before { OS.stub(:linux?) { true } }
+      before { Utilities.stub(:os) { :linux } }
+      it { Utilities.should_receive(:time_at).with(%[stat -c %Y file]) { 10 } }
+    end
+    context "on a Unix" do
+      before { Utilities.stub(:os) { :unix } }
       it { Utilities.should_receive(:time_at).with(%[stat -c %Y file]) { 10 } }
     end
   end
@@ -120,48 +118,52 @@ describe Utilities do
     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 {blob.instance_of?(Grit::Blob).should be_true}
-      it {blob.name.should == file}
+      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 {blob.instance_of?(Grit::Blob).should be_true}
-      it {blob.name.should == file.split(File::Separator).last}
+      it { should be_instance_of Grit::Blob }
+      its(:name) { should == File.basename(file) }
     end
 
     context "file is nil" do
-      let(:blob) {Utilities.find_blob_in_tree(tree, nil)}
-      it {blob.should.nil?}
+      subject {Utilities.find_blob_in_tree(tree, nil)}
+      it { should be_nil }
     end
 
     context "file is empty" do
       let(:file) {""}
-      it {blob.should.nil?}
+      it { should be_nil }
     end
 
     context "file is submodule" do
       let(:sha) {"1940ef1c613a04f855d3867b874a4267d3e2c011"}
       let(:file) {"Spoon-Knife"}
-      it {blob.instance_of?(Grit::Submodule).should be_true}
-      it {blob.name.should == file}
+      it { should be_instance_of Grit::Submodule }
+      its(:name) { should == file }
     end
   end
 
   describe "#number_of_matching_files" do
-    let(:files) {Utilities.number_of_matching_files(directory, pattern)}
-    let(:pattern) {/\d+\.json/}
-    let(:directory) {Dir.pwd + File::Separator + "tmp_dir_for_spec" + File::Separator}
+    let(:directory) { File.join(Dir.pwd, "tmp_dir_for_spec") }
+    let(:pattern) { (/\d+\.json/) }
+    subject {Utilities.number_of_matching_files(directory, pattern)}
 
-    before(:each) do
+    around do |example|
       FileUtils.mkdir_p(directory)
+      Dir.chdir(directory) do
+        example.run
+      end
+      FileUtils.rmdir(directory)
     end
 
     context "with missing directory" do
-      subject { files }
       before do
         subject.class.stub(:warn)
         FileUtils.rmdir(directory)
@@ -169,36 +171,36 @@ describe Utilities do
       it { should == 0 }
     end
 
-    after(:each) do
-      FileUtils.rmdir(directory)
-    end
-
     context "with valid files" do
-      it do
-        FileUtils.touch(directory + "0.json")
-        FileUtils.touch(directory + "1.json")
-        FileUtils.touch(directory + "2.json")
-        files.should == 3
-        FileUtils.rm(directory + "0.json")
-        FileUtils.rm(directory + "1.json")
-        FileUtils.rm(directory + "2.json")
+      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")
       end
+      it { should == 3 }
     end
 
     context "with invalid files" do
-      it do
-        FileUtils.touch(directory + "0.json")
-        FileUtils.touch(directory + "incorrect.json")
-        FileUtils.touch(directory + "1.json")
-        files.should == 2
-        FileUtils.rm(directory + "0.json")
-        FileUtils.rm(directory + "incorrect.json")
-        FileUtils.rm(directory + "1.json")
+      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")
+      end
+      it { should == 2 }
     end
 
     context "with no files" do
-      it {files.should == 0}
+      it { should == 0 }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_statistics
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: grit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: github-linguist
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,14 +60,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: github-linguist
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -76,14 +92,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: os
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tailor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -101,20 +133,25 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/git_statistics/blob.rb
+- lib/git_statistics/branches.rb
 - lib/git_statistics/collector.rb
 - lib/git_statistics/commit_line_extractor.rb
 - lib/git_statistics/commits.rb
-- lib/git_statistics/core_ext/string.rb
 - lib/git_statistics/formatters/console.rb
 - lib/git_statistics/initialize.rb
+- lib/git_statistics/log.rb
+- lib/git_statistics/pipe.rb
 - lib/git_statistics/regex_matcher.rb
 - lib/git_statistics/utilities.rb
 - lib/git_statistics/version.rb
 - lib/git_statistics.rb
+- spec/branches_spec.rb
 - spec/collector_spec.rb
 - spec/commit_line_extractor_spec.rb
 - spec/commits_spec.rb
 - spec/formatters/console_spec.rb
+- spec/log_spec.rb
+- spec/pipe_spec.rb
 - spec/regex_matcher_spec.rb
 - spec/utilities_spec.rb
 - bin/git_statistics
@@ -137,6 +174,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2745027118134232724
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -144,9 +184,12 @@ signing_key:
 specification_version: 3
 summary: Gem that provides the ability to gather detailed git statistics
 test_files:
+- spec/branches_spec.rb
 - spec/collector_spec.rb
 - spec/commit_line_extractor_spec.rb
 - spec/commits_spec.rb
 - spec/formatters/console_spec.rb
+- spec/log_spec.rb
+- spec/pipe_spec.rb
 - spec/regex_matcher_spec.rb
 - spec/utilities_spec.rb