doing 2.0.10 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cc03da6b7d2ea778baf93cd1031b1663f071e1aaddf84efc15ffc21690fc157
-  data.tar.gz: 1fecde44c95f32746406cbf2cafbdddea6d47db1696a0311437cd7dd928f3fef
+  metadata.gz: 262b91be12667a7fe32b425976d59da69e29c7a6979ef51b57672db4e2d6ac5f
+  data.tar.gz: 40557fb4ab216703c4c72d8509c42373187be1f328d9e54ba562b95d9d8af4e1
 SHA512:
-  metadata.gz: '095d859e021692c9cee5e9ab16b82b48c1c1619798db261e83a9c50375f9df52547390a817623ba1ec3173f502731b9bf208dc574333886742955864e7a21ba9'
-  data.tar.gz: e0a350fb87a0c173181eb5ff4ca6ea8e2152d98a8f54cf9a70153e24b94990f058d8fd5937ae2f5f40a7826b85e9d98b84277d4dd02a98a99d996ba24d17ca31
+  metadata.gz: 1ae876bc4a6aefe32d7fa4e2b81d86b0a8d1fe3a8299c8e4567065a707e03468a0e65cb3bba51519e9e2bf9a9f09be41ae13d918f50707677cfa8fb61f5a3345
+  data.tar.gz: d2dbc67e2479d98084eb4e4375c4ccdf3701747ed4b138879449c121abdbc64298e7070c2845ee8f5187058d2bd04bb3d2d5347af814807ed5c1cc902e657d16

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 2.0.16
+
+- Test release to validate git flow automation
+
+### 2.0.13
+
+#### FIXED
+
+- Remove amatch gem dependency due to compatibility issues with Windows systems (also removes `--fuzzy` option from all search commands)
+
+### 2.0.11
+
+#### NEW
+
+- Append `/r` to tag transforms to replace original tag
+
+#### FIXED
+
+- Autotag tag transform fixes
+
 ### 2.0.10
 
 #### NEW

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.0.10)
-      amatch (~> 0.4, >= 0.4.0)
+    doing (2.0.16)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.19, >= 2.19.2)
@@ -18,9 +17,6 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    amatch (0.4.0)
-      mize
-      tins (~> 1.0)
     aruba (1.0.4)
       childprocess (>= 2.0, < 5.0)
       contracts (~> 0.16.0)
@@ -75,17 +71,16 @@ GEM
       concurrent-ruby (~> 1.0)
     middleware (0.1.0)
     minitest (5.14.4)
-    mize (0.4.0)
-      protocol (~> 2.0)
     multi_test (0.1.2)
+    parallel (1.21.0)
+    parallel_tests (3.7.3)
+      parallel
     power_assert (2.0.1)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
       middleware
       thor
       thread_safe
-    protocol (2.0.0)
-      ruby_parser (~> 3.0)
     rake (13.0.6)
     rdoc (6.3.3)
     redcarpet (3.5.1)
@@ -93,11 +88,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    ruby_parser (3.18.1)
-      sexp_processor (~> 4.16)
     safe_yaml (1.0.5)
-    sexp_processor (4.16.0)
-    sync (0.5.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
     temple (0.8.2)
@@ -106,8 +97,6 @@ GEM
     thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tins (1.29.1)
-      sync
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     yard (0.9.26)
@@ -120,6 +109,7 @@ DEPENDENCIES
   aruba (~> 1.0.2)
   doing!
   github-markup
+  parallel_tests
   rake (~> 13.0, >= 13.0.1)
   rdoc (~> 6.3.1)
   redcarpet

data/README.md

@@ -6,7 +6,7 @@ _If you're one of the rare people like me who find this useful, feel free to [bu
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.0.9<!--END VER-->.
+The current version of `doing` is <!--VER-->2.0.15<!--END VER-->.
 
 Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
 

data/Rakefile

@@ -6,6 +6,8 @@ require 'rdoc/task'
 require 'rake/testtask'
 require 'open3'
 require 'yard'
+require 'parallel_tests'
+require 'parallel_tests/tasks'
 
 YARD::Rake::YardocTask.new do |t|
  t.files = ['lib/doing/*.rb']

data/bin/doing

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -W1
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
@@ -198,8 +198,8 @@ command %i[reset begin] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -219,6 +219,7 @@ command %i[reset begin] do |c|
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |global_options, options, args|
+    options[:fuzzy] = false
     if options[:section]
       options[:section] = wwid.guess_section(options[:section]) || options[:section].cap_first
     end
@@ -296,8 +297,8 @@ command :note do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -317,6 +318,7 @@ command :note do |c|
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
+    options[:fuzzy] = false
     if options[:section]
       options[:section] = wwid.guess_section(options[:section]) || options[:section].cap_first
     end
@@ -854,8 +856,8 @@ command :cancel do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -874,6 +876,7 @@ command :cancel do |c|
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
+    options[:fuzzy] = false
     if options[:section]
       section = wwid.guess_section(options[:section]) || options[:section].cap_first
     else
@@ -956,8 +959,8 @@ command :finish do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -995,6 +998,7 @@ command :finish do |c|
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
+    options[:fuzzy] = false
     unless options[:auto]
       if options[:took]
         took = wwid.chronify_qty(options[:took])
@@ -1086,8 +1090,8 @@ command %i[again resume] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -1114,6 +1118,7 @@ command %i[again resume] do |c|
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, _args|
+    options[:fuzzy] = false
     tags = options[:tag].nil? ? [] : options[:tag].to_tags
 
     options[:case] = options[:case].normalize_case
@@ -1195,8 +1200,8 @@ command :tag do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -1216,6 +1221,7 @@ command :tag do |c|
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
+    options[:fuzzy] = false
     raise MissingArgument, 'You must specify at least one tag' if args.empty? && !options[:autotag]
 
     raise InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
@@ -1252,6 +1258,7 @@ command :tag do |c|
       count = options[:count].to_i
     end
 
+    options[:case] ||= :smart
     options[:case] = options[:case].normalize_case
 
     if options[:search]
@@ -1330,8 +1337,8 @@ command [:mark, :flag] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -1351,6 +1358,7 @@ command [:mark, :flag] do |c|
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, _args|
+    options[:fuzzy] = false
     mark = settings['marker_tag'] || 'flagged'
 
     raise InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
@@ -1458,8 +1466,8 @@ command :show do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -1509,6 +1517,7 @@ command :show do |c|
   c.arg_name 'FORMAT'
   c.flag %i[o output]
   c.action do |global_options, options, args|
+    options[:fuzzy] = false
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     tag_filter = false
@@ -1573,7 +1582,12 @@ command :show do |c|
 
     options[:times] = true if options[:totals]
 
-    tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
+    template = settings['templates']['default'].deep_merge({
+        'wrap_width' => settings['wrap_width'] || 0,
+        'date_format' => settings['default_date_format'],
+        'order' => settings['order'] || 'asc',
+        'tags_color' => settings['tags_color']
+      })
 
     options[:case] = options[:case].normalize_case
 
@@ -1594,7 +1608,7 @@ command :show do |c|
     opt[:tag] = nil
     opt[:tag_filter] = tag_filter
     opt[:tag_order] = options[:tag_order].normalize_order
-    opt[:tags_color] = tags_color
+    opt[:tags_color] = template['tags_color']
 
     Doing::Pager.page wwid.list_section(opt)
   end
@@ -1645,8 +1659,8 @@ command %i[grep search] do |c|
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -1662,9 +1676,11 @@ command %i[grep search] do |c|
   c.switch %i[i interactive], default_value: false, negatable: false
 
   c.action do |_global_options, options, args|
+    options[:fuzzy] = false
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
-    tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
+    template = settings['templates']['default'].deep_merge(settings)
+    tags_color = template.key?('tags_color') ? template['tags_color'] : nil
 
     section = wwid.guess_section(options[:section]) if options[:section]
 
@@ -1730,7 +1746,9 @@ command :recent do |c|
 
       options[:t] = true if options[:totals]
       options[:sort_tags] = options[:tag_sort] =~ /^n/i
-      tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
+
+      template = settings['templates']['recent'].deep_merge(settings['templates']['default'])
+      tags_color = template.key?('tags_color') ? template['tags_color'] : nil
 
       opts = {
         sort_tags: options[:sort_tags],
@@ -1791,8 +1809,7 @@ command :today do |c|
       before: options[:before],
       section: options[:section],
       sort_tags: options[:sort_tags],
-      totals: options[:totals],
-      order: settings.dig('templates', 'today', 'order')
+      totals: options[:totals]
     }
     Doing::Pager.page wwid.today(options[:times], options[:output], opt).chomp
   end
@@ -1994,8 +2011,8 @@ command :last do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -2008,6 +2025,7 @@ command :last do |c|
   c.flag [:case], must_match: /^[csi]/, default_value: 'smart'
 
   c.action do |global_options, options, _args|
+    options[:fuzzy] = false
     raise InvalidArgument, '--tag and --search can not be used together' if options[:tag] && options[:search]
 
     if options[:tag].nil?
@@ -2196,8 +2214,8 @@ command :view do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -2232,6 +2250,7 @@ command :view do |c|
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |global_options, options, args|
+    options[:fuzzy] = false
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     raise InvalidArgument, '--tag and --search can not be used together' if options[:tag] && options[:search]
@@ -2266,6 +2285,7 @@ command :view do |c|
 
       template = view.key?('template') ? view['template'] : nil
       date_format = view.key?('date_format') ? view['date_format'] : nil
+
       tags_color = view.key?('tags_color') ? view['tags_color'] : nil
       tag_filter = false
       if options[:tag]
@@ -2423,8 +2443,8 @@ command %i[archive move] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -2442,6 +2462,7 @@ command %i[archive move] do |c|
   c.flag [:before]
 
   c.action do |_global_options, options, args|
+    options[:fuzzy] = false
     if args.empty?
       section = settings['current_section']
       tags = []
@@ -2504,8 +2525,8 @@ command :rotate do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -2523,6 +2544,7 @@ command :rotate do |c|
   c.flag [:before]
 
   c.action do |_global_options, options, args|
+    options[:fuzzy] = false
     if options[:section] && options[:section] !~ /^all$/i
       options[:section] = wwid.guess_section(options[:section])
     end
@@ -2727,8 +2749,8 @@ command :import do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
-  c.desc 'Use alternative fuzzy matching for search string'
-  c.switch [:fuzzy], default_value: false, negatable: false
+  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
+  # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact search string matching (case sensitive)'
   c.switch %i[x exact], default_value: false, negatable: false
@@ -2778,7 +2800,7 @@ command :import do |c|
   c.switch [:overlap], negatable: true
 
   c.action do |_global_options, options, args|
-
+    options[:fuzzy] = false
     if options[:section]
       options[:section] = wwid.guess_section(options[:section]) || options[:section].cap_first
     end

data/doing.gemspec

@@ -30,9 +30,10 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'redcarpet'
   s.add_development_dependency 'github-markup'
+  s.add_development_dependency 'parallel_tests'
   s.add_runtime_dependency('gli', '~> 2.19', '>= 2.19.2')
   s.add_runtime_dependency('haml','~>5.0.0', '>= 5.0.0')
   s.add_runtime_dependency('chronic','~> 0.10', '>= 0.10.2')
   s.add_runtime_dependency('deep_merge', '~> 1.2', '>= 1.2.1')
-  s.add_runtime_dependency('amatch', '~> 0.4', '>= 0.4.0')
+  # s.add_runtime_dependency('amatch', '~> 0.4', '>= 0.4.0')
 end

data/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.0.10
+v2.0.16
 
 === Global Options
 === --config_file arg
@@ -139,11 +139,6 @@ Edit duplicated entry with vim before adding
 
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== -i|--interactive
 Select item to resume from a menu of matching entries
 
@@ -220,11 +215,6 @@ Tag filter, combine multiple tags with a comma. Added for compatibility with oth
 [Default Value] None
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== --[no-]label
 Label moved items with @from(SECTION_NAME)
 
@@ -347,11 +337,6 @@ Archive entries
 
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== -i|--interactive
 Select item(s) to cancel from a menu of matching entries
 
@@ -606,11 +591,6 @@ Include date
 
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== -i|--interactive
 Select item(s) to finish from a menu of matching entries
 
@@ -687,11 +667,6 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== -i|--interactive
 Display an interactive menu of results to perform further operations
 
@@ -808,11 +783,6 @@ Autotag entries
 
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== --not
 Import items that *don't* match search/tag/date filters
 
@@ -880,11 +850,6 @@ Edit entry with vim
 
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== --not
 Show items that *don't* match search string or tag filter
 
@@ -980,11 +945,6 @@ Don't ask permission to flag all entries when count is 0
 
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== -i|--interactive
 Select item(s) to flag from a menu of matching entries
 
@@ -1097,11 +1057,6 @@ Edit entry with vim
 
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== -i|--interactive
 Select item for new note from a menu of matching entries
 
@@ -1319,11 +1274,6 @@ Reset last entry matching tag
 [Default Value] None
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== -i|--interactive
 Select from a menu of matching entries
 
@@ -1402,11 +1352,6 @@ Tag filter, combine multiple tags with a comma. Added for compatibility with oth
 [Default Value] None
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== --not
 Rotate items that *don't* match search string or tag filter
 
@@ -1650,11 +1595,6 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time))
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== -i|--interactive
 Select from a menu of matching entries to perform additional operations
 
@@ -1808,11 +1748,6 @@ Don't ask permission to tag all entries when count is 0
 
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== -i|--interactive
 Select item(s) to tag from a menu of matching entries
 
@@ -2018,11 +1953,6 @@ Include colors in output
 
 
 
-===== --fuzzy
-Use alternative fuzzy matching for search string
-
-
-
 ===== -i|--interactive
 Select from a menu of matching entries to perform additional operations