clockout 0.5.3 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2b346638c936f5439b5177c3444cb265b655f84
-  data.tar.gz: c51397600bb9b1d889d54cab6417cccc74862414
+  metadata.gz: 154224b857d9ee8cf5c769c4073a6df0f7c91631
+  data.tar.gz: 6fe6c7a5ce04129f0427bc1ee9d95cfa7e7f3ebe
 SHA512:
-  metadata.gz: 9915d4af55306b0cd997a3ee2bb1e738dad3e439e2ffd2321cdd80d2362584161c5402bf75d30fa0b458d8456326da56e220316b75f09f19d2a980a0f0552269
-  data.tar.gz: d4f15a5606f2d93a9b925a915f9e041ca27bf2d47a8f1a55a9cd7421d2810343bf29fe15b8815f31ab2ae6502a7dfbe373bf386781e2560a6ad3ad05c877d256
+  metadata.gz: f2b4d39a6a10f94e959cd71d42991faffda8bff3770a63790a90c883ff46c26b3a45405ab6ea8d881311d5798d2f75d9fd5ff2f71abaf5e5111a7c9d018b0eda
+  data.tar.gz: f13404df40ad6f5098737f145249402d86b6ea21ba84096cc7ba125b85c522a7b4ed76a3b327ed4f034e80f81f33ac65ca49692374779f080187d35f15e1c22c

data/bin/clock

@@ -2,6 +2,8 @@
 
 require 'clockout'
 
+VERSION = "0.6"
+
 HELP_BANNER = <<-EOS
 
 See hours:
@@ -38,32 +40,15 @@ TEMPLATE_CLOCKFILE = <<-EOF
 
 #time_cutoff: 90
 
-
-### Time-estimation options for each first commit of a timeblock ###
-
-# Diffs of files matched by this regex will be included in commit time estimation.
-# With some projects, there are diffs to binaries, images, files modified by an IDE, etc,
-# that you don't want to report as your own work. Below is an example regex that will only
-# calculate changes made to files with those extensions
-# - Default:  /.*/ (matches everything)
-
-#my_files: /\\.(m|h|txt)$/
-
-# Diffs of files matched by this regex will NOT be included in commit time estimation
-# You also have the option of defining a negative regex match, to ignore certain files.
-# For example, if you added an external library or something, you should ignore it
-# - Default:  <nothing>
-
-#not_my_files: /SomeThirdPartyLibrary/
-
-# Estimation factor
+# Estimation factor (for each first commit of a timeblock)
 # Use the -e option to see the estimations Clockout makes, and tweak them using this 
 # value as necessary.
 # - Default: 1.0
 
 #estimation_factor: 0.9
 
-# Put any override times for specific commits here (minutes). (You can use SHA1 hashes of any length)
+# Put any override times for specific commits here (minutes). (You can use SHA1 hashes
+# of any length). Useful for ignoring commits that add 3rd party libraries, say.
 # Note: keep a space before each hash for the YAML to parse properly.
 
 #overrides:
@@ -90,6 +75,8 @@ def parse_options(args)
         next_arg = args[i+1]
         if (arg == "-h" || arg == "--help")
             opts[:help] = true
+        elsif (arg == "-v" || arg == "--version")
+            opts[:version] = true
         elsif (arg == "-e" || arg == "--estimations")
             opts[:estimations] = true
         elsif (arg == "-c" || arg == "--condensed")
@@ -183,6 +170,11 @@ else
         exit
     end
 
+    if opts[:version]
+        puts VERSION
+        exit
+    end
+
     if opts[:generate]
         root = Clockout.root_path(path)
         exit if !root
@@ -221,7 +213,7 @@ else
         puts "Showing hours for #{user}"
     end
     
-    max = 500
+    max = 800
     clock = Clockout.new(path, user, max)
     printer = Printer.new(clock)
 

data/lib/clockout.rb

@@ -1,4 +1,4 @@
-require 'grit'
+require 'rugged'
 require 'yaml'
 
 require 'printer'
@@ -7,26 +7,12 @@ require 'record'
 COLS = 80
 DAY_FORMAT = '%B %e, %Y'
 
-# Grit does not support Ruby 2.0 right now
-class String
-  if ((defined? RUBY_VERSION) && (RUBY_VERSION[0..2] == "1.9" || RUBY_VERSION[0].to_i >= 2))
-    def getord(offset); self[offset].ord; end
-  else
-    alias :getord :[]
-  end
-end
-
 class Clockout
     attr_accessor :blocks, :time_per_day, :maxed_out
 
-    def commits_to_records(grit_commits, commit_stats)
-        my_files = eval($opts[:my_files])
-        not_my_files = eval($opts[:not_my_files] || "")
-        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
+    def commits_to_records(git_commits)
+        git_commits.each_with_index.map do |commit, i| 
+            Commit.new(commit)
         end
     end
 
@@ -164,13 +150,13 @@ class Clockout
         blocks
     end
 
-    def prepare_blocks(commits_in, commit_stats, author)
+    def prepare_blocks(commits_in, 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, commit_stats)
+        commits = commits_to_records(commits_in)
 
         # Merge & sort everything by date
         data = (commits + clocks).sort { |a,b| a.date <=> b.date }
@@ -185,29 +171,9 @@ class Clockout
         @blocks.last.last
     end
 
-    def self.get_repo(path, original_path = nil)
-        begin
-            return Grit::Repo.new(path), path
-        rescue Exception => e
-            if e.class == Grit::NoSuchPathError
-                puts_error "Path '#{path}' could not be found."
-                return nil
-            else
-                # Must have drilled down to /
-                if (path.length <= 1)
-                    puts_error "'#{original_path}' is not a Git repository."
-                    return nil
-                end
-
-                # Could be that we're in a directory inside the repo
-                # Strip off last directory
-                one_up = path
-                while ((one_up = one_up[0..-2])[-1] != '/') do end
-
-                # Recursively try one level higher
-                return get_repo(one_up[0..-2], path)
-            end
-        end
+    def self.get_repo(path)
+        repo = Rugged::Repository.discover(path)
+        return repo, repo.workdir
     end
 
     def self.parse_clockfile(file)
@@ -226,7 +192,7 @@ class Clockout
 
     def self.clock_path(path)
         return nil if !path
-        path+"/clock.yml"
+        File.join(path,"clock.yml")
     end
 
     def self.root_path(path)
@@ -234,11 +200,17 @@ class Clockout
         root_path
     end
 
+    def get_commits(repo, num)
+        walker = Rugged::Walker.new(repo)
+        walker.push(repo.head.target_id)
+        walker.each.take(num)
+    end
+
     def initialize(path = nil, author = nil, num = 1)
         @time_per_day = Hash.new(0)
 
         # Default options
-        $opts = {time_cutoff:120, my_files:"/.*/", estimation_factor:1.0}
+        $opts = {time_cutoff:120, estimation_factor:1.0}
 
         if path
             repo, root_path = Clockout.get_repo(path) || exit
@@ -249,12 +221,11 @@ class Clockout
             # Merge with config override options
             $opts.merge!(clock_opts) if clock_opts
 
-            commits = repo.commits('master', num).reverse
-            commit_stats = repo.commit_stats('master', num).reverse #much faster if retrieved in batch
+            commits = get_commits(repo, num)
 
             @maxed_out = (commits.size == num)
     
-            prepare_blocks(commits, commit_stats, author)
+            prepare_blocks(commits, author)
         end
     end
 end

data/lib/record.rb

@@ -4,40 +4,27 @@ end
 
 class Commit < Record
     # From Grit::Commit object
-    attr_accessor :message, :stats, :diffs, :sha
+    attr_accessor :message, :diffs, :sha
     # Time calc
     attr_accessor :minutes, :addition, :overriden, :estimated
     # Whether it's been padded by a clock in/out
     attr_accessor :clocked_in, :clocked_out
     
-    def initialize(commit = nil, date = nil)
+    def initialize(commit = nil, date = nil, paths = nil)
         @addition = 0
         @date = date
         if commit
-            @author = commit.author.email
-            @date = commit.committed_date
+            @author = commit.author[:email]
+            @date = commit.time
             @message = commit.message.gsub("\n",' ')
-            @sha = commit.id
-        end
-    end
-
-    def calculate_diffs(my_files, not_my_files)
-        return @diffs if @diffs
-
-        plus, minus = 0, 0
-
-        @stats.to_diffstat.each do |diff_stat|
-            should_include = (diff_stat.filename =~ my_files)
-            should_ignore = not_my_files && (diff_stat.filename =~ not_my_files)
-            if should_include && !should_ignore
-                plus += diff_stat.additions
-                minus += diff_stat.deletions
+            @sha = commit.oid
+            @diffs = 0
+            commit.diff(commit.parents[0]).each_patch do |patch|
+                # Weight deletions half as much, since they are typically
+                # faster to do & also are 1:1 with additions when changing a line
+                @diffs += patch.stat[0] + patch.stat[1]/2
             end
         end
-
-        # Weight deletions half as much, since they are typically
-        # faster to do & also are 1:1 with additions when changing a line
-        @diffs = plus+minus/2
     end
 end
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: clockout
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: '0.6'
 platform: ruby
 authors:
 - Dan Hassin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -51,7 +51,8 @@ files:
 - lib/printer.rb
 - bin/clock
 homepage: http://rubygems.org/gems/clockout
-licenses: []
+licenses:
+- license.md
 metadata: {}
 post_install_message: 
 rdoc_options: []