clockout 0.3 → 0.3.1

data/bin/clock

@@ -3,18 +3,20 @@
 require 'clockout'
 
 HELP_BANNER = <<-EOS
-Clockout v0.3
+
 See hours:
-            $ clock [options]
+    $ clock [options]
 
 Options:
-      --estimations, -e:   Show estimations made for first commit of each block
-        --condensed, -c:   Condense output (don't show the timeline for each day)
-   --generate-clock, -g:   Generate config file
-             --help, -h:   Show this message
-
-            $ clock in     Clock-in (when you start working, preceding a commit)
-            $ clock out    Clock-out (after you keep working overtime after a commit)
+    --estimations, -e:  Show estimations made, if any
+      --condensed, -c:  Condense output (don't show the timeline for each day)
+--generate-config, -g:  Generate config file (clock.yaml)
+ --user, -u (<email>):  Only count current user's commits (or specified user)
+           --help, -h:  Show this message
+
+Other:
+    $ clock in     Clock-in (when you start working, preceding a commit)
+    $ clock out    Clock-out (after you keep working overtime after a commit)
 EOS
 
 TEMPLATE_CLOCKFILE = <<-EOF
@@ -76,20 +78,31 @@ EOF
 def parse_options(args)
     opts = {}
 
-    args.each do |arg|
+    i = 0
+    while i < args.length
+        arg = args[i]
         if (arg == "-h" || arg == "--help")
             opts[:help] = true
         elsif (arg == "-e" || arg == "--estimations")
             opts[:estimations] = true
         elsif (arg == "-c" || arg == "--condensed")
             opts[:condensed] = true
-        elsif (arg == "-g" || arg == "--generate-clock")
-            opts[:generate_clock] = true
+        elsif (arg == "-g" || arg == "--generate-config")
+            opts[:generate_config] = true
+        elsif (arg == "-u" || arg == "--user")
+            next_arg = args[i+1]
+            if next_arg && next_arg[0] != '-'
+                opts[:user] = next_arg
+                i += 1
+            else
+                opts[:user] = true
+            end
         else
             puts_error "invalid option '#{arg}'."
             puts "Try --help for help."
             exit
         end
+        i += 1
     end
 
     opts
@@ -112,6 +125,10 @@ def generate_clock_file(path)
     end
 end
 
+def current_git_user
+    `git config user.email`.strip
+end
+
 path = Dir.pwd
 
 if (ARGV[0] == "in" || ARGV[0] == "out")
@@ -122,7 +139,7 @@ if (ARGV[0] == "in" || ARGV[0] == "out")
     buf = ""
     mod = false
     seek_line = ARGV[0] + ":"
-    time_line = "- " + Time.new.to_s + "\n"
+    time_line =  '- ' + Time.new.to_s + ': ' + current_git_user + "\n"
     File.foreach(clock_path) do |line|
         buf += line
         if line.strip == seek_line
@@ -143,14 +160,23 @@ else
         exit
     end
 
-    if opts[:generate_clock]
+    if opts[:generate_config]
         if !generate_clock_file(path) && clock_path
             puts_error "config file already exists for this repo: #{clock_path}"
         end
         exit
     end
 
-    clock = Clockout.new(path)
+    if opts[:user]
+        if opts[:user] == true
+            user = current_git_user
+        else
+            user = opts[:user]
+        end
+        puts "Showing hours for #{user}"
+    end
+    
+    clock = Clockout.new(path, user)
 
     if (opts[:estimations])
         clock.print_estimations

data/lib/clockout.rb

@@ -6,10 +6,11 @@ COLS = 80
 DAY_FORMAT = '%B %e, %Y'
 
 class Commit
-    attr_accessor :message, :minutes, :date, :diffs, :sha, :clocked_in, :clocked_out, :addition, :overriden
+    attr_accessor :message, :minutes, :date, :diffs, :sha, :clocked_in, :clocked_out, :addition, :overriden, :author, :estimated
     def initialize(commit = nil)
         @addition = 0
         if commit
+            @author = commit.author.email
             @date = commit.committed_date
             @message = commit.message.gsub("\n",' ')
             @sha = commit.id
@@ -18,11 +19,12 @@ class Commit
 end
 
 class Clock
-    attr_accessor :in, :out, :date
-    def initialize(type, date)
+    attr_accessor :in, :out, :date, :author
+    def initialize(type, date, auth)
         @in = (type == :in)
         @out = (type == :out)
         @date = date
+        @author = auth
     end
 end
 
@@ -104,13 +106,14 @@ class Clockout
         plus+minus/2
     end
 
-    def prepare_data(commits_in)
-        clockins = $opts[:in] || []
-        clockouts = $opts[:out] || []
+    def prepare_data(commits_in, author)
+        clockins = $opts[:in] || {}
+        clockouts = $opts[:out] || {}
 
         # Convert clock-in/-outs into Clock objs & commits into Commit objs
-        clockins.map! { |date| Clock.new(:in, date) }
-        clockouts.map! { |date| Clock.new(:out, date) }
+        clocks = []
+        clockins.each { |c| clocks << Clock.new(:in, c.first[0], c.first[1]) }
+        clockouts.each { |c| clocks << Clock.new(:out, c.first[0], c.first[1]) }
         commits_in.map! do |commit| 
             c = Commit.new(commit) 
             c.diffs = diffs(commit)
@@ -118,7 +121,10 @@ class Clockout
         end
 
         # Merge & sort everything by date
-        data = (commits_in + clockins + clockouts).sort { |a,b| a.date <=> b.date }
+        data = (commits_in + clocks).sort { |a,b| a.date <=> b.date }
+
+        # If author is specified, delete everything not by that author
+        data.delete_if { |c| c.author != author } if author
 
         blocks = []
         total_diffs, total_mins = 0, 0
@@ -219,17 +225,21 @@ class Clockout
         end
 
         diffs_per_min = (1.0*total_diffs/total_mins)
-        if !diffs_per_min.nan? && !diffs_per_min.infinite?
-            # Do estimation for all `nil` minutes.
-            blocks.each do |block|
-                first = block.first
-                if !first.minutes
+
+        # Do estimation for all `nil` minutes.
+        blocks.each do |block|
+            first = block.first
+            if !first.minutes
+                first.estimated = true
+                if diffs_per_min.nan? || diffs_per_min.infinite?
+                    first.minutes = 0
+                else
                     first.minutes = first.diffs/diffs_per_min * $opts[:estimation_factor] + first.addition
-                    add_time_to_day.call(first.minutes, first.date)
                 end
+                add_time_to_day.call(first.minutes, first.date)
             end
         end
-
+        
         blocks
     end
 
@@ -240,7 +250,7 @@ class Clockout
         @blocks.each do |block|
             date = block.first.date.strftime(DAY_FORMAT)
             if date != current_day
-                puts if (!condensed)
+                puts if (!condensed && current_day)
 
                 current_day = date
 
@@ -288,19 +298,27 @@ class Clockout
 
     def print_estimations
         sum = 0
+        estimations = []
         @blocks.each do |block|
-            first = block.first
-            date = first.date.strftime('%b %e')+":"
-            sha = first.sha[0..7]
-            time = first.minutes.as_time
+            estimations << block.first if block.first.estimated
+        end
 
-            puts align({date => :yellow, sha => :red, first.message => :to_s, time => :light_blue})
+        if estimations.empty?
+            puts "No estimations made."
+        else
+            estimations.each do |c|
+                date = c.date.strftime('%b %e')+":"
+                sha = c.sha[0..7]
+                time = c.minutes.as_time
 
-            sum += first.minutes
-        end
+                puts align({date => :yellow, sha => :red, c.message => :to_s, time => :light_blue})
 
-        puts align({"-"*10 => :light_blue})
-        puts align({sum.as_time(:hours) => :light_blue})
+                sum += c.minutes
+            end
+
+            puts align({"-"*10 => :light_blue})
+            puts align({sum.as_time(:hours) => :light_blue})
+        end
     end
 
     def self.get_repo(path, original_path = nil)
@@ -351,7 +369,7 @@ class Clockout
         root_path
     end
 
-    def initialize(path)
+    def initialize(path, author = nil)
         repo, root_path = Clockout.get_repo(path) || exit
 
         # Default options
@@ -367,6 +385,6 @@ class Clockout
         commits.reverse!
 
         @time_per_day = Hash.new(0)
-        @blocks = prepare_data(commits)
+        @blocks = prepare_data(commits, author)
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clockout
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit