doing 1.0.2pre → 1.0.6pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5064939efa2f734452f37eee44517c0a8d51095a
-  data.tar.gz: b0191dc3bffb802e0be53c69a29597a1d4680b49
+  metadata.gz: 31cbf5627a0818d3252c9f75265372652b7b22df
+  data.tar.gz: 3c70bc7a7b81dd3ce0db6d0e291dd4d4cf45d29f
 SHA512:
-  metadata.gz: 073cafe680ac203949742743bc8b1fb18a92886d85758f0accca35fd363ea481fb33a468d17adb6f64b4433f01b5cf0a2a748eda30b2c35b37165ebbc14d9917
-  data.tar.gz: e1ee165879dd1640a07755e903385e1d94f60bc8a13a0dfa1a61de76b2a934cb37f9d9718a114293ec7d6bf078a7b112d6c4579f4232ae31fc0f03a9344a6f80
+  metadata.gz: 68287fcedc4d02dc46fa61e6587f4c3d7cf33f6727a9a03a9c155b9ecce63244deca08451be86be9d0c0260221d75b3478224c2c52edf538fc161a4bde191662
+  data.tar.gz: a20c0b2ff59f6125e7d5f0046034a3bc1825546d3f8c01b0b72600285325a0ef719e97f4ead9beafb9954ec82e465263636caf152b08c9f93d6f22bd885fa588

data/README.md

@@ -283,7 +283,9 @@ You can finish the last unfinished task when starting a new one using `doing now
 
 `doing done` is used to add an entry that you've already completed. Like `now`, you can specify a section with `-s section_name`. You can also skip straight to Archive with `-a`.
 
-You can also backdate entries using natural language with `--back 15m` or `--back "3/15 3pm"`. That will modify the starting timestamp of the entry. You can also use `--took 1h20m` or `--took 1:20` to set the finish date based on a "natural language" time interval. When used with `doing done`, this allows time intervals to be accurately counted when entering items after the fact. `--took` is also available for the `doing finish` command, but cannot be used in conjunction with `--back`. (In `finish` they both set the end date, and neither has priority. `--back` allows specific days/times, `--took` uses time intervals.)
+`doing done` can also backdate entries using natural language with `--back 15m` or `--back "3/15 3pm"`. That will modify the starting timestamp of the entry. You can also use `--took 1h20m` or `--took 1:20` to set the finish date based on a "natural language" time interval. If `--took` is used without `--back`, then the start date is adjusted (`--took` interval is subtracted) so that the completion date is the current time.
+
+When used with `doing done`, `--back` and `--took` allow time intervals to be accurately counted when entering items after the fact. `--took` is also available for the `doing finish` command, but cannot be used in conjunction with `--back`. (In `finish` they both set the end date, and neither has priority. `--back` allows specific days/times, `--took` uses time intervals.)
 
 All of these commands accept a `-e` argument. This opens your command line editor as defined in the environment variable `$EDITOR`. Add your entry, save the temp file and close it, and the new entry will be added. Anything after the first line is included as a note on the entry.
 
@@ -299,7 +301,7 @@ All of these commands accept a `-e` argument. This opens your command line edito
 
 `doing finish` also provides an `--auto` flag, which you can use to set the end time of any entry to 1 minute before the start time of the next. Running a command such as `doing finish --auto 10` will go through the last 10 entries and sequentially update any without a `@done` tag with one set to the time just before the next entry in the list.
 
-As mentioned above, `finish` also accepts `--back "2 hours"` (sets the date from time now minus interval) or `--took 30m` (sets the date from time started plus interval) so you can accurately add times to completed tasks, even if you don't do it in the moment.
+As mentioned above, `finish` also accepts `--back "2 hours"` (sets the finish date from time now minus interval) or `--took 30m` (sets the finish date to time started plus interval) so you can accurately add times to completed tasks, even if you don't do it in the moment.
 
 `tag` adds one or more tags to the last entry, or specify a count with `-c X`. Tags are specified as basic arguments, separated by spaces. For example:
 
@@ -382,6 +384,10 @@ Example: Archive all Currently items for @client that are marked @done
 
 See the file `doing.completion.bash` in the git repository for full bash completion. Thanks to [fcrespo82](https://github.com/fcrespo82) for getting it [started](https://gist.github.com/fcrespo82/9609318).
 
+### Zsh completion
+
+See the file doing.completion.zsh in the git repository for zsh completion.
+
 ### Launchbar
 
 The previous incarnation of `doing` had a [LaunchBar](http://obdev.at/launchbar/) action that I used frequently. The Day One popup has mostly replaced that for me, but only because I have a system that connects it to my WWID file. However, I've still found a place for adding WWID entries without including them in my journal, and LaunchBar is the perfect way to do that for me.
@@ -445,6 +451,11 @@ I'll try to document some of the code structure as I flesh it out. I'm currently
 
 ### Changelog
 
+#### 1.0.4pre
+
+* Improved HTML output
+* --only_timed option for view/show commands that only outputs items with elapsed timers (interval between start and done dates)
+
 #### 1.0.0pre
 
 * Skipped ahead in the version numbering. Because I don't care.

data/bin/doing

@@ -16,7 +16,7 @@ wwid = WWID.new
 program_desc 'A CLI for a What Was I Doing system'
 
 default_command :recent
-sort_help :manually
+# sort_help :manually
 
 desc 'Output notes if included in the template'
 default_value true
@@ -272,10 +272,15 @@ command :done do |c|
   c.default_value false
   c.switch [:a,:archive], :negatable => false, :default_value => false
 
-  c.desc 'Backdate start date to date string [4pm|20m|2h|yesterday noon]'
+  # TODO: Set @done date to specific time, backtracking start date in case of --took option. Should ignore --back option if present.
+  # c.desc 'Set finish date to specific date/time (natural langauge)'
+  # c.flag [:at]
+
+  c.desc 'Backdate start date by interval [4pm|20m|2h|yesterday noon]'
   c.flag [:b,:back]
 
-  c.desc 'Set completion date to start date plus XX[mhd] or [HH:MM]'
+  c.desc 'Set completion date to start date plus interval (XX[mhd] or HH:MM)'
+  c.long_desc 'If used without the --back option, the start date will be moved back to allow the completion date to be the current time.'
   c.flag [:t,:took]
 
   c.desc 'Section'
@@ -291,17 +296,22 @@ command :done do |c|
   # c.flag [:a,:app]
 
   c.action do |global_options,options,args|
+    took = 0
+
+    if options[:took]
+      took = wwid.chronify_qty(options[:took])
+      raise "Unable to parse date string for --took" if took.nil?
+    end
+
     if options[:back]
       date = wwid.chronify(options[:back])
       raise "Unable to parse date string for --back" if date.nil?
     else
-      date = Time.now
+      date = options[:took] ? Time.now - took : Time.now
     end
 
     if options[:took]
-      minutes = wwid.chronify_qty(options[:took])
-      finish_date = date + minutes
-      raise "Unable to parse date string for --took" if date.nil?
+      finish_date = date + took
     else
       finish_date = Time.now
     end
@@ -495,6 +505,10 @@ command :show do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Only show items with recorded time intervals'
+  c.default_value false
+  c.switch [:only_timed], :default_value => false, :negatable => false
+
   c.action do |global_options,options,args|
     tag_filter = false
     tags = []
@@ -524,9 +538,7 @@ command :show do |c|
 
     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], :output => options[:output], :times => options[:t], :highlight => true})
-
-    puts wwid.tag_times if options[:totals]
+    puts wwid.list_section({:section => section, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :output => options[:output], :times => options[:t], :totals => options[:totals], :highlight => true, :only_timed => options[:only_timed]})
 
   end
 end
@@ -550,15 +562,18 @@ command :grep do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Only show items with recorded time intervals'
+  c.default_value false
+  c.switch [:only_timed], :default_value => false, :negatable => false
+
   c.action do |global_options,options,args|
 
     section = wwid.guess_section(options[:s]) if options[:s]
 
     options[:t] = true if options[:totals]
 
-    puts wwid.list_section({:search => args.join, :section => section, :output => options[:output], :times => options[:t], :highlight => true})
+    puts wwid.list_section({:search => args.join, :section => section, :output => options[:output], :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => options[:only_timed]})
 
-    puts wwid.tag_times if options[:totals]
   end
 end
 
@@ -590,9 +605,8 @@ command :recent do |c|
       end
       options[:t] = true if options[:totals]
 
-      puts wwid.recent(count,section.cap_first,{ :times => options[:t] })
+      puts wwid.recent(count,section.cap_first,{ :times => options[:t], :totals => options[:totals] })
 
-      puts wwid.tag_times if options[:totals]
     end
   end
 end
@@ -614,9 +628,8 @@ command :today do |c|
 
     options[:t] = true if options[:totals]
 
-    puts wwid.today(options[:t],options[:output]).chomp
+    puts wwid.today(options[:t],options[:output],{:totals => options[:totals]}).chomp
 
-    puts wwid.tag_times if options[:totals]
   end
 end
 
@@ -637,9 +650,8 @@ command :yesterday do |c|
 
   c.action do |global_options, options,args|
     section = args.length > 0 ? args.join(" ") : wwid.current_section
-    puts wwid.yesterday(section,options[:t],options[:o]).chomp
+    puts wwid.yesterday(section,options[:t],options[:o],{:totals => options[:totals]}).chomp
 
-    puts wwid.tag_times if options[:totals]
   end
 end
 
@@ -698,6 +710,10 @@ command :view do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Only show items with recorded time intervals'
+  c.default_value false
+  c.switch [:only_timed], :default_value => false, :negatable => false
+
   c.action do |global_options,options,args|
     if args.empty?
       title = wwid.choose_view
@@ -731,9 +747,7 @@ command :view do |c|
       order = view.has_key?('order') ? view['order'] : "asc"
       options[:t] = true if options[:totals]
       options[:output].downcase! if options[:output]
-      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:output], :tags_color => tags_color, :times => options[:t], :highlight => true })
-
-      puts wwid.tag_times if options[:totals]
+      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:output], :tags_color => tags_color, :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => options[:only_timed] })
     else
       raise "View #{title} not found in config"
     end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.2pre'
+  VERSION = '1.0.6pre'
 end

data/lib/doing/wwid.rb

@@ -147,7 +147,11 @@ class WWID
   end
 
   def home_config
-    File.join(Dir.home, DOING_CONFIG_NAME)
+    if Dir.respond_to?('home')
+      File.join(Dir.home, DOING_CONFIG_NAME)
+    else
+      File.join(File.expand_path("~"), DOING_CONFIG_NAME)
+    end
   end
 
   def read_config
@@ -586,7 +590,9 @@ class WWID
     opt[:tag_filter] ||= false
     opt[:tags_color] ||= false
     opt[:times] ||= false
+    opt[:totals] ||= false
     opt[:search] ||= false
+    opt[:only_timed] ||= false
 
     # opt[:highlight] ||= true
     section = ""
@@ -645,6 +651,12 @@ class WWID
       }
     end
 
+    if opt[:only_timed]
+      items.delete_if {|item|
+        get_interval(item) == "00:00:00"
+      }
+    end
+
     if opt[:today]
       items.delete_if {|item|
         item['date'] < Date.today.to_time
@@ -673,14 +685,18 @@ class WWID
     end
 
     if opt[:output] == "csv"
-      output = [CSV.generate_line(['date','title','note'])]
+      output = [CSV.generate_line(['date','title','note','timer'])]
       items.each {|i|
         note = ""
         if i['note']
           arr = i['note'].map{|line| line.strip}.delete_if{|e| e =~ /^\s*$/}
           note = arr.join("\n") unless arr.nil?
         end
-        output.push(CSV.generate_line([i['date'],i['title'],note]))
+        if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+          interval = get_interval(i, false)
+        end
+        interval ||= 0
+        output.push(CSV.generate_line([i['date'],i['title'],note,interval]))
       }
       out = output.join("")
     elsif opt[:output] == "html"
@@ -699,13 +715,20 @@ class WWID
           title = i['title']
           note = i['note'].map { |line| line.strip }
         end
+
+        if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+          interval = get_interval(i)
+        end
+        interval ||= false
+
         items_out << {
           :date => i['date'].strftime('%a %-I:%M%p'),
           :title => title.gsub(/(@[^ \(]+(\(.*?\))?)/im,'<span class="tag">\1</span>').strip, #+ " #{note}"
-          :note => note
+          :note => note,
+          :time => interval
         }
       }
-      style = "body{background:#fff;color:#333;font-family:Helvetica,arial,freesans,clean,sans-serif;font-size:16px;line-height:120%;text-align:justify;padding:20px}h1{text-align:left;position:relative;left:220px;margin-bottom:1em}ul{list-style-position:outside;position:relative;left:170px;margin-right:170px;text-align:left}ul li{list-style-type:none;border-left:solid 1px #ccc;padding-left:10px;line-height:2}ul li .date{font-size:14px;position:absolute;left:-82px;color:#7d9ca2;text-align:right;width:110px;line-height:2}ul li .tag{color:#999}ul li .note{display:block;color:#666;padding:0 0 0 22px;line-height:1.4;font-size:15px}ul li .note:before{content:'\\25BA';font-weight:300;position:absolute;left:40px;font-size:8px;color:#aaa;line-height:3}ul li:hover .note{display:block}"
+      style = "body{background:#fff;color:#333;font-family:Helvetica,arial,freesans,clean,sans-serif;font-size:16px;line-height:120%;text-align:justify;padding:20px}h1{text-align:left;position:relative;left:220px;margin-bottom:1em}ul{list-style-position:outside;position:relative;left:170px;margin-right:170px;text-align:left}ul li{list-style-type:none;border-left:solid 1px #ccc;padding-left:10px;line-height:2;position:relative}ul li .date{font-size:14px;position:absolute;left:-122px;color:#7d9ca2;text-align:right;width:110px;line-height:2}ul li .tag{color:#999}ul li .note{display:block;color:#666;padding:0 0 0 22px;line-height:1.4;font-size:15px}ul li .note:before{content:'\\25BA';font-weight:300;position:absolute;left:40px;font-size:8px;color:#aaa;line-height:3}ul li:hover .note{display:block}span.time{color:#729953;float:left;position:relative;padding:0 5px;font-size:15px;border-bottom:dashed 1px #ccc;text-align:right;background:#f9fced;margin-right:4px}table td{border-bottom:solid 1px #ddd;height:24px}caption{text-align:left;border-bottom:solid 1px #aaa;margin:10px 0}table{width:400px;margin:50px 0 0 211px}th{padding-bottom:10px}th,td{padding-right:20px}table{max-width:400px;margin:50px 0 0 221px}"
       template =<<EOT
 !!!
 %html
@@ -723,11 +746,15 @@ class WWID
           %li
             %span.date= i[:date]
             = i[:title]
+            - if i[:time] && i[:time] != "00:00:00"
+              %span.time= i[:time]
             - if i[:note]
               %span.note= i[:note].map{|n| n.strip }.join('<br>')
+      = @totals
 EOT
+      totals = opt[:totals] ? tag_times("html") : ""
       engine = Haml::Engine.new(template)
-      puts engine.render(Object.new, { :@items => items_out, :@page_title => page_title, :@style => style })
+      puts engine.render(Object.new, { :@items => items_out, :@page_title => page_title, :@style => style, :@totals => totals })
 
     else
       items.each {|item|
@@ -807,7 +834,7 @@ EOT
         out += output + "\n"
       }
     end
-
+    out += tag_times if opt[:totals]
     return out
   end
 
@@ -947,22 +974,25 @@ EOT
     list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 0, :format => cfg['date_format'], :template => cfg['template'], :order => order})
   end
 
-  def today(times=true,output=nil)
+  def today(times=true,output=nil,opt={})
+    opt[:totals] ||= 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, :times => times, :output => output})
+    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, :output => output, :totals => opt[:totals]})
   end
 
-  def yesterday(section,times=nil,output=nil)
+  def yesterday(section,times=nil,output=nil,opt={})
+    opt[:totals] ||= false
     section = guess_section(section)
-    list_section({:section => section, :count => 0, :order => "asc", :yesterday => true, :times => times, :output => output })
+    list_section({:section => section, :count => 0, :order => "asc", :yesterday => true, :times => times, :output => output, :totals => opt[:totals] })
   end
 
   def recent(count=10,section=nil,opt={})
     times = opt[:t] || true
+    opt[:totals] ||= false
     cfg = @config['templates']['recent']
     section ||= @current_section
     section = guess_section(section)
-    list_section({:section => section, :wrap_width => cfg['wrap_width'], :count => count, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :times => times })
+    list_section({:section => section, :wrap_width => cfg['wrap_width'], :count => count, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :times => times, :totals => opt[:totals] })
   end
 
   def last(times=true)
@@ -970,30 +1000,68 @@ EOT
     list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 1, :format => cfg['date_format'], :template => cfg['template'], :times => times})
   end
 
-  def tag_times
-    output = []
-    # return "" if @timers.length == 0
+  def tag_times(format="text")
+
+    return "" if @timers.empty?
 
     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)}")
-    }
+    if format == "html"
+      output =<<EOS
+        <table>
+        <caption id="tagtotals">Tag Totals</caption>
+        <colgroup>
+        <col style="text-align:left;"/>
+        <col style="text-align:left;"/>
+        </colgroup>
+        <thead>
+        <tr>
+          <th style="text-align:left;">project</th>
+          <th style="text-align:left;">time</th>
+        </tr>
+        </thead>
+        <tbody>
+EOS
+      @timers.sort_by {|k,v|
+        v
+      }.reverse.each {|k,v|
+        output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{"%02d:%02d:%02d" % fmt_time(v)}</td></tr>\n" if v > 0
+      }
+      tail =<<EOS
+      <tr>
+        <td style="text-align:left;" colspan="2"></td>
+      </tr>
+      </tbody>
+      <tfoot>
+      <tr>
+        <td style="text-align:left;"><strong>Total</strong></td>
+        <td style="text-align:left;">#{"%02d:%02d:%02d" % fmt_time(total)}</td>
+      </tr>
+      </tfoot>
+      </table>
+EOS
+      output + tail
+    else
+      output = []
+      @timers.delete_if { |k,v| v == 0}.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 = output.empty? ? "" : "\n--- Tag Totals ---\n" + output.join("\n")
-    output += "\n\nTotal tracked: #{"%02d:%02d:%02d" % fmt_time(total)}\n"
-    output
+      output = output.empty? ? "" : "\n--- Tag Totals ---\n" + output.join("\n")
+      output += "\n\nTotal tracked: #{"%02d:%02d:%02d" % fmt_time(total)}\n"
+      output
+    end
   end
 
   private
 
-  def get_interval(item)
+  def get_interval(item, formatted=true)
     done = nil
     start = nil
 
@@ -1020,6 +1088,8 @@ EOT
       end
     }
 
+    return seconds unless formatted
+
     "%02d:%02d:%02d" % fmt_time(seconds)
   end
 
@@ -1032,12 +1102,3 @@ EOT
     [days, hours, minutes]
   end
 end
-
-
-
-# infile = "~/Dropbox/nvALT2.2/?? What was I doing.md"
-
-# wwid = WWID.new(infile)
-
-# wwid.add_item("Getting freaky with wwid CLI","Currently",{:date => Time.now})
-# wwid.write(infile)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.2pre
+  version: 1.0.6pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake