diff --git a/CHANGELOG.md b/CHANGELOG.md index 87bbde4d..9683202f 100644 --- 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 index 5d68b93f..7726dfaa 100644 --- 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 index df5b12c8..6983acc9 100644 --- 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 -The current version of `doing` is 2.1.80. +The current version of `doing` is 2.1.81. Find all of the documentation in the [doing wiki][wiki]. diff --git a/bin/commands/show.rb b/bin/commands/show.rb index d4b2db96..dbd38843 100644 --- 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 index 50cd2b1c..5e3fa692 100644 --- a/docs/doc/Array.html +++ b/docs/doc/Array.html @@ -350,7 +350,7 @@

diff --git a/docs/doc/BooleanTermParser.html b/docs/doc/BooleanTermParser.html index 6baaca4d..3aff2503 100644 --- a/docs/doc/BooleanTermParser.html +++ b/docs/doc/BooleanTermParser.html @@ -105,7 +105,7 @@

Defined Under Namespace

diff --git a/docs/doc/BooleanTermParser/Clause.html b/docs/doc/BooleanTermParser/Clause.html index 36ea770a..c8680e2b 100644 --- a/docs/doc/BooleanTermParser/Clause.html +++ b/docs/doc/BooleanTermParser/Clause.html @@ -283,7 +283,7 @@

diff --git a/docs/doc/BooleanTermParser/Operator.html b/docs/doc/BooleanTermParser/Operator.html index 3e1b38da..11141924 100644 --- a/docs/doc/BooleanTermParser/Operator.html +++ b/docs/doc/BooleanTermParser/Operator.html @@ -162,7 +162,7 @@

diff --git a/docs/doc/BooleanTermParser/Query.html b/docs/doc/BooleanTermParser/Query.html index 1444003e..b61a9017 100644 --- a/docs/doc/BooleanTermParser/Query.html +++ b/docs/doc/BooleanTermParser/Query.html @@ -407,7 +407,7 @@

diff --git a/docs/doc/BooleanTermParser/QueryParser.html b/docs/doc/BooleanTermParser/QueryParser.html index 5e14bcc7..7a6a1bf3 100644 --- a/docs/doc/BooleanTermParser/QueryParser.html +++ b/docs/doc/BooleanTermParser/QueryParser.html @@ -125,7 +125,7 @@

Overview

diff --git a/docs/doc/BooleanTermParser/QueryTransformer.html b/docs/doc/BooleanTermParser/QueryTransformer.html index 94d3b9be..45c617a1 100644 --- a/docs/doc/BooleanTermParser/QueryTransformer.html +++ b/docs/doc/BooleanTermParser/QueryTransformer.html @@ -114,7 +114,7 @@ diff --git a/docs/doc/Doing.html b/docs/doc/Doing.html index 3f59e37d..56709473 100644 --- a/docs/doc/Doing.html +++ b/docs/doc/Doing.html @@ -122,7 +122,7 @@

VERSION =
- 
'2.1.81'
+ 
'2.1.82'
@@ -138,7 +138,7 @@

diff --git a/docs/doc/Doing/ArrayCleanup.html b/docs/doc/Doing/ArrayCleanup.html index 66ff0aea..793cfbf1 100644 --- a/docs/doc/Doing/ArrayCleanup.html +++ b/docs/doc/Doing/ArrayCleanup.html @@ -306,7 +306,7 @@

diff --git a/docs/doc/Doing/ArrayNestedHash.html b/docs/doc/Doing/ArrayNestedHash.html index dfc9011c..239d0f00 100644 --- a/docs/doc/Doing/ArrayNestedHash.html +++ b/docs/doc/Doing/ArrayNestedHash.html @@ -188,7 +188,7 @@

diff --git a/docs/doc/Doing/ArrayTags.html b/docs/doc/Doing/ArrayTags.html index 47916dde..8a1945e9 100644 --- a/docs/doc/Doing/ArrayTags.html +++ b/docs/doc/Doing/ArrayTags.html @@ -414,7 +414,7 @@

diff --git a/docs/doc/Doing/ByDayExport.html b/docs/doc/Doing/ByDayExport.html index 6acfa0cf..060bd5db 100644 --- a/docs/doc/Doing/ByDayExport.html +++ b/docs/doc/Doing/ByDayExport.html @@ -196,7 +196,7 @@

diff --git a/docs/doc/Doing/CSVExport.html b/docs/doc/Doing/CSVExport.html index 691530a1..98861760 100644 --- a/docs/doc/Doing/CSVExport.html +++ b/docs/doc/Doing/CSVExport.html @@ -256,7 +256,7 @@

diff --git a/docs/doc/Doing/CalendarImport.html b/docs/doc/Doing/CalendarImport.html index c814d17f..7ab57e20 100644 --- a/docs/doc/Doing/CalendarImport.html +++ b/docs/doc/Doing/CalendarImport.html @@ -222,7 +222,7 @@

diff --git a/docs/doc/Doing/Change.html b/docs/doc/Doing/Change.html index 0d3b6a77..2ca1e11e 100644 --- a/docs/doc/Doing/Change.html +++ b/docs/doc/Doing/Change.html @@ -678,7 +678,7 @@

diff --git a/docs/doc/Doing/Changes.html b/docs/doc/Doing/Changes.html index b88680e5..ebccad67 100644 --- a/docs/doc/Doing/Changes.html +++ b/docs/doc/Doing/Changes.html @@ -458,7 +458,7 @@

diff --git a/docs/doc/Doing/ChronifyArray.html b/docs/doc/Doing/ChronifyArray.html index 4443969b..f7734155 100644 --- a/docs/doc/Doing/ChronifyArray.html +++ b/docs/doc/Doing/ChronifyArray.html @@ -337,7 +337,7 @@

diff --git a/docs/doc/Doing/ChronifyNumeric.html b/docs/doc/Doing/ChronifyNumeric.html index 2b871408..b1ff2144 100644 --- a/docs/doc/Doing/ChronifyNumeric.html +++ b/docs/doc/Doing/ChronifyNumeric.html @@ -261,7 +261,7 @@

diff --git a/docs/doc/Doing/ChronifyString.html b/docs/doc/Doing/ChronifyString.html index ceaca924..a7605ae0 100644 --- a/docs/doc/Doing/ChronifyString.html +++ b/docs/doc/Doing/ChronifyString.html @@ -672,7 +672,7 @@

diff --git a/docs/doc/Doing/Color.html b/docs/doc/Doing/Color.html index 20c113e3..5f8bc0ef 100644 --- a/docs/doc/Doing/Color.html +++ b/docs/doc/Doing/Color.html @@ -687,7 +687,7 @@

diff --git a/docs/doc/Doing/Completion.html b/docs/doc/Doing/Completion.html index 86f9be21..749a72b9 100644 --- a/docs/doc/Doing/Completion.html +++ b/docs/doc/Doing/Completion.html @@ -540,7 +540,7 @@

diff --git a/docs/doc/Doing/Completion/BashCompletions.html b/docs/doc/Doing/Completion/BashCompletions.html index b1a007bc..215d4936 100644 --- a/docs/doc/Doing/Completion/BashCompletions.html +++ b/docs/doc/Doing/Completion/BashCompletions.html @@ -435,7 +435,7 @@

diff --git a/docs/doc/Doing/Completion/FigCompletions.html b/docs/doc/Doing/Completion/FigCompletions.html index 1b5d5015..4f6a8a61 100644 --- a/docs/doc/Doing/Completion/FigCompletions.html +++ b/docs/doc/Doing/Completion/FigCompletions.html @@ -435,7 +435,7 @@

- Generated on Wed May 31 15:49:42 2023 by + Generated on Sat Jul 1 12:43:15 2023 by yard 0.9.34 (ruby-3.2.0). diff --git a/docs/doc/Doing/Completion/FishCompletions.html b/docs/doc/Doing/Completion/FishCompletions.html index 1cd76fd3..33cb0688 100644 --- a/docs/doc/Doing/Completion/FishCompletions.html +++ b/docs/doc/Doing/Completion/FishCompletions.html @@ -435,7 +435,7 @@

- Generated on Wed May 31 15:49:42 2023 by + Generated on Sat Jul 1 12:43:15 2023 by yard 0.9.34 (ruby-3.2.0). diff --git a/docs/doc/Doing/Completion/StringUtils.html b/docs/doc/Doing/Completion/StringUtils.html index b4b289aa..b995ff2b 100644 --- a/docs/doc/Doing/Completion/StringUtils.html +++ b/docs/doc/Doing/Completion/StringUtils.html @@ -277,7 +277,7 @@

diff --git a/docs/doc/Doing/Completion/ZshCompletions.html b/docs/doc/Doing/Completion/ZshCompletions.html index 848724ad..66094fdc 100644 --- a/docs/doc/Doing/Completion/ZshCompletions.html +++ b/docs/doc/Doing/Completion/ZshCompletions.html @@ -435,7 +435,7 @@

- Generated on Wed May 31 15:49:42 2023 by + Generated on Sat Jul 1 12:43:15 2023 by yard 0.9.34 (ruby-3.2.0). diff --git a/docs/doc/Doing/Configuration.html b/docs/doc/Doing/Configuration.html index 5d8cb721..cda916f3 100644 --- a/docs/doc/Doing/Configuration.html +++ b/docs/doc/Doing/Configuration.html @@ -1219,7 +1219,7 @@

diff --git a/docs/doc/Doing/DayOneRenderer.html b/docs/doc/Doing/DayOneRenderer.html index eeee5c84..3e04b7d2 100644 --- a/docs/doc/Doing/DayOneRenderer.html +++ b/docs/doc/Doing/DayOneRenderer.html @@ -373,7 +373,7 @@

diff --git a/docs/doc/Doing/DayoneExport.html b/docs/doc/Doing/DayoneExport.html index 79c41c6d..d0db238c 100644 --- a/docs/doc/Doing/DayoneExport.html +++ b/docs/doc/Doing/DayoneExport.html @@ -280,7 +280,7 @@

diff --git a/docs/doc/Doing/DoingExport.html b/docs/doc/Doing/DoingExport.html index afae3991..8d098d94 100644 --- a/docs/doc/Doing/DoingExport.html +++ b/docs/doc/Doing/DoingExport.html @@ -196,7 +196,7 @@

diff --git a/docs/doc/Doing/DoingImport.html b/docs/doc/Doing/DoingImport.html index 8d13140e..17ee8f5f 100644 --- a/docs/doc/Doing/DoingImport.html +++ b/docs/doc/Doing/DoingImport.html @@ -381,7 +381,7 @@

diff --git a/docs/doc/Doing/Entry.html b/docs/doc/Doing/Entry.html index bc4c24d0..1c1845a5 100644 --- a/docs/doc/Doing/Entry.html +++ b/docs/doc/Doing/Entry.html @@ -476,7 +476,7 @@

diff --git a/docs/doc/Doing/Errors.html b/docs/doc/Doing/Errors.html index d14373f3..c709ab05 100644 --- a/docs/doc/Doing/Errors.html +++ b/docs/doc/Doing/Errors.html @@ -181,7 +181,7 @@

diff --git a/docs/doc/Doing/Errors/DoingNoTraceError.html b/docs/doc/Doing/Errors/DoingNoTraceError.html index 7d220c52..adceb75e 100644 --- a/docs/doc/Doing/Errors/DoingNoTraceError.html +++ b/docs/doc/Doing/Errors/DoingNoTraceError.html @@ -180,7 +180,7 @@

diff --git a/docs/doc/Doing/Errors/DoingRuntimeError.html b/docs/doc/Doing/Errors/DoingRuntimeError.html index 9e35161a..36d393d1 100644 --- a/docs/doc/Doing/Errors/DoingRuntimeError.html +++ b/docs/doc/Doing/Errors/DoingRuntimeError.html @@ -180,7 +180,7 @@

diff --git a/docs/doc/Doing/Errors/DoingStandardError.html b/docs/doc/Doing/Errors/DoingStandardError.html index d22db1f0..1914c192 100644 --- a/docs/doc/Doing/Errors/DoingStandardError.html +++ b/docs/doc/Doing/Errors/DoingStandardError.html @@ -176,7 +176,7 @@

diff --git a/docs/doc/Doing/Errors/EmptyInput.html b/docs/doc/Doing/Errors/EmptyInput.html index 4a0fad40..895f5a1b 100644 --- a/docs/doc/Doing/Errors/EmptyInput.html +++ b/docs/doc/Doing/Errors/EmptyInput.html @@ -184,7 +184,7 @@

diff --git a/docs/doc/Doing/Errors/HistoryLimitError.html b/docs/doc/Doing/Errors/HistoryLimitError.html index ba8c4626..f1375e65 100644 --- a/docs/doc/Doing/Errors/HistoryLimitError.html +++ b/docs/doc/Doing/Errors/HistoryLimitError.html @@ -184,7 +184,7 @@

diff --git a/docs/doc/Doing/Errors/InvalidPlugin.html b/docs/doc/Doing/Errors/InvalidPlugin.html index e7ef8d78..128c1336 100644 --- a/docs/doc/Doing/Errors/InvalidPlugin.html +++ b/docs/doc/Doing/Errors/InvalidPlugin.html @@ -184,7 +184,7 @@

diff --git a/docs/doc/Doing/Errors/MissingBackupFile.html b/docs/doc/Doing/Errors/MissingBackupFile.html index 106c5fee..ae8608ca 100644 --- a/docs/doc/Doing/Errors/MissingBackupFile.html +++ b/docs/doc/Doing/Errors/MissingBackupFile.html @@ -184,7 +184,7 @@

diff --git a/docs/doc/Doing/Errors/NoResults.html b/docs/doc/Doing/Errors/NoResults.html index 299f2650..08f222cd 100644 --- a/docs/doc/Doing/Errors/NoResults.html +++ b/docs/doc/Doing/Errors/NoResults.html @@ -184,7 +184,7 @@

diff --git a/docs/doc/Doing/Errors/PluginException.html b/docs/doc/Doing/Errors/PluginException.html index da256c78..d0de36c4 100644 --- a/docs/doc/Doing/Errors/PluginException.html +++ b/docs/doc/Doing/Errors/PluginException.html @@ -238,7 +238,7 @@

diff --git a/docs/doc/Doing/Errors/UserCancelled.html b/docs/doc/Doing/Errors/UserCancelled.html index 17bf6b67..4c6ba37e 100644 --- a/docs/doc/Doing/Errors/UserCancelled.html +++ b/docs/doc/Doing/Errors/UserCancelled.html @@ -184,7 +184,7 @@

diff --git a/docs/doc/Doing/Errors/WrongCommand.html b/docs/doc/Doing/Errors/WrongCommand.html index cabb14ab..189ee150 100644 --- a/docs/doc/Doing/Errors/WrongCommand.html +++ b/docs/doc/Doing/Errors/WrongCommand.html @@ -184,7 +184,7 @@

diff --git a/docs/doc/Doing/HTMLExport.html b/docs/doc/Doing/HTMLExport.html index 6b25cc50..cfe469f3 100644 --- a/docs/doc/Doing/HTMLExport.html +++ b/docs/doc/Doing/HTMLExport.html @@ -246,7 +246,7 @@

diff --git a/docs/doc/Doing/Hooks.html b/docs/doc/Doing/Hooks.html index d9bbc524..0b1649cd 100644 --- a/docs/doc/Doing/Hooks.html +++ b/docs/doc/Doing/Hooks.html @@ -354,7 +354,7 @@

diff --git a/docs/doc/Doing/Item.html b/docs/doc/Doing/Item.html index 808a4824..364518dc 100644 --- a/docs/doc/Doing/Item.html +++ b/docs/doc/Doing/Item.html @@ -991,7 +991,7 @@

diff --git a/docs/doc/Doing/ItemDates.html b/docs/doc/Doing/ItemDates.html index e1d184bc..509ff948 100644 --- a/docs/doc/Doing/ItemDates.html +++ b/docs/doc/Doing/ItemDates.html @@ -554,7 +554,7 @@

diff --git a/docs/doc/Doing/ItemQuery.html b/docs/doc/Doing/ItemQuery.html index 160588e0..62651f64 100644 --- a/docs/doc/Doing/ItemQuery.html +++ b/docs/doc/Doing/ItemQuery.html @@ -685,7 +685,7 @@

diff --git a/docs/doc/Doing/ItemState.html b/docs/doc/Doing/ItemState.html index 9ed397d9..2d46593d 100644 --- a/docs/doc/Doing/ItemState.html +++ b/docs/doc/Doing/ItemState.html @@ -377,7 +377,7 @@

diff --git a/docs/doc/Doing/ItemTags.html b/docs/doc/Doing/ItemTags.html index b4d7dc9d..4a2a2b92 100644 --- a/docs/doc/Doing/ItemTags.html +++ b/docs/doc/Doing/ItemTags.html @@ -488,7 +488,7 @@

diff --git a/docs/doc/Doing/Items.html b/docs/doc/Doing/Items.html index f2e29a56..44a64eb3 100644 --- a/docs/doc/Doing/Items.html +++ b/docs/doc/Doing/Items.html @@ -1792,7 +1792,7 @@

diff --git a/docs/doc/Doing/JSONExport.html b/docs/doc/Doing/JSONExport.html index 7df11cc6..22470288 100644 --- a/docs/doc/Doing/JSONExport.html +++ b/docs/doc/Doing/JSONExport.html @@ -212,7 +212,7 @@

diff --git a/docs/doc/Doing/JSONImport.html b/docs/doc/Doing/JSONImport.html index 0ad6c838..bce3aff2 100644 --- a/docs/doc/Doing/JSONImport.html +++ b/docs/doc/Doing/JSONImport.html @@ -285,7 +285,7 @@

diff --git a/docs/doc/Doing/Logger.html b/docs/doc/Doing/Logger.html index 9b3be1a1..7d0a7472 100644 --- a/docs/doc/Doing/Logger.html +++ b/docs/doc/Doing/Logger.html @@ -1797,7 +1797,7 @@

diff --git a/docs/doc/Doing/MarkdownExport.html b/docs/doc/Doing/MarkdownExport.html index 3505e95d..1ef4224d 100644 --- a/docs/doc/Doing/MarkdownExport.html +++ b/docs/doc/Doing/MarkdownExport.html @@ -256,7 +256,7 @@

diff --git a/docs/doc/Doing/Note.html b/docs/doc/Doing/Note.html index 6967f550..1a6b53a2 100644 --- a/docs/doc/Doing/Note.html +++ b/docs/doc/Doing/Note.html @@ -747,7 +747,7 @@

diff --git a/docs/doc/Doing/Pager.html b/docs/doc/Doing/Pager.html index 8eca7bb7..a2b36a00 100644 --- a/docs/doc/Doing/Pager.html +++ b/docs/doc/Doing/Pager.html @@ -296,7 +296,7 @@

diff --git a/docs/doc/Doing/Plugins.html b/docs/doc/Doing/Plugins.html index fe4db209..8b681399 100644 --- a/docs/doc/Doing/Plugins.html +++ b/docs/doc/Doing/Plugins.html @@ -1340,7 +1340,7 @@

diff --git a/docs/doc/Doing/Prompt.html b/docs/doc/Doing/Prompt.html index 4f7f0e28..027ea52d 100644 --- a/docs/doc/Doing/Prompt.html +++ b/docs/doc/Doing/Prompt.html @@ -326,7 +326,7 @@

diff --git a/docs/doc/Doing/PromptChoose.html b/docs/doc/Doing/PromptChoose.html index 8cae4474..dbdce30b 100644 --- a/docs/doc/Doing/PromptChoose.html +++ b/docs/doc/Doing/PromptChoose.html @@ -474,7 +474,7 @@

diff --git a/docs/doc/Doing/PromptFZF.html b/docs/doc/Doing/PromptFZF.html index 0601299b..faa4cdec 100644 --- a/docs/doc/Doing/PromptFZF.html +++ b/docs/doc/Doing/PromptFZF.html @@ -381,7 +381,7 @@

diff --git a/docs/doc/Doing/PromptInput.html b/docs/doc/Doing/PromptInput.html index 4fd39ac5..c2c9449e 100644 --- a/docs/doc/Doing/PromptInput.html +++ b/docs/doc/Doing/PromptInput.html @@ -562,7 +562,7 @@

diff --git a/docs/doc/Doing/PromptSTD.html b/docs/doc/Doing/PromptSTD.html index c3cf68de..6c840e3e 100644 --- a/docs/doc/Doing/PromptSTD.html +++ b/docs/doc/Doing/PromptSTD.html @@ -283,7 +283,7 @@

diff --git a/docs/doc/Doing/PromptYN.html b/docs/doc/Doing/PromptYN.html index b899548a..53df3a9d 100644 --- a/docs/doc/Doing/PromptYN.html +++ b/docs/doc/Doing/PromptYN.html @@ -227,7 +227,7 @@

diff --git a/docs/doc/Doing/Section.html b/docs/doc/Doing/Section.html index e8c146c0..e3b04e76 100644 --- a/docs/doc/Doing/Section.html +++ b/docs/doc/Doing/Section.html @@ -400,7 +400,7 @@

diff --git a/docs/doc/Doing/StringHighlight.html b/docs/doc/Doing/StringHighlight.html index 62cd8a0e..3f7d8500 100644 --- a/docs/doc/Doing/StringHighlight.html +++ b/docs/doc/Doing/StringHighlight.html @@ -523,7 +523,7 @@

diff --git a/docs/doc/Doing/StringNormalize.html b/docs/doc/Doing/StringNormalize.html index a51d4f66..b5538cae 100644 --- a/docs/doc/Doing/StringNormalize.html +++ b/docs/doc/Doing/StringNormalize.html @@ -1036,7 +1036,7 @@

diff --git a/docs/doc/Doing/StringQuery.html b/docs/doc/Doing/StringQuery.html index 13fb6360..8e1a598c 100644 --- a/docs/doc/Doing/StringQuery.html +++ b/docs/doc/Doing/StringQuery.html @@ -771,7 +771,7 @@

diff --git a/docs/doc/Doing/StringTags.html b/docs/doc/Doing/StringTags.html index e56549c1..7cf4a1c7 100644 --- a/docs/doc/Doing/StringTags.html +++ b/docs/doc/Doing/StringTags.html @@ -874,7 +874,7 @@

diff --git a/docs/doc/Doing/StringTransform.html b/docs/doc/Doing/StringTransform.html index 1ba8a594..ca4152c9 100644 --- a/docs/doc/Doing/StringTransform.html +++ b/docs/doc/Doing/StringTransform.html @@ -589,7 +589,7 @@

diff --git a/docs/doc/Doing/StringTruncate.html b/docs/doc/Doing/StringTruncate.html index c7e8b4f2..99a7121e 100644 --- a/docs/doc/Doing/StringTruncate.html +++ b/docs/doc/Doing/StringTruncate.html @@ -438,7 +438,7 @@

diff --git a/docs/doc/Doing/StringURL.html b/docs/doc/Doing/StringURL.html index 39e9fd01..4fc6acfa 100644 --- a/docs/doc/Doing/StringURL.html +++ b/docs/doc/Doing/StringURL.html @@ -399,7 +399,7 @@

diff --git a/docs/doc/Doing/SymbolNormalize.html b/docs/doc/Doing/SymbolNormalize.html index a9d7857f..747ae307 100644 --- a/docs/doc/Doing/SymbolNormalize.html +++ b/docs/doc/Doing/SymbolNormalize.html @@ -331,7 +331,7 @@

diff --git a/docs/doc/Doing/TaskPaperExport.html b/docs/doc/Doing/TaskPaperExport.html index 21b2f160..c3ebedc4 100644 --- a/docs/doc/Doing/TaskPaperExport.html +++ b/docs/doc/Doing/TaskPaperExport.html @@ -212,7 +212,7 @@

diff --git a/docs/doc/Doing/TemplateExport.html b/docs/doc/Doing/TemplateExport.html index 417a0dad..0221963f 100644 --- a/docs/doc/Doing/TemplateExport.html +++ b/docs/doc/Doing/TemplateExport.html @@ -239,7 +239,7 @@

diff --git a/docs/doc/Doing/TemplateString.html b/docs/doc/Doing/TemplateString.html index 4e6e6859..697cc824 100644 --- a/docs/doc/Doing/TemplateString.html +++ b/docs/doc/Doing/TemplateString.html @@ -802,7 +802,7 @@

diff --git a/docs/doc/Doing/TimingImport.html b/docs/doc/Doing/TimingImport.html index 73054644..5e7392cb 100644 --- a/docs/doc/Doing/TimingImport.html +++ b/docs/doc/Doing/TimingImport.html @@ -275,7 +275,7 @@

diff --git a/docs/doc/Doing/Types.html b/docs/doc/Doing/Types.html index 87b21cfe..2a01335c 100644 --- a/docs/doc/Doing/Types.html +++ b/docs/doc/Doing/Types.html @@ -241,7 +241,7 @@

diff --git a/docs/doc/Doing/Util.html b/docs/doc/Doing/Util.html index 54f41464..b2eb43dc 100644 --- a/docs/doc/Doing/Util.html +++ b/docs/doc/Doing/Util.html @@ -982,7 +982,7 @@

diff --git a/docs/doc/Doing/Util/Backup.html b/docs/doc/Doing/Util/Backup.html index 96b17530..af9caa0c 100644 --- a/docs/doc/Doing/Util/Backup.html +++ b/docs/doc/Doing/Util/Backup.html @@ -684,7 +684,7 @@

diff --git a/docs/doc/Doing/Version.html b/docs/doc/Doing/Version.html index c11c8084..cf55b653 100644 --- a/docs/doc/Doing/Version.html +++ b/docs/doc/Doing/Version.html @@ -513,7 +513,7 @@

diff --git a/docs/doc/Doing/WWID.html b/docs/doc/Doing/WWID.html index c93505ed..59703033 100644 --- a/docs/doc/Doing/WWID.html +++ b/docs/doc/Doing/WWID.html @@ -5155,7 +5155,7 @@

diff --git a/docs/doc/FalseClass.html b/docs/doc/FalseClass.html index c49c2416..e78334e3 100644 --- a/docs/doc/FalseClass.html +++ b/docs/doc/FalseClass.html @@ -235,7 +235,7 @@

diff --git a/docs/doc/GLI.html b/docs/doc/GLI.html index 3f9aa5ca..68b99813 100644 --- a/docs/doc/GLI.html +++ b/docs/doc/GLI.html @@ -107,7 +107,7 @@

Defined Under Namespace

diff --git a/docs/doc/GLI/Commands.html b/docs/doc/GLI/Commands.html index e5faa252..4c0a7ee4 100644 --- a/docs/doc/GLI/Commands.html +++ b/docs/doc/GLI/Commands.html @@ -107,7 +107,7 @@

Defined Under Namespace

diff --git a/docs/doc/GLI/Commands/Help.html b/docs/doc/GLI/Commands/Help.html index 325be96f..cd0c6a84 100644 --- a/docs/doc/GLI/Commands/Help.html +++ b/docs/doc/GLI/Commands/Help.html @@ -175,7 +175,7 @@

diff --git a/docs/doc/GLI/Commands/MarkdownDocumentListener.html b/docs/doc/GLI/Commands/MarkdownDocumentListener.html index d158ddc5..32e27a77 100644 --- a/docs/doc/GLI/Commands/MarkdownDocumentListener.html +++ b/docs/doc/GLI/Commands/MarkdownDocumentListener.html @@ -753,7 +753,7 @@

diff --git a/docs/doc/Hash.html b/docs/doc/Hash.html index 1045917e..7e61c7fe 100644 --- a/docs/doc/Hash.html +++ b/docs/doc/Hash.html @@ -1000,7 +1000,7 @@

diff --git a/docs/doc/Numeric.html b/docs/doc/Numeric.html index 2f520f29..e2a93c73 100644 --- a/docs/doc/Numeric.html +++ b/docs/doc/Numeric.html @@ -214,7 +214,7 @@

diff --git a/docs/doc/Object.html b/docs/doc/Object.html index 1dcaead8..221f4205 100644 --- a/docs/doc/Object.html +++ b/docs/doc/Object.html @@ -193,7 +193,7 @@

diff --git a/docs/doc/PhraseParser.html b/docs/doc/PhraseParser.html index b2665388..80bc70dc 100644 --- a/docs/doc/PhraseParser.html +++ b/docs/doc/PhraseParser.html @@ -105,7 +105,7 @@

Defined Under Namespace

diff --git a/docs/doc/PhraseParser/Operator.html b/docs/doc/PhraseParser/Operator.html index 07f41184..b24e2223 100644 --- a/docs/doc/PhraseParser/Operator.html +++ b/docs/doc/PhraseParser/Operator.html @@ -162,7 +162,7 @@

diff --git a/docs/doc/PhraseParser/PhraseClause.html b/docs/doc/PhraseParser/PhraseClause.html index c2730673..2e01ba4e 100644 --- a/docs/doc/PhraseParser/PhraseClause.html +++ b/docs/doc/PhraseParser/PhraseClause.html @@ -293,7 +293,7 @@

diff --git a/docs/doc/PhraseParser/Query.html b/docs/doc/PhraseParser/Query.html index e76f2a6f..8b045fae 100644 --- a/docs/doc/PhraseParser/Query.html +++ b/docs/doc/PhraseParser/Query.html @@ -485,7 +485,7 @@

diff --git a/docs/doc/PhraseParser/QueryParser.html b/docs/doc/PhraseParser/QueryParser.html index db1004ed..ef3758c2 100644 --- a/docs/doc/PhraseParser/QueryParser.html +++ b/docs/doc/PhraseParser/QueryParser.html @@ -126,7 +126,7 @@

Overview

diff --git a/docs/doc/PhraseParser/QueryTransformer.html b/docs/doc/PhraseParser/QueryTransformer.html index 4a5939df..bdf10c70 100644 --- a/docs/doc/PhraseParser/QueryTransformer.html +++ b/docs/doc/PhraseParser/QueryTransformer.html @@ -114,7 +114,7 @@ diff --git a/docs/doc/PhraseParser/TermClause.html b/docs/doc/PhraseParser/TermClause.html index 0048e474..6d5b566e 100644 --- a/docs/doc/PhraseParser/TermClause.html +++ b/docs/doc/PhraseParser/TermClause.html @@ -283,7 +283,7 @@

diff --git a/docs/doc/Status.html b/docs/doc/Status.html index 35e117c5..cc5eba08 100644 --- a/docs/doc/Status.html +++ b/docs/doc/Status.html @@ -316,7 +316,7 @@

diff --git a/docs/doc/String.html b/docs/doc/String.html index 61d27928..32fdd8bb 100644 --- a/docs/doc/String.html +++ b/docs/doc/String.html @@ -679,7 +679,7 @@

diff --git a/docs/doc/Symbol.html b/docs/doc/Symbol.html index 3dcc2e3a..acc2a76f 100644 --- a/docs/doc/Symbol.html +++ b/docs/doc/Symbol.html @@ -127,7 +127,7 @@

Methods included from - Generated on Wed May 31 15:49:42 2023 by + Generated on Sat Jul 1 12:43:14 2023 by yard 0.9.34 (ruby-3.2.0). diff --git a/docs/doc/Time.html b/docs/doc/Time.html index fd05e3da..fe301392 100644 --- a/docs/doc/Time.html +++ b/docs/doc/Time.html @@ -411,7 +411,7 @@

diff --git a/docs/doc/TrueClass.html b/docs/doc/TrueClass.html index aebf84b4..6ef072dd 100644 --- a/docs/doc/TrueClass.html +++ b/docs/doc/TrueClass.html @@ -235,7 +235,7 @@

diff --git a/docs/doc/_index.html b/docs/doc/_index.html index c2e40fb8..2452633a 100644 --- a/docs/doc/_index.html +++ b/docs/doc/_index.html @@ -961,7 +961,7 @@

Namespace Listing A-Z

diff --git a/docs/doc/file.README.html b/docs/doc/file.README.html index a18c0fdd..9a9a0a37 100644 --- a/docs/doc/file.README.html +++ b/docs/doc/file.README.html @@ -71,7 +71,7 @@ -

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.

@@ -153,7 +153,7 @@

Changelog

diff --git a/docs/doc/index.html b/docs/doc/index.html index e42ef78b..4ba75b3d 100644 --- a/docs/doc/index.html +++ b/docs/doc/index.html @@ -71,7 +71,7 @@ -

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.

@@ -153,7 +153,7 @@

Changelog

diff --git a/docs/doc/top-level-namespace.html b/docs/doc/top-level-namespace.html index fa79ef2d..1503212f 100644 --- a/docs/doc/top-level-namespace.html +++ b/docs/doc/top-level-namespace.html @@ -216,7 +216,7 @@

diff --git a/doing.rdoc b/doing.rdoc index c9750dab..be3f2bff 100644 --- a/doing.rdoc +++ b/doing.rdoc @@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The command line tool allows you to add entries, annotate with tags and notes, and view your entries with myriad options, with a focus on a "natural" language syntax. -v2.1.81 +v2.1.82 === Global Options === --config_file arg diff --git a/lib/doing/errors.rb b/lib/doing/errors.rb index 596ab528..eea71ba8 100644 --- a/lib/doing/errors.rb +++ b/lib/doing/errors.rb @@ -70,7 +70,7 @@ def initialize(msg, exit_code = 26) class InvalidPlugin < DoingRuntimeError def initialize(kind = 'output', msg = nil) - super(%(Invalid #{kind} type (#{msg})), 128, topic: 'Invalid:') + super(%(Invalid #{kind} type (#{msg})), 128, topic: 'Plugin:') end end diff --git a/lib/doing/good.rb b/lib/doing/good.rb index 9d032cbf..07d6f498 100644 --- a/lib/doing/good.rb +++ b/lib/doing/good.rb @@ -5,7 +5,7 @@ module Doing class ::Numeric # Test of number is positive def good? - positive? + self >= 0 end end diff --git a/lib/doing/hash.rb b/lib/doing/hash.rb index cd8831a5..dd86359a 100644 --- a/lib/doing/hash.rb +++ b/lib/doing/hash.rb @@ -158,7 +158,7 @@ def remove_empty def tag_filter_to_options hsh = dup - if hsh.key?(:tag_filter) + if hsh.key?(:tag_filter) && hsh[:tag_filter] hsh[:tags] = hsh[:tag_filter][:tags] hsh[:bool] = hsh[:tag_filter][:bool] hsh.delete(:tag_filter) @@ -173,8 +173,8 @@ def tag_filter_to_options ## def to_view hsh = symbolize_keys - %w[x save c a s o h e editor m menu i interactive d delete t fuzzy time_filter sort_tags].each do |key| - hsh.delete(key.to_sym) if hsh.key?(key.to_sym) + %i[x save c a s o h e editor m menu i interactive d delete t fuzzy time_filter sort_tags].each do |key| + hsh.delete(key) if hsh.key?(key) end hsh.delete_unless_key(:tag, %i[bool]) diff --git a/lib/doing/normalize.rb b/lib/doing/normalize.rb index a0293caa..e1972784 100644 --- a/lib/doing/normalize.rb +++ b/lib/doing/normalize.rb @@ -17,7 +17,7 @@ def normalize_tag_sort(default = :name) when /^t/i :time else - default + default.is_a?(Symbol) ? default : default.normalize_tag_sort end end @@ -35,14 +35,14 @@ def normalize_tag_sort!(default = :name) ## def normalize_list_style(default = :space) case self - when /^com/i + when /^c(om|sv)/i :comma when /^c/i :column when /^t/i :tab else - :space + default.is_a?(Symbol) ? default : default.normalize_list_style end end @@ -58,7 +58,7 @@ def normalize_age(default = :newest) when /^n/i :newest else - default + default.is_a?(Symbol) ? default : default.normalize_age end end @@ -83,7 +83,7 @@ def normalize_order(default = :asc) when /^d/i :desc else - default + default.is_a?(Symbol) ? default : default.normalize_order end end diff --git a/lib/doing/version.rb b/lib/doing/version.rb index 862d1d28..94bd6577 100644 --- a/lib/doing/version.rb +++ b/lib/doing/version.rb @@ -1,3 +1,3 @@ module Doing - VERSION = '2.1.81' + VERSION = '2.1.82' end