doing 0.1.9 → 0.2.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8e66a72fd2de31862fdc6423f9771b4a41ac012
-  data.tar.gz: 1bc3c5ab4be017092e802dba802c1a7c1d1721db
+  metadata.gz: a4b26436b15b40cf894c0d3b15dfaf367e299f95
+  data.tar.gz: d13cf54255ec6db1b5d24c7fec73455cb6e642f5
 SHA512:
-  metadata.gz: e1b2d0a13c32cb31f971f85afe278138bd7ceffae608f801b3640d23a397474efca6f812830d4089b8220f149f2dc688ef80b680626caac6b98529265f68fe17
-  data.tar.gz: 4536f5c497ef9c2510e81faa08b83786f140d85695ceb757e5233988feaa0ea26fb7f72ff83da9b6d042b6bc2df1b68944b381b1e45708c3a6e0294f0b633301
+  metadata.gz: 5fdaadd019f03f7a93e1fc211c20ed017502d16eade73f7f6eb616e123f14988422296c17b2a759643efcb7abbcc721a451d47fe1ede0c30e8f719c1cafc94e5
+  data.tar.gz: 75907e9acf02fadfa7416550cca0bbfe487452a660a8c494c4228b9e87f47b0306e79188718395da56e48e6a6c15c631e7bb34590655ec830ca59115fdf89b7e

data/README.md

@@ -20,6 +20,8 @@ _Side note:_ I actually use the library behind this utility as part of another s
 
 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.
+
 See the [support](#support) section below for troubleshooting details.
 
 ## The "doing" file
@@ -28,7 +30,9 @@ The file that stores all of your entries is generated the first time you add an
 
 The format of the "doing" file is TaskPaper-compatible. You can edit it by hand at any time (in TaskPaper or any text editor), but it uses a specific format for parsing, so be sure to maintain the dates and pipe characters. 
 
-Notes are anything in the list without a leading hyphen and date. They belong to the entry directly before them, and they should be indented one level beyond the parent item. The `now` and `later` commands don't currently make it possible to add notes at the time of entry creation, but I have scripts that do it and will incorporate them soon.
+Notes are anything in the list without a leading hyphen and date. They belong to the entry directly before them, and they should be indented one level beyond the parent item. When using the `now` and `later` commands on the command line, you can start the entry with a quote and hit return, then type the note and close the quote. Anything after the first line will be turned into a TaskPaper-compatible note for the task and can be displayed in templates using `%note`.
+
+Notes can be prevented from ever appearing in output with the global option `--no-notes`: `doing --no-notes show all`.
 
 ## Configuration
 
@@ -39,6 +43,14 @@ A basic configuration looks like this:
     current_section: Currently
     default_template: '%date: %title%note'
     default_date_format: '%Y-%m-%d %H:%M'
+    views:
+      color:
+        date_format: '%F %_I:%M%P'
+        section: Currently
+        count: 10
+        wrap_width: 0
+        template: '%boldblack%date %boldgreen| %boldwhite%title%default%note'
+        order: desc
     templates:
       default:
         date_format: '%Y-%m-%d %H:%M'
@@ -79,7 +91,7 @@ You can rename the section that holds your current tasks. By default, this is "C
 
 The setting `editor_app` only applies to Mac OS X users. It's the default application that the command `doing open` will open your WWID file in. If this is blank, it will be opened by whatever the system default is, or you can use `-a app_name` or `-b bundle_id` to override.
 
-In the case of the `doing now -e` command, your $EDITOR environment variable will be used to complete the entry text and notes. Set it in your .bash_profile or whatever is appropriate for your system:
+In the case of the `doing now -e` command, your $EDITOR environment variable will be used to complete the entry text and notes. Set it in your `~/.bash_profile` or whatever is appropriate for your system:
 
     export EDITOR="mate -w"
 
@@ -184,7 +196,10 @@ You can create your own "views" in the `~/.doingrc` file and view them with `doi
         count: 5
         wrap_width: 0
         date_format: '%F %_I:%M%P'
-        template: '%date | %title%note' 
+        template: '%date | %title%note'
+        order: asc
+        tags: done finished cancelled
+        tags_bool: ANY
 
 You can add additional custom views, just nest them under the "views" key (indented two spaces from the edge). Multiple views would look like this:
 
@@ -202,9 +217,13 @@ You can add additional custom views, just nest them under the "views" key (inden
         date_format: '%F %_I:%M%P'
         template: '%date | %title%note' 
 
-The "section" key is the default section to pull entries from. Count and section can be overridden at runtime with the `-c` and `-s` flags.
+The "section" key is the default section to pull entries from. Count and section can be overridden at runtime with the `-c` and `-s` flags. Setting `section` to All will combine all sections in the output.
+
+You can add new sections with `doing add_section section_name`. You can also create them on the fly by using the `-s section_name` flag when running `doing now`. For example, `doing now -s Misc just a random side note` would create the "just a random side note" entry in a new section called "Misc," if Misc didn't already exist.
 
-You can add new sections with `done add_section section_name`. You can also create them on the fly by using the `-s section_name` flag when running `doing now`. For example, `doing now -s Misc just a random side note` would create the "just a random side note" entry in a new section called "Misc."
+The `tags` and `tags_bool` keys allow you to specify tags that the view is filtered by. You can list multiple tags separated by spaces, and then use `tags_bool` to specify "ALL," "ANY," or "NONE" to determine how it handles the multiple tags.
+
+The `order` key defines the sort order of the output. This is applied _after_ the tasks are retrieved and cut off at the maximum number specified in `count`.
 
 Regarding colors, you can use them to create very nice displays if you're outputting to a color terminal. Example:
 
@@ -231,13 +250,35 @@ Outputs:
 
 ### Commands:
 
-    help     - Shows a list of commands or help for one command (`doing help now`)
+    help           - Shows a list of commands and global options
+    help [command] - Shows help for any command (`doing help now`)
 
 #### Adding entries:
 
     now      - Add an entry
     later    - Add an item to the Later section
-    done     - Add an entry tagged with @done(YYYY-mm-dd hh:mm)
+    done     - Add a completed item with @done(date). No argument finishes last entry.
+
+The `doing now` command can accept `-s section_name` to send the new entry straight to a non-default section. 
+
+`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.
+
+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.
+
+#### Modifying entries:
+
+    finish      - Mark last X entries as @done
+    tag         - Tag 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.
+
+`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.
 
 #### Displaying entries:
 
@@ -246,18 +287,41 @@ Outputs:
     today    - List entries from today
     last     - Show the last entry
 
+`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.
+
+You can filter the `show` command by tags. Simply list them after the section name (or "all"). The boolean defaults to "ANY," meaning any entry that contains any of the listed tags will be shown. You can use `-b ALL` or `-b NONE` to change the filtering behavior: `doing show all done cancelled -b NONE` will show all tasks from all sections that do not have either "@done" or "@cancelled" tags.
+
+Use `-c X` to limit the displayed results. Combine it with `-a newest` or `-a oldest` to choose which chronological end it trims from. You can also set the sort order of the output with `-s asc` or `-s desc`.
+
+If you have a use for it, you can use `--csv` on the show or view commands to output the results as a comma-separated CSV to STDOUT. Redirect to a file to save it: `doing show all done --csv > ~/Desktop/done.csv`.
+
+#### Views
+
+    view     - Display a user-created view
+    views    - List available custom views
+
+Display any of the custom views you make in `~/.doingrc` with the `view` command. Use `doing views` to get a list of available views. Any time a section or view is specified on the command line, fuzzy matching will be used to find the closest match. Thus, `lat` will match `Later`, etc..
+
 #### Sections
 
-    sections - List sections
-    choose   - Select a section to display from a menu
+    sections    - List sections
+    choose      - Select a section to display from a menu
+    add_section - Add a new section to the "doing" file
 
 #### Utilities
 
     archive  - Move all but the most recent 5 entries to the Archive section
+    open     - Open the "doing" file in an editor (OS X)
     config   - Edit the default configuration
 
 ---
 
+## Extras
+
+### Bash completion
+
+Add basic command line completion for Bash with [this gist](https://gist.github.com/fcrespo82/9609318).
+
 ## Troubleshooting
 
 ### Errors after "Successfully installed..."

data/bin/doing

@@ -31,24 +31,37 @@ command :now do |c|
   c.desc 'Section'
   c.arg_name 'section_name'
   c.default_value wwid.current_section
-  c.flag [:s,:section]
+  c.flag [:s,:section], :default_value => wwid.current_section
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
   c.switch [:e,:editor]
 
+  c.desc 'Backdate to "date_string" (natural language)'
+  c.flag [:back]
+
   # 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
   # c.flag [:a,:app]
 
   c.action do |global_options,options,args|
+    if options[:back]
+      date = wwid.chronify(options[:back])
+      raise "Unable to parse date string" if date.nil?
+    else
+      date = Time.now
+    end
+
+    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+
     if options[:e] || (args.length == 0 && STDIN.stat.size == 0)
+      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)
-        wwid.add_item(title.cap_first, options[:s].cap_first, {:note => note})
+        wwid.add_item(title.cap_first, section, {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       else
         raise "No content"
@@ -56,11 +69,11 @@ command :now do |c|
     else
       if args.length > 0
         title, note = wwid.format_input(args.join(" "))
-        wwid.add_item(title.cap_first, options[:s].cap_first, {:note => note})
+        wwid.add_item(title.cap_first, section, {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       elsif STDIN.stat.size > 0
         title, note = wwid.format_input(STDIN.read)
-        wwid.add_item(title.cap_first, options[:s].cap_first, {:note => note})
+        wwid.add_item(title.cap_first, section, {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       else
         raise "You must provide content when creating a new entry"
@@ -80,14 +93,25 @@ 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.flag [:back]
+
   c.action do |global_options,options,args|
+    if options[:back]
+      date = wwid.chronify(options[:back])
+      raise "Unable to parse date string" if date.nil?
+    else
+      date = Time.now
+    end
+
     if options[:e] || (args.length == 0 && STDIN.stat.size == 0)
+      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)
-        wwid.add_item(title.cap_first, "Later", {:note => note})
+        wwid.add_item(title.cap_first, "Later", {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       else
         raise "No content"
@@ -95,11 +119,11 @@ command :later do |c|
     else
       if args.length > 0
         title, note = wwid.format_input(args.join(" "))
-        wwid.add_item(title.cap_first, "Later", {:note => note})
+        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)
-        wwid.add_item(title.cap_first, "Later", {:note => note})
+        wwid.add_item(title.cap_first, "Later", {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       else
         raise "You must provide content when creating a new entry"
@@ -108,11 +132,15 @@ command :later do |c|
   end
 end
 
-desc 'Add a completed item with @done(date)'
+desc 'Add a completed item with @done(date). No argument finishes last entry.'
 arg_name 'entry'
 command :done do |c|
   c.desc 'Immediately archive the entry'
-  c.switch [:a,:archive], :negatable => true
+  c.default_value false
+  c.switch [:a,:archive], :negatable => false, :default_value => false
+
+  c.desc 'Backdate to "date_string" (natural language)'
+  c.flag [:backdate]
 
   c.desc 'Section'
   c.default_value wwid.current_section
@@ -127,31 +155,43 @@ command :done do |c|
   # c.flag [:a,:app]
 
   c.action do |global_options,options,args|
-    if options[:e] || (args.length == 0 && STDIN.stat.size == 0)
+    if options[:back]
+      date = wwid.chronify(options[:back])
+      raise "Unable to parse date string" if date.nil?
+    else
+      date = Time.now
+    end
+
+    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+
+    if options[:e]
+      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)
         title += " @done(#{Time.now.strftime('%F %R')})"
-        section = options[:a] ? "Archive" : options[:s]
-        wwid.add_item(title.cap_first, section.cap_first, {:note => note})
+        section = "Archive" if options[:a]
+        wwid.add_item(title.cap_first, section.cap_first, {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       else
         raise "No content"
       end
+    elsif args.length == 0 && STDIN.stat.size == 0
+      wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :archive => options[:a], :back => date})
     else
       if args.length > 0
         title, note = wwid.format_input(args.join(" "))
         title += " @done(#{Time.now.strftime('%F %R')})"
-        section = options[:a] ? "Archive" : options[:s]
-        wwid.add_item(title.cap_first, section.cap_first, {:note => note})
+        section = "Archive" if options[:a]
+        wwid.add_item(title.cap_first, section.cap_first, {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       elsif STDIN.stat.size > 0
         title, note = wwid.format_input(STDIN.read)
         title += " @done(#{Time.now.strftime('%F %R')})"
-        section = options[:a] ? "Archive" : options[:s]
-        wwid.add_item(title.cap_first, section.cap_first, {:note => note})
+        section = options[:a] ? "Archive" : section
+        wwid.add_item(title.cap_first, section.cap_first, {:note => note, :back => date})
         wwid.write(wwid.doing_file)
       else
         raise "You must provide content when creating a new entry"
@@ -160,20 +200,124 @@ command :done do |c|
   end
 end
 
+desc 'Mark last X entries as @done'
+arg_name 'count'
+command :finish do |c|
+  c.desc 'Archive entries'
+  c.default_value false
+  c.switch [:a,:archive], :negatable => false, :default_value => false
+
+  c.desc 'Section'
+  c.default_value wwid.current_section
+  c.flag [:s,:section], :default_value => wwid.current_section
+
+  c.action do |global_options,options,args|
+
+    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+
+    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]})
+    else
+      raise "Invalid argument (specify number of recent items to mark @done)"
+    end
+  end
+end
+
+desc 'Tag last entry'
+arg_name 'tag1 [tag2...]'
+command :tag do |c|
+  c.desc 'Section'
+  c.default_value wwid.current_section
+  c.flag [:s,:section], :default_value => wwid.current_section
+
+  c.desc 'How many recent entries to tag'
+  c.default_value 1
+  c.flag [:c,:count], :default_value => 1
+
+  c.desc 'Include current date/time with tag'
+  c.default_value false
+  c.switch [:d,:date], :negatable => false, :default_value => false
+
+  c.desc 'Remove given tag(s)'
+  c.default_value false
+  c.switch [:r,:remove], :negatable => false, :default_value => false
+
+  c.action do |global_options,options,args|
+    if args.length == 0
+      raise "You must specify at least one tag"
+    else
+
+      section = wwid.guess_section(options[:s]) || options[:s].cap_first
+
+      count = options[:c].to_i
+      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 }
+
+      wwid.tag_last({:tags => tags, :count => count, :section => section, :date => options[:d], :remove => options[:r]})
+    end
+  end
+end
+
+
 desc 'List all entries'
-arg_name 'section'
+arg_name 'section [tags]'
 command :show do |c|
+  c.desc 'Tag boolean (AND,OR,NONE)'
+  c.default_value "OR"
+  c.flag [:b,:boolean], :default_value => "OR"
+
+  c.desc 'Max count to show'
+  c.default_value 0
+  c.flag [:c,:count], :default_value => 0
+
+  c.desc 'Age (oldest/newest)'
+  c.default_value 'newest'
+  c.flag [:a,:age], :default_value => 'newest'
+
+  c.desc 'Sort order (asc/desc)'
+  c.default_value 'asc'
+  c.flag [:s,:sort], :default_value => 'asc'
+
+  c.desc 'Output to csv'
+  c.default_value 'false'
+  c.switch [:csv], :default_value => false, :negatable => false
+
   c.action do |global_options,options,args|
+    tag_filter = false
+    tags = []
     if args.length > 0
-      if wwid.sections.include? args.join(" ").cap_first
-        section = args.join(" ").cap_first
+      if args[0] =~ /^all$/i
+        section = "All"
+      elsif args[0] =~ /^@/
+        section = "All"
+        tags.push(args[0].sub(/^@/,''))
       else
-        raise "No such section: #{args.join(" ")}"
+        section = wwid.guess_section(args[0])
+        raise "No such section: #{args[0]}" unless section
+      end
+      if args.length > 1
+        tags += args[1..-1].map{|tag| tag.sub(/^@/,'').strip}
       end
     else
       section = wwid.current_section
     end
-    puts wwid.list_section({:section => section, :count => 0})
+
+    unless tags.empty?
+      tag_filter = {
+        'tags' => tags,
+        'bool' => options[:b]
+      }
+    end
+
+    puts wwid.list_section({:section => section, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :csv => options[:csv]})
   end
 end
 
@@ -183,15 +327,18 @@ arg_name 'count'
 command :recent do |c|
   c.desc 'Section'
   c.default_value wwid.current_section
-  c.flag [:s,:section]
+  c.flag [:s,:section], :default_value => wwid.current_section
   c.action do |global_options,options,args|
+
+    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+
     unless global_options[:version]
       if args.length > 0
         count = args[0].to_i
       else
         count = 10
       end
-      puts wwid.recent(count,options[:s].cap_first)
+      puts wwid.recent(count,section.cap_first)
     end
   end
 end
@@ -241,26 +388,48 @@ end
 desc 'Display a user-created view'
 arg_name 'view_name'
 command :view do |c|
-  c.desc 'Section'
+  c.desc 'Section (override view settings)'
   c.flag [:s,:section]
 
-  c.desc 'Count to display'
+  c.desc 'Count to display (override view settings)'
   c.flag [:c,:count], :must_match => /^\d+$/, :type => Integer
 
+  c.desc 'Output to csv'
+  c.default_value 'false'
+  c.switch [:csv], :default_value => false, :negatable => false
+
   c.action do |global_options,options,args|
     if args.empty?
       title = wwid.choose_view
     else
-      title = args[0]
+      title = wwid.guess_view(args[0])
     end
+
+    if options[:s]
+      section = wwid.guess_section(options[:s]) || options[:s].cap_first
+    end
+
     view = wwid.get_view(title)
     if view
       template = view.has_key?('template') ? view['template'] : nil
       format = view.has_key?('date_format') ? view['date_format'] : nil
+      tags_color = view.has_key?('tags_color') ? view['tags_color'] : nil
+      tag_filter = false
+      if view.has_key?('tags')
+        unless view['tags'].nil? || view['tags'].empty?
+          tag_filter = {'tags' => [], 'bool' => "OR"}
+          if view['tags'].class == Array
+            tag_filter['tags'] = view['tags'].map{|tag| tag.strip }
+          else
+            tag_filter['tags'] = view['tags'].split(" ").map{|tag| tag.strip }
+          end
+          tag_filter['bool'] = view.has_key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].upcase : "OR"
+        end
+      end
       count = options[:c] ? options[:c] : view.has_key?('count') ? view['count'] : 10
-      section = options[:s] ? options[:s].cap_first : view.has_key?('section') ? view['section'] : wwid.current_section
+      section = options[:s] ? section : view.has_key?('section') ? view['section'] : wwid.current_section
       order = view.has_key?('order') ? view['order'] : "asc"
-      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order })
+      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :csv => options[:csv], :tags_color => tags_color })
     else
       raise "View #{title} not found in config"
     end
@@ -317,6 +486,7 @@ command :open do |c|
       elsif options[:b]
         system %Q{open -b "#{options[:b]}" "#{File.expand_path(wwid.doing_file)}"}
       elsif options[:e]
+        raise "No EDITOR variable defined in environment" if ENV['EDITOR'].nil?
         system %Q{$EDITOR "#{File.expand_path(wwid.doing_file)}"}
       else
         if wwid.config.has_key?('editor_app') && !wwid.config['editor_app'].nil?
@@ -335,10 +505,26 @@ desc 'Edit the configuration file'
 command :config do |c|
   c.desc 'Editor to use'
   c.default_value ENV['EDITOR']
-  c.flag [:e,:editor]
+  c.flag [:e,:editor], :default_value => nil
+
+  c.desc 'Application to use (OS X only)'
+  c.flag [:a]
+
+  c.desc 'Application bundle id to use (OS X only)'
+  c.flag [:b]
 
   c.action do |global_options,options,args|
-    system %Q{#{options[:e]} "#{File.expand_path(DOING_CONFIG)}"}
+    if 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)}"}
+      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
   end
 end
 
@@ -347,6 +533,7 @@ pre do |global,command,options,args|
   if global[:version]
     puts "doing v" + Doing::VERSION
   end
+
   # Return true to proceed; false to abort and not call the
   # chosen command
   # Use skips_pre before a command to skip this block

data/lib/doing.rb

@@ -3,7 +3,9 @@ require 'time'
 require 'date'
 require 'yaml'
 require 'pp'
+require 'csv'
 require 'tempfile'
+require 'chronic'
 require 'doing/wwid.rb'
 
 DOING_CONFIG = "~/.doingrc"

data/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -41,13 +41,15 @@ class WWID
       'wrap_width' => 88
     }
     @config['views'] ||= {
-      'sample' => {
+      'done' => {
         'date_format' => '%_I:%M%P',
         'template' => '%date | %title%note',
         'wrap_width' => 0,
-        'section' => 'section_name',
-        'count' => 5,
-        'order' => "desc"
+        'section' => 'All',
+        'count' => 0,
+        'order' => 'desc',
+        'tags' => 'done complete cancelled',
+        'tags_bool' => 'OR'
       },
       'color' => {
           'date_format' => '%F %_I:%M%P',
@@ -89,7 +91,7 @@ class WWID
 
     lines.each {|line|
       next if line =~ /^\s*$/
-      if line =~ /^(\w[\w ]+):\s*(@\S+\s*)*$/
+      if line =~ /^(\S[\S ]+):\s*(@\S+\s*)*$/
         section = $1
         @content[section] = {}
         @content[section]['original'] = line
@@ -184,6 +186,25 @@ class WWID
     [title, note]
   end
 
+  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
+      end
+    end
+
+    Chronic.parse(input, {:context => :past, :ambiguous_time_range => 8})
+  end
+
   def sections
     @content.keys
   end
@@ -192,19 +213,109 @@ class WWID
     @content[title.cap_first] = {'original' => "#{title}:", 'items' => []}
   end
 
+  def guess_section(frag)
+    sections.each {|section| return section if frag.downcase == section.downcase}
+    section = false
+    re = frag.split('').join(".*?")
+    sections.each {|sect|
+      if sect =~ /#{re}/i
+        $stderr.puts "Assuming you meant #{sect}"
+        section = sect
+        break
+      end
+    }
+    unless section
+      alt = guess_view(frag)
+      if alt
+        raise "Did you mean `doing view #{alt}`?"
+      else
+        raise "Invalid section: #{frag}"
+      end
+    end
+    section.cap_first
+  end
+
+  def guess_view(frag)
+    views.each {|view| return view if frag.downcase == view.downcase}
+    view = false
+    re = frag.split('').join(".*?")
+    views.each {|v|
+      if v =~ /#{re}/i
+        $stderr.puts "Assuming you meant #{v}"
+        view = v
+        break
+      end
+    }
+    unless view
+      alt = guess_section(frag)
+      if alt
+        raise "Did you mean `doing show #{alt}`?"
+      else
+        raise "Invalid view: #{frag}"
+      end
+    end
+    view
+  end
+
   def add_item(title,section=nil,opt={})
     section ||= @current_section
     add_section(section) unless @content.has_key?(section)
     opt[:date] ||= Time.now
     opt[:note] ||= []
+    opt[:back] ||= Time.now
 
-    entry = {'title' => title.strip.cap_first, 'date' => opt[:date]}
+    entry = {'title' => title.strip.cap_first, 'date' => opt[:back]}
     unless opt[:note] =~ /^\s*$/s
       entry['note'] = opt[:note]
     end
     @content[section]['items'].push(entry)
   end
 
+  def tag_last(opt={})
+    opt[:section] ||= @current_section
+    opt[:count] ||= 1
+    opt[:archive] ||= false
+    opt[:tags] ||= ["done"]
+    opt[:date] ||= false
+    opt[:remove] ||= false
+
+    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
+
+      @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}/,'')
+          else
+            unless title =~ /@#{tag}/
+              if tag == "done" || opt[:date]
+                title += " @#{tag}(#{Time.now.strftime('%F %R')})"
+              else
+                title += " @#{tag}"
+              end
+            end
+          end
+        }
+        @content[opt[:section]]['items'][i]['title'] = title
+      }
+
+      if opt[:archive] && opt[:section] != "Archive"
+        archived = @content[opt[:section]]['items'][0..opt[:count]-1]
+        @content[opt[:section]]['items'] = @content[opt[:section]]['items'][opt[:count]..-1]
+        @content['Archive']['items'] = archived + @content['Archive']['items']
+      end
+
+      write(@doing_file)
+    else
+      raise "Section not found"
+    end
+  end
+
   def write(file=nil)
     if @other_content_top.empty?
       output = ""
@@ -264,17 +375,23 @@ class WWID
     opt[:section] ||= nil
     opt[:format] ||= @default_date_format
     opt[:template] ||= @default_template
+    opt[:age] ||= "newest"
     opt[:order] ||= "desc"
     opt[:today] ||= false
+    opt[:tag_filter] ||= false
+    opt[:tags_color] ||= false
 
     if opt[:section].nil?
       opt[:section] = @content[choose_section]
     elsif opt[:section].class == String
-      if @content.has_key? opt[:section]
-        opt[:section] = @content[opt[:section]]
+      if opt[:section] =~ /^all$/i
+        combined = {'items' => []}
+        @content.each {|k,v|
+          combined['items'] += v['items']
+        }
+        opt[:section] = combined
       else
-        $stderr.puts "Section '#{opt[:section]}' not found"
-        return
+        opt[:section] = @content[guess_section(opt[:section])]
       end
     end
 
@@ -285,78 +402,127 @@ class WWID
 
     items = opt[:section]['items'].sort_by{|item| item['date'] }
 
+    if opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
+      items.delete_if {|item|
+        if opt[:tag_filter]['bool'] =~ /(AND|ALL)/
+          score = 0
+          opt[:tag_filter]['tags'].each {|tag|
+            score += 1 if item['title'] =~ /@#{tag}/
+          }
+          score < opt[:tag_filter]['tags'].length
+        elsif opt[:tag_filter]['bool'] =~ /NONE/
+          del = false
+          opt[:tag_filter]['tags'].each {|tag|
+            del = true if item['title'] =~ /@#{tag}/
+          }
+          del
+        elsif opt[:tag_filter]['bool'] =~ /(OR|ANY)/
+          del = true
+          opt[:tag_filter]['tags'].each {|tag|
+            del = false if item['title'] =~ /@#{tag}/
+          }
+          del
+        end
+      }
+    end
+
     if opt[:today]
       items.delete_if {|item|
         item['date'] < Date.today.to_time
       }.reverse!
     else
-      items = items.reverse[0..count]
+      if opt[:age] =~ /oldest/i
+        items = items[0..count]
+      else
+        items = items.reverse[0..count]
+      end
     end
 
-    items.reverse! if opt[:order] =~ /^asc/i
+    if opt[:order] =~ /^a/i
+      items.reverse!
+    end
 
     out = ""
 
-    items.each {|item|
-      if (item.has_key?('note') && !item['note'].empty?) && @config[:include_notes]
-        note_lines = item['note'].delete_if{|line| line =~ /^\s*$/ }.map{|line| "\t\t" + line.sub(/^\t\t/,'') }
-        if opt[:wrap_width] && opt[:wrap_width] > 0
-          width = opt[:wrap_width]
-          note_lines.map! {|line|
-            line.strip.gsub(/(.{1,#{width}})(\s+|\Z)/, "\t\\1\n")
-          }
-        end
-        note = "\n#{note_lines.join("\n").chomp}"
-      else
+    if opt[:csv]
+      output = [['date','title','note'].to_csv]
+      items.each {|i|
         note = ""
-      end
-      output = opt[:template].dup
-      output.gsub!(/%[a-z]+/) do |m|
-        if colors.has_key?(m.sub(/^%/,''))
-          colors[m.sub(/^%/,'')]
-        else
-          m
-        end
-      end
-      output.sub!(/%date/,item['date'].strftime(opt[:format]))
-      output.sub!(/%shortdate/) {
-        if item['date'] > Date.today.to_time
-          item['date'].strftime('%_I:%M%P')
-        elsif item['date'] > (Date.today - 7).to_time
-          item['date'].strftime('%a %-I:%M%P')
-        elsif item['date'].year == Date.today.year
-          item['date'].strftime('%b %d, %-I:%M%P')
-        else
-          item['date'].strftime('%b %d %Y, %-I:%M%P')
+        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([i['date'],i['title'],note].to_csv)
       }
-      output.sub!(/%title/) {|m|
-        if opt[:wrap_width] && opt[:wrap_width] > 0
-          item['title'].gsub(/(.{1,#{opt[:wrap_width]}})(\s+|\Z)/, "\\1\n\t ").strip
+      out = output.join()
+    else
+
+      items.each {|item|
+        if (item.has_key?('note') && !item['note'].empty?) && @config[:include_notes]
+          note_lines = item['note'].delete_if{|line| line =~ /^\s*$/ }.map{|line| "\t\t" + line.sub(/^\t\t/,'') }
+          if opt[:wrap_width] && opt[:wrap_width] > 0
+            width = opt[:wrap_width]
+            note_lines.map! {|line|
+              line.strip.gsub(/(.{1,#{width}})(\s+|\Z)/, "\t\\1\n")
+            }
+          end
+          note = "\n#{note_lines.join("\n").chomp}"
         else
-          item['title'].strip
+          note = ""
         end
-      }
-      output.sub!(/%note/,note)
-      output.sub!(/%odnote/,note.gsub(/\t\t/,"\t"))
-      output.gsub!(/%hr(_under)?/) do |m|
-        o = ""
-        `tput cols`.to_i.times do
-          o += $1.nil? ? "-" : "_"
+        output = opt[:template].dup
+
+        output.gsub!(/%[a-z]+/) do |m|
+          if colors.has_key?(m.sub(/^%/,''))
+            colors[m.sub(/^%/,'')]
+          else
+            m
+          end
         end
-        o
-      end
 
+        output.sub!(/%date/,item['date'].strftime(opt[:format]))
+        output.sub!(/%shortdate/) {
+          if item['date'] > Date.today.to_time
+            item['date'].strftime('%_I:%M%P')
+          elsif item['date'] > (Date.today - 7).to_time
+            item['date'].strftime('%a %-I:%M%P')
+          elsif item['date'].year == Date.today.year
+            item['date'].strftime('%b %d, %-I:%M%P')
+          else
+            item['date'].strftime('%b %d %Y, %-I:%M%P')
+          end
+        }
+        output.sub!(/%title/) {|m|
+          if opt[:wrap_width] && opt[:wrap_width] > 0
+            item['title'].gsub(/(.{1,#{opt[:wrap_width]}})(\s+|\Z)/, "\\1\n\t ").strip
+          else
+            item['title'].strip
+          end
+        }
+        if opt[:tags_color]
+          output.gsub!(/\s(@\S+(?:\(.*?\))?)/," #{colors[opt[:tags_color]]}\\1")
+        end
+        output.sub!(/%note/,note)
+        output.sub!(/%odnote/,note.gsub(/\t\t/,"\t"))
+        output.gsub!(/%hr(_under)?/) do |m|
+          o = ""
+          `tput cols`.to_i.times do
+            o += $1.nil? ? "-" : "_"
+          end
+          o
+        end
 
-      out += output + "\n"
-    }
+
+        out += output + "\n"
+      }
+    end
 
     return out
   end
 
   def archive(section=nil,count=10)
     section = choose_section if section.nil? || section =~ /choose/i
-    section = section.cap_first
+    section = guess_section(section)
     if sections.include?(section)
       items = @content[section]['items']
       return if items.length < count
@@ -422,6 +588,7 @@ class WWID
   def recent(count=10,section=nil)
     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"})
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.2.pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,6 +72,26 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 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.
@@ -110,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2