clockout 0.4.2 → 0.5

data/bin/clock

@@ -10,13 +10,16 @@ See hours:
 Options:
     --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.yml)
  --user, -u (<email>):  Only count current user's commits (or specified user)
            --help, -h:  Show this message
 
+Generators:
+    $ clock generate config    Generate config file (clock.yml)
+    $ clock generate hook      Generate a post-commit hook for clockout!
+
 Other:
-    $ clock in     Clock-in (when you start working, preceding a commit)
-    $ clock out    Clock-out (after you've worked overtime following a commit)
+    $ clock in      Clock-in (when you start working, preceding a commit)
+    $ clock out     Clock-out (after you've worked overtime following a commit)
 EOS
 
 TEMPLATE_CLOCKFILE = <<-EOF
@@ -81,16 +84,22 @@ def parse_options(args)
     i = 0
     while i < args.length
         arg = args[i]
+        next_arg = args[i+1]
         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-config")
-            opts[:generate_config] = true
+        elsif (arg == "generate")
+            if next_arg == "hook" || next_arg == "config"
+                i += 1
+                opts[:generate] = next_arg
+            else
+                puts_error "invalid generator '#{next_arg}' (there's only 'config' and 'hook', see --help)."
+                exit
+            end
         elsif (arg == "-u" || arg == "--user")
-            next_arg = args[i+1]
             if next_arg && next_arg[0] != '-'
                 opts[:user] = next_arg
                 i += 1
@@ -152,6 +161,10 @@ if (ARGV[0] == "in" || ARGV[0] == "out")
         # Add in: or out:, along with the time if it doesn't exist
         file << "\n#{seek_line}\n#{time_line}" if !mod
     end
+elsif (ARGV[0] == "last")
+    print "[clockout] ".green if (ARGV[1] == "--hook")
+    clock = Clockout.new(path, nil, 2)
+    clock.print_last
 else
     opts = parse_options(ARGV)
     
@@ -160,9 +173,31 @@ else
         exit
     end
 
-    if opts[:generate_config]
-        if !generate_clock_file(path) && clock_path
-            puts_error "config file already exists for this repo: #{clock_path}"
+    if opts[:generate]
+        root = Clockout.root_path(path)
+        exit if !root
+        if opts[:generate] == "config"
+            if !generate_clock_file(path) && clock_path
+                puts_error "config file already exists for this repo: #{clock_path}"
+            end
+        elsif opts[:generate] == "hook"
+            hook_path = root+"/.git/hooks/post-commit"
+            hook_txt = "#clockout\nclock last --hook"
+            if File.exist? hook_path
+                contents = File.open(hook_path).read
+                if (contents[hook_txt])
+                    puts_error "post-commit clock hook already added"
+                else
+                    File.open(hook_path, "a") do |file|
+                        file.puts "\n\n#{hook_txt}"
+                    end
+                end
+            else
+                File.open(hook_path, "w") do |file|
+                    file.puts "#!/bin/sh\n\n#{hook_txt}"
+                end
+                File.chmod(0755, hook_path)
+            end
         end
         exit
     end

data/lib/clockout.rb

@@ -171,6 +171,11 @@ class Clockout
         @blocks = run(data)
     end
 
+    def print_last
+        last = @blocks.last.last
+        puts "#{last.minutes.round(2)} minutes logged" if last
+    end
+
     def self.get_repo(path, original_path = nil)
         begin
             return Grit::Repo.new(path), path
@@ -211,6 +216,7 @@ class Clockout
     end
 
     def self.clock_path(path)
+        return nil if !path
         path+"/clock.yml"
     end
 
@@ -219,7 +225,7 @@ class Clockout
         root_path
     end
 
-    def initialize(path = nil, author = nil)
+    def initialize(path = nil, author = nil, num=500)
         @time_per_day = Hash.new(0)
 
         # Default options
@@ -234,7 +240,7 @@ class Clockout
             # Merge with config override options
             $opts.merge!(clock_opts) if clock_opts
 
-            commits = repo.commits('master', 500)
+            commits = repo.commits('master', num)
             commits.reverse!
     
             prepare_blocks(commits, author)

data/lib/printer.rb

@@ -8,6 +8,7 @@ class String
     end
 
     def red() colorize(31) end
+    def green() colorize(32) end
     def yellow() colorize(33) end
     def magenta() colorize(35) end
     def light_blue() colorize(94) end

metadata

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