doing 0.2.2.pre → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4b26436b15b40cf894c0d3b15dfaf367e299f95
-  data.tar.gz: d13cf54255ec6db1b5d24c7fec73455cb6e642f5
+  metadata.gz: 9113d5736076e7608e42c328d3bc6a9f6edb517e
+  data.tar.gz: 793034d75510f42fa2c9f2e3f75d26156fef4d51
 SHA512:
-  metadata.gz: 5fdaadd019f03f7a93e1fc211c20ed017502d16eade73f7f6eb616e123f14988422296c17b2a759643efcb7abbcc721a451d47fe1ede0c30e8f719c1cafc94e5
-  data.tar.gz: 75907e9acf02fadfa7416550cca0bbfe487452a660a8c494c4228b9e87f47b0306e79188718395da56e48e6a6c15c631e7bb34590655ec830ca59115fdf89b7e
+  metadata.gz: bd187715ead8168b92c2a70ebe53d68d95271a241524a1011c82c9358cae43ed0766dea0b1fe73c469d112435921342e2fb9811af2835f039d9ab1445519196f
+  data.tar.gz: 11c41e6db6c47490ff82b922a262df3292808e6b5736babf3d12a28de96075f91322da61f882c73178a7b9240c82c8056f7f99180bee8c309d1dc852f7427ddc

data/README.md

@@ -109,8 +109,9 @@ The config also contains templates for various command outputs. Include placehol
 - `%hr`: a horizontal rule (`-`) the width of the terminal
 - `%hr_under`: a horizontal rule (`_`) the width of the terminal
 - `%[color]`: color can be black, red, green, blue, yellow, magenta, cyan or white
-  - you can prefix "bg" to affect background colors (%bgyellow)
-  - prefix "bold" and "boldbg" for strong colors (%boldgreen, %boldbgblue)
+    - you can prefix "bg" to affect background colors (%bgyellow)
+    - prefix "bold" and "boldbg" for strong colors (%boldgreen, %boldbgblue)
+- `%interval`: when used with the `-t` switch on the `show` command, it will display the time between a timestamp or `@start(date)` tag and the `@done(date)` tag, if it exists. Otherwise, it will remain empty.
 
 Date formats are based on Ruby [strftime](http://www.ruby-doc.org/stdlib-2.1.1/libdoc/date/rdoc/Date.html#method-i-strftime) formatting.
 
@@ -293,6 +294,8 @@ You can filter the `show` command by tags. Simply list them after the section na
 
 Use `-c X` to limit the displayed results. Combine it with `-a newest` or `-a oldest` to choose which chronological end it trims from. You can also set the sort order of the output with `-s asc` or `-s desc`.
 
+The `show` command can also show the time spent on a task if it has a `@done(date)` tag with the `-t` option. This requires that you include a `%interval` token in template -> default in the config. You can also include `@start(date)` tags, which override the timestamp when calculating the intervals.
+
 If you have a use for it, you can use `--csv` on the show or view commands to output the results as a comma-separated CSV to STDOUT. Redirect to a file to save it: `doing show all done --csv > ~/Desktop/done.csv`.
 
 #### Views

data/bin/doing

@@ -140,7 +140,7 @@ command :done do |c|
   c.switch [:a,:archive], :negatable => false, :default_value => false
 
   c.desc 'Backdate to "date_string" (natural language)'
-  c.flag [:backdate]
+  c.flag [:back]
 
   c.desc 'Section'
   c.default_value wwid.current_section
@@ -287,9 +287,17 @@ command :show do |c|
   c.flag [:s,:sort], :default_value => 'asc'
 
   c.desc 'Output to csv'
-  c.default_value 'false'
+  c.default_value false
   c.switch [:csv], :default_value => false, :negatable => false
 
+  c.desc 'Show time intervals on @done tasks'
+  c.default_value false
+  c.switch [:t,:times], :default_value => false
+
+  c.desc 'Show intervals with totals at the end of output'
+  c.default_value false
+  c.switch [:totals], :default_value => false, :negatable => true
+
   c.action do |global_options,options,args|
     tag_filter = false
     tags = []
@@ -317,7 +325,12 @@ command :show do |c|
       }
     end
 
-    puts wwid.list_section({:section => section, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :csv => options[:csv]})
+    options[:t] = true if options[:totals]
+
+    puts wwid.list_section({:section => section, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :csv => options[:csv], :times => options[:t]})
+
+    puts wwid.tag_times if options[:totals]
+
   end
 end
 
@@ -345,8 +358,21 @@ end
 
 desc 'List entries from today'
 command :today do |c|
+  c.desc 'Show time intervals on @done tasks'
+  c.default_value false
+  c.switch [:t,:times], :default_value => false
+
+  c.desc 'Show time totals at the end of output'
+  c.default_value false
+  c.switch [:totals], :default_value => false, :negatable => true
+
   c.action do |global_options,options,args|
-    puts wwid.today.strip
+
+    options[:t] = true if options[:totals]
+
+    puts wwid.today(options[:t]).strip
+
+    puts wwid.tag_times if options[:totals]
   end
 end
 
@@ -398,6 +424,14 @@ command :view do |c|
   c.default_value 'false'
   c.switch [:csv], :default_value => false, :negatable => false
 
+  c.desc 'Show time intervals on @done tasks'
+  c.default_value false
+  c.switch [:t,:times], :default_value => false
+
+  c.desc 'Show intervals with totals at the end of output'
+  c.default_value false
+  c.switch [:totals], :default_value => false, :negatable => true
+
   c.action do |global_options,options,args|
     if args.empty?
       title = wwid.choose_view
@@ -429,7 +463,11 @@ command :view do |c|
       count = options[:c] ? options[:c] : view.has_key?('count') ? view['count'] : 10
       section = options[:s] ? section : view.has_key?('section') ? view['section'] : wwid.current_section
       order = view.has_key?('order') ? view['order'] : "asc"
-      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :csv => options[:csv], :tags_color => tags_color })
+      options[:t] = true if options[:totals]
+
+      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :csv => options[:csv], :tags_color => tags_color, :times => options[:t] })
+
+      puts wwid.tag_times if options[:totals]
     else
       raise "View #{title} not found in config"
     end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '0.2.2.pre'
+  VERSION = '0.2.4'
 end

data/lib/doing/wwid.rb

@@ -13,7 +13,7 @@ class WWID
 
   def initialize(input=nil)
     @content = {}
-
+    @timers = {}
     @config = read_config
 
     @config['doing_file'] ||= "~/what_was_i_doing.md"
@@ -27,7 +27,7 @@ class WWID
     }
     @config['templates']['today'] ||= {
       'date_format' => '%_I:%M%P',
-      'template' => '%date: %title%note',
+      'template' => '%date: %title %interval%note',
       'wrap_width' => 0
     }
     @config['templates']['last'] ||= {
@@ -380,6 +380,7 @@ class WWID
     opt[:today] ||= false
     opt[:tag_filter] ||= false
     opt[:tags_color] ||= false
+    opt[:times] ||= false
 
     if opt[:section].nil?
       opt[:section] = @content[choose_section]
@@ -481,6 +482,13 @@ class WWID
         end
 
         output.sub!(/%date/,item['date'].strftime(opt[:format]))
+
+        if item['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+          interval = get_interval(item)
+        end
+        interval ||= ""
+        output.sub!(/%interval/,interval)
+
         output.sub!(/%shortdate/) {
           if item['date'] > Date.today.to_time
             item['date'].strftime('%_I:%M%P')
@@ -580,9 +588,9 @@ class WWID
     list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 0, :format => cfg['date_format'], :template => cfg['template'], :order => order})
   end
 
-  def today
+  def today(times=false)
     cfg = @config['templates']['today']
-    list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 0, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :today => true})
+    list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 0, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :today => true, :times => times})
   end
 
   def recent(count=10,section=nil)
@@ -597,8 +605,68 @@ class WWID
     list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 1, :format => cfg['date_format'], :template => cfg['template']})
   end
 
+  def tag_times
+    output = []
+    return "" if @timers.length == 0
+    max = @timers.keys.sort_by {|k| k.length }.reverse[0].length + 1
+
+    total = @timers.delete("All")
+
+    @timers.sort_by{|k,v| v }.reverse.each {|k,v|
+      spacer = ""
+      (max - k.length).times do
+        spacer += " "
+      end
+      output.push("#{k}:#{spacer}#{"%02d:%02d:%02d" % fmt_time(v)}")
+    }
+    output.empty? ? "" : "\n--- Tag Totals ---\n" + output.join("\n") + "\n\nTotal tracked: #{"%02d:%02d:%02d" % fmt_time(total)}\n"
+  end
+
+  private
+
+  def get_interval(item)
+    done = nil
+    start = nil
+
+    if item['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/
+      done = Time.parse($1)
+    else
+      return nil
+    end
+
+    if item['title'] =~ /@start\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/
+      start = Time.parse($1)
+    else
+      start = item['date']
+    end
+
+    seconds = (done - start).to_i
+
+    item['title'].scan(/(?mi)@(\S+?)(\(.*\))?(?=\s|$)/).each {|m|
+      k = m[0] == "done" ? "All" : m[0]
+      if @timers.has_key?(k)
+        @timers[k] += seconds
+      else
+        @timers[k] = seconds
+      end
+    }
+
+    "%02d:%02d:%02d" % fmt_time(seconds)
+  end
+
+  def fmt_time(seconds)
+    minutes =  (seconds / 60).to_i
+    hours = (minutes / 60).to_i
+    days = (hours / 24).to_i
+    hours = (hours % 60).to_i
+    minutes = (minutes % 60).to_i
+    [days, hours, minutes]
+  end
 end
 
+
+
+
 # infile = "~/Dropbox/nvALT2.2/?? What was I doing.md"
 
 # wwid = WWID.new(infile)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre
+  version: 0.2.4
 platform: ruby
 authors:
 - Brett Terpstra
@@ -130,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2