doing 0.2.5 → 1.0.0pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4645c47a272a4fdf45174b2adff019820ed1537
-  data.tar.gz: 444fa7c255629e9f9e5f1b357c28b0fd2ac3e8c3
+  metadata.gz: 74966c0e6ac08312d5b1ebb980795e47a19ae278
+  data.tar.gz: 746b50bfae984c7f95e3b64a7bb095a185d2208e
 SHA512:
-  metadata.gz: 4b8872bc854b897c25737f79f50ab86ec91f48b5b64118cc121c463c0782738070150b06ef8a9e076b5a9bdf5922f94a5d45db35166f80af8cf0fc63f9e51519
-  data.tar.gz: 4ed502a4de7165e67a5cc41d4737f069ececd82e64efa8af092d0c847b32ca1e99151ec7071945dace041277208411c0e0b36bdfc6a468330bb14a60b3660e87
+  metadata.gz: 7968dfa76f2c4b6aef6a8ae098f86df6286d5968330a1cebb471d1d13978c5ccfe1aa0bbda49e2bc74af83cadd7aae37197719f33b4336f51d25bc6f001c8ff1
+  data.tar.gz: 5fcf33fccaa418ba41c5f1c79515bb341024b9363a95adc07b7479163bd4eb5de96912d8c0b9994d4e6d6bdd0649ff8baf82628f996040ee993d90b8099b08bd

data/README.md

@@ -263,11 +263,13 @@ Outputs:
     done     - Add a completed item with @done(date). No argument finishes last entry.
     meanwhile - Finish any @meanwhile tasks and optionally create a new one
 
-The `doing now` command can accept `-s section_name` to send the new entry straight to a non-default section. 
+The `doing now` command can accept `-s section_name` to send the new entry straight to a non-default section. It also accepts `--back AMOUNT` to let you specify a start date in the past using "natural language." For example, `doing now --back 25m ENTRY` or `doing now --back "yesterday 3:30pm" ENTRY`.
+
+You can finish the last unfinished task when starting a new one using `doing now` with the `-f` switch. It will look for the last task not marked `@done` and add the `@done` tag with the start time of the new task (either the current time or what you specified with `--back`).
 
 `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 timestamp of the entry. When used with `doing done`, this allows time intervals to be accurately counted when entering items after the fact.
+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.)
 
 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.
 
@@ -277,15 +279,24 @@ All of these commands accept a `-e` argument. This opens your command line edito
 
     finish      - Mark last X entries as @done
     tag         - Tag last entry
+    note        - Add a note to the last entry
 
 `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 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.
+
 `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.
 
+`note` lets you enter a note on the last entry. You can specify a section with `-s section_name`. `-e` will open your $EDITOR for typing the note, but you can just include it on the command line after any arguments. You can also pipe a note in on STDIN (`echo "fun stuff"|doing 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 in text to any of the creation commands that has multiple lines, everything after the first line break will become the note.
+
 #### Displaying entries:
 
     show      - List all entries
@@ -293,6 +304,7 @@ All of these commands accept a `-e` argument. This opens your command line edito
     today     - List entries from today
     yesterday - List entries from yesterday
     last      - Show the last entry
+    grep      - Show entries matching text or pattern
 
 `doing show` on its own will list all entries in the "Currently" section. Add a section name as an argument to display that section instead. Use "all" to display all entries from all sections.
 
@@ -413,19 +425,106 @@ That said, you can get support from other users (and occasionally me) on GitHub.
 
 Please try not to email me directly about GitHub projects.
 
+### Developer notes
+
+I'll try to document some of the code structure as I flesh it out. I'm currently working on adding a CLI reporting structure and logging methods, as well as santizing and standardizing all the flags and switches for consistency. Feel free to [poke around](http://github.com/ttscoff/doing/), I'll try to add more comments in the future (and retroactively).
+
 ### Changelog
 
-#### 0.2.5 / 2014-03-21 
-
- * Default to showing times #26, show totals even if no tags exist #27, fix indentation #29
- * Add section label to archived tasks automatically, excepting Currently section
- * Today outputs and backdate for finish
- * html styling and fix for 1.8.7 haml errors
- * Look, HTML output! (`--output html`)
- * Also, `--output csv`
- * let doing archive function on all sections
- * option to exclude date from `@done`,  
- * output newlines in sections and views
- * Flagging (`doing mark`)
- * fix for view/section guess error
- * Adding tag filtering to archive command (`doing archive @done`)
+#### 0.2.6pre
+
+* --totals, --[no-]times, --output [csv,html] options for yesterday command.
+* Add tests for Darwin to hide OS X-only features on other systems
+* -f flag to `now` command for finishing last task when starting a new one (Looks back for the last unfinished task in the list)
+* --took option for `done` and `finish` for specifying intervals from the start date for the completion date
+* Basic command line reporting
+* --auto flag for `finish` and `done` that will automatically set the completion time to 1 minute before the next start time in the list. You can use it retroactively to add times to sequential todos.
+* `doing grep` for searching by text or regex
+
+#### 0.2.5
+
+* Default to showing times #26, show totals even if no tags exist #27, fix indentation #29
+* Add section label to archived tasks automatically, excepting Currently section
+* Today outputs and backdate for finish
+* html styling and fix for 1.8.7 haml errors
+* Look, HTML output! (`--output html`)
+* Also, `--output csv`
+* let doing archive function on all sections
+* option to exclude date from `@done`,  
+* output newlines in sections and views
+* Flagging (`doing mark`)
+* fix for view/section guess error
+* Adding tag filtering to archive command (`doing archive \@done`)
+* `doing yesterday`
+* `doing done -r` to remove last doing tag (optionally from `-s Section`)
+* Add -f flag to specify alternate doing file
+* Meanwhile command
+
+#### 0.2.1
+
+- CSV output for show command (`--csv`)
+- HTML output for show command (`--output html`)
+- fuzzy searching for all commands that specify a view. 
+  - On the terminal you'll see "Assume you meant XXX" to show what match it found, but this is output to STDERR and won't show up if you're redirecting the output or using it in GeekTool, etc.
+- tags_color in view config to highlight tags at the end of the lines. Can be set to any of the %colors.
+- Basic time tracking. 
+  - `-t` on `show` and `view` will turn on time calculations
+  - Intervals between timestamps and dated `@done` tags are calculated for each line, if the tag exists. 
+  - You must include a %interval token in the appropriate template for it to show
+  - `@start(date)` tags can optionally be used to override the time stamp in the calculation
+  - Any other tags in the line have that line's total added to them
+  - Totals for tags can be displayed at the end of output with `--totals`
+
+
+#### 0.2.0
+
+- `doing done` without argument tags last entry done
+  - `-a` archives them
+- `doing finish` or `doing finish X` marks last X entries done
+  - `-a` archives them
+- `doing tag tag1 [tag2]` tags last entry or `-c X` entries
+  - `doing tag -r tag1 [tag2]` removes said tag(s)
+- custom views additions
+  - custom views can include `tags` and `tags_bool`
+    - tags is a space separated list of tags to filter the results by
+    - tags_bool defines AND (all tags must exist), OR (any tag exists), or NONE (none of the tags exist)
+  - order key (asc or desc) defines output sort order by date
+  - section key can be set to "All" to combine sections
+- `doing show` updates
+  - accepts "all" as a section
+  - arguments following section name are tags to filter by
+    - `-b` sets boolean (AND, OR, NONE) or (ALL, ANY, NONE) (default OR/ANY)
+  - use `-c X` to limit results
+  - use `-s` to set sort order (asc or desc)
+  - use `-a` to set age (newest or oldest)
+- fuzzy section guessing when specified section isn't found
+- fuzzy view guessing for `doing view` command
+
+----
+
+#### 0.1.9
+
+- colors in templated output
+- open command
+  - opens in the default app for file type
+  - -a APPNAME (`doing open -a TaskPaper`)
+  - -b bundle_id (`doing open -b com.sublimetext.3`)
+- -e switch for `now`, `later` and `done` commands
+  - save a tmp file and open it in an editor
+  - allows multi-line entries, anything after first line is considered a note
+  - assumed when no input is provided (`doing now`)
+- `doing views` shows all available custom views
+- `doing view` without a view name will let you choose a view from a menu
+- `doing archive` fixed so that `-k X` works to keep X number of entries in the section
+
+#### 0.1.7
+
+- colors in templated output
+- open command
+  - opens in the default app for file type
+  - -a APPNAME (`doing open -a TaskPaper`)
+  - -b bundle_id (`doing open -b com.sublimetext.3`)
+- -e switch for `now`, `later` and `done` commands
+  - save a tmp file and open it in an editor
+  - allows multi-line entries, anything after first line is considered a note
+  - assumed when no input is provided (`doing now`)

data/bin/doing

@@ -39,9 +39,18 @@ command :now do |c|
   c.desc "Edit entry with #{ENV['EDITOR']}"
   c.switch [:e,:editor]
 
-  c.desc 'Backdate to "date_string" (natural language)'
+  c.desc 'Backdate start time [4pm|20m|2h|yesterday noon]'
   c.flag [:back]
 
+  c.desc 'Timed entry, marks last entry in section as @done'
+  c.default_value false
+  c.switch [:f,:finish_last], :negatable => false, :default_value => false
+
+  c.desc 'Note'
+  c.arg_name 'note_text'
+  c.default_value wwid.current_section
+  c.flag [:n,:note]
+
   # c.desc "Edit entry with specified app"
   # c.arg_name 'editor_app'
   # c.default_value wwid.config.has_key?('editor_app') && wwid.config['editor_app'] ? wwid.config['editor_app'] : false
@@ -65,7 +74,8 @@ command :now do |c|
       input = wwid.fork_editor(input)
       if input
         title, note = wwid.format_input(input)
-        wwid.add_item(title.cap_first, section, {:note => note, :back => date})
+        note.push(options[:n]) if options[:n]
+        wwid.add_item(title.cap_first, section, {:note => note, :back => date, :timed => options[:f]})
         wwid.write(wwid.doing_file)
       else
         raise "No content"
@@ -73,11 +83,13 @@ command :now do |c|
     else
       if args.length > 0
         title, note = wwid.format_input(args.join(" "))
-        wwid.add_item(title.cap_first, section, {:note => note, :back => date})
+        note.push(options[:n]) if options[:n]
+        wwid.add_item(title.cap_first, section, {:note => note, :back => date, :timed => options[:f]})
         wwid.write(wwid.doing_file)
       elsif STDIN.stat.size > 0
         title, note = wwid.format_input(STDIN.read)
-        wwid.add_item(title.cap_first, section, {:note => note, :back => date})
+        note.push(options[:n]) if options[:n]
+        wwid.add_item(title.cap_first, section, {:note => note, :back => date, :timed => options[:f]})
         wwid.write(wwid.doing_file)
       else
         raise "You must provide content when creating a new entry"
@@ -86,6 +98,57 @@ command :now do |c|
   end
 end
 
+desc 'Add a note to the last entry'
+arg_name 'note_text'
+command :note do |c|
+  c.desc 'Section'
+  c.arg_name 'section_name'
+  c.default_value wwid.current_section
+  c.flag [:s,:section], :default_value => wwid.current_section
+
+  c.desc "Edit entry with #{ENV['EDITOR']}"
+  c.switch [:e,:editor], :negatable => false, :default_value => false
+
+  c.desc "Replace/Remove last entry's note"
+  c.long_desc "If -r is provided with no other arguments, the last note is removed. If new content is specified through arguments or STDIN, any previous note will be replaced with the new one."
+  c.switch [:r,:remove], :negatable => false, :default_value => false
+
+  c.action do |global_options,options,args|
+    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+
+    if options[:e] || (args.length == 0 && STDIN.stat.size == 0 && !options[:r])
+      raise "No EDITOR variable defined in environment" if ENV['EDITOR'].nil?
+      input = ""
+      input += args.join(" ") if args.length > 0
+      input = wwid.fork_editor(input)
+      if input
+        title, note = wwid.format_input(input)
+        note.insert(0, title)
+        wwid.note_last(section, note, options[:r])
+      else
+        raise "No content"
+      end
+    else
+      if args.length > 0
+        title, note = wwid.format_input(args.join(" "))
+        note.insert(0, title)
+        wwid.note_last(section, note, options[:r])
+      elsif STDIN.stat.size > 0
+        title, note = wwid.format_input(STDIN.read)
+        note.insert(0, title)
+        wwid.note_last(section, note, options[:r])
+      else
+        if options[:r]
+          wwid.note_last(section, [], true)
+        else
+          raise "You must provide content when adding a note"
+        end
+      end
+    end
+    wwid.write(wwid.doing_file)
+  end
+end
+
 desc 'Finish any running @meanwhile tasks and optionally create a new one'
 arg_name 'entry'
 command :meanwhile do |c|
@@ -100,9 +163,14 @@ command :meanwhile do |c|
   c.desc "Archive previous @meanwhile entry"
   c.switch [:a,:archive], :default_value => false
 
-  c.desc 'Backdate to "date_string" (natural language)'
+  c.desc 'Backdate start date for new entry to date string [4pm|20m|2h|yesterday noon]'
   c.flag [:back]
 
+  c.desc 'Note'
+  c.arg_name 'note_text'
+  c.default_value wwid.current_section
+  c.flag [:n,:note]
+
   c.action do |global_options,options,args|
     if options[:back]
       date = wwid.chronify(options[:back])
@@ -128,7 +196,8 @@ command :meanwhile do |c|
     end
     input = false unless input && input.length > 0
 
-    wwid.stop_start("meanwhile",{:new_item => input, :back => date, :section => section, :archive => options[:a]})
+    note = options[:n] ? options[:n] : false
+    wwid.stop_start("meanwhile",{:new_item => input, :back => date, :section => section, :archive => options[:a], :note => note})
     wwid.write(wwid.doing_file)
   end
 end
@@ -144,9 +213,14 @@ command :later do |c|
   c.default_value wwid.config.has_key?('editor_app') && wwid.config['editor_app'] ? wwid.config['editor_app'] : false
   c.flag [:a,:app]
 
-  c.desc 'Backdate to "date_string" (natural language)'
+  c.desc 'Backdate start time to date string [4pm|20m|2h|yesterday noon]'
   c.flag [:back]
 
+  c.desc 'Note'
+  c.arg_name 'note_text'
+  c.default_value wwid.current_section
+  c.flag [:n,:note]
+
   c.action do |global_options,options,args|
     if options[:back]
       date = wwid.chronify(options[:back])
@@ -162,6 +236,7 @@ command :later do |c|
       input = wwid.fork_editor(input)
       if input
         title, note = wwid.format_input(input)
+        note.push(options[:n]) if options[:n]
         wwid.add_item(title.cap_first, "Later", {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       else
@@ -170,10 +245,12 @@ command :later do |c|
     else
       if args.length > 0
         title, note = wwid.format_input(args.join(" "))
+        note.push(options[:n]) if options[:n]
         wwid.add_item(title.cap_first, "Later", {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       elsif STDIN.stat.size > 0
         title, note = wwid.format_input(STDIN.read)
+        note.push(options[:n]) if options[:n]
         wwid.add_item(title.cap_first, "Later", {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       else
@@ -192,14 +269,17 @@ command :done do |c|
 
   c.desc 'Include date'
   c.default_value true
-  c.switch [:d,:date], :default_value => true
+  c.switch [:d,:date], :negatable => true, :default_value => true
 
   c.desc 'Immediately archive the entry'
   c.default_value false
   c.switch [:a,:archive], :negatable => false, :default_value => false
 
-  c.desc 'Backdate to "date_string" (natural language)'
-  c.flag [:back]
+  c.desc 'Backdate start date to date string [4pm|20m|2h|yesterday noon]'
+  c.flag [:b,:back]
+
+  c.desc 'Set completion date to start date plus XX[mhd] or [HH:MM]'
+  c.flag [:t,:took]
 
   c.desc 'Section'
   c.default_value wwid.current_section
@@ -216,13 +296,21 @@ command :done do |c|
   c.action do |global_options,options,args|
     if options[:back]
       date = wwid.chronify(options[:back])
-      raise "Unable to parse date string" if date.nil?
+      raise "Unable to parse date string for --back" if date.nil?
     else
       date = 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?
+    else
+      finish_date = Time.now
+    end
+
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
-    donedate = options[:d] ? "(#{Time.now.strftime('%F %R')})" : ""
+    donedate = options[:d] ? "(#{finish_date.strftime('%F %R')})" : ""
 
     if options[:e]
       raise "No EDITOR variable defined in environment" if ENV['EDITOR'].nil?
@@ -242,11 +330,12 @@ command :done do |c|
       if options[:r]
         wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :remove => true })
       else
-        wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :archive => options[:a], :back => date, :date => options[:d]})
+        wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :archive => options[:a], :back => finish_date, :date => options[:d]})
       end
     else
       if args.length > 0
         title, note = wwid.format_input(args.join(" "))
+        title.chomp!
         title += " @done#{donedate}"
         section = "Archive" if options[:a]
         wwid.add_item(title.cap_first, section.cap_first, {:note => note, :back => date})
@@ -265,14 +354,23 @@ command :done do |c|
 end
 
 desc 'Mark last X entries as @done'
+long_desc 'Marks the last X entries with a @done tag and current date. Does not alter already completed entries.'
 arg_name 'count'
 command :finish do |c|
   c.desc 'Include date'
   c.default_value true
   c.switch [:d,:date], :default_value => true
 
-  c.desc 'Backdate to "date_string" (natural language)'
-  c.flag [:back]
+  c.desc 'Backdate completed date to date string [4pm|20m|2h|yesterday noon]'
+  c.flag [:b,:back]
+
+  c.desc 'Set the completed date to the start date plus XX[hmd]'
+  c.flag [:t,:took]
+
+  c.desc 'Auto-generate finish dates from next entry\'s start time'
+  c.long_desc 'Automatically generate completion dates 1 minute before next start date. --auto overrides the --date and --back parameters.'
+  c.default_value false
+  c.switch [:auto], :negatable => false, :default_value => false
 
   c.desc 'Archive entries'
   c.default_value false
@@ -286,19 +384,25 @@ command :finish do |c|
 
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
-    if options[:back]
-      date = wwid.chronify(options[:back])
+    unless options[:auto]
+      raise "--back and --took cannot be used together" if options[:back] and options[:took]
 
-      raise "Unable to parse date string" if date.nil?
-    else
-      date = Time.now
+      if options[:back]
+        date = wwid.chronify(options[:back])
+
+        raise "Unable to parse date string" if date.nil?
+      elsif options[:took]
+        date = wwid.chronify_qty(options[:took])
+      else
+        date = Time.now
+      end
     end
 
     if args.length > 1
       raise "Only one argument allowed"
     elsif args.length == 0 || args[0] =~ /\d+/
       count = args[0] ? args[0].to_i : 1
-      wwid.tag_last({:tags => ["done"], :count => count, :section => section, :archive => options[:a], :date => options[:d], :back => date })
+      wwid.tag_last({:tags => ["done"], :count => count, :section => section, :archive => options[:a], :sequential => options[:auto], :date => options[:d], :back => date })
     else
       raise "Invalid argument (specify number of recent items to mark @done)"
     end
@@ -383,11 +487,11 @@ command :show do |c|
   c.default_value 'asc'
   c.flag [:s,:sort], :default_value => 'asc'
 
-  c.desc 'Output to format'
+  c.desc 'Output to export format (csv|html)'
   c.flag [:o,:output]
 
   c.desc 'Show time intervals on @done tasks'
-  c.default_value false
+  c.default_value true
   c.switch [:t,:times], :default_value => true
 
   c.desc 'Show intervals with totals at the end of output'
@@ -430,6 +534,37 @@ command :show do |c|
   end
 end
 
+desc 'Search for entries'
+long_desc 'Search all sections (or limit to a single section) for entries matching text or regular expression.'
+arg_name 'search_pattern'
+command :grep do |c|
+  c.desc 'Section'
+  c.default_value "all"
+  c.flag [:s,:section], :default_value => "All"
+
+  c.desc 'Output to export format (csv|html)'
+  c.flag [:o,:output]
+
+  c.desc 'Show time intervals on @done tasks'
+  c.default_value true
+  c.switch [:t,:times], :default_value => true
+
+  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|
+
+    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.tag_times if options[:totals]
+  end
+end
+
 desc 'List recent entries'
 default_value 10
 arg_name 'count'
@@ -439,7 +574,7 @@ command :recent do |c|
   c.flag [:s,:section], :default_value => wwid.current_section
 
   c.desc 'Show time intervals on @done tasks'
-  c.default_value false
+  c.default_value true
   c.switch [:t,:times], :default_value => true
 
   c.desc 'Show intervals with totals at the end of output'
@@ -468,14 +603,14 @@ end
 desc 'List entries from today'
 command :today do |c|
   c.desc 'Show time intervals on @done tasks'
-  c.default_value false
+  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 format'
+  c.desc 'Output to export format (csv|html)'
   c.flag [:o,:output]
 
   c.action do |global_options,options,args|
@@ -492,9 +627,22 @@ 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.flag [:o,:output]
+
+  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.action do |global_options, options,args|
     section = args.length > 0 ? args.join(" ") : wwid.current_section
-    puts wwid.yesterday(section).strip
+    puts wwid.yesterday(section,options[:t],options[:o]).chomp
+
+    puts wwid.tag_times if options[:totals]
   end
 end
 
@@ -542,11 +690,11 @@ 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 format'
+  c.desc 'Output to export format (csv|html)'
   c.flag [:o,:output]
 
   c.desc 'Show time intervals on @done tasks'
-  c.default_value false
+  c.default_value true
   c.switch [:t,:times], :default_value => true
 
   c.desc 'Show intervals with totals at the end of output'
@@ -635,8 +783,9 @@ command :archive do |c|
   end
 end
 
-desc 'Open the "doing" file in an editor (OS X)'
+desc 'Open the "doing" file in an editor'
 command :open do |c|
+if `uname` =~ /Darwin/
   c.desc 'open with app name'
   c.arg_name 'app_name'
   c.flag [:a]
@@ -644,7 +793,7 @@ command :open do |c|
   c.desc 'open with app bundle id'
   c.arg_name 'bundle_id'
   c.flag [:b]
-
+end
   c.desc 'open with $EDITOR'
   c.switch [:e], :negatable => false
 
@@ -653,7 +802,7 @@ command :open do |c|
     params.delete_if { |k,v|
       k.class == String || v.nil? || v == false
     }
-
+    if `uname` =~ /Darwin/
     if params.length < 2
       if options[:a]
         system %Q{open -a "#{options[:a]}" "#{File.expand_path(wwid.doing_file)}"}
@@ -672,41 +821,66 @@ command :open do |c|
     else
       raise "The open command takes a single parameter. #{params.length} specified."
     end
+    else
+      raise "No EDITOR variable defined in environment" if ENV['EDITOR'].nil?
+      system %Q{$EDITOR "#{File.expand_path(wwid.doing_file)}"}
+    end
   end
 end
 
+
 desc 'Edit the configuration file'
 command :config do |c|
   c.desc 'Editor to use'
   c.default_value ENV['EDITOR']
   c.flag [:e,:editor], :default_value => nil
 
-  c.desc 'Application to use (OS X only)'
-  c.flag [:a]
-
-  c.desc "Use the editor_app defined in ~/.doingrc (#{wwid.config['editor_app']})"
-  c.switch [:x]
+  if `uname` =~ /Darwins/
+    c.desc 'Application to use'
+    c.flag [:a]
 
-  c.desc 'Application bundle id to use (OS X only)'
-  c.flag [:b]
+    c.desc "Use the editor_app defined in ~/.doingrc (#{wwid.config['editor_app']})"
+    c.switch [:x]
 
+    c.desc 'Application bundle id to use'
+    c.flag [:b]
+  end
   c.action do |global_options,options,args|
-    if options[:x]
-      %x{open -a "#{wwid.config['editor_app']}" "#{File.expand_path(DOING_CONFIG)}"}
-    elsif options[:a] || options[:b]
-      if options[:a]
-        %x{open -a "#{options[:a]}" "#{File.expand_path(DOING_CONFIG)}"}
-      elsif options[:b]
-        %x{open -b #{options[:b]} "#{File.expand_path(DOING_CONFIG)}"}
+    if `uname` =~ /Darwins/
+      if options[:x]
+        %x{open -a "#{wwid.config['editor_app']}" "#{File.join(Dir.home, DOING_CONFIG_NAME)}"}
+      elsif options[:a] || options[:b]
+        if options[:a]
+          %x{open -a "#{options[:a]}" "#{File.join(Dir.home, DOING_CONFIG_NAME)}"}
+        elsif options[:b]
+          %x{open -b #{options[:b]} "#{File.join(Dir.home, DOING_CONFIG_NAME)}"}
+        end
+      else
+        raise "No EDITOR variable defined in environment" if options[:e].nil? && ENV['EDITOR'].nil?
+        editor = options[:e].nil? ? ENV['EDITOR'] : options[:e]
+        system %Q{#{editor} "#{File.expand_path(DOING_CONFIG)}"}
       end
     else
       raise "No EDITOR variable defined in environment" if options[:e].nil? && ENV['EDITOR'].nil?
       editor = options[:e].nil? ? ENV['EDITOR'] : options[:e]
-      system %Q{#{editor} "#{File.expand_path(DOING_CONFIG)}"}
+      system %Q{#{editor} "#{File.join(Dir.home, DOING_CONFIG_NAME)}"}
     end
   end
 end
 
+desc 'Undo the last change to the doing_file'
+command :undo do |c|
+  c.desc 'Specify alternate doing file'
+  c.default_value wwid.doing_file
+  c.flag [:f,:file], :default_value => wwid.doing_file
+
+  c.action do |global_options,options,args|
+    file = options[:f] || wwid.doing_file
+    wwid.restore_backup(file)
+  end
+end
+
+
 pre do |global,command,options,args|
   if global[:doing_file]
     wwid.init_doing_file(input=global[:doing_file])
@@ -728,6 +902,7 @@ end
 post do |global,command,options,args|
   # Use skips_post before a command to skip this
   # block on that command only
+  puts wwid.results.join("\n")
 end
 
 on_error do |exception|

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '0.2.5'
+  VERSION = '1.0.0pre'
 end

data/lib/doing/wwid.rb

@@ -1,4 +1,7 @@
 #!/usr/bin/ruby
+
+require 'deep_merge'
+
 class String
   def cap_first
     self.sub(/^\w/) do |m|
@@ -9,13 +12,14 @@ class String
 end
 
 class WWID
-  attr_accessor :content, :sections, :current_section, :doing_file, :config
+  attr_accessor :content, :sections, :current_section, :doing_file, :config, :results
 
 
   def initialize
     @content = {}
     @timers = {}
     @config = read_config
+    @results = []
 
     @config['doing_file'] ||= "~/what_was_i_doing.md"
     @config['current_section'] ||= 'Currently'
@@ -63,6 +67,7 @@ class WWID
     }
     @config['marker_tag'] ||= 'flagged'
     @config['marker_color'] ||= 'red'
+    @config['default_tags'] ||= []
 
     @current_section = config['current_section']
     @default_template = config['templates']['default']['template']
@@ -70,7 +75,7 @@ class WWID
 
     @config[:include_notes] ||= true
 
-    File.open(File.expand_path(DOING_CONFIG), 'w') { |yf| YAML::dump(config, yf) }
+    File.open(home_config, 'w') { |yf| YAML::dump(config, yf) }
   end
 
   def init_doing_file(input=nil)
@@ -141,12 +146,23 @@ class WWID
     end
   end
 
+  def home_config
+    File.join(Dir.home, DOING_CONFIG_NAME)
+  end
+
   def read_config
-    if File.exists? File.expand_path(DOING_CONFIG)
-      return YAML.load_file(File.expand_path(DOING_CONFIG))
-    else
-      return {}
+    config = {}
+    dir = Dir.pwd
+    while(dir != '/')
+      if File.exists? File.join(dir, DOING_CONFIG_NAME)
+        config = YAML.load_file(File.join(dir, DOING_CONFIG_NAME)).deep_merge!(config)
+      end
+      dir = File.dirname(dir)
+    end
+    if config.empty? && File.exists?(home_config)
+      config = YAML.load_file(home_config)
     end
+    config
   end
 
   def fork_editor(input="")
@@ -182,7 +198,10 @@ class WWID
   end
 
   # This takes a multi-line string and formats it as an entry
-  # returns an array of [title(String), note(Array)]
+  # Params:
+  # +input+:: String
+  # Returns:
+  # [title(String), note(Array)]
   def format_input(input)
     raise "No content in entry" if input.nil? || input.strip.length == 0
     input_lines = input.split(/[\n\r]+/)
@@ -197,16 +216,21 @@ class WWID
     [title, note]
   end
 
+  # Converts simple strings into seconds that can be added to a Time object
+  # Params:
+  # +qty+:: HH:MM or XX[dhm][[XXhm][XXm]] (1d2h30m, 45m, 1.5d, 1h20m, etc.)
+  # Returns:
+  # seconds(Integer)
   def chronify(input)
-    if input =~ /^(\d+)([mhd])?$/i
+    if input =~ /^(\d+)\s*([mhd])?/i
       amt = $1
       type = $2.nil? ? "m" : $2
       input = case type.downcase
-      when "m"
+      when 'm'
         amt + " minutes ago"
-      when "h"
+      when 'h'
         amt + " hours ago"
-      when "d"
+      when 'd'
         amt + " days ago"
       else
         input
@@ -216,6 +240,32 @@ class WWID
     Chronic.parse(input, {:context => :past, :ambiguous_time_range => 8})
   end
 
+
+  # Converts simple strings into seconds that can be added to a Time object
+  # Params:
+  # +qty+:: HH:MM or XX[dhm][[XXhm][XXm]] (1d2h30m, 45m, 1.5d, 1h20m, etc.)
+  # Returns seconds (Integer)
+  def chronify_qty(qty)
+    minutes = 0
+    if qty.strip =~ /^(\d+):(\d\d)$/
+      minutes += $1.to_i * 60
+      minutes += $2.to_i
+    elsif qty.strip =~ /\d+\s*[hmd]/
+      matches = qty.scan(/([\d\.]+)\s*([hmd])/)
+      matches.each {|m|
+        case m[1]
+        when "m"
+          minutes += m[0].to_i
+        when "h"
+          minutes += (m[0].to_f * 60).round
+        when "d"
+          minutes += (m[0].to_f * 60 * 24).round
+        end
+      }
+    end
+    minutes * 60
+  end
+
   def sections
     @content.keys
   end
@@ -282,12 +332,29 @@ class WWID
     opt[:date] ||= Time.now
     opt[:note] ||= []
     opt[:back] ||= Time.now
+    opt[:timed] ||= false
 
-    entry = {'title' => title.strip.cap_first, 'date' => opt[:back]}
+    title = [title.strip.cap_first] + @config['default_tags'].map{|t| '@' + t.sub(/^ *@/,'').chomp}
+    entry = {'title' => title.join(' '), 'date' => opt[:back]}
     unless opt[:note] =~ /^\s*$/s
       entry['note'] = opt[:note]
     end
-    @content[section]['items'].push(entry)
+    items = @content[section]['items']
+    if opt[:timed]
+      items.reverse!
+      items.each_with_index {|i,x|
+        if i['title'] =~ / @done/
+          next
+        else
+          items[x]['title'] = "#{i['title']} @done(#{opt[:back].strftime('%F %R')})"
+          break
+        end
+      }
+      items.reverse!
+    end
+    items.push(entry)
+    @content[section]['items'] = items
+    @results.push(%Q{Added "#{entry['title']}" to #{section}})
   end
 
   def tag_last(opt={})
@@ -295,39 +362,68 @@ class WWID
     opt[:count] ||= 1
     opt[:archive] ||= false
     opt[:tags] ||= ["done"]
+    opt[:sequential] ||= false
     opt[:date] ||= false
     opt[:remove] ||= false
     opt[:back] ||= Time.now
 
+
+
     opt[:section] = guess_section(opt[:section])
 
     if @content.has_key?(opt[:section])
       # sort_section(opt[:section])
-      # items = @content[opt[:section]]['items'].sort_by{|item| item['date'] }.reverse
+      items = @content[opt[:section]]['items'].dup.sort_by{|item| item['date'] }.reverse
+
+      index = 0
+      done_date = Time.now
+      next_start = Time.now
+      items.map! {|item|
+        break if index == opt[: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
 
-      @content[opt[:section]]['items'].each_with_index {|item, i|
-        break if i == opt[:count]
         title = item['title']
         opt[:tags].each {|tag|
           if opt[:remove]
             title.gsub!(/(^| )@#{tag.strip}(\([^\)]*\))?/,'')
+            @results.push("Updated: #{title}")
           else
             unless title =~ /@#{tag}/
-              if (tag == "done" && opt[:date]) || opt[:date]
-                title += " @#{tag}(#{opt[:back].strftime('%F %R')})"
+              title.chomp!
+              if opt[:date]
+                title += " @#{tag}(#{done_date.strftime('%F %R')})"
               else
                 title += " @#{tag}"
               end
+              @results.push("Updated: #{title}")
             end
           end
         }
-        @content[opt[:section]]['items'][i]['title'] = title
+
+        item['title'] = title
+        index += 1
+        item
       }
 
+      @content[opt[:section]]['items'] = items
+
       if opt[:archive] && opt[:section] != "Archive"
+        # concat [count] items from [section] and archive section
         archived = @content[opt[:section]]['items'][0..opt[:count]-1].concat(@content['Archive']['items'])
+        # chop [count] items off of [section] items
         @content[opt[:section]]['items'] = @content[opt[:section]]['items'][opt[:count]..-1]
+        # overwrite archive section with concatenated array
         @content['Archive']['items'] = archived
+        # log it
+        result = opt[:count] == 1 ? "1 entry" : "#{opt[:count]} entries"
+        @results.push("Archived #{result}")
       end
 
       write(@doing_file)
@@ -336,6 +432,41 @@ class WWID
     end
   end
 
+  def note_last(section, note, replace=false)
+    section = guess_section(section)
+
+    if @content.has_key?(section)
+      # sort_section(opt[:section])
+      items = @content[section]['items'].dup.sort_by{|item| item['date'] }.reverse
+
+      current_note = items[0]['note']
+      current_note = [] if current_note.nil?
+      title = items[0]['title']
+      if replace
+        items[0]['note'] = note
+        if note.empty? && !current_note.empty?
+          @results.push(%Q{Removed note from "#{title}"})
+        elsif current_note.length > 0 && note.length > 0
+          @results.push(%Q{Replaced note from "#{title}"})
+        elsif note.length > 0
+          @results.push(%Q{Added note to #{title}})
+        else
+          @results.push(%Q{Entry "#{title}" has no note})
+        end
+      elsif current_note.class == Array
+        items[0]['note'] = current_note.concat(note)
+        @results.push(%Q{Added note to "#{title}"}) if note.length > 0
+      else
+        items[0]['note'] = note
+        @results.push(%Q{Added note to "#{title}"}) if note.length > 0
+      end
+
+      @content[section]['items'] = items
+    else
+      raise "Section not found"
+    end
+  end
+
   # accepts one tag and the raw text of a new item
   # if the passed tag is on any item, it's replaced with @done
   # if new_item is not nil, it's tagged with the passed tag and inserted
@@ -345,6 +476,7 @@ class WWID
     opt[:archive] ||= false
     opt[:back] ||= Time.now
     opt[:new_item] ||= false
+    opt[:note] ||= false
 
     opt[:section] = guess_section(opt[:section])
 
@@ -358,14 +490,18 @@ class WWID
         @content[opt[:section]]['items'][i]['title'] = title
 
         if opt[:archive] && opt[:section] != "Archive"
+          @results.push(%Q{Completed and archived "#{@content[opt[:section]]['items'][i]['title']}"})
           @content['Archive']['items'].push(@content[opt[:section]]['items'][i])
           @content[opt[:section]]['items'].delete_at(i)
+        else
+          @results.push(%Q{Completed "#{@content[opt[:section]]['items'][i]['title']}"})
         end
       end
     }
 
     if opt[:new_item]
       title, note = format_input(opt[:new_item])
+      note.push(opt[:note]) if opt[:note]
       title += " @#{tag}"
       add_item(title.cap_first, opt[:section], {:note => note, :back => opt[:back]})
     end
@@ -374,7 +510,7 @@ class WWID
   end
 
   def write(file=nil)
-    if @other_content_top.empty?
+    unless @other_content_top
       output = ""
     else
       output = @other_content_top.join("\n") + "\n"
@@ -383,11 +519,12 @@ class WWID
       output += section['original'] + "\n"
       output += list_section({:section => title, :template => "\t- %date | %title%note", :highlight => false})
     }
-    output += @other_content_bottom.join("\n")
+    output += @other_content_bottom.join("\n") unless @other_content_bottom.nil?
     if file.nil?
       $stdout.puts output
     else
       if File.exists?(File.expand_path(file))
+        FileUtils.cp(file,file+"~")
         File.open(File.expand_path(file),'w+') do |f|
           f.puts output
         end
@@ -395,6 +532,15 @@ class WWID
     end
   end
 
+  def restore_backup(file)
+    if File.exists?(file+"~")
+      puts file+"~"
+      FileUtils.cp(file+"~",file)
+      @results.push("Restored #{file}")
+    end
+  end
+
+
   def choose_section
     sections.each_with_index {|section, i|
       puts "% 3d: %s" % [i+1, section]
@@ -438,6 +584,8 @@ class WWID
     opt[:tag_filter] ||= false
     opt[:tags_color] ||= false
     opt[:times] ||= false
+    opt[:search] ||= false
+
     # opt[:highlight] ||= true
     section = ""
     if opt[:section].nil?
@@ -488,6 +636,13 @@ class WWID
       }
     end
 
+    if opt[:search]
+      items.keep_if {|item|
+        text = item['note'] ? item['title'] + item['note'].join(" ") : item['title']
+        text =~ /#{opt[:search]}/i
+      }
+    end
+
     if opt[:today]
       items.delete_if {|item|
         item['date'] < Date.today.to_time
@@ -792,9 +947,9 @@ 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})
   end
 
-  def yesterday(section)
+  def yesterday(section,times=nil,output=nil)
     section = guess_section(section)
-    list_section({:section => section, :count => 0, :order => "asc", :yesterday => true})
+    list_section({:section => section, :count => 0, :order => "asc", :yesterday => true, :times => times, :output => output })
   end
 
   def recent(count=10,section=nil,opt={})

data/lib/doing.rb

@@ -9,4 +9,4 @@ require 'chronic'
 require 'haml'
 require 'doing/wwid.rb'
 
-DOING_CONFIG = "~/.doingrc"
+DOING_CONFIG_NAME = ".doingrc"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 1.0.0pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,6 +106,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.2
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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.
@@ -144,9 +158,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2