doing 0.2.4 → 0.2.5pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9113d5736076e7608e42c328d3bc6a9f6edb517e
-  data.tar.gz: 793034d75510f42fa2c9f2e3f75d26156fef4d51
+  metadata.gz: 8806f026f8106baa4c033a2d30675e0f3c30afea
+  data.tar.gz: 77139cb8ae62cc18311d5fcd7c27a725806375c9
 SHA512:
-  metadata.gz: bd187715ead8168b92c2a70ebe53d68d95271a241524a1011c82c9358cae43ed0766dea0b1fe73c469d112435921342e2fb9811af2835f039d9ab1445519196f
-  data.tar.gz: 11c41e6db6c47490ff82b922a262df3292808e6b5736babf3d12a28de96075f91322da61f882c73178a7b9240c82c8056f7f99180bee8c309d1dc852f7427ddc
+  metadata.gz: 6fb8b55cc46ceefe4c139af635417b2c318e90705ef7da3fb3aa2e2050bd7e7de89d4d9633e538ec0ca26e6d3582a81e3fa394ac3bf032684d463a36573f5cca
+  data.tar.gz: 659c26db54235f3ca7d13cc34bdc2f4cdd3e028cc6514c2c5f01c0c9216c7c0fcc693de629f3b965dd5b533e91b8390e09fdd29aebd010d5109ba947394ef16a

data/README.md

@@ -4,6 +4,8 @@
 
 _If you're one of the rare people like me who find this useful, feel free to contribute to my [GitTip fund](https://www.gittip.com/ttscoff/) or just [buy me some coffee](http://brettterpstra.com/donate)._
 
+[Changelog](#changelog)
+
 ## What and why
 
 `doing` is a basic CLI for adding and listing "what was I doing" reminders in a [TaskPaper-formatted](http://www.hogbaysoftware.com/products/taskpaper) text file. It allows for multiple sections/categories and flexible output formatting.
@@ -313,17 +315,63 @@ Display any of the custom views you make in `~/.doingrc` with the `view` command
 
 #### Utilities
 
-    archive  - Move all but the most recent 5 entries to the Archive section
+    archive  - Move entries between sections
     open     - Open the "doing" file in an editor (OS X)
     config   - Edit the default configuration
 
+#### Archiving
+
+    COMMAND OPTIONS
+        -k, --keep=arg - Count to keep (ignored if archiving by tag) (default: 5)
+        -t, --to=arg   - Move entries to (default: Archive)
+        -b, --bool=arg - Tag boolean (default: AND)
+
+The `archive` command will move entries from one section (default: Currently) to another section (default: Archive). 
+
+`doing archive` on its own will move all but the most recent 5 entries from currently into the archive.
+
+`doing archive other_section` will archive from "other_section" to Archive.
+
+`doing archive other_section -t alternate` will move from "other_section" to "alternate." You can use the `-k` flag on any of these to change the number of items to leave behind. To move everything, use `-k 0`.
+
+You can also use tags to archive. You define the section first, and anything following it is treated as tags. If your first argument starts with "@", it will assume all sections and assume any following arguments are tags.
+
+By default tag archiving uses an "AND" boolean, meaning all the tags listed must exist on the entry for it to be moved. You can change this behavior with `-b OR` or `-b NONE` ("ALL" and "ANY" also work). 
+
+Example: Archive all Currently items for @client that are marked @done
+
+    doing archive @client @done
+
 ---
 
 ## Extras
 
 ### Bash completion
 
-Add basic command line completion for Bash with [this gist](https://gist.github.com/fcrespo82/9609318).
+See the file `doing.completion.bash` in the git repository for full bash completion. Thanks to [fcrespo82](https://github.com/fcrespo82) for getting it [started](https://gist.github.com/fcrespo82/9609318).
+
+### Launchbar
+
+The previous incarnation of `doing` had a [LaunchBar](http://obdev.at/launchbar/) action that I used frequently. The Day One popup has mostly replaced that for me, but only because I have a system that connects it to my WWID file. However, I've still found a place for adding WWID entries without including them in my journal, and LaunchBar is the perfect way to do that for me.
+
+All you need is an AppleScript saved at "~/Library/Application Support/LaunchBar/Actions/Doing.scpt". It should look like this:
+
+
+    on handle_string(message)
+        -- get the input from LaunchBar
+        if message is "?" then
+            -- if the input is just "?" display the last three entries
+            set _doing to do shell script "/usr/bin/doing recent 3"
+            tell application "LaunchBar" to display in large type _doing
+        else
+            -- otherwise, create a new entry using the input
+            do shell script "/usr/bin/doing now " & quoted form of message
+        end if
+        
+    end handle_string
+
+
+Evan Lovely has [converted this to an Alfred workflow as well](http://www.evanlovely.com/blog/technology/alfred-for-terpstras-doing/).
 
 ## Troubleshooting
 
@@ -358,3 +406,20 @@ I'm not making any money on `doing`, and I don't plan to spend a lot of time fix
 That said, you can get support from other users (and occasionally me) on GitHub. If you run into a replicatable issue in your environment, please [post an issue](https://github.com/ttscoff/doing/issues) and include your platform, OS version, and the result of `ruby -v`, along with a copy/paste of the error message.
 
 Please try not to email me directly about GitHub projects.
+
+### 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`)

data/bin/doing

@@ -47,6 +47,7 @@ command :now 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?
     else
       date = Time.now
@@ -135,6 +136,10 @@ end
 desc 'Add a completed item with @done(date). No argument finishes last entry.'
 arg_name 'entry'
 command :done do |c|
+  c.desc 'Include date'
+  c.default_value true
+  c.switch [:d,:date], :default_value => true
+
   c.desc 'Immediately archive the entry'
   c.default_value false
   c.switch [:a,:archive], :negatable => false, :default_value => false
@@ -163,6 +168,7 @@ command :done do |c|
     end
 
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
+    donedate = options[:d] ? "(#{Time.now.strftime('%F %R')})" : ""
 
     if options[:e]
       raise "No EDITOR variable defined in environment" if ENV['EDITOR'].nil?
@@ -171,7 +177,7 @@ command :done do |c|
       input = wwid.fork_editor(input)
       if input
         title, note = wwid.format_input(input)
-        title += " @done(#{Time.now.strftime('%F %R')})"
+        title += " @done#{donedate}"
         section = "Archive" if options[:a]
         wwid.add_item(title.cap_first, section.cap_first, {:note => note, :back => date})
         wwid.write(wwid.doing_file)
@@ -179,17 +185,17 @@ command :done do |c|
         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})
+      wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :archive => options[:a], :back => date, :date => options[:d]})
     else
       if args.length > 0
         title, note = wwid.format_input(args.join(" "))
-        title += " @done(#{Time.now.strftime('%F %R')})"
+        title += " @done#{donedate}"
         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')})"
+        title += " @done#{donedate}"
         section = options[:a] ? "Archive" : section
         wwid.add_item(title.cap_first, section.cap_first, {:note => note, :back => date})
         wwid.write(wwid.doing_file)
@@ -203,6 +209,13 @@ end
 desc 'Mark last X entries as @done'
 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 'Archive entries'
   c.default_value false
   c.switch [:a,:archive], :negatable => false, :default_value => false
@@ -215,11 +228,19 @@ command :finish do |c|
 
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
+    if options[:back]
+      date = wwid.chronify(options[:back])
+
+      raise "Unable to parse date string" if date.nil?
+    else
+      date = Time.now
+    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]})
+      wwid.tag_last({:tags => ["done"], :count => count, :section => section, :archive => options[:a], :date => options[:d], :back => date })
     else
       raise "Invalid argument (specify number of recent items to mark @done)"
     end
@@ -266,6 +287,24 @@ command :tag do |c|
   end
 end
 
+desc 'Mark last entry as highlighted'
+command :mark do |c|
+  c.desc 'Section'
+  c.default_value wwid.current_section
+  c.flag [:s,:section], :default_value => wwid.current_section
+
+  c.desc 'Remove mark'
+  c.default_value false
+  c.switch [:r,:remove], :negatable => false, :default_value => false
+
+
+  c.action do |global_options,options,args|
+    mark = wwid.config['marker_tag'] || "flagged"
+    wwid.tag_last({:tags => [mark], :section => options[:s], :remove => options[:r]})
+  end
+end
+
+
 
 desc 'List all entries'
 arg_name 'section [tags]'
@@ -286,13 +325,12 @@ command :show do |c|
   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.desc 'Output to format'
+  c.flag [:o,:output]
 
   c.desc 'Show time intervals on @done tasks'
   c.default_value false
-  c.switch [:t,:times], :default_value => false
+  c.switch [:t,:times], :default_value => true
 
   c.desc 'Show intervals with totals at the end of output'
   c.default_value false
@@ -327,7 +365,7 @@ command :show do |c|
 
     options[:t] = true if options[:totals]
 
-    puts wwid.list_section({:section => section, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :csv => options[:csv], :times => options[:t]})
+    puts wwid.list_section({:section => section, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :output => options[:output], :times => options[:t], :highlight => true})
 
     puts wwid.tag_times if options[:totals]
 
@@ -341,6 +379,15 @@ command :recent do |c|
   c.desc 'Section'
   c.default_value wwid.current_section
   c.flag [:s,:section], :default_value => wwid.current_section
+
+  c.desc 'Show time intervals on @done tasks'
+  c.default_value false
+  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]) || options[:s].cap_first
@@ -351,7 +398,11 @@ command :recent do |c|
       else
         count = 10
       end
-      puts wwid.recent(count,section.cap_first)
+      options[:t] = true if options[:totals]
+
+      puts wwid.recent(count,section.cap_first,{ :times => options[:t] })
+
+      puts wwid.tag_times if options[:totals]
     end
   end
 end
@@ -360,17 +411,20 @@ desc 'List entries from today'
 command :today do |c|
   c.desc 'Show time intervals on @done tasks'
   c.default_value false
-  c.switch [:t,:times], :default_value => false
+  c.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.flag [:o,:output]
+
   c.action do |global_options,options,args|
 
     options[:t] = true if options[:totals]
 
-    puts wwid.today(options[:t]).strip
+    puts wwid.today(options[:t],options[:output]).chomp
 
     puts wwid.tag_times if options[:totals]
   end
@@ -386,7 +440,7 @@ end
 desc 'List sections'
 command :sections do |c|
   c.action do |global_options,options,args|
-    puts wwid.sections.join(", ")
+    puts wwid.sections.join("\t")
   end
 end
 
@@ -420,13 +474,12 @@ 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 csv'
-  c.default_value 'false'
-  c.switch [:csv], :default_value => false, :negatable => false
+  c.desc 'Output to format'
+  c.flag [:o,:output]
 
   c.desc 'Show time intervals on @done tasks'
   c.default_value false
-  c.switch [:t,:times], :default_value => false
+  c.switch [:t,:times], :default_value => true
 
   c.desc 'Show intervals with totals at the end of output'
   c.default_value false
@@ -455,7 +508,7 @@ command :view do |c|
           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 }
+            tag_filter['tags'] = view['tags'].gsub(/[, ]+/," ").split(" ").map{|tag| tag.strip }
           end
           tag_filter['bool'] = view.has_key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].upcase : "OR"
         end
@@ -464,8 +517,8 @@ command :view do |c|
       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]
-
-      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :csv => options[:csv], :tags_color => tags_color, :times => options[:t] })
+      options[:output].downcase! if options[:output]
+      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:output], :tags_color => tags_color, :times => options[:t], :highlight => true })
 
       puts wwid.tag_times if options[:totals]
     else
@@ -477,25 +530,40 @@ end
 desc 'List available custom views'
 command :views do |c|
   c.action do |global_options,options,args|
-    puts wwid.views.join(", ")
+    puts wwid.views.join("\t")
   end
 end
 
-desc 'Move all but the most recent 5 entries in a section to Archive'
+desc 'Move entries in between sections'
 arg_name 'section'
 default_value wwid.current_section
 command :archive do |c|
-  c.desc 'Count to keep'
+  c.desc 'Count to keep (ignored if archiving by tag)'
   c.default_value 5
   c.flag [:k,:keep], :default_value => 5, :must_match => /^\d+$/, :type => Integer
 
+  c.desc 'Move entries to'
+  c.default_value "Archive"
+  c.flag [:t,:to], :default_value => "Archive"
+
+  c.desc 'Tag boolean'
+  c.default_value "AND"
+  c.flag [:b,:bool], :default_value => "AND"
+
   c.action do |global_options,options,args|
     if args.length > 0
-      section = args.join(" ").cap_first
+      if args[0] =~ /^@\S+/
+        section = "all"
+        tags = args.map {|t| t.sub(/^@/,'').strip }
+      else
+        section = args[0].cap_first
+        tags = args.length > 1 ? args[1..-1].map {|t| t.sub(/^@/,'').strip } : nil
+      end
     else
       section = wwid.current_section
+      tags = nil
     end
-    wwid.archive(section,options[:k])
+    wwid.archive(section,options[:k],options[:t],tags,options[:b])
   end
 end
 

data/lib/doing.rb

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

data/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -5,6 +5,7 @@ class String
       m.upcase
     end
   end
+
 end
 
 class WWID
@@ -60,6 +61,8 @@ class WWID
           'order' => "asc"
       }
     }
+    @config['marker_tag'] ||= 'flagged'
+    @config['marker_color'] ||= 'red'
 
     @doing_file = File.expand_path(config['doing_file'])
     @current_section = config['current_section']
@@ -213,8 +216,9 @@ class WWID
     @content[title.cap_first] = {'original' => "#{title}:", 'items' => []}
   end
 
-  def guess_section(frag)
-    sections.each {|section| return section if frag.downcase == section.downcase}
+  def guess_section(frag,guessed=false)
+    return "All" if frag =~ /all/i
+    sections.each {|section| return section.cap_first if frag.downcase == section.downcase }
     section = false
     re = frag.split('').join(".*?")
     sections.each {|sect|
@@ -224,18 +228,25 @@ class WWID
         break
       end
     }
-    unless section
-      alt = guess_view(frag)
+    unless section || guessed
+      alt = guess_view(frag,true)
       if alt
         raise "Did you mean `doing view #{alt}`?"
       else
-        raise "Invalid section: #{frag}"
+        print "Create a new section called #{frag.cap_first} (y/N)?"
+        input = STDIN.gets
+        if input =~ /^y/i
+          add_section(frag.cap_first)
+          write(doing_file)
+          return frag.cap_first
+        end
+        raise "Unknown section: #{frag}"
       end
     end
-    section.cap_first
+    section ? section.cap_first : section
   end
 
-  def guess_view(frag)
+  def guess_view(frag,guessed=false)
     views.each {|view| return view if frag.downcase == view.downcase}
     view = false
     re = frag.split('').join(".*?")
@@ -246,12 +257,12 @@ class WWID
         break
       end
     }
-    unless view
-      alt = guess_section(frag)
+    unless view || guessed
+      alt = guess_section(frag,true)
       if alt
         raise "Did you mean `doing show #{alt}`?"
       else
-        raise "Invalid view: #{frag}"
+        raise "Unknown view: #{frag}"
       end
     end
     view
@@ -278,6 +289,7 @@ class WWID
     opt[:tags] ||= ["done"]
     opt[:date] ||= false
     opt[:remove] ||= false
+    opt[:back] ||= Time.now
 
     opt[:section] = guess_section(opt[:section])
 
@@ -290,11 +302,11 @@ class WWID
         title = item['title']
         opt[:tags].each {|tag|
           if opt[:remove]
-            title.gsub!(/ @#{tag}/,'')
+            title.gsub!(/(^| )@#{tag}/,'')
           else
             unless title =~ /@#{tag}/
-              if tag == "done" || opt[:date]
-                title += " @#{tag}(#{Time.now.strftime('%F %R')})"
+              if (tag == "done" && opt[:date]) || opt[:date]
+                title += " @#{tag}(#{opt[:back].strftime('%F %R')})"
               else
                 title += " @#{tag}"
               end
@@ -305,9 +317,9 @@ class WWID
       }
 
       if opt[:archive] && opt[:section] != "Archive"
-        archived = @content[opt[:section]]['items'][0..opt[:count]-1]
+        archived = @content[opt[:section]]['items'][0..opt[:count]-1].concat(@content['Archive']['items'])
         @content[opt[:section]]['items'] = @content[opt[:section]]['items'][opt[:count]..-1]
-        @content['Archive']['items'] = archived + @content['Archive']['items']
+        @content['Archive']['items'] = archived
       end
 
       write(@doing_file)
@@ -324,7 +336,7 @@ class WWID
     end
     @content.each {|title, section|
       output += section['original'] + "\n"
-      output += list_section({:section => title, :template => "\t- %date | %title%note"})
+      output += list_section({:section => title, :template => "\t- %date | %title%note", :highlight => false})
     }
     output += @other_content_bottom.join("\n")
     if file.nil?
@@ -381,18 +393,22 @@ class WWID
     opt[:tag_filter] ||= false
     opt[:tags_color] ||= false
     opt[:times] ||= false
-
+    # opt[:highlight] ||= true
+    section = ""
     if opt[:section].nil?
-      opt[:section] = @content[choose_section]
+      section = choose_section
+      opt[:section] = @content[section]
     elsif opt[:section].class == String
       if opt[:section] =~ /^all$/i
         combined = {'items' => []}
         @content.each {|k,v|
           combined['items'] += v['items']
         }
+        section = opt[:tag_filter] ? opt[:tag_filter]['tags'].map {|tag| "@#{tag}"}.join(" + ") : "doing"
         opt[:section] = combined
       else
-        opt[:section] = @content[guess_section(opt[:section])]
+        section = guess_section(opt[:section])
+        opt[:section] = @content[section]
       end
     end
 
@@ -431,6 +447,7 @@ class WWID
       items.delete_if {|item|
         item['date'] < Date.today.to_time
       }.reverse!
+      section = Time.now.strftime('%A, %B %d')
     else
       if opt[:age] =~ /oldest/i
         items = items[0..count]
@@ -445,20 +462,71 @@ class WWID
 
     out = ""
 
-    if opt[:csv]
-      output = [['date','title','note'].to_csv]
+    if opt[:output]
+      raise "Unknown output format" unless opt[:output] =~ /(html|csv)/
+    end
+
+    if opt[:output] == "csv"
+      output = [CSV.generate_line(['date','title','note'])]
       items.each {|i|
         note = ""
         if i['note']
           arr = i['note'].map{|line| line.strip}.delete_if{|e| e =~ /^\s*$/}
           note = arr.join("\n") unless arr.nil?
         end
-        output.push([i['date'],i['title'],note].to_csv)
+        output.push(CSV.generate_line([i['date'],i['title'],note]))
       }
-      out = output.join()
-    else
+      out = output.join("")
+    elsif opt[:output] == "html"
+      page_title = section
+      items_out = []
+      items.each {|i|
+        # if i.has_key?('note')
+        #   note = '<span class="note">' + i['note'].map{|n| n.strip }.join('<br>') + '</span>'
+        # else
+        #   note = ''
+        # end
+        items_out << {
+          :date => i['date'].strftime('%a %-I:%M%p'),
+          :title => i['title'].gsub(/(@[^ \(]+(\(.*?\))?)/is,'<span class="tag">\1</span>').strip, #+ " #{note}"
+          :note => i['note']
+        }
+      }
+      style = "body{background:#faf9f5;color:#333;font-family:Palatino,Georgia,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:1.75}ul li .date{font-size:14px;position:absolute;left:-82px;color:#7d9ca2;text-align:right;width:110px;line-height:2}ul li .tag{color:#999}ul li .note{display:block;color:#666;padding:0 0 0 22px;line-height:1.4;font-size:15px}ul li .note:before{content:'\\25BA';font-weight:300;position:absolute;left:40px;font-size:8px;color:#aaa;line-height:3}ul li:hover .note{display:block}"
+      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[:note]
+              %span.note= i[:note].map{|n| n.strip }.join('<br>')
+EOT
+      engine = Haml::Engine.new(template)
+      puts engine.render(Object.new, { :@items => items_out, :@page_title => page_title, :@style => style })
 
+    else
       items.each {|item|
+
+        if opt[:highlight] && item['title'] =~ /@#{@config['marker_tag']}\b/i
+          flag = colors[@config['marker_color']]
+          reset = colors['default']
+        else
+          flag = ""
+          reset = ""
+        end
+
         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
@@ -500,11 +568,12 @@ class WWID
             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
+            flag+item['title'].gsub(/(.{1,#{opt[:wrap_width]}})(\s+|\Z)/, "\\1\n\t ").chomp+reset
           else
-            item['title'].strip
+            flag+item['title'].chomp+reset
           end
         }
         if opt[:tags_color]
@@ -528,20 +597,94 @@ class WWID
     return out
   end
 
-  def archive(section=nil,count=10)
+  def archive(section="Currently",count=5,destination=nil,tags=nil,bool=nil,export=nil)
+
     section = choose_section if section.nil? || section =~ /choose/i
-    section = guess_section(section)
-    if sections.include?(section)
-      items = @content[section]['items']
-      return if items.length < count
-      @content[section]['items'] = items[0..count-1]
-      add_section('Archive') unless sections.include?('Archive')
-      @content['Archive']['items'] += items[count..-1]
-      write(@doing_file)
+    archive_all = section =~ /all/i # && !(tags.nil? || tags.empty?)
+    section = guess_section(section) unless archive_all
+
+    if destination =~ /archive/i && !sections.include?("Archive")
+      add_section("Archive")
+    end
+
+    destination = guess_section(destination)
+
+    if sections.include?(destination) && (sections.include?(section) || archive_all)
+      if archive_all
+        to_archive = sections.dup
+        to_archive.delete(destination)
+        to_archive.each {|source,v|
+          do_archive(source, destination, { :count => count, :tags => tags, :bool => bool, :label => true })
+        }
+      else
+        do_archive(section, destination, { :count => count, :tags => tags, :bool => bool, :label => true })
+      end
+
+      write(doing_file)
+    else
+      raise "Either source or destination does not exist"
     end
   end
 
+  def do_archive(section, destination, opt={})
+    count = opt[:count] || 5
+    tags = opt[:tags] || []
+    bool = opt[:bool] || "AND"
+    label = opt[:label] || false
 
+    items = @content[section]['items']
+    moved_items = []
+
+    if tags && !tags.empty?
+      items.delete_if {|item|
+        if bool =~ /(AND|ALL)/
+          score = 0
+          tags.each {|tag|
+            score += 1 if item['title'] =~ /@#{tag}/i
+          }
+          res = score < tags.length
+          moved_items.push(item) if res
+          res
+        elsif bool =~ /NONE/
+          del = false
+          tags.each {|tag|
+            del = true if item['title'] =~ /@#{tag}/i
+          }
+          moved_items.push(item) if del
+          del
+        elsif bool =~ /(OR|ANY)/
+          del = true
+          tags.each {|tag|
+            del = false if item['title'] =~ /@#{tag}/i
+          }
+          moved_items.push(item) if del
+          del
+        end
+      }
+      moved_items.each {|item|
+        if label
+          item['title'] += " @from(#{section})" unless section == "Currently" || item['title'] =~ /@from\(/
+        end
+      }
+      @content[section]['items'] = moved_items
+      @content[destination]['items'] += items
+    else
+
+      return if items.length < count
+      if count == 0
+        @content[section]['items'] = []
+      else
+        @content[section]['items'] = items[0..count-1]
+      end
+
+      items.each{|item|
+        if label
+          item['title'] += " @from(#{section})" unless section == "Currently"
+        end
+      }
+      @content[destination]['items'] += items[count..-1]
+    end
+  end
 
   def colors
     color = {}
@@ -588,26 +731,28 @@ class WWID
     list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 0, :format => cfg['date_format'], :template => cfg['template'], :order => order})
   end
 
-  def today(times=false)
+  def today(times=true,output=nil)
     cfg = @config['templates']['today']
-    list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 0, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :today => true, :times => times})
+    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 recent(count=10,section=nil)
+  def recent(count=10,section=nil,opt={})
+    times = opt[:t] || true
     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"})
+    list_section({:section => section, :wrap_width => cfg['wrap_width'], :count => count, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :times => times })
   end
 
-  def last
+  def last(times=true)
     cfg = @config['templates']['last']
-    list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 1, :format => cfg['date_format'], :template => cfg['template']})
+    list_section({:section => @current_section, :wrap_width => cfg['wrap_width'], :count => 1, :format => cfg['date_format'], :template => cfg['template'], :times => times})
   end
 
   def tag_times
     output = []
-    return "" if @timers.length == 0
+    # return "" if @timers.length == 0
+
     max = @timers.keys.sort_by {|k| k.length }.reverse[0].length + 1
 
     total = @timers.delete("All")
@@ -619,7 +764,10 @@ class WWID
       end
       output.push("#{k}:#{spacer}#{"%02d:%02d:%02d" % fmt_time(v)}")
     }
-    output.empty? ? "" : "\n--- Tag Totals ---\n" + output.join("\n") + "\n\nTotal tracked: #{"%02d:%02d:%02d" % fmt_time(total)}\n"
+
+    output = output.empty? ? "" : "\n--- Tag Totals ---\n" + output.join("\n")
+    output += "\n\nTotal tracked: #{"%02d:%02d:%02d" % fmt_time(total)}\n"
+    output
   end
 
   private
@@ -666,7 +814,6 @@ end
 
 
 
-
 # infile = "~/Dropbox/nvALT2.2/?? What was I doing.md"
 
 # wwid = WWID.new(infile)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,6 +72,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -130,9 +144,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