git_fame 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ed28564572151ef8368874a40c3a78b7450bf6
-  data.tar.gz: 69f85cbc4d81f337b6c32963805030329303f5f8
+  metadata.gz: f60cc8e1ebb619b563a10256cd86549fdd59a901
+  data.tar.gz: 93a5887855e265c463bd3c8ab1a48c24a107cfa1
 SHA512:
-  metadata.gz: bca32c460a55a96cee4cb5673ff371d6695589185e9b86ab3b7ce5e480b59c1f254f996452b8ee10d11d095b7bff122aad67703192607612dadf3d7cd0d30ac1
-  data.tar.gz: 05270545850772755df28042a05088a64c6b60566948019834e20fe718b05bb5da1a1cfb3b06b86cae87ec0647342c1bb5b72a7a581abfa0d685faf1f0314c92
+  metadata.gz: 20cbb0c37d9d3637c0b9c3e73241c4a10e73ffa877e76e97014e7ddcfab064d03c1f2932b3d1b6e441ce298bdb8b7d96dffb9530f570a1ac19c75f844cb63673
+  data.tar.gz: 86e2e53e6f36480ec4bb3b9f99925a77429c4c9d5af99809558ff65b49fab52f82b523a7aea5219f7ae5e8f72ae4169d7f431f8e87c7887d52fb7ab56cea9569

data/bin/git-fame

@@ -28,7 +28,7 @@ unless GitFame::SORT.include?(opts[:sort])
   Trollop::die :sort, "must be one of the following; #{GitFame::SORT.join(", ")}"
 end
 
-if opts[:timeout] <= 0
+if opts[:timeout] != -1 and opts[:timeout] <= 0
   Trollop::die :timeout, "must be positive"
 end
 

data/lib/git_fame/base.rb

@@ -52,11 +52,12 @@ module GitFame
       # Default sorting option is by loc
       @include = args.fetch(:include, "").split(",")
       @sort = args.fetch(:sort, @default_settings.fetch(:sorting))
-      @repository = args.fetch(:repository)
+      @repository = File.expand_path(args.fetch(:repository))
       @by_type = args.fetch(:by_type, false)
       @branch = args.fetch(:branch, nil)
       @everything = args.fetch(:everything, false)
       @timeout = args.fetch(:timeout, CMD_TIMEOUT)
+      @git_dir = File.join(@repository, ".git")
 
       # Figure out what branch the caller is using
       if present?(@branch = args[:branch])
@@ -89,7 +90,6 @@ module GitFame
       @authors = {}
       @cache = {}
       @verbose = args.fetch(:verbose, false)
-
       populate
     end
 
@@ -186,7 +186,7 @@ module GitFame
         # -w ignore whitespaces (defined in @wopt)
         # -M detect moved or copied lines.
         # -p procelain mode (parsed by BlameParser)
-        execute("git blame #{encoding_opt} -p -M #{default_params} #{commit_range.to_s} #{@wopt} -- '#{file}'") do |result|
+        execute("git #{git_directory_params} blame #{encoding_opt} -p -M #{default_params} #{commit_range.to_s} #{@wopt} -- '#{file}'") do |result|
           BlameParser.new(result.to_s).parse.each do |row|
             next if row[:boundary]
 
@@ -206,7 +206,7 @@ module GitFame
       end
 
       # Get repository summery and update each author accordingly
-      execute("git shortlog #{encoding_opt} #{default_params} -se #{commit_range.to_s}") do |result|
+      execute("git #{git_directory_params} shortlog #{encoding_opt} #{default_params} -se #{commit_range.to_s}") do |result|
         result.to_s.split("\n").map do |line|
           _, commits, name, email = line.match(/(\d+)\s+(.+)\s+<(.+?)>/).to_a
           author = author_by_email(email)
@@ -233,7 +233,7 @@ module GitFame
 
     # Return mime type for file (form: x/y)
     def mime_type_for_file(file)
-      execute("git show #{commit_range.range.last}:'#{file}' | LC_ALL=C file --mime-type -").to_s.
+      execute("git #{git_directory_params} show #{commit_range.range.last}:'#{file}' | LC_ALL=C file --mime-type -").to_s.
         match(/.+: (.+?)$/).to_a[1]
     end
 
@@ -312,8 +312,7 @@ module GitFame
     # Command to be executed at @repository
     # @silent = true wont raise an error on exit code =! 0
     def execute(command, silent = false, &block)
-      result = run(command)
-
+      result = run_with_timeout(command)
       if result.success? or silent
         warn command if @verbose
         return result unless block
@@ -324,21 +323,19 @@ module GitFame
       raise Error, cmd_error_message(command, $!.message)
     end
 
-    def run(command)
+    def run_with_timeout(command)
       if @timeout != -1
-        Timeout.timeout(CMD_TIMEOUT) { raw_run(command) }
+        Timeout.timeout(CMD_TIMEOUT) { run_no_timeout(command) }
       else
-        raw_run(command)
+        run_no_timeout(command)
       end
     end
 
-    def raw_run(command)
-      Open3.popen3(command, chdir: @repository) do |_, out, err, thread|
-        out_data = out.read
-        err_data = err.read
-        output = thread.value.success? ? out_data : err_data
-        Result.new(output.scrub.strip, thread.value.success?)
-      end
+    def run_no_timeout(command)
+      out, err, status = Open3.capture3(command)
+      ok = status.success?
+      output = ok ? out : err
+      Result.new(output.scrub.strip, ok)
     end
 
     def cmd_error_message(command, message)
@@ -347,7 +344,7 @@ module GitFame
 
     # Does @branch exist in the current git repo?
     def branch_exists?(branch)
-      execute("git show-ref '#{branch}'", true) do |result|
+      execute("git #{git_directory_params} show-ref '#{branch}'", true) do |result|
         result.success?
       end
     end
@@ -361,7 +358,7 @@ module GitFame
         return @default_settings.fetch(:branch)
       end
 
-      execute("git rev-parse HEAD | head -1") do |result|
+      execute("git #{git_directory_params} rev-parse HEAD | head -1") do |result|
         return result.data.split(" ")[0] if result.success?
       end
       raise Error, "No branch found. Define one using --branch=<branch>"
@@ -375,11 +372,11 @@ module GitFame
     # extensions in @extensions defined by the user
     def current_files
       if commit_range.is_range?
-        execute("git diff -l 100 --name-status #{encoding_opt} #{default_params} #{commit_range.to_s} | grep -v '^D' | cut -f2-") do |result|
+        execute("git #{git_directory_params} -c diff.renames=0 -c diff.renameLimit=1000 diff -M -C -c --name-only --diff-filter=AM #{encoding_opt} #{default_params} #{commit_range.to_s}") do |result|
           filter_files(result)
         end
       else
-        execute("git ls-tree -r #{commit_range.to_s} | grep blob | cut -f2-") do |result|
+        execute("git #{git_directory_params} ls-tree --name-only -r #{commit_range.to_s}") do |result|
           filter_files(result)
         end
       end
@@ -389,6 +386,10 @@ module GitFame
       "--date=local"
     end
 
+    def git_directory_params
+      "--git-dir='#{@git_dir}' --work-tree='#{@repository}'"
+    end
+
     def encoding_opt
       "--encoding=UTF-8"
     end
@@ -436,11 +437,11 @@ module GitFame
           commit2 = @branch
         else
           # Try finding a commit that day
-          commit2 = execute("git rev-list --before='#{@before} 23:59:59' --after='#{@before} 00:00:01' #{default_params} '#{@branch}' | head -1").to_s
+          commit2 = execute("git #{git_directory_params} rev-list --before='#{@before} 23:59:59' --after='#{@before} 00:00:01' #{default_params} '#{@branch}' | head -1").to_s
 
           # Otherwise, look for the closest commit
           if blank?(commit2)
-            commit2 = execute("git rev-list --before='#{@before}' #{default_params} '#{@branch}' | head -1").to_s
+            commit2 = execute("git #{git_directory_params} rev-list --before='#{@before}' #{default_params} '#{@branch}' | head -1").to_s
           end
         end
       end
@@ -450,7 +451,7 @@ module GitFame
           return present?(commit2) ? commit2 : @branch
         end
 
-        commit1 = execute("git rev-list --before='#{end_of_yesterday(@after)}' #{default_params} '#{@branch}' | head -1").to_s
+        commit1 = execute("git #{git_directory_params} rev-list --before='#{end_of_yesterday(@after)}' #{default_params} '#{@branch}' | head -1").to_s
 
         # No commit found this early
         # If NO end date is choosen, just use current branch
@@ -478,11 +479,11 @@ module GitFame
     end
 
     def start_commit_date
-      Time.parse(execute("git log #{encoding_opt} --pretty=format:'%cd' #{default_params} #{@branch} | tail -1").to_s)
+      Time.parse(execute("git #{git_directory_params} log #{encoding_opt} --pretty=format:'%cd' #{default_params} #{@branch} | tail -1").to_s)
     end
 
     def end_commit_date
-      Time.parse(execute("git log #{encoding_opt} --pretty=format:'%cd' #{default_params} #{@branch} | head -1").to_s)
+      Time.parse(execute("git #{git_directory_params} log #{encoding_opt} --pretty=format:'%cd' #{default_params} #{@branch} | head -1").to_s)
     end
 
     def end_date
@@ -514,7 +515,7 @@ module GitFame
     end
 
     # TODO: Are all these needed?
-    memoize :populate, :run
+    memoize :populate, :run_with_timeout
     memoize :current_range, :current_files
     memoize :printable_fields, :files_from_author
     memoize :raw_fields, :fields, :file_list

data/lib/git_fame/version.rb

@@ -1,3 +1,3 @@
 module GitFame
-  VERSION = "2.2.0"
+  VERSION = "2.3.1"
 end

data/spec/bin_spec.rb

@@ -34,7 +34,8 @@ describe "bin/git-fame" do
     "--help",
     "--verbose",
     "--everything",
-    "--timeout=10"
+    "--timeout=10",
+    "--timeout=-1"
   ].each do |option|
     it "should support #{option}" do
       run(option).should be_a_succees
@@ -67,8 +68,8 @@ describe "bin/git-fame" do
     it "should fail on invalid timeout" do
       run("--timeout=hello").should_not be_a_succees
       run("--timeout=").should_not be_a_succees
-      run("--timeout=-1").should_not be_a_succees
       run("--timeout=0").should_not be_a_succees
+      run("--timeout=-2").should_not be_a_succees
     end
 
     it "should not print stack trace on invalid dates (--before)" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_fame
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar