doing 1.0.23 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d74d1d69c6dbae627fc25dc8c14a8e8bff95072fdc2f1b1761ab6186c7c0a26
-  data.tar.gz: e17b0df1b7c2122c0d8ae33290ccf7e2763cf3e143acf0b60af061b8302c83d2
+  metadata.gz: b8701939f6f7f9ab73bd84b4f5eb12fb11000d4267b8e50bb95a586f3f3c031f
+  data.tar.gz: befe08c2e78ec8df076041cea7e2b7c114950003ffab85697e2fc934acca5c85
 SHA512:
-  metadata.gz: 802dbf09b3b658640c52ca8e3b74f665fb163199bd0a3648f3f7831121e275a062df3ea47c31921b5b4f5390cbd29c3beeb7fa852624d0c00823a61081222cb9
-  data.tar.gz: dea212e53281258c783b0155c3304ada1d26a08db58d27b521d0080c19dec93c40c86f35c086383642d081caf85ac2ecf931a3ad2df927a0c6047cdea6d05b2d
+  metadata.gz: bddd6093eeacb8f29539b67e02d8fd3b47f68c4350d8c8bb5d13c8b33fe02e6e62cbaa12c4a406880716a4bb5560ef4a5d52125e7c83e3168896bfa38d85c771
+  data.tar.gz: '094ba3ce7917a2e1d596f727a7cbd97b1e4eba0d3d1916810ddcccae1eda42082e0b8f8f818afa34c1dbedbd3ecaa3cbfd0d78beabb6f38f44580de84996f5da'

data/README.md

@@ -600,6 +600,14 @@ Feel free to [poke around](http://github.com/ttscoff/doing/), I'll try to add mo
 
 ## Changelog
 
+#### 1.0.24
+
+- `doing note` operates on whatever is most recent, not just the last note in Currently
+- `doing tag` with no count specified operates on most recent entry in any section, not just Currently
+- `doing tag` with a count greater than 1 requires a section to be specified
+- Improved results reporting for `doing tag`
+- When removing tag do a whole-word match to avoid removing part of a longer tag
+
 #### 1.0.23
 
 - Apply default_tags after autotagging to avoid tags triggering tags

data/bin/doing

@@ -124,13 +124,13 @@ 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.flag [:s, :section], :default_value => "All"
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
-  c.switch [:e,:editor], :negatable => false, :default_value => false
+  c.switch [:e, :editor], :negatable => false, :default_value => false
 
   c.desc "Replace/Remove last entry's note"
-  c.switch [:r,:remove], :negatable => false, :default_value => false
+  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
@@ -184,20 +184,20 @@ command :meanwhile 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.flag [:s, :section], :default_value => wwid.current_section
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
-  c.switch [:e,:editor]
+  c.switch [:e, :editor]
 
   c.desc "Archive previous @meanwhile entry"
-  c.switch [:a,:archive], :default_value => false
+  c.switch [:a, :archive], :default_value => false
 
   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.flag [:n,:note]
+  c.flag [:n, :note]
 
   c.action do |global_options,options,args|
     if options[:back]
@@ -237,7 +237,7 @@ long_desc %{
 command :templates do |c|
   c.desc "Type of template to output (HAML|CSS)"
   c.arg_name 'template_type'
-  c.flag [:t,:type]
+  c.flag [:t, :type]
 
   c.action do |global_options,options,args|
     unless options[:type]
@@ -259,19 +259,19 @@ desc 'Add an item to the Later section'
 arg_name 'entry'
 command :later do |c|
   c.desc "Edit entry with #{ENV['EDITOR']}"
-  c.switch [:e,:editor]
+  c.switch [:e, :editor]
 
   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.flag [:a, :app]
 
   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.flag [:n,:note]
+  c.flag [:n, :note]
 
   c.action do |global_options,options,args|
     if options[:back]
@@ -317,25 +317,25 @@ arg_name 'entry'
 command :done do |c|
   c.desc 'Remove @done tag'
   c.default_value false
-  c.switch [:r,:remove], :negatable => false, :default_value => false
+  c.switch [:r, :remove], :negatable => false, :default_value => false
 
   c.desc 'Include date'
   c.default_value true
-  c.switch [:d,:date], :negatable => true, :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.switch [:a, :archive], :negatable => false, :default_value => false
 
   # TODO: Set @done date to specific time, backtracking start date in case of --took option. Should ignore --back option if present.
   # c.desc 'Set finish date to specific date/time (natural langauge)'
   # c.flag [:at]
 
   c.desc 'Backdate start date by interval [4pm|20m|2h|yesterday noon]'
-  c.flag [:b,:back]
+  c.flag [:b, :back]
 
   c.desc 'Set completion date to start date plus interval (XX[mhd] or HH:MM). If used without the --back option, the start date will be moved back to allow the completion date to be the current time.'
-  c.flag [:t,:took]
+  c.flag [:t, :took]
 
   c.desc 'Section'
   c.default_value wwid.current_section
@@ -475,8 +475,7 @@ 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.flag [:s,:section], :default_value => "All"
 
   c.desc 'How many recent entries to tag (0 for all)'
   c.default_value 1

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.23'
+  VERSION = '1.0.24'
 end

data/lib/doing/wwid.rb

@@ -600,10 +600,18 @@ class WWID
   ## @brief      Return the content of the last note for a given section
   ##
   ## @param      section  (String) The section to retrieve from, default
-  ##                      Currently
+  ##                      All
   ##
-  def last_note(section=@current_section)
+  def last_note(section="All")
     section = guess_section(section)
+    if section =~ /^all$/i
+      combined = {'items' => []}
+      @content.each {|k,v|
+        combined['items'] += v['items']
+      }
+      section = combined['items'].dup.sort_by{|item| item['date'] }.reverse[0]['section']
+    end
+
     if @content.has_key?(section)
       last_item = @content[section]['items'].dup.sort_by{|item| item['date'] }.reverse[0]
       $stderr.puts "Editing note for #{last_item['title']}"
@@ -636,12 +644,25 @@ class WWID
       sec_arr = [@current_section]
     elsif opt[:section].class == String
       if opt[:section] =~ /^all$/i
-        sec_arr = sections
+        if opt[:count] == 1
+          combined = {'items' => []}
+          @content.each {|k,v|
+            combined['items'] += v['items']
+          }
+          items = combined['items'].dup.sort_by{|item| item['date'] }.reverse
+          sec_arr.push(items[0]['section'])
+        elsif opt[:count] > 1
+          raise "A count greater than one requires a section to be specified"
+        else
+          sec_arr = sections
+        end
       else
         sec_arr = [guess_section(opt[:section])]
       end
     end
 
+
+
     sec_arr.each {|section|
       if @content.has_key?(section)
 
@@ -668,9 +689,9 @@ class WWID
             opt[:tags].each {|tag|
               tag.strip!
               if opt[:remove]
-                if title =~ /@#{tag}/
+                if title =~ /@#{tag}\b/
                   title.gsub!(/(^| )@#{tag}(\([^\)]*\))?/,'')
-                  @results.push("Removed @#{tag}: #{title}")
+                  @results.push(%Q{Removed @#{tag}: "#{title}" in #{section}})
                 end
               else
                 unless title =~ /@#{tag}/
@@ -680,7 +701,7 @@ class WWID
                   else
                     title += " @#{tag}"
                   end
-                  @results.push("Added @#{tag}: #{title}")
+                  @results.push(%Q{Added @#{tag}: "#{title}" in #{section}})
                 end
               end
             }
@@ -707,7 +728,7 @@ class WWID
           @content['Archive']['items'] = archived
           # log it
           result = opt[:count] == 1 ? "1 entry" : "#{opt[:count]} entries"
-          @results.push("Archived #{result}")
+          @results.push("Archived #{result} from #{section}")
         elsif opt[:archive] && opt[:count] == 0
           @results.push("Archiving is skipped when operating on all entries") if opt[:count] == 0
         end
@@ -722,13 +743,21 @@ class WWID
   ##
   ## @brief      Add a note to the last entry in a section
   ##
-  ## @param      section  (String) The section, default Currently
+  ## @param      section  (String) The section, default "All"
   ## @param      note     (String) The note to add
   ## @param      replace  (Bool) Should replace existing note
   ##
   def note_last(section, note, replace=false)
     section = guess_section(section)
 
+    if section =~ /^all$/i
+      combined = {'items' => []}
+      @content.each {|k,v|
+        combined['items'] += v['items']
+      }
+      section = combined['items'].dup.sort_by{|item| item['date'] }.reverse[0]['section']
+    end
+
     if @content.has_key?(section)
       # sort_section(opt[:section])
       items = @content[section]['items'].dup.sort_by{|item| item['date'] }.reverse
@@ -757,7 +786,7 @@ class WWID
 
       @content[section]['items'] = items
     else
-      raise "Section not found"
+      raise "Section #{section} not found"
     end
   end
 
@@ -784,7 +813,6 @@ class WWID
     tag.sub!(/^@/,'')
 
     found_items = 0
-    begin
     @content[opt[:section]]['items'].each_with_index {|item, i|
       if item['title'] =~ /@#{tag}/
         title = item['title'].gsub(/(^| )@(#{tag}|done)(\([^\)]*\))?/,'')
@@ -814,12 +842,6 @@ class WWID
       add_item(title.cap_first, opt[:section], {:note => note.join(' ').rstrip, :back => opt[:back]})
     end
 
-    rescue Exception=>e
-      puts e
-      puts e.backtrace
-    end
-
-
     write(@doing_file)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-09 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake