git_fame 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00cb789b59804a3307424c8bffaafa1c07cee019
-  data.tar.gz: 211d4c69bd1adcabd848ca660ae83f9369d87654
+  metadata.gz: 56ed28564572151ef8368874a40c3a78b7450bf6
+  data.tar.gz: 69f85cbc4d81f337b6c32963805030329303f5f8
 SHA512:
-  metadata.gz: 65932d6a3744577f3776b6221e8e94fa4283061452264eca0a1533f0c726d99b53e71cdf774200c47c41e5713c82663eb215f7ff97484044a0df51cf705b633b
-  data.tar.gz: 267729e8610daa3ce854ce18ac7bed062ea01a27c2aaaf72d96095b1e1303f8b6dc1a03f702a7827e75fa53d1891e6efa2d1e85338b98d33cbe18e4c30e6943d
+  metadata.gz: bca32c460a55a96cee4cb5673ff371d6695589185e9b86ab3b7ce5e480b59c1f254f996452b8ee10d11d095b7bff122aad67703192607612dadf3d7cd0d30ac1
+  data.tar.gz: 05270545850772755df28042a05088a64c6b60566948019834e20fe718b05bb5da1a1cfb3b06b86cae87ec0647342c1bb5b72a7a581abfa0d685faf1f0314c92

data/README.md

@@ -49,6 +49,7 @@ From a git repository run `git fame`.
 - `git fame --before=2016-02-01` Only use commits before this date. Format: yyyy-mm-dd. Note that the given date is included.
 - `git fame --verbose` Print shell commands used by `git-fame`.
 - `git fame --everything` Images and binaries are ignored by default. Include them as well.
+- `git fame --timeout` Set timeout in seconds for each git command.
 
 #### By type
 

data/bin/git-fame

@@ -20,6 +20,7 @@ opts = Trollop::options do
   opt :after, "Only use commmits after this date. Format: yyyy-mm-dd. Note that the given date is included", type: String
   opt :before, "Only use commits before this date. Format: yyyy-mm-dd. Note that the given date is included", type: String
   opt :verbose, "Print shell commands used by git-fame", default: false
+  opt :timeout, "Set timeout in seconds for each git command. Turn off by using -1", type: Integer, default: GitFame::CMD_TIMEOUT
   opt :everything, "Images and binaries are ignored by default. Include them as well", default: false
 end
 
@@ -27,6 +28,10 @@ unless GitFame::SORT.include?(opts[:sort])
   Trollop::die :sort, "must be one of the following; #{GitFame::SORT.join(", ")}"
 end
 
+if opts[:timeout] <= 0
+  Trollop::die :timeout, "must be positive"
+end
+
 begin
   fame = GitFame::Base.new({
     repository: opts[:repository],
@@ -41,10 +46,13 @@ begin
     after: opts[:after],
     before: opts[:before],
     verbose: opts[:verbose],
-    everything: opts[:everything]
+    everything: opts[:everything],
+    timeout: opts[:timeout]
   })
 
   opts[:format] == "csv" ? fame.csv_puts : fame.pretty_puts
 rescue GitFame::Error => e
-  abort "Error: #{e.message}"
+  Trollop::die e.message
+rescue Timeout::Error
+  Trollop::die "Maximum timeout of #{opts[:timeout]} sec exceed. Try passing --timeout=<sec> or -1 for no timeout"
 end

data/lib/git_fame/base.rb

@@ -56,6 +56,7 @@ module GitFame
       @by_type = args.fetch(:by_type, false)
       @branch = args.fetch(:branch, nil)
       @everything = args.fetch(:everything, false)
+      @timeout = args.fetch(:timeout, CMD_TIMEOUT)
 
       # Figure out what branch the caller is using
       if present?(@branch = args[:branch])
@@ -324,10 +325,19 @@ module GitFame
     end
 
     def run(command)
-      Timeout.timeout(CMD_TIMEOUT) do
-        Open3.popen2e(command, chdir: @repository) do |_, out, thread|
-          Result.new(out.read.scrub.strip, thread.value.success?)
-        end
+      if @timeout != -1
+        Timeout.timeout(CMD_TIMEOUT) { raw_run(command) }
+      else
+        raw_run(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
     end
 
@@ -365,7 +375,7 @@ module GitFame
     # extensions in @extensions defined by the user
     def current_files
       if commit_range.is_range?
-        execute("git diff --name-status #{encoding_opt} #{default_params} #{commit_range.to_s} | grep -v '^D' | cut -f2-") do |result|
+        execute("git diff -l 100 --name-status #{encoding_opt} #{default_params} #{commit_range.to_s} | grep -v '^D' | cut -f2-") do |result|
           filter_files(result)
         end
       else

data/lib/git_fame/version.rb

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

data/spec/bin_spec.rb

@@ -33,7 +33,8 @@ describe "bin/git-fame" do
     "--version",
     "--help",
     "--verbose",
-    "--everything"
+    "--everything",
+    "--timeout=10"
   ].each do |option|
     it "should support #{option}" do
       run(option).should be_a_succees
@@ -48,13 +49,13 @@ describe "bin/git-fame" do
     it "should fail on invalid before date" do
       res = run("--before='---'")
       res.should_not be_a_succees
-      res.first.should eq("Error: '---' is not a valid date\n")
+      res.should include_output("'---' is not a valid date")
     end
 
     it "should fail on invalid after date" do
       res = run("--after='---'")
       res.should_not be_a_succees
-      res.should include_output("Error: '---' is not a valid date\n")
+      res.should include_output("'---' is not a valid date")
     end
 
     it "should not print stack trace on invalid dates (--after)" do
@@ -63,6 +64,13 @@ describe "bin/git-fame" do
       res.should_not include_output("GitFame::Error")
     end
 
+    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
+    end
+
     it "should not print stack trace on invalid dates (--before)" do
       res = run("--before='---'")
       res.should_not be_a_succees

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_fame
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Linus Oleander