clockout 0.5 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7699cc7de9299eb18655d2f48767232a773519f3
+  data.tar.gz: 33ae0150ea39fbf0df5057f2ecb82582619fb3a7
+SHA512:
+  metadata.gz: f74da6e936aae0e648d6821be438b3aa0f4738dd6c9419e3e320ffaee8a34e90d0f7e8bbf384a0c3301b4cbdeef6f1ba9fc660d693e6153a32f6d81a6578ca57
+  data.tar.gz: 5bc55a18b4f7211fd1f78b03eb329a075668eeaa2315f52856e53ec7a597f9633f4142b299bfb1dead4b5f2cc7197b5a149c326f9bbfd86ed8d02263063af902

data/bin/clock

@@ -162,9 +162,11 @@ if (ARGV[0] == "in" || ARGV[0] == "out")
         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
+    #need a decent amount of commits so we can get a good estimation of diffs rate (for pioneer commits), 
+    #but we don't want the hook to take too long
+    num = 150
+    last = Clockout.new(path, nil, num).last
+    puts "[clockout] ".green + "#{last.minutes.round(2)} minutes logged" if last
 else
     opts = parse_options(ARGV)
     
@@ -182,7 +184,7 @@ else
             end
         elsif opts[:generate] == "hook"
             hook_path = root+"/.git/hooks/post-commit"
-            hook_txt = "#clockout\nclock last --hook"
+            hook_txt = "#clockout\nclock last"
             if File.exist? hook_path
                 contents = File.open(hook_path).read
                 if (contents[hook_txt])
@@ -211,7 +213,8 @@ else
         puts "Showing hours for #{user}"
     end
     
-    clock = Clockout.new(path, user)
+    max = 500
+    clock = Clockout.new(path, user, max)
     printer = Printer.new(clock)
 
     if (opts[:estimations])
@@ -219,4 +222,8 @@ else
     else
         printer.print_chart(opts[:condensed])
     end
+
+    if (clock.maxed_out)
+        puts "** only showing the #{max} most recent commits **"
+    end
 end

data/lib/clockout.rb

@@ -8,13 +8,14 @@ COLS = 80
 DAY_FORMAT = '%B %e, %Y'
 
 class Clockout
-    attr_accessor :blocks, :time_per_day
+    attr_accessor :blocks, :time_per_day, :maxed_out
 
-    def commits_to_records(grit_commits)
+    def commits_to_records(grit_commits, commit_stats)
         my_files = eval($opts[:my_files])
         not_my_files = eval($opts[:not_my_files] || "")
-        grit_commits.map do |commit| 
-            c = Commit.new(commit) 
+        grit_commits.each_with_index.map do |commit, i| 
+            c = Commit.new(commit)
+            c.stats = commit_stats[i][1]
             c.calculate_diffs(my_files, not_my_files)
             c
         end
@@ -143,7 +144,7 @@ class Clockout
             if !first.minutes
                 first.estimated = true
                 if diffs_per_min.nan? || diffs_per_min.infinite?
-                    first.minutes = 0
+                    first.minutes = first.addition
                 else
                     first.minutes = first.diffs/diffs_per_min * $opts[:estimation_factor] + first.addition
                 end
@@ -154,13 +155,13 @@ class Clockout
         blocks
     end
 
-    def prepare_blocks(commits_in, author)
+    def prepare_blocks(commits_in, commit_stats, author)
         clockins = $opts[:in] || {}
         clockouts = $opts[:out] || {}
 
         # Convert clock-in/-outs into Clock objs & commits into Commit objs
         clocks = clocks_to_records(clockins, :in) + clocks_to_records(clockouts, :out)
-        commits = commits_to_records(commits_in)
+        commits = commits_to_records(commits_in, commit_stats)
 
         # Merge & sort everything by date
         data = (commits + clocks).sort { |a,b| a.date <=> b.date }
@@ -171,9 +172,8 @@ class Clockout
         @blocks = run(data)
     end
 
-    def print_last
-        last = @blocks.last.last
-        puts "#{last.minutes.round(2)} minutes logged" if last
+    def last
+        @blocks.last.last
     end
 
     def self.get_repo(path, original_path = nil)
@@ -225,7 +225,7 @@ class Clockout
         root_path
     end
 
-    def initialize(path = nil, author = nil, num=500)
+    def initialize(path = nil, author = nil, num = 1)
         @time_per_day = Hash.new(0)
 
         # Default options
@@ -240,10 +240,12 @@ class Clockout
             # Merge with config override options
             $opts.merge!(clock_opts) if clock_opts
 
-            commits = repo.commits('master', num)
-            commits.reverse!
+            commits = repo.commits('master', num).reverse
+            commit_stats = repo.commit_stats('master', num).reverse #much faster if retrieved in batch
+
+            @maxed_out = (commits.size == num)
     
-            prepare_blocks(commits, author)
+            prepare_blocks(commits, commit_stats, author)
         end
     end
 end

data/lib/record.rb

@@ -18,7 +18,6 @@ class Commit < Record
             @date = commit.committed_date
             @message = commit.message.gsub("\n",' ')
             @sha = commit.id
-            @stats = commit.stats
         end
     end
 

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: clockout
 version: !ruby/object:Gem::Version
-  version: '0.5'
-  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - Dan Hassin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Sort of an extension to Git to support clocking hours worked on a project.
@@ -54,30 +49,28 @@ files:
 - lib/record.rb
 - lib/clockout.rb
 - lib/printer.rb
-- !binary |-
-  YmluL2Nsb2Nr
+- bin/clock
 homepage: http://rubygems.org/gems/clockout
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Clock your hours worked using Git
 test_files: []