git_fame 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f884e24c83b7a966af59ab96a045ea3ece06b6ff
-  data.tar.gz: fa4e2967c967867b568ace60dc7bd62bf1a191d4
+  metadata.gz: fd0e84253d48334aadecae9770216086d4ac67e7
+  data.tar.gz: af9f1a996b0e68e4d537cfe456319d66f66c9c1a
 SHA512:
-  metadata.gz: a3f5a220b5e3a6211c3d8aad13d881bcb500e1e0bff4ad8b16bf984e0038c3acd1f4d1673ee6577a495d7be8387fe5c24d33b6f6f612010cee8d0e5084781d79
-  data.tar.gz: 53101b66a4a44b3eabf739c43bbabf33664e5ccbcee1225566e2dcf41aeb47217eac3225b945f2870de0549c7e89854c8fca6ddf29c31c82d4fb1846b441dab3
+  metadata.gz: da9a68656473b6c1bfaefad0bab00634b2ff0f5fafd8b999ebc695ead627e4b3340ff80a6ce5409ac122a81a5e99eae73c6d7ce337f910cf94b6c62ef9cf151b
+  data.tar.gz: 87fbb2d5a0f67140eb55929ef1e5ec1aedc7169c711337425873ee652579f52f1bda3f805dce5d1d419cd36f0a320a8cffd89eaf58a47864e72b584170034801

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
 - 2.0.0
 - 1.9.3
 script:
- - 'rspec spec/git_fame_spec.rb --format documentation'
+ - 'rspec spec --format documentation'
 notifications:
   webhooks:
     urls:

data/bin/git-fame

@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -w
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 
 require "git_fame"
 require "trollop"

data/lib/git_fame/base.rb

@@ -39,9 +39,13 @@ module GitFame
       @bytype = args.fetch(:bytype, false)
       @branch = args.fetch(:branch, default_branch)
 
-      # User defined branch must exist
-      if not blank?(@branch) and not default_branch_exists?
-        raise GitFame::BranchNotFound, "Branch '#{@branch}' does not exist"
+      # Figure out what branch the caller is using
+      if present?(@branch = args[:branch])
+        unless branch_exists?(@branch)
+          raise GitFame::BranchNotFound, "Branch '#{@branch}' does not exist"
+        end
+      else
+        @branch = default_branch
       end
 
       # Fields that should be visible in the final table
@@ -219,6 +223,10 @@ module GitFame
       value.nil? or value.empty?
     end
 
+    def present?(value)
+      not blank?(value)
+    end
+
     # Includes fields from file extensions
     def raw_fields
       return @visible_fields unless @bytype
@@ -255,11 +263,6 @@ module GitFame
       "Could not run '#{command}' => #{message}"
     end
 
-    # Boolean Does the branch exist?
-    def default_branch_exists?
-      branch_exists?(@branch)
-    end
-
     # Does @branch exist in the current git repo?
     def branch_exists?(branch)
       execute("git show-ref '#{branch}'", true) do |result|

data/lib/git_fame/version.rb

@@ -1,3 +1,3 @@
 module GitFame
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end

data/spec/bin_spec.rb

@@ -0,0 +1,44 @@
+describe "bin/git-fame" do
+  it "should include the authors name" do
+    run("--help").should include_output("Linus Oleander")
+  end
+
+  it "should include the the current version" do
+    run("--version").should include_output(GitFame::VERSION)
+  end
+
+  it "should fail on invalid option" do
+    run("--nope").should_not be_a_succees
+  end
+
+  it "should not accept a non-existent repository" do
+    run("--repository=??").should_not be_a_succees
+  end
+
+  [
+    "--sort=name",
+    "--sort=commits",
+    "--sort=loc",
+    "--sort=files",
+    "--progressbar=0",
+    "--progressbar=1",
+    "--whitespace",
+    "--bytype",
+    "--include=hello",
+    "--exclude=hello",
+    "--extension=rb,ln",
+    "--branch=master",
+    "--format=csv",
+    "--format=pretty",
+    "--version",
+    "--help"
+  ].each do |option|
+    it "should support #{option}" do
+      run(option).should be_a_succees
+    end
+  end
+
+  it "should sort by loc by default" do
+    run("--sort=loc", "--progressbar=0").first.should eq(run("--progressbar=0").first)
+  end
+end

data/spec/git_fame_spec.rb

@@ -158,5 +158,17 @@ describe GitFame::Base do
         }).authors
       }.to raise_error(GitFame::BranchNotFound)
     end
+
+    it "should not raise on empty branch (use fallback)" do
+      GitFame::Base.new({
+        repository: repository,
+        branch: ""
+      }).authors.should_not be_empty
+
+      GitFame::Base.new({
+        repository: repository,
+        branch: nil
+      }).authors.should_not be_empty
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,9 +3,30 @@ require "git_fame"
 require "coveralls"
 require "rspec/collection_matchers"
 require_relative "./support/startup"
+require "rspec/expectations"
 
 Coveralls.wear!
 
+RSpec::Matchers.define :be_a_succees do
+  match do |actual|
+    actual.last
+  end
+
+  failure_message do |actual|
+    "expected command to be a success, but failed"
+  end
+end
+
+RSpec::Matchers.define :include_output do |expected|
+  match do |actual|
+    actual.first.include?(expected)
+  end
+
+  failure_message do |actual|
+    "expected #{actual} to include #{expected}, but didn't"
+  end
+end
+
 RSpec.configure do |config|
   config.include GitFame::Startup
   config.mock_with :rspec
@@ -13,7 +34,7 @@ RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
   config.fail_fast = false
   config.before(:all) do
-    Dir.chdir(repository) { `git checkout 7ab01bc5a720` }
+    Dir.chdir(repository) { system "git checkout 7ab01bc5a720 > /dev/null 2>&1" }
   end
 
   # Remove this line to allow Kernel#puts

data/spec/support/startup.rb

@@ -1,7 +1,21 @@
+require "open3"
+
 module GitFame
   module Startup
     def repository
       File.join(File.dirname(File.dirname(__FILE__)), "fixtures/gash")
     end
+
+    def binary
+      File.join(File.dirname(File.dirname(__FILE__)), "../bin/git-fame")
+    end
+
+    def run(*args)
+      Open3.popen2e(*([binary] + args), chdir: repository) do |_, out, thread|
+        return [out.read, thread.value.success?]
+      end
+    rescue Errno::ENOENT
+      [$!.message, false]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_fame
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Linus Oleander
@@ -163,6 +163,7 @@ files:
 - lib/git_fame/result.rb
 - lib/git_fame/silent_progressbar.rb
 - lib/git_fame/version.rb
+- spec/bin_spec.rb
 - spec/git_fame_spec.rb
 - spec/spec_helper.rb
 - spec/support/startup.rb
@@ -192,6 +193,7 @@ summary: 'Generates awesome stats from git-blame  A Ruby wrapper for git-blame.
   data like: - Number of files changed by a user - Number of commits by user - Lines
   of code by a user'
 test_files:
+- spec/bin_spec.rb
 - spec/git_fame_spec.rb
 - spec/spec_helper.rb
 - spec/support/startup.rb