Merge branch 'release/2.1.82'

* release/2.1.82: Finishing 2.1.82 2.1.82 release prep Changelog update Better defaults for normalize functions Changelog update Allow zero values when testing for good? version bump
ttscoff · Jul 1, 2023 · 971e1ca · 971e1ca
2 parents 05ad860 + a7468d7
commit 971e1ca
Show file tree

Hide file tree

Showing 117 changed files with 150 additions and 138 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+### 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

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.1.81)
+    doing (2.1.82)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.20, >= 2.20.1)
@@ -40,17 +40,17 @@ GEM
     rdoc (6.3.3)
     redcarpet (3.6.0)
     rexml (3.2.5)
-    rouge (4.1.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.10.0)
+    temple (0.10.2)
     test-unit (3.4.9)
       power_assert
-    tilt (2.1.0)
+    tilt (2.2.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-link (0.1.1)

diff --git a/README.md b/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.80<!--END VER-->.
+The current version of `doing` is <!--VER-->2.1.81<!--END VER-->.
 
 Find all of the documentation in the [doing wiki][wiki].
 

diff --git a/bin/commands/show.rb b/bin/commands/show.rb
@@ -68,7 +68,7 @@
       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
@@ -98,11 +98,11 @@
         end
       end
     else
-      if options[:section] && !options[:section].empty?
-        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
 
@@ -111,11 +111,11 @@
     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]

diff --git a/docs/doc/Array.html b/docs/doc/Array.html
@@ -350,7 +350,7 @@ <h3 class="signature " id="utf8-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/BooleanTermParser.html b/docs/doc/BooleanTermParser.html
@@ -105,7 +105,7 @@ <h2>Defined Under Namespace</h2>
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/BooleanTermParser/Clause.html b/docs/doc/BooleanTermParser/Clause.html
@@ -283,7 +283,7 @@ <h3 class="signature " id="term-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/BooleanTermParser/Operator.html b/docs/doc/BooleanTermParser/Operator.html
@@ -162,7 +162,7 @@ <h3 class="signature first" id="symbol-class_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/BooleanTermParser/Query.html b/docs/doc/BooleanTermParser/Query.html
@@ -407,7 +407,7 @@ <h3 class="signature " id="to_elasticsearch-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/BooleanTermParser/QueryParser.html b/docs/doc/BooleanTermParser/QueryParser.html
@@ -125,7 +125,7 @@ <h2>Overview</h2><div class="docstring">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/BooleanTermParser/QueryTransformer.html b/docs/doc/BooleanTermParser/QueryTransformer.html
@@ -114,7 +114,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing.html b/docs/doc/Doing.html
@@ -122,7 +122,7 @@ <h2>
         <dt id="VERSION-constant" class="">VERSION =
 
         </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>2.1.81</span><span class='tstring_end'>&#39;</span></span></pre></dd>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>2.1.82</span><span class='tstring_end'>&#39;</span></span></pre></dd>
 
     </dl>
 
@@ -138,7 +138,7 @@ <h2>
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:41 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/ArrayCleanup.html b/docs/doc/Doing/ArrayCleanup.html
@@ -306,7 +306,7 @@ <h3 class="signature " id="remove_empty!-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/ArrayNestedHash.html b/docs/doc/Doing/ArrayNestedHash.html
@@ -188,7 +188,7 @@ <h3 class="signature first" id="nested_hash-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/ArrayTags.html b/docs/doc/Doing/ArrayTags.html
@@ -414,7 +414,7 @@ <h3 class="signature " id="to_tags-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/ByDayExport.html b/docs/doc/Doing/ByDayExport.html
@@ -196,7 +196,7 @@ <h3 class="signature " id="settings-class_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/CSVExport.html b/docs/doc/Doing/CSVExport.html
@@ -256,7 +256,7 @@ <h3 class="signature " id="settings-class_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/CalendarImport.html b/docs/doc/Doing/CalendarImport.html
@@ -222,7 +222,7 @@ <h3 class="signature " id="settings-class_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Change.html b/docs/doc/Doing/Change.html
@@ -678,7 +678,7 @@ <h3 class="signature " id="to_s-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Changes.html b/docs/doc/Doing/Changes.html
@@ -458,7 +458,7 @@ <h3 class="signature " id="versions-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/ChronifyArray.html b/docs/doc/Doing/ChronifyArray.html
@@ -337,7 +337,7 @@ <h3 class="signature " id="to_years-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/ChronifyNumeric.html b/docs/doc/Doing/ChronifyNumeric.html
@@ -261,7 +261,7 @@ <h3 class="signature " id="time_string-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/ChronifyString.html b/docs/doc/Doing/ChronifyString.html
@@ -672,7 +672,7 @@ <h3 class="signature " id="to_seconds-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Color.html b/docs/doc/Doing/Color.html
@@ -687,7 +687,7 @@ <h3 class="signature " id="uncolor-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:41 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Completion.html b/docs/doc/Doing/Completion.html
@@ -540,7 +540,7 @@ <h3 class="signature " id="parse_options-class_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Completion/BashCompletions.html b/docs/doc/Doing/Completion/BashCompletions.html
@@ -435,7 +435,7 @@ <h3 class="signature " id="main_function-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Completion/FigCompletions.html b/docs/doc/Doing/Completion/FigCompletions.html
@@ -435,7 +435,7 @@ <h3 class="signature " id="generate_subcommand_option_completions-instance_metho
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Completion/FishCompletions.html b/docs/doc/Doing/Completion/FishCompletions.html
@@ -435,7 +435,7 @@ <h3 class="signature " id="generate_subcommand_option_completions-instance_metho
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Completion/StringUtils.html b/docs/doc/Doing/Completion/StringUtils.html
@@ -277,7 +277,7 @@ <h3 class="signature " id="short_desc-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Completion/ZshCompletions.html b/docs/doc/Doing/Completion/ZshCompletions.html
@@ -435,7 +435,7 @@ <h3 class="signature " id="generate_subcommand_option_completions-instance_metho
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Configuration.html b/docs/doc/Doing/Configuration.html
@@ -1219,7 +1219,7 @@ <h3 class="signature " id="value_for_key-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 2023 by
+  Generated on Sat Jul  1 12:43:14 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/DayOneRenderer.html b/docs/doc/Doing/DayOneRenderer.html
@@ -373,7 +373,7 @@ <h3 class="signature first" id="get_binding-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/DayoneExport.html b/docs/doc/Doing/DayoneExport.html
@@ -280,7 +280,7 @@ <h3 class="signature " id="to_dayone-class_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/DoingExport.html b/docs/doc/Doing/DoingExport.html
@@ -196,7 +196,7 @@ <h3 class="signature " id="settings-class_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/DoingImport.html b/docs/doc/Doing/DoingImport.html
@@ -381,7 +381,7 @@ <h3 class="signature " id="settings-class_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 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.34 (ruby-3.2.0).
 </div>

diff --git a/docs/doc/Doing/Entry.html b/docs/doc/Doing/Entry.html
@@ -476,7 +476,7 @@ <h3 class="signature " id="to_s-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 31 15:49:42 2023 by
+  Generated on Sat Jul  1 12:43:14 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.34 (ruby-3.2.0).
 </div>