doing 1.0.6pre → 1.0.7pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31cbf5627a0818d3252c9f75265372652b7b22df
-  data.tar.gz: 3c70bc7a7b81dd3ce0db6d0e291dd4d4cf45d29f
+  metadata.gz: 416eb3b0c0b4892d106c8e6431a5925b393e587c
+  data.tar.gz: 47b5a29f17ce836404630379612a0c82e0811a97
 SHA512:
-  metadata.gz: 68287fcedc4d02dc46fa61e6587f4c3d7cf33f6727a9a03a9c155b9ecce63244deca08451be86be9d0c0260221d75b3478224c2c52edf538fc161a4bde191662
-  data.tar.gz: a20c0b2ff59f6125e7d5f0046034a3bc1825546d3f8c01b0b72600285325a0ef719e97f4ead9beafb9954ec82e465263636caf152b08c9f93d6f22bd885fa588
+  metadata.gz: 4fb329e66f43e85a03a2c256d1ef0b68db8b8c917c974de5d39c5de805c71b9c2b7a0e4a5357cc4e5fe854ffdf2bfcb266ec60b1537e8426736023179b5dd541
+  data.tar.gz: a1057480b5758c883d6602a6e50b328b68972b9566888516a84a0b5d57a76c25e56031e725f6036bab35581a4bb9c37ead73b4a54cf0d7b59a800dd473587610

data/README.md

@@ -127,6 +127,7 @@ The config also contains templates for various command outputs. Include placehol
 - `%[color]`: color can be black, red, green, blue, yellow, magenta, cyan or white
     - you can prefix "bg" to affect background colors (%bgyellow)
     - prefix "bold" and "boldbg" for strong colors (%boldgreen, %boldbgblue)
+    - there are some random special combo colors. Use `doing colors` to see the list
 - `%interval`: when used with the `-t` switch on the `show` command, it will display the time between a timestamp or `@start(date)` tag and the `@done(date)` tag, if it exists. Otherwise, it will remain empty.
 
 Date formats are based on Ruby [strftime](http://www.ruby-doc.org/stdlib-2.1.1/libdoc/date/rdoc/Date.html#method-i-strftime) formatting.
@@ -309,9 +310,9 @@ As mentioned above, `finish` also accepts `--back "2 hours"` (sets the finish da
 
 ... 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.
+`note` lets you append a note to the last entry. You can specify a section to grab the last entry from with `-s section_name`. `-e` will open your $EDITOR for typing the note, but you can also just include it on the command line after any flags. You can also pipe a note in on STDIN (`echo "fun stuff"|doing note`). If you don't use the `-r` switch, new notes will be appended to the existing notes, and using the `-e` switch will let you edit and add to an existing note. The `-r` switch will remove/replace a note; if there's new note text passed when using the `-r` switch, it will replace any existing note. If the `-r` switch is used alone, any existing note will be removed.
 
-You can also add notes at the time of entry by using the `-n` or `--note` flag with `doing now`, `doing later`, or `doing done`. If you pass in text to any of the creation commands that has multiple lines, everything after the first line break will become the note.
+You can also add notes at the time of entry by using the `-n` or `--note` flag with `doing now`, `doing later`, or `doing done`. If you pass text to any of the creation commands which has multiple lines, everything after the first line break will become the note.
 
 #### Displaying entries:
 
@@ -451,10 +452,36 @@ I'll try to document some of the code structure as I flesh it out. I'm currently
 
 ### Changelog
 
+
+#### 1.0.7 / 2014-09-23 
+
+* fix for -v option
+* Slightly fuzzier searching in the grep command
+* cleaner exits, only_timed key for view configs
+* making the note command append new notes better, and load existing notes in the editor if -e is called
+* handle multiple tag input in 'show' tag filter
+* Global tag operations, better reporting
+
 #### 1.0.4pre
 
 * Improved HTML output
 * --only_timed option for view/show commands that only outputs items with elapsed timers (interval between start and done dates)
+* add seconds for timed items in CSV output, run --only_timed before chopping off --count #
+* fix for 1.8.7 Dir.home issue
+* version bump
+* don't show tag totals with zero times
+* zsh completion for doing
+* HTML styling
+* --only_timed option
+* added zsh completion file to README.md
+* add zsh completion file
+
+#### 1.0.3pre
+
+* done command: making --took modify start time if --back isn't specified
+* Cleaned up time totals, improved HTML output
+* fixes for --back and --took parsing
+* Adding more complete terminal reporting to archive command
 
 #### 1.0.0pre
 

data/bin/doing

@@ -117,15 +117,22 @@ command :note do |c|
 
     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 = args.length > 0 ? args.join(" ") : ""
+
+      prev_input = wwid.last_note(section)
+      if prev_input.class == Array
+        prev_input = prev_input.join("\n")
+      end
+      input = prev_input + input
+
       input = wwid.fork_editor(input)
       if input
         title, note = wwid.format_input(input)
         note.insert(0, title)
-        wwid.note_last(section, note, options[:r])
+        wwid.note_last(section, note, true)
       else
-        raise "No content"
+        raise "No content, cancelled"
       end
     else
       if args.length > 0
@@ -423,7 +430,7 @@ command :tag do |c|
   c.default_value wwid.current_section
   c.flag [:s,:section], :default_value => wwid.current_section
 
-  c.desc 'How many recent entries to tag'
+  c.desc 'How many recent entries to tag (0 for all)'
   c.default_value 1
   c.flag [:c,:count], :default_value => 1
 
@@ -442,7 +449,6 @@ command :tag do |c|
 
       section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
-      count = options[:c].to_i
       if args.join("") =~ /,/
         tags = args.join("").split(/,/)
       else
@@ -451,6 +457,22 @@ command :tag do |c|
 
       tags.map!{|tag| tag.sub(/^@/,'').strip }
 
+      count = options[:c].to_i
+
+      if count == 0
+        if options[:r]
+          print "Are you sure you want to remove #{tags.join(" and ")} from all records? (y/N) "
+        else
+          print "Are you sure you want to add #{tags.join(" and ")} to all records? (y/N) "
+        end
+
+        res = STDIN.gets
+
+        unless res.strip =~ /^y(es)?$/i
+          raise "Cancelled"
+        end
+      end
+
       wwid.tag_last({:tags => tags, :count => count, :section => section, :date => options[:d], :remove => options[:r]})
     end
   end
@@ -476,6 +498,7 @@ end
 
 
 desc 'List all entries'
+long_desc 'The argument can be a section name, tag(s) or both. "pick" or "choose" as an argument will offer a section menu.'
 arg_name 'section [tags]'
 command :show do |c|
   c.desc 'Tag boolean (AND,OR,NONE)'
@@ -515,15 +538,27 @@ command :show do |c|
     if args.length > 0
       if args[0] =~ /^all$/i
         section = "All"
+        args.shift
+      elsif args[0] =~ /^(choose|pick)$/i
+        section = wwid.choose_section
+        args.shift
       elsif args[0] =~ /^@/
         section = "All"
-        tags.push(args[0].sub(/^@/,''))
       else
         section = wwid.guess_section(args[0])
         raise "No such section: #{args[0]}" unless section
+        args.shift
       end
-      if args.length > 1
-        tags += args[1..-1].map{|tag| tag.sub(/^@/,'').strip}
+      if args.length > 0
+        args.each {|arg|
+          if arg =~ /,/
+            arg_tags = arg.split(/,/).each {|tag|
+              tags.push(tag.strip.sub(/^@/,''))
+            }
+          else
+            tags.push(arg.strip.sub(/^@/,''))
+          end
+        }
       end
     else
       section = wwid.current_section
@@ -572,7 +607,7 @@ command :grep do |c|
 
     options[:t] = true if options[:totals]
 
-    puts wwid.list_section({:search => args.join, :section => section, :output => options[:output], :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => options[:only_timed]})
+    puts wwid.list_section({:search => args.join(' '), :section => section, :output => options[:output], :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => options[:only_timed]})
 
   end
 end
@@ -690,6 +725,24 @@ command :add_section do |c|
   end
 end
 
+desc 'List available color variables for configuration templates and views'
+command :colors do |c|
+  c.action do |global_options,options,args|
+    clrs = wwid.colors
+    bgs = []
+    fgs = []
+    clrs.each {|k,v|
+      if k =~ /bg/
+        bgs.push("#{v}    #{clrs['default']} <-- #{k}")
+      else
+        fgs.push("#{v}XXXX#{clrs['default']} <-- #{k}")
+      end
+    }
+    puts fgs.join("\n")
+    puts bgs.join("\n")
+  end
+end
+
 desc 'Display a user-created view'
 arg_name 'view_name'
 command :view do |c|
@@ -712,7 +765,7 @@ command :view do |c|
 
   c.desc 'Only show items with recorded time intervals'
   c.default_value false
-  c.switch [:only_timed], :default_value => false, :negatable => false
+  c.switch [:only_timed], :default_value => false, :negatable => true
 
   c.action do |global_options,options,args|
     if args.empty?
@@ -727,6 +780,12 @@ command :view do |c|
 
     view = wwid.get_view(title)
     if view
+      if (view.has_key?('only_timed') && view['only_timed']) || options[:only_timed]
+        only_timed = true
+      else
+        only_timed = false
+      end
+
       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
@@ -747,7 +806,7 @@ command :view do |c|
       order = view.has_key?('order') ? view['order'] : "asc"
       options[:t] = true if options[:totals]
       options[:output].downcase! if options[:output]
-      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:output], :tags_color => tags_color, :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => options[:only_timed] })
+      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:output], :tags_color => tags_color, :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => only_timed })
     else
       raise "View #{title} not found in config"
     end
@@ -900,7 +959,7 @@ pre do |global,command,options,args|
   end
   wwid.config[:include_notes] = false unless global[:notes]
   if global[:version]
-    puts "doing v" + Doing::VERSION
+    $stdout.puts "doing v" + Doing::VERSION
   end
 
   # Return true to proceed; false to abort and not call the
@@ -917,8 +976,7 @@ post do |global,command,options,args|
 end
 
 on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
+  # puts exception.message
   true
 end
 

data/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -363,6 +363,17 @@ class WWID
     @results.push(%Q{Added "#{entry['title']}" to #{section}})
   end
 
+  def last_note(section=@current_section)
+    section = guess_section(section)
+    if @content.has_key?(section)
+      last_item = @content[section]['items'].dup.sort_by{|item| item['date'] }.reverse[0]
+      p last_item
+      return last_item['note']
+    else
+      raise "Section #{section} not found"
+    end
+  end
+
   def tag_last(opt={})
     opt[:section] ||= @current_section
     opt[:count] ||= 1
@@ -374,68 +385,85 @@ class WWID
     opt[:back] ||= Time.now
 
 
+    sec_arr = []
 
-    opt[:section] = guess_section(opt[:section])
-
-    if @content.has_key?(opt[:section])
-      # sort_section(opt[:section])
-      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
+    if opt[:section].nil?
+      sec_arr = [@current_section]
+    elsif opt[:section].class == String
+      if opt[:section] =~ /^all$/i
+        sec_arr = sections
+      else
+        sec_arr = [guess_section(opt[:section])]
+      end
+    end
 
-        title = item['title']
-        opt[:tags].each {|tag|
-          if opt[:remove]
-            title.gsub!(/(^| )@#{tag.strip}(\([^\)]*\))?/,'')
-            @results.push("Updated: #{title}")
+    sec_arr.each {|section|
+      if @content.has_key?(section)
+
+        items = @content[section]['items'].dup.sort_by{|item| item['date'] }.reverse
+
+        index = 0
+        done_date = Time.now
+        next_start = Time.now
+        count = opt[:count] == 0 ? items.length : opt[:count]
+        items.map! {|item|
+          break if index == count
+          if opt[:sequential]
+            done_date = next_start - 1
+            next_start = item['date']
+          elsif opt[:back].instance_of? Fixnum
+            done_date = item['date'] + opt[:back]
           else
-            unless title =~ /@#{tag}/
-              title.chomp!
-              if opt[:date]
-                title += " @#{tag}(#{done_date.strftime('%F %R')})"
-              else
-                title += " @#{tag}"
+            done_date = opt[:back]
+          end
+
+          title = item['title']
+          opt[:tags].each {|tag|
+            tag.strip!
+            if opt[:remove]
+              if title =~ /@#{tag}/
+                title.gsub!(/(^| )@#{tag}(\([^\)]*\))?/,'')
+                @results.push("Removed @#{tag}: #{title}")
+              end
+            else
+              unless title =~ /@#{tag}/
+                title.chomp!
+                if opt[:date]
+                  title += " @#{tag}(#{done_date.strftime('%F %R')})"
+                else
+                  title += " @#{tag}"
+                end
+                @results.push("Added @#{tag}: #{title}")
               end
-              @results.push("Updated: #{title}")
             end
-          end
-        }
+          }
 
-        item['title'] = title
-        index += 1
-        item
-      }
+          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}")
+        @content[section]['items'] = items
+
+        if opt[:archive] && section != "Archive" && opt[:count] > 0
+          # concat [count] items from [section] and archive section
+          archived = @content[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}")
+        elsif opt[:archive] && opt[:count] == 0
+          @results.push("Archiving is skipped when operating on all entries") if opt[:count] == 0
+        end
+      else
+        raise "Section not found: #{section}"
       end
+    }
 
-      write(@doing_file)
-    else
-      raise "Section not found"
-    end
+    write(@doing_file)
   end
 
   def note_last(section, note, replace=false)
@@ -488,12 +516,15 @@ class WWID
 
     tag.sub!(/^@/,'')
 
+    found_items = 0
+
     @content[opt[:section]]['items'].each_with_index {|item, i|
       if item['title'] =~ /@#{tag}/
         title = item['title'].gsub(/(^| )@(#{tag}|done)(\([^\)]*\))?/,'')
         title += " @done(#{opt[:back].strftime('%F %R')})"
 
         @content[opt[:section]]['items'][i]['title'] = title
+        found_items += 1
 
         if opt[:archive] && opt[:section] != "Archive"
           @results.push(%Q{Completed and archived "#{@content[opt[:section]]['items'][i]['title']}"})
@@ -505,6 +536,8 @@ class WWID
       end
     }
 
+    @results.push("No active @#{tag} tasks found.") if found_items == 0
+
     if opt[:new_item]
       title, note = format_input(opt[:new_item])
       note.push(opt[:note]) if opt[:note]
@@ -530,7 +563,9 @@ class WWID
       $stdout.puts output
     else
       if File.exists?(File.expand_path(file))
+        # Create a backup copy for the undo command
         FileUtils.cp(file,file+"~")
+
         File.open(File.expand_path(file),'w+') do |f|
           f.puts output
         end
@@ -647,13 +682,14 @@ class WWID
     if opt[:search]
       items.keep_if {|item|
         text = item['note'] ? item['title'] + item['note'].join(" ") : item['title']
-        text =~ /#{opt[:search]}/i
+        pattern = opt[:search].split('').join('.{0,3}')
+        text =~ /#{pattern}/i
       }
     end
 
     if opt[:only_timed]
       items.delete_if {|item|
-        get_interval(item) == "00:00:00"
+        get_interval(item) == false
       }
     end
 
@@ -963,6 +999,12 @@ EOT
     color['boldbgmagenta'] = "\033[1;45m"
     color['boldbgcyan'] = "\033[1;46m"
     color['boldbgwhite'] = "\033[1;47m"
+    color['softpurple'] = "\033[0;35;40m"
+    color['hotpants'] = "\033[7;34;40m"
+    color['knightrider'] = "\033[7;30;40m"
+    color['flamingo'] = "\033[7;31;47m"
+    color['yeller'] = "\033[1;37;43m"
+    color['whiteboard'] = "\033[1;30;47m"
     color['default']="\033[0;39m"
     color
   end
@@ -1090,7 +1132,7 @@ EOS
 
     return seconds unless formatted
 
-    "%02d:%02d:%02d" % fmt_time(seconds)
+    seconds > 0 ? "%02d:%02d:%02d" % fmt_time(seconds) : false
   end
 
   def fmt_time(seconds)

metadata

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