git_time_extractor 0.2.0 → 0.2.1

data/README.txt

@@ -1,18 +1,19 @@
 = git_time_extractor
 
+RubyGem Page: https://rubygems.org/gems/git_time_extractor
 Project Wiki: https://github.com/rietta/git_time_extractor/wiki
 
 == DESCRIPTION:
 
 EXTRACT REASONABLE TIME RECORDS FROM A GIT REPOSITORY
 
-git_time_extractor is a free tool that goes through a GIT, the popular revision control system, repository's commit log and produces a Comma Seperated Values (CSV) file that indicates the time spent by each developer, per day. 
+git_time_extractor is a free tool that goes through a GIT, the popular revision control system, repository's commit log and produces a Comma Separated Values (CSV) file that indicates the time spent by each developer, per day. 
 
 The working time estimates are based on three assumptions:
 
-    1. A series of commits within a 3 hour window are part of the same development session
+    1. A series of commits within a three (3) hour window are part of the same development session
     2. A single commit (or the first commit of the session) is considered to represent 30 minutes of work time
-    3. The more frequent a developer commits to the repository while working, the more accurate the time report will be
+    3. The more frequently a developer commits to the repository while working, the more accurate the time report will be
 
 This script is based on previous code published publicly by Sharad at http://www.tatvartha.com/2010/01/generating-time-entry-from-git-log/. However, it has been adapted to run without Rails from the command line. The portions of the code written by Rietta are licensed under the terms of the BSD license (see section 3 below).
 

data/lib/git_time_extractor.rb

@@ -8,7 +8,7 @@
 # Portions (C) 2012 Rietta Inc. and licensed under the terms of the BSD license.
 #
 class GitTimeExtractor
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
   
   require 'rubygems'
   require 'ostruct'
@@ -95,7 +95,9 @@ class GitTimeExtractor
       duration = commit.author_date - previous_commit.author_date
       
       # ASSUMPTION: if the gap between 2 commits is more than 3 hours, reduce it to 1/2 hour
-      duration = 30 * 60 if duration > 3 * 3600
+      # Also, if the time is negative then this is usually a merge operation.  Assume the developer spent
+      # 30 minutes reviewing it
+      duration = 30 * 60 if duration < 0 || duration > 3 * 3600
     else
       # ASSUMPTION: first commit took 1/2 hour
       duration = 30 * 60

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_time_extractor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -45,6 +45,7 @@ dependencies:
         version: '0'
 description: Compute the estimated time spent by developers working on code within
   a GIT respository. Useful for verifying developer timesheets and for tax purposes.
+  See https://github.com/rietta/git_time_extractor/wiki.
 email: products@rietta.com
 executables:
 - git_time_extractor