doing 1.0.7pre → 1.0.8pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 416eb3b0c0b4892d106c8e6431a5925b393e587c
-  data.tar.gz: 47b5a29f17ce836404630379612a0c82e0811a97
+  metadata.gz: fe65d7638817ae91c0b28db474b25e1db315c32d
+  data.tar.gz: 2f3f3b3100bd5b9495be019787201b773d7f9e16
 SHA512:
-  metadata.gz: 4fb329e66f43e85a03a2c256d1ef0b68db8b8c917c974de5d39c5de805c71b9c2b7a0e4a5357cc4e5fe854ffdf2bfcb266ec60b1537e8426736023179b5dd541
-  data.tar.gz: a1057480b5758c883d6602a6e50b328b68972b9566888516a84a0b5d57a76c25e56031e725f6036bab35581a4bb9c37ead73b4a54cf0d7b59a800dd473587610
+  metadata.gz: 945b6b6794717f6dfaa41b180209e28cf5cd219852c2098a862e940cb6989010c3aa79fdec5010bfffc82c43bc177667988d6357427d4f6c936efa26950b77e9
+  data.tar.gz: afcc84a5dd4b5723e0b003aa68c444a44ead9b99b56e7e625508482bdd92982acb4c8dcee2859191b912cc3c0500c1dc5d7d37896c569f657c13314a5ffe0fc7

data/README.md

@@ -32,6 +32,10 @@ _Side note:_ I actually use the library behind this utility as part of another s
 
     $ [sudo] gem install doing
 
+To install the _latest_ version, use `--pre`:
+
+    $ [sudo] gem install --pre doing
+
 Only use `sudo` if your environment requires it. If you're using the system Ruby on a Mac, for example, it will likely be necessary. If `gem install doing` fails, then run `sudo gem install doing` and provide your administrator password.
 
 Run `doing config` to open your `~/.doingrc` file in the editor defined in the $EDITOR environment variable. Set up your `doing_file` right away (where you want entries to be stored), and cover the rest after you've read the docs.
@@ -120,6 +124,7 @@ The config also contains templates for various command outputs. Include placehol
 - `%shortdate`: a custom date formatter that removes the day/month/year from the entry if they match the current day/month/year
 - `%note`: Any note in the entry will be included here, a newline and tabs are automatically added.
 - `%odnote`: The notes with a leading tab removed (outdented note)
+- `%chompnote`: Notes on one line, beginning and trailing whitespace removed.
 - `%hr`: a horizontal rule (`-`) the width of the terminal
 - `%hr_under`: a horizontal rule (`_`) the width of the terminal
 - `%n`: inserts a newline
@@ -256,6 +261,8 @@ Outputs:
 
 ![](http://ckyp.us/XKpj+)
 
+You can also specify a default output format for a view. Most of the optional output formats override the template specification (html, csv, json). If the `view` command is used with the `-o` flag, it will override what's specified in the file.
+
 ## Usage
 
     doing [global options] command [command options] [arguments...]
@@ -298,18 +305,48 @@ All of these commands accept a `-e` argument. This opens your command line edito
     tag         - Tag last entry
     note        - Add a note to the last entry
 
+##### Finishing
+
 `doing finish` by itself is the same as `doing done` by itself. It adds `@done(timestamp)` to the last entry. It also accepts a numeric argument to complete X number of tasks back in history. Add `-a` to also archive the affected entries.
 
 `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 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.
 
+
+##### Tagging and Autotagging
+
 `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:
 
     doing tag -c 3 client cancelled
 
 ... will mark the last three entries as "@client @cancelled." Add `-r` as a switch to remove the listed tags instead.
 
+You can optionally define keywords for common tasks and projects in your `.doingrc` file. When these keywords appear in an item title, they'll automatically be converted into @tags. The "whitelist" tags are exact (but case insensitive) matches. You can also define "synonyms" which will add a tag at the end based on keywords associated with it.
+
+To add autotagging, include a section like this in your `~/.doingrc` file:
+
+    autotag:
+      whitelist:
+      - doing
+      - mindmeister
+      - marked
+      - playing
+      - working
+      - writing
+      synonyms:
+        playing:
+        - hacking
+        - tweaking
+        - toying
+        - messing
+        writing:
+        - blogging
+        - posting
+        - publishing
+
+##### Annotating
+
 `note` lets you append a note to the last entry. You can specify a section to grab the last entry from with `-s section_name`. `-e` will open your $EDITOR for typing the note, but you can also just include it on the command line after any flags. You can also pipe a note in on STDIN (`echo "fun stuff"|doing note`). If you don't use the `-r` switch, new notes will be appended to the existing notes, and using the `-e` switch will let you edit and add to an existing note. The `-r` switch will remove/replace a note; if there's new note text passed when using the `-r` switch, it will replace any existing note. If the `-r` switch is used alone, any existing note will be removed.
 
 You can also add notes at the time of entry by using the `-n` or `--note` flag with `doing now`, `doing later`, or `doing done`. If you pass text to any of the creation commands which has multiple lines, everything after the first line break will become the note.
@@ -331,10 +368,12 @@ Use `-c X` to limit the displayed results. Combine it with `-a newest` or `-a ol
 
 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`.
+If you have a use for it, you can use `-o 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 -o csv > ~/Desktop/done.csv`. You can do the same with `-o json`.
 
 `doing yesterday` is great for stand-ups, thanks to [Sean Collins](https://github.com/sc68cal) for that. Note that you can show yesterday's activity from an alternate section by using the section name as an argument (e.g. `doing yesterday archive`).
 
+`doing on` allows for full date ranges and filtering. `doing on saturday`, or `doing on one month to today` will give you ranges. You can use the same terms with the `show` command by adding the `-f` or `--from` flag. `doing show @done --from "monday to friday"` will give you all of your completed items for the last week (assuming it's the weekend).
+
 #### Views
 
     view     - Display a user-created view
@@ -452,8 +491,16 @@ I'll try to document some of the code structure as I flesh it out. I'm currently
 
 ### Changelog
 
+#### 1.0.8pre
+
+* JSON output option to view commands
+* Added autotagging to tag command
+* date filtering, improved date language
+* added doing on command
+* let view templates define output format (csv, json, html, template)
+    * add %chompnote template variable (item note with newlines and extra whitespace stripped)
 
-#### 1.0.7 / 2014-09-23 
+#### 1.0.7pre
 
 * fix for -v option
 * Slightly fuzzier searching in the grep command

data/bin/doing

@@ -442,25 +442,35 @@ command :tag do |c|
   c.default_value false
   c.switch [:r,:remove], :negatable => false, :default_value => false
 
+  c.desc 'Autotag entries based on autotag configuration in ~/.doingrc'
+  c.default_value false
+  c.switch [:a,:autotag], :negatable => false, :default_value => false
+
   c.action do |global_options,options,args|
-    if args.length == 0
+    if args.length == 0 && !options[:a]
       raise "You must specify at least one tag"
     else
 
       section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
-      if args.join("") =~ /,/
-        tags = args.join("").split(/,/)
+      unless options[:a]
+        if args.join("") =~ /,/
+          tags = args.join("").split(/,/)
+        else
+          tags = args.join(" ").split(" ") # in case tags are quoted as one arg
+        end
+
+        tags.map!{|tag| tag.sub(/^@/,'').strip }
       else
-        tags = args.join(" ").split(" ") # in case tags are quoted as one arg
+        tags = []
       end
 
-      tags.map!{|tag| tag.sub(/^@/,'').strip }
-
       count = options[:c].to_i
 
       if count == 0
-        if options[:r]
+        if options[:a]
+          print "Are you sure you want to autotag all records? (y/N) "
+        elsif options[:r]
           print "Are you sure you want to remove #{tags.join(" and ")} from all records? (y/N) "
         else
           print "Are you sure you want to add #{tags.join(" and ")} to all records? (y/N) "
@@ -473,7 +483,7 @@ command :tag do |c|
         end
       end
 
-      wwid.tag_last({:tags => tags, :count => count, :section => section, :date => options[:d], :remove => options[:r]})
+      wwid.tag_last({:tags => tags, :count => count, :section => section, :date => options[:d], :remove => options[:r], :autotag => options[:a]})
     end
   end
 end
@@ -495,8 +505,6 @@ command :mark do |c|
   end
 end
 
-
-
 desc 'List all entries'
 long_desc 'The argument can be a section name, tag(s) or both. "pick" or "choose" as an argument will offer a section menu.'
 arg_name 'section [tags]'
@@ -517,8 +525,9 @@ command :show do |c|
   c.default_value 'asc'
   c.flag [:s,:sort], :default_value => 'asc'
 
-  c.desc 'Output to export format (csv|html)'
-  c.flag [:o,:output]
+  c.desc 'Date range to show, or a single day to filter date on.'
+  c.long_desc 'Date range argument should be quoted. Date specifications can be natural language. To specify a range, use "to," or "through,".\n\ndoing show --from "monday to friday"'
+  c.flag [:f,:from]
 
   c.desc 'Show time intervals on @done tasks'
   c.default_value true
@@ -532,7 +541,10 @@ command :show do |c|
   c.default_value false
   c.switch [:only_timed], :default_value => false, :negatable => false
 
+  c.desc 'Output to export format (csv|html|json)'
+  c.flag [:o,:output]
   c.action do |global_options,options,args|
+
     tag_filter = false
     tags = []
     if args.length > 0
@@ -552,7 +564,7 @@ command :show do |c|
       if args.length > 0
         args.each {|arg|
           if arg =~ /,/
-            arg_tags = arg.split(/,/).each {|tag|
+            arg.split(/,/).each {|tag|
               tags.push(tag.strip.sub(/^@/,''))
             }
           else
@@ -571,9 +583,23 @@ command :show do |c|
       }
     end
 
+    if options[:f]
+      date_string = options[:f]
+      if date_string =~ / (to|through|thru|(un)?til|-+) /
+        dates = date_string.split(/ (to|through|thru|(un)?til|-+) /)
+        start = wwid.chronify(dates[0])
+        finish = wwid.chronify(dates[2])
+      else
+        start = wwid.chronify(date_string)
+        finish = false
+      end
+      exit_now! "Unrecognized date string" unless start
+      dates = [start,finish]
+    end
+
     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], :totals => options[:totals], :highlight => true, :only_timed => options[:only_timed]})
+    puts wwid.list_section({:section => section, :date_filter => dates, :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
@@ -586,7 +612,7 @@ command :grep do |c|
   c.default_value "all"
   c.flag [:s,:section], :default_value => "All"
 
-  c.desc 'Output to export format (csv|html)'
+  c.desc 'Output to export format (csv|html|json)'
   c.flag [:o,:output]
 
   c.desc 'Show time intervals on @done tasks'
@@ -656,7 +682,7 @@ command :today do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
-  c.desc 'Output to export format (csv|html)'
+  c.desc 'Output to export format (csv|html|json)'
   c.flag [:o,:output]
 
   c.action do |global_options,options,args|
@@ -668,11 +694,52 @@ command :today do |c|
   end
 end
 
+desc 'List entries for a date'
+long_desc 'Date argument can be natural language. "thursday" would be interpreted as "last thursday," and "2d" would be interpreted as "two days ago." If you use "to" or "through" between two dates, it will create a range.'
+arg_name 'date_string'
+command :on do |c|
+  c.desc 'Section'
+  c.arg_name 'section_name'
+  c.default_value 'All'
+  c.flag [:s,:section], :default_value => 'All'
+
+  c.desc 'Show time intervals on @done tasks'
+  c.default_value true
+  c.switch [:t,:times], :default_value => true
+
+  c.desc 'Show time totals at the end of output'
+  c.default_value false
+  c.switch [:totals], :default_value => false, :negatable => true
+
+  c.desc 'Output to export format (csv|html|json)'
+  c.flag [:o,:output]
+
+  c.action do |global_options,options,args|
+
+    date_string = args.join(" ")
+
+    if date_string =~ / (to|through|thru) /
+      dates = date_string.split(/ (to|through|thru) /)
+      start = wwid.chronify(dates[0])
+      finish = wwid.chronify(dates[2])
+    else
+      start = wwid.chronify(date_string)
+      finish = false
+    end
+    exit_now! "Unrecognized date string" unless start
+
+    options[:t] = true if options[:totals]
+
+    puts wwid.list_date([start,finish],options[:s],options[:t],options[:output],{:totals => options[:totals]}).chomp
+
+  end
+end
+
 desc 'List entries from yesterday'
 default_value wwid.current_section
 arg_name 'section'
 command :yesterday do |c|
-  c.desc 'Output to export format (csv|html)'
+  c.desc 'Output to export format (csv|html|json)'
   c.flag [:o,:output]
 
   c.desc 'Show time intervals on @done tasks'
@@ -752,7 +819,7 @@ command :view do |c|
   c.desc 'Count to display (override view settings)'
   c.flag [:c,:count], :must_match => /^\d+$/, :type => Integer
 
-  c.desc 'Output to export format (csv|html)'
+  c.desc 'Output to export format (csv|html|json)'
   c.flag [:o,:output]
 
   c.desc 'Show time intervals on @done tasks'
@@ -801,14 +868,22 @@ command :view do |c|
           tag_filter['bool'] = view.has_key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].upcase : "OR"
         end
       end
+
+      # If the -o/--output flag was specified, override any default in the view template
+      options[:o] ||= view.has_key?('output_format') ? view['output_format'] : "template"
+
       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"
       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, :totals => options[:totals], :only_timed => only_timed })
+      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:o], :tags_color => tags_color, :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => only_timed })
     else
-      raise "View #{title} not found in config"
+      if title.class == FalseClass
+        exit_now! "Cancelled"
+      else
+        raise "View #{title} not found in config"
+      end
     end
   end
 end
@@ -953,7 +1028,7 @@ end
 
 pre do |global,command,options,args|
   if global[:doing_file]
-    wwid.init_doing_file(input=global[:doing_file])
+    wwid.init_doing_file(global[:doing_file])
   else
     wwid.init_doing_file
   end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.7pre'
+  VERSION = '1.0.8pre'
 end

data/lib/doing/wwid.rb

@@ -226,22 +226,29 @@ class WWID
   # Returns:
   # seconds(Integer)
   def chronify(input)
-    if input =~ /^(\d+)([mhd])?$/i
-      amt = $1
-      type = $2.nil? ? "m" : $2
-      input = case type.downcase
-      when 'm'
-        amt + " minutes ago"
-      when 'h'
-        amt + " hours ago"
-      when 'd'
-        amt + " days ago"
-      else
-        input
+
+    had_to_try = Time.parse(input) rescue false
+
+    if had_to_try.class == FalseClass
+      if input =~ /^(\d+)([mhd])?$/i
+        amt = $1
+        type = $2.nil? ? "m" : $2
+        input = case type.downcase
+        when 'm'
+          amt + " minutes ago"
+        when 'h'
+          amt + " hours ago"
+        when 'd'
+          amt + " days ago"
+        else
+          input
+        end
       end
-    end
 
-    Chronic.parse(input, {:context => :past, :ambiguous_time_range => 8})
+      Chronic.parse(input, {:context => :past, :ambiguous_time_range => 8})
+    else
+      had_to_try
+    end
   end
 
 
@@ -260,11 +267,11 @@ class WWID
 
       minutes = case type.downcase
       when 'm'
-        $1.to_i
+        amt.to_i
       when 'h'
-        ($1.to_f * 60).round
+        (amt.to_f * 60).round
       when 'd'
-        ($1.to_f * 60 * 24).round
+        (amt.to_f * 60 * 24).round
       else
         minutes
       end
@@ -341,7 +348,8 @@ class WWID
     opt[:timed] ||= false
 
     title = [title.strip.cap_first] + @config['default_tags'].map{|t| '@' + t.sub(/^ *@/,'').chomp}
-    entry = {'title' => title.join(' '), 'date' => opt[:back]}
+    title = autotag(title.join(' '))
+    entry = {'title' => title, 'date' => opt[:back]}
     unless opt[:note] =~ /^\s*$/s
       entry['note'] = opt[:note]
     end
@@ -382,6 +390,7 @@ class WWID
     opt[:sequential] ||= false
     opt[:date] ||= false
     opt[:remove] ||= false
+    opt[:autotag] ||= false
     opt[:back] ||= Time.now
 
 
@@ -408,38 +417,44 @@ class WWID
         count = opt[:count] == 0 ? items.length : opt[:count]
         items.map! {|item|
           break if index == count
-          if opt[:sequential]
-            done_date = next_start - 1
-            next_start = item['date']
-          elsif opt[:back].instance_of? Fixnum
-            done_date = item['date'] + opt[:back]
-          else
-            done_date = opt[:back]
-          end
 
-          title = item['title']
-          opt[:tags].each {|tag|
-            tag.strip!
-            if opt[:remove]
-              if title =~ /@#{tag}/
-                title.gsub!(/(^| )@#{tag}(\([^\)]*\))?/,'')
-                @results.push("Removed @#{tag}: #{title}")
-              end
+          unless opt[:autotag]
+            if opt[:sequential]
+              done_date = next_start - 1
+              next_start = item['date']
+            elsif opt[:back].instance_of? Fixnum
+              done_date = item['date'] + opt[:back]
             else
-              unless title =~ /@#{tag}/
-                title.chomp!
-                if opt[:date]
-                  title += " @#{tag}(#{done_date.strftime('%F %R')})"
-                else
-                  title += " @#{tag}"
+              done_date = opt[:back]
+            end
+
+            title = item['title']
+            opt[:tags].each {|tag|
+              tag.strip!
+              if opt[:remove]
+                if title =~ /@#{tag}/
+                  title.gsub!(/(^| )@#{tag}(\([^\)]*\))?/,'')
+                  @results.push("Removed @#{tag}: #{title}")
+                end
+              else
+                unless title =~ /@#{tag}/
+                  title.chomp!
+                  if opt[:date]
+                    title += " @#{tag}(#{done_date.strftime('%F %R')})"
+                  else
+                    title += " @#{tag}"
+                  end
+                  @results.push("Added @#{tag}: #{title}")
                 end
-                @results.push("Added @#{tag}: #{title}")
               end
-            end
-          }
+            }
+            item['title'] = title
+          else
+            item['title'] = autotag(item['title'])
+          end
 
-          item['title'] = title
           index += 1
+
           item
         }
 
@@ -628,6 +643,7 @@ class WWID
     opt[:totals] ||= false
     opt[:search] ||= false
     opt[:only_timed] ||= false
+    opt[:date_filter] ||= []
 
     # opt[:highlight] ||= true
     section = ""
@@ -655,6 +671,18 @@ class WWID
 
     items = opt[:section]['items'].sort_by{|item| item['date'] }
 
+    if opt[:date_filter].length == 2
+      start_date = opt[:date_filter][0]
+      end_date = opt[:date_filter][1]
+      items.keep_if {|item|
+        if end_date
+          item['date'] >= start_date && item['date'] <= end_date
+        else
+          item['date'].strftime('%F') == start_date.strftime('%F')
+        end
+      }
+    end
+
     if opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
       items.delete_if {|item|
         if opt[:tag_filter]['bool'] =~ /(AND|ALL)/
@@ -717,9 +745,8 @@ class WWID
     out = ""
 
     if opt[:output]
-      raise "Unknown output format" unless opt[:output] =~ /(html|csv)/
+      raise "Unknown output format" unless opt[:output] =~ /(template|html|csv|json|timeline)/
     end
-
     if opt[:output] == "csv"
       output = [CSV.generate_line(['date','title','note','timer'])]
       items.each {|i|
@@ -735,6 +762,104 @@ class WWID
         output.push(CSV.generate_line([i['date'],i['title'],note,interval]))
       }
       out = output.join("")
+    elsif opt[:output] == "json" || opt[:output] == "timeline"
+
+      items_out = []
+      max = items[-1]['date'].strftime('%F')
+      min = items[0]['date'].strftime('%F')
+      items.each_with_index {|i,index|
+        if RUBY_VERSION.to_f > 1.8
+          title = i['title'].force_encoding('utf-8')
+          note = i['note'].map {|line| line.force_encoding('utf-8').strip } if i['note']
+        else
+          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]
+          end_date = Time.parse($1)
+          interval = get_interval(i,false)
+        end
+        end_date ||= ""
+        interval ||= 0
+        note ||= ""
+
+        tags = []
+        skip_tags = ['meanwhile', 'done', 'cancelled', 'flagged']
+        i['title'].scan(/@([^\(\s]+)(?:\((.*?)\))?/).each {|tag|
+          tags.push(tag[0]) unless skip_tags.include?(tag[0])
+        }
+        if opt[:output] == "json"
+          items_out << {
+            :date => i['date'],
+            :end_date => end_date,
+            :title => title.strip, #+ " #{note}"
+            :note => note.class == Array ? note.join("\n") : note,
+            :time => "%02d:%02d:%02d" % fmt_time(interval),
+            :tags => tags
+          }
+        elsif opt[:output] == "timeline"
+          new_item = {
+            'id' => index + 1,
+            'content' => title.strip, #+ " #{note}"
+            'title' => title.strip + " (#{"%02d:%02d:%02d" % fmt_time(interval)})",
+            'start' => i['date'].strftime('%F'),
+            'type' => 'point'
+          }
+
+          if interval && interval > 0
+            new_item['end'] = end_date.strftime('%F')
+            if interval > 3600 * 3
+              new_item['type'] = 'range'
+            end
+          end
+          items_out.push(new_item)
+        end
+      }
+      if opt[:output] == "json"
+        out = {
+          'section' => section,
+          'items' => items_out,
+          'timers' => tag_times("json")
+        }.to_json
+      elsif opt[:output] == "timeline"
+                template =<<EOTEMPLATE
+<!doctype html>
+<html>
+<head>
+  <link href="http://visjs.org/dist/vis.css" rel="stylesheet" type="text/css" />
+  <script src="http://visjs.org/dist/vis.js"></script>
+</head>
+<body>
+  <div id="mytimeline"></div>
+
+  <script type="text/javascript">
+    // DOM element where the Timeline will be attached
+    var container = document.getElementById('mytimeline');
+
+    // Create a DataSet with data (enables two way data binding)
+    var data = new vis.DataSet(#{items_out.to_json});
+
+    // Configuration for the Timeline
+    var options = {
+      width: '100%',
+      height: '800px',
+      margin: {
+        item: 20
+      },
+      stack: true,
+      min: '#{min}',
+      max: '#{max}'
+    };
+
+    // Create a Timeline
+    var timeline = new vis.Timeline(container, data, options);
+  </script>
+</body>
+</html>
+EOTEMPLATE
+        return template
+      end
     elsif opt[:output] == "html"
       page_title = section
       items_out = []
@@ -764,34 +889,34 @@ class WWID
           :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;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
-  %head
-    %meta{"charset" => "utf-8"}/
-    %meta{"content" => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}/
-    %title what are you doing?
-    %style= @style
-  %body
-    %header
-      %h1= @page_title
-    %article
-      %ul
-        - @items.each do |i|
-          %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
+%head
+  %meta{"charset" => "utf-8"}/
+  %meta{"content" => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}/
+  %title what are you doing?
+  %style= @style
+%body
+  %header
+    %h1= @page_title
+  %article
+    %ul
+      - @items.each do |i|
+        %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, :@totals => totals })
-
     else
       items.each {|item|
 
@@ -857,6 +982,7 @@ EOT
         end
         output.sub!(/%note/,note)
         output.sub!(/%odnote/,note.gsub(/^\t*/,""))
+        output.sub!(/%chompnote/,note.gsub(/\n+/,' ').gsub(/(^\s*|\s*$)/,'').gsub(/\s+/,' '))
         output.gsub!(/%hr(_under)?/) do |m|
           o = ""
           `tput cols`.to_i.times do
@@ -1022,6 +1148,17 @@ EOT
     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 list_date(dates,section,times=nil,output=nil,opt={})
+    opt[:totals] ||= false
+    section = guess_section(section)
+    # :date_filter expects an array with start and end date
+    if dates.class == String
+      dates = [dates, dates]
+    end
+
+    list_section({:section => section, :count => 0, :order => "asc", :date_filter => dates, :times => times, :output => output, :totals => opt[:totals] })
+  end
+
   def yesterday(section,times=nil,output=nil,opt={})
     opt[:totals] ||= false
     section = guess_section(section)
@@ -1085,6 +1222,16 @@ EOS
       </table>
 EOS
       output + tail
+    elsif format == "json"
+      output = []
+      @timers.delete_if { |k,v| v == 0}.sort_by{|k,v| v }.reverse.each {|k,v|
+        output << {
+          'tag' => k,
+          'seconds' => v,
+          'formatted' => "%02d:%02d:%02d" % fmt_time(v)
+        }
+      }
+      output
     else
       output = []
       @timers.delete_if { |k,v| v == 0}.sort_by{|k,v| v }.reverse.each {|k,v|
@@ -1101,6 +1248,30 @@ EOS
     end
   end
 
+  # Uses autotag: configuration to turn keywords into tags for time tracking.
+  # Does not repeat tags in a title, and only converts the first instance of
+  # an untagged keyword
+  def autotag(title)
+    return unless title
+    @config['autotag']['whitelist'].each {|tag|
+      title.sub!(/(?<!@)(#{tag.strip})\b/i,'@\1') unless title =~ /@#{tag}\b/i
+    }
+    tail_tags = []
+    @config['autotag']['synonyms'].each {|tag, v|
+      v.each {|word|
+        if title =~ /\b#{word}\b/i
+          tail_tags.push(tag)
+        end
+      }
+    }
+    title + tail_tags.uniq.map {|t| '@'+t }.join(' ')
+  end
+
+  def autotag_item(item)
+    item['title'] = autotag(item['title'])
+    item
+  end
+
   private
 
   def get_interval(item, formatted=true)

data/lib/doing.rb

@@ -7,6 +7,7 @@ require 'csv'
 require 'tempfile'
 require 'chronic'
 require 'haml'
+require 'json'
 require 'doing/wwid.rb'
 
 DOING_CONFIG_NAME = ".doingrc"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.7pre
+  version: 1.0.8pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -120,6 +120,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 description: A tool for managing a TaskPaper-like file of recent activites. Perfect
   for the late-night hacker on too much caffeine to remember what they accomplished
   at 2 in the morning.