timetrackr 0.1.5 → 0.1.6

data/README.mkd

@@ -6,22 +6,57 @@ A simple CLI time tracking utility.
 
 (with a Bash alias of 'tt')
 
+start a task:
+
     $ tt start something
 
+...view durations:
+
     $ tt
     something *     0h  0m  4s
 
+...have two running tasks:
+
     $ tt start another-thing
 
     $ tt log
-    2011-05-18   something *     22:11            0h  0m 26s
-                 another-thing * 22:11            0h  0m  6s
+    2011-05-18   something *     22:11            0h  0m 30s
+                 another-thing * 22:11            0h  0m 15s
+
+...start with a note:
+
+    $ tt start one-more with a note
+
+    $ tt log
+    2011-05-18   something *     22:11            0h  0m 45s
+                 another-thing * 22:11            0h  0m 30s
+                 one-more *      22:13            0h  0m 15s  with a note
+
+...restrict some:
+
+    $ tt log something
+    2011-05-18   something *     22:11            0h  1m 00s
+
+...exclude some:
+
+    $ tt log something -n another-thing
+    2011-05-18   something *     22:11            0h  1m 15s
+                 one-more *      22:13            0h  0m 45s  with a note
+
+...stop one (or more):
 
     $ tt stop something
 
     $ tt
-    something       0h  0m 37s
-    another-thing * 0h  0m 20s
+    something       0h  1m 20s
+    another-thing * 0h  1m 30s
+    one-more *      0h  1m 15s
+
+...and delete one:
+
+    $ tt clear something
+    another-thing * 0h  1m 45s
+    one-more *      0h  1m 30s
 
 
 ## Contributing to timetrackr

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/timetrackr/cli.rb

@@ -44,6 +44,7 @@ module TimeTrackr
 
     #
     # run a command on the tracker
+    # 'args' is everything after the command
     #
     def run(cmd,args)
       case cmd
@@ -62,11 +63,7 @@ module TimeTrackr
         @trackr.start(task, notes)
 
       when 'stop','out','kill','k'
-        if args[0] == 'all' || args[0].nil?
-          tasks = @trackr.tasks
-        else
-          tasks = args
-        end
+        tasks = get_tasks(args)
         tasks.each do |task|
           @trackr.stop(task)
           puts "Stopped task '#{task}'" if @verbose
@@ -82,46 +79,17 @@ module TimeTrackr
         puts "Switched to task '#{task}'" if @verbose
 
       when 'time','status',nil
-        task = args.shift
-        if task && @trackr.tasks.include?(task)
-          tasks = [*task]
-        else
-          tasks = @trackr.tasks.each
-        end
-        tasks.each do |task|
-          total = @trackr.history(task).reduce(0){ |t, period|
-            t = t + period.length
-          }
-          name = @trackr.current.include?(task) ? task+' *' : task
-          puts name.ljust(15) << format_time(total,@config['relative_format'])
-        end
+        tasks = get_tasks(args)
+        puts create_log(tasks,'t')
 
       when 'log'
-        if args[0] == 'all' || args[0].nil?
-          tasks = @trackr.tasks
-        else
-          tasks = args
-        end
-        table = []
-        periods = tasks.each.collect{ |t| @trackr.history(t) }.flatten
-        lastday = nil
-        table << periods.sort{|x,y| x.start <=> y.start}.collect{ |period|
-          currday = period.start.strftime(@config['absolute_day'])
-          day = (currday == lastday) ? ' ' : currday
-          lastday = currday
-          name = period.current? ? period.task+' *' : period.task
-          start = period.start.strftime(@config['absolute_time'])
-          stop = period.current? ? ' ' : period.stop.strftime(@config['absolute_time'])
-          length = format_time(period.length, @config['relative_format'])
-          notes = period.notes
-          "#{day.ljust(12)} #{name.ljust(15)} #{start} - #{stop.ljust(5)}  #{length}  #{notes}"
-        }
-        puts table
+        group = args.shift[1] if ['-d','-t'].include?(args[0])
 
+        tasks = get_tasks(args)
+        puts create_log(tasks,group)
 
       when 'clear','delete','del'
-        tasks = args
-        tasks = @trackr.tasks if task == 'all'
+        tasks = get_tasks(args)
         tasks.each do |task|
           @trackr.clear(task)
           puts "Task '#{task}' cleared" if @verbose
@@ -146,6 +114,17 @@ module TimeTrackr
 
     protected
 
+    def get_tasks(args)
+      if args[0].nil? || args[0] == 'all' || args[0] == '-n'
+        args.unshift(@trackr.tasks).flatten!.delete('all')
+      end
+
+      split = args.index('-n') || args.length
+      show = args.slice(0...split).compact.uniq
+      ignore =[*args.slice(split+1..-1)].compact.uniq
+      tasks = (show.empty? ? @trackr.tasks : @trackr.tasks & show) - ignore
+    end
+
     def format_time(time, fmt_str)
       hours = time.to_i/3600.to_i
       minutes = (time/60 - hours * 60).to_i
@@ -156,6 +135,55 @@ module TimeTrackr
         :seconds => seconds})
     end
 
+    def create_log(tasks,group=nil)
+      totals = Hash.new(0)
+      days = {}
+      table = []
+      # get all periods for selected tasks
+      periods = tasks.each.collect{ |t| @trackr.history(t) }.flatten
+      lastday = nil
+      periods.sort{|x,y| x.start <=> y.start}.collect do |period|
+        currday = period.start.strftime(@config['absolute_day'])
+        if currday == lastday
+          day = ''
+        else
+          day = currday
+          days[day] = Hash.new(0)
+        end
+        lastday = currday
+
+        start = period.start.strftime(@config['absolute_time'])
+        stop = period.current? ? ' ' : period.stop.strftime(@config['absolute_time'])
+        name = period.current? ? period.task+' *' : period.task
+        notes = period.notes
+        length = format_time(period.length, @config['relative_format'])
+
+        totals[period.task] = totals[period.task] + period.length if group == 't'
+        days[currday][period.task] = days[currday][period.task] + period.length if group == 'd'
+        # for full log
+        table << "#{day.ljust(12)} #{name.ljust(15)} #{start} - #{stop.ljust(5)}  #{length}  #{notes}" if group.nil?
+      end
+
+      case group
+      when 't'
+        tasks.each do |task|
+          name = @trackr.current.include?(task) ? task+' *' : task
+          table <<  name.ljust(15) + format_time(totals[task],@config['relative_format'])
+        end
+      when 'd'
+        prev_date = ''
+        days.each_pair do |date,tasks|
+          tasks.each_pair do |task,length|
+            name = @trackr.current.include?(task) ? task+' *' : task
+            date_string = (date == prev_date) ? ' ' : date
+            prev_date = date
+            table << "#{date_string.ljust(12)} #{name.ljust(15)}  " + format_time(length, @config['relative_format'])
+          end
+        end
+      end
+      table
+    end
+
     def show_help
       version = File.exist?('VERSION') ? File.read('VERSION') : ""
       puts "timetrackr version #{version}"

data/timetrackr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrackr}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felix Hanley"]
-  s.date = %q{2011-05-23}
+  s.date = %q{2011-06-02}
   s.default_executable = %q{timetrackr}
   s.description = %q{A simple time tracking utility}
   s.email = %q{felix@seconddrawer.com.au}

metadata

@@ -2,7 +2,7 @@
 name: timetrackr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Felix Hanley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 +07:00
+date: 2011-06-02 00:00:00 +07:00
 default_executable: timetrackr
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2538018453800347300
+      hash: -4452594232215196430
       segments: 
       - 0
       version: "0"