doing 2.1.80 → 2.1.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53f0eb5f3700a634fe6a9f0589033b1e3646110eb5b5ba32cd1c45bf086a87be
-  data.tar.gz: 815659ee8f7bbe3abf5344c91c7cf4ec0307c35d9885484529039eed7ce909d2
+  metadata.gz: 0d4ed94eab21e2026b1f8f8674a7cf72e7b3c9c108a2e65f391d0a79e8fc4cc7
+  data.tar.gz: ab274fb0d4949f1e54d88a6a494f7139b46086b68d93473d4c36bbf68d1a4059
 SHA512:
-  metadata.gz: 1e7bac3356a82e4aa195e51c89dd04b816c17c979cba25fce68cabb5f8b788166aa4ab3b47ec54f712e2c416b259585d10eaa3daf1a78abfa9495fab6dda866a
-  data.tar.gz: ec9c25c53201375e6c164bb86e2b33078d46fab46117f1612128426d04e0f490e9d0d262cf1af398c98d688cab31d20cd7fe44a3bb3e13e1d895b4ef99b65b7b
+  metadata.gz: 251b853cd73c16aaf746303432db8b2fe71651fb2f5df81c040eceef98e73af3fb13af1fa70a490f976fce5bc6d0414758d8e26151113ba6a95feed96b922d04
+  data.tar.gz: 742d9ec1e7b467ea19516242eb845abefc30647367e3ff98cef940ef3fd3615350120cc6edf84cb1f60f81f005fd7d24e703e55085d23f0c47fc866da77c0a4a

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 2.1.82
+
+2023-07-01 12:39
+
+#### IMPROVED
+
+- Better handling of defaults for normalize functions
+
+#### FIXED
+
+- Allow value of 0 to be considered a good result when testing for good values
+
+### 2.1.81
+
+2023-05-31 11:47
+
+#### IMPROVED
+
+- Most commands that allow --section can now take multiple values, either by using --section multiple times or providing a comma separated list of sections to the flag
+
 ### 2.1.80
 
 2023-03-11 10:50

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.1.80)
+    doing (2.1.82)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.20, >= 2.20.1)
@@ -21,43 +21,43 @@ GEM
   specs:
     chronic (0.10.2)
     deep_merge (1.2.2)
-    github-markup (4.0.0)
+    github-markup (4.0.1)
     gli (2.21.0)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
     kramdown (2.4.0)
       rexml
-    parallel (1.21.0)
-    parallel_tests (3.7.3)
+    parallel (1.23.0)
+    parallel_tests (3.13.0)
       parallel
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    plist (3.6.0)
-    power_assert (2.0.1)
+    plist (3.7.0)
+    power_assert (2.0.3)
     rake (13.0.6)
     rdoc (6.3.3)
-    redcarpet (3.5.1)
+    redcarpet (3.6.0)
     rexml (3.2.5)
-    rouge (3.30.0)
+    rouge (4.1.2)
     safe_yaml (1.0.5)
     strings (0.2.1)
       strings-ansi (~> 0.2)
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    temple (0.9.1)
+    temple (0.10.2)
     test-unit (3.4.9)
       power_assert
-    tilt (2.0.11)
+    tilt (2.2.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-link (0.1.1)
-    tty-markdown (0.7.1)
+    tty-markdown (0.7.2)
       kramdown (>= 1.16.2, < 3.0)
       pastel (~> 0.8)
-      rouge (~> 3.14)
+      rouge (>= 3.14, < 5.0)
       strings (~> 0.2.0)
       tty-color (~> 0.5)
       tty-screen (~> 0.8)
@@ -76,10 +76,8 @@ GEM
     tty-which (0.5.0)
     unicode-display_width (2.4.2)
     unicode_utils (1.4.0)
-    webrick (1.7.0)
     wisper (2.0.1)
-    yard (0.9.27)
-      webrick (~> 1.7.0)
+    yard (0.9.34)
 
 PLATFORMS
   ruby

data/README.md

@@ -12,7 +12,7 @@ _If you're one of the rare people like me who find this useful, feel free to
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.1.79<!--END VER-->.
+The current version of `doing` is <!--VER-->2.1.81<!--END VER-->.
 
 Find all of the documentation in the [doing wiki][wiki].
 

data/bin/commands/again.rb

@@ -17,7 +17,7 @@ command %i[again resume] do |c|
 
   c.desc 'Get last entry from a specific section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   c.desc 'Add new entry to section (default: same section as repeated entry)'
   c.arg_name 'SECTION_NAME'

data/bin/commands/archive.rb

@@ -39,7 +39,7 @@ command %i[archive move] do |c|
                     elsif args[0] =~ /^@\S+/
                       ['all', args.tags_to_array]
                     else
-                      [args.shift.cap_first, args.tags_to_array]
+                      [@wwid.guess_section(args.shift.cap_first), args.tags_to_array]
                     end
 
     raise InvalidArgument, '--keep and --count can not be used together' if options[:keep] && options[:count]

data/bin/commands/cancel.rb

@@ -14,7 +14,7 @@ command :cancel do |c|
 
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section]
+  c.flag %i[s section], multiple: true
 
   c.desc 'Cancel last entry (or entries) not already marked @done'
   c.switch %i[u unfinished], negatable: false, default_value: false

data/bin/commands/finish.rb

@@ -41,7 +41,7 @@ module Doing
 
       cmd.desc 'Section'
       cmd.arg_name 'NAME'
-      cmd.flag %i[s section]
+      cmd.flag %i[s section], multiple: true
 
       cmd.desc 'Select item(s) to finish from a menu of matching entries'
       cmd.switch %i[i interactive], negatable: false, default_value: false

data/bin/commands/flag.rb

@@ -12,7 +12,7 @@ command %i[mark flag] do |c|
 
   c.desc 'Section'
   c.arg_name 'SECTION_NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   c.desc 'How many recent entries to tag (0 for all)'
   c.arg_name 'COUNT'

data/bin/commands/grep.rb

@@ -1,7 +1,7 @@
 # @@grep @@search
 desc 'Search for entries'
 long_desc %(
-Search all sections (or limit to a single section) for entries matching text or regular expression. Normal strings are fuzzy matched.
+Search all sections (or limit to a specific sections) for entries matching text or regular expression. Normal strings are fuzzy matched.
 
 To search with regular expressions, single quote the string and surround with slashes: `doing search '/\bm.*?x\b/'`
 )
@@ -11,10 +11,11 @@ command %i[grep search] do |c|
   c.example 'doing search "\'search command"', desc: 'Find entries containing "search command" using exact matching (search is an alias for grep)'
   c.example 'doing grep "/do.*?wiki.*?@done/"', desc: 'Find entries matching regular expression'
   c.example 'doing search --before 12/21 "doing wiki"', desc: 'Find entries containing "doing wiki" with entry dates before 12/21 of the current year'
+  c.example 'doing grep @project1 -s currently -s projects', desc: 'Search only in Currently and Projects'
 
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false

data/bin/commands/last.rb

@@ -13,7 +13,7 @@ command :last do |c|
 
   c.desc 'Specify a section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   c.desc "Edit entry with #{Doing::Util.default_editor}"
   c.switch %i[e editor], negatable: false, default_value: false

data/bin/commands/note.rb

@@ -16,7 +16,7 @@ command :note do |c|
 
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   c.desc "Edit entry with #{Doing::Util.default_editor}"
   c.switch %i[e editor], negatable: false, default_value: false

data/bin/commands/on.rb

@@ -13,7 +13,7 @@ command :on do |c|
 
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   add_options(:output_template, c)
   add_options(:time_display, c)

data/bin/commands/recent.rb

@@ -11,7 +11,7 @@ command :recent do |c|
 
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   c.desc 'Select from a menu of matching entries to perform additional operations'
   c.switch %i[i interactive], negatable: false, default_value: false

data/bin/commands/reset.rb

@@ -12,7 +12,7 @@ command %i[reset begin] do |c|
 
   c.desc 'Limit search to section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   c.desc 'Resume entry (remove @done)'
   c.switch %i[r resume], default_value: true

data/bin/commands/select.rb

@@ -23,7 +23,7 @@ command :select do |c|
 
   c.desc 'Select from a specific section'
   c.arg_name 'SECTION'
-  c.flag %i[s section]
+  c.flag %i[s section], multiple: true
 
   c.desc 'Tag selected entries'
   c.arg_name 'TAG'

data/bin/commands/show.rb

@@ -38,7 +38,7 @@ command :show do |c|
 
   c.desc 'Only show entries within section'
   c.arg_name 'NAME'
-  c.flag %i[s section]
+  c.flag %i[s section], multiple: true
 
   c.desc 'Select section or tag to display from a menu'
   c.switch %i[m menu], negatable: false, default_value: false
@@ -68,14 +68,15 @@ command :show do |c|
       when /^all$/i
         section = 'All'
         args.shift
-      when /^(choose|pick)$/i
+      when /^(choose|pick|menu)$/i
         section = @wwid.choose_section(include_all: true)
 
         args.shift
       when /^[@+-]/
         section = options[:section] ? @wwid.guess_section(options[:section]) : 'All'
       else
-        sect = options[:section] ? options[:section] : args[0]
+        sect = options[:section].empty? ? args[0] : options[:section]
+
         begin
           section = @wwid.guess_section(sect)
         rescue WrongCommand
@@ -88,6 +89,7 @@ command :show do |c|
 
         args.shift
       end
+
       if args.length.positive?
         args.each do |arg|
           arg.split(/,/).each do |tag|
@@ -96,11 +98,11 @@ command :show do |c|
         end
       end
     else
-      if options[:section]
-        section = @wwid.guess_section(options[:section]) || 'All'
-      else
-        section = options[:menu] ? @wwid.choose_section(include_all: true) : Doing.setting('current_section')
-      end
+      section = if options[:section] && !options[:section].empty?
+                  @wwid.guess_section(options[:section]) || 'All'
+                else
+                  options[:menu] ? @wwid.choose_section(include_all: true) : Doing.setting('current_section')
+                end
       section ||= 'All'
     end
 
@@ -109,11 +111,11 @@ command :show do |c|
     options[:times] = true if options[:totals]
 
     template = Doing.setting(['templates', options[:config_template]]).deep_merge({
-                                                    'wrap_width' => Doing.setting('wrap_width') || 0,
-                                                    'date_format' => Doing.setting('default_date_format'),
-                                                    'order' => Doing.setting('order')&.normalize_order || :asc,
-                                                    'tags_color' => Doing.setting('tags_color')
-                                                  })
+                              'wrap_width' => Doing.setting('wrap_width') || 0,
+                              'date_format' => Doing.setting('default_date_format'),
+                              'order' => Doing.setting('order')&.normalize_order || :asc,
+                              'tags_color' => Doing.setting('tags_color')
+                            })
 
     if options[:search]
       search = options[:search]

data/bin/commands/since.rb

@@ -9,7 +9,7 @@ command :since do |c|
 
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   add_options(:output_template, c)
   add_options(:time_display, c)

data/bin/commands/tag.rb

@@ -23,7 +23,7 @@ command :tag do |c|
 
   c.desc 'Section'
   c.arg_name 'SECTION_NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   c.desc 'How many recent entries to tag (0 for all)'
   c.arg_name 'COUNT'
@@ -73,25 +73,18 @@ command :tag do |c|
       section = @wwid.guess_section(options[:section]) || options[:section].cap_first
     end
 
-
-    if options[:tag].nil?
-      search_tags = []
-    else
-      search_tags = options[:tag]
-    end
+    search_tags = options[:tag].nil? ? [] : options[:tag]
 
     if options[:autotag]
       tags = []
     else
-      if args.empty?
-        tags = []
-      else
-        tags = if args.join('') =~ /,/
-                 args.join('').split(/ *, */)
-               else
-                 args.join(' ').split(' ') # in case tags are quoted as one arg
-               end
-      end
+      tags = if args.empty?
+               []
+             elsif args.join('') =~ /,/
+               args.join('').split(/ *, */)
+             else
+               args.join(' ').split(' ') # in case tags are quoted as one arg
+             end
 
       tags.map! { |tag| tag.sub(/^@/, '').strip }
     end

data/bin/commands/tags.rb

@@ -4,7 +4,7 @@ arg_name 'MAX_COUNT', optional: true, type: Integer
 command :tags do |c|
   c.desc 'Section'
   c.arg_name 'SECTION_NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   c.desc 'Show count of occurrences'
   c.switch %i[c counts]

data/bin/commands/today.rb

@@ -10,7 +10,7 @@ command :today do |c|
 
   c.desc 'Specify a section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   add_options(:output_template, c, default_template: 'today')
   add_options(:time_filter, c)

data/bin/commands/view.rb

@@ -9,7 +9,7 @@ command :view do |c|
 
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section]
+  c.flag %i[s section], multiple: true
 
   c.desc 'Count to display'
   c.arg_name 'COUNT'

data/bin/commands/views.rb

@@ -82,7 +82,7 @@ module Doing
       res = if @options[:output] =~ /^j/i
               JSON.parse(@wwid.fork_editor(JSON.pretty_generate(@views), message: nil))
             else
-              YAML.safe_load(@wwid.fork_editor(YAML.dump(@views), message: nil))
+              Doing::Util.safe_load_file(@wwid.fork_editor(YAML.dump(@views), message: nil))
             end
       @args.each do |v|
         save_view(v, res)

data/bin/commands/yesterday.rb

@@ -9,7 +9,7 @@ command :yesterday do |c|
 
   c.desc 'Specify a section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   add_options(:output_template, c, default_template: 'today')
   add_options(:time_filter, c)

data/docs/doc/Array.html

@@ -6,7 +6,7 @@
 <title>
   Class: Array
   
-    &mdash; Documentation by YARD 0.9.28
+    &mdash; Documentation by YARD 0.9.34
   
 </title>
 
@@ -138,6 +138,29 @@
         <li class="public ">
   <span class="summary_signature">
     
+      <a href="#cap_first-instance_method" title="#cap_first (instance method)">#<strong>cap_first</strong>  &#x21d2; Array </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'><p>Capitalize first letter of each element.</p>
+</div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
       <a href="#good%3F-instance_method" title="#good? (instance method)">#<strong>good?</strong>  &#x21d2; Boolean </a>
     
 
@@ -205,7 +228,46 @@
 
     
       <div class="method_details first">
-  <h3 class="signature first" id="good?-instance_method">
+  <h3 class="signature first" id="cap_first-instance_method">
+  
+    #<strong>cap_first</strong>  &#x21d2; <tt><span class='object_link'><a href="" title="Array (class)">Array</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    <p>Capitalize first letter of each element</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="" title="Array (class)">Array</a></span></tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'><p>capitalized items</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+</div>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="good?-instance_method">
   
     #<strong>good?</strong>  &#x21d2; <tt>Boolean</tt> 
   
@@ -288,9 +350,9 @@ has content</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 11 10:54:31 2023 by
+  Generated on Sat Jul  1 12:43:13 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.28 (ruby-3.0.1).
+  0.9.34 (ruby-3.2.0).
 </div>
 
     </div>

data/docs/doc/BooleanTermParser/Clause.html

@@ -6,7 +6,7 @@
 <title>
   Class: BooleanTermParser::Clause
   
-    &mdash; Documentation by YARD 0.9.28
+    &mdash; Documentation by YARD 0.9.34
   
 </title>
 
@@ -283,9 +283,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 11 10:54:31 2023 by
+  Generated on Sat Jul  1 12:43:15 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.28 (ruby-3.0.1).
+  0.9.34 (ruby-3.2.0).
 </div>
 
     </div>

data/docs/doc/BooleanTermParser/Operator.html

@@ -6,7 +6,7 @@
 <title>
   Class: BooleanTermParser::Operator
   
-    &mdash; Documentation by YARD 0.9.28
+    &mdash; Documentation by YARD 0.9.34
   
 </title>
 
@@ -162,9 +162,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 11 10:54:31 2023 by
+  Generated on Sat Jul  1 12:43:15 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.28 (ruby-3.0.1).
+  0.9.34 (ruby-3.2.0).
 </div>
 
     </div>

data/docs/doc/BooleanTermParser/Query.html

@@ -6,7 +6,7 @@
 <title>
   Class: BooleanTermParser::Query
   
-    &mdash; Documentation by YARD 0.9.28
+    &mdash; Documentation by YARD 0.9.34
   
 </title>
 
@@ -407,9 +407,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 11 10:54:31 2023 by
+  Generated on Sat Jul  1 12:43:15 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.28 (ruby-3.0.1).
+  0.9.34 (ruby-3.2.0).
 </div>
 
     </div>

data/docs/doc/BooleanTermParser/QueryParser.html

@@ -6,7 +6,7 @@
 <title>
   Class: BooleanTermParser::QueryParser
   
-    &mdash; Documentation by YARD 0.9.28
+    &mdash; Documentation by YARD 0.9.34
   
 </title>
 
@@ -125,9 +125,9 @@ parser. In order to do that, a new &quot;clause&quot; node is added to the parse
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 11 10:54:31 2023 by
+  Generated on Sat Jul  1 12:43:15 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.28 (ruby-3.0.1).
+  0.9.34 (ruby-3.2.0).
 </div>
 
     </div>

data/docs/doc/BooleanTermParser/QueryTransformer.html

@@ -6,7 +6,7 @@
 <title>
   Class: BooleanTermParser::QueryTransformer
   
-    &mdash; Documentation by YARD 0.9.28
+    &mdash; Documentation by YARD 0.9.34
   
 </title>
 
@@ -114,9 +114,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 11 10:54:31 2023 by
+  Generated on Sat Jul  1 12:43:15 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.28 (ruby-3.0.1).
+  0.9.34 (ruby-3.2.0).
 </div>
 
     </div>

data/docs/doc/BooleanTermParser.html

@@ -6,7 +6,7 @@
 <title>
   Module: BooleanTermParser
   
-    &mdash; Documentation by YARD 0.9.28
+    &mdash; Documentation by YARD 0.9.34
   
 </title>
 
@@ -105,9 +105,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 11 10:54:31 2023 by
+  Generated on Sat Jul  1 12:43:13 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.28 (ruby-3.0.1).
+  0.9.34 (ruby-3.2.0).
 </div>
 
     </div>