doing 2.1.37 → 2.1.40

data/bin/commands/reset.rb

@@ -17,6 +17,17 @@ command %i[reset begin] do |c|
   c.desc 'Resume entry (remove @done)'
   c.switch %i[r resume], default_value: true
 
+  c.desc %(
+        Start and end times as a date/time range `doing done --from "1am to 8am"`.
+        Overrides any date argument and disables --resume.
+      )
+  c.arg_name 'TIME_RANGE'
+  c.flag [:from], must_match: REGEX_RANGE
+
+  c.desc %(Set completion date to start date plus interval (XX[mhd] or HH:MM). Disables --resume)
+  c.arg_name 'INTERVAL'
+  c.flag %i[t took for], type: DateIntervalString
+
   c.desc 'Change start date but do not remove @done (shortcut for --no-resume)'
   c.switch [:n]
 
@@ -62,9 +73,21 @@ command %i[reset begin] do |c|
 
     raise NoResults, 'No entry matching parameters was found.' unless last_entry
 
+    finish_date = nil
+
+    if options[:from]
+      options[:from] = options[:from].split(/#{REGEX_RANGE_INDICATOR}/).map do |time|
+        time =~ REGEX_TIME ? "today #{time.sub(/(?mi)(^.*?(?=\d+)|(?<=[ap]m).*?$)/, '')}" : time
+      end.join(' to ').split_date_range
+      reset_date, finish_date = options[:from]
+      options[:resume] = false if finish_date
+    end
+
+    finish_date = reset_date + options[:took] if options[:took]
+
     old_item = last_entry.clone
 
-    @wwid.reset_item(last_entry, date: reset_date, resume: options[:resume])
+    @wwid.reset_item(last_entry, date: reset_date, finish_date: finish_date, resume: options[:resume])
     Doing::Hooks.trigger :post_entry_updated, @wwid, last_entry, old_item
     # new_entry = Doing::Item.new(last_entry.date, last_entry.title, last_entry.section, new_note)
 

data/bin/commands/select.rb

@@ -94,7 +94,7 @@ command :select do |c|
 
   c.action do |_global_options, options, _args|
     if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
-      raise DoingRuntimeError, %(Invalid output type "#{options[:output]}")
+      raise InvalidPlugin.new('output', options[:output])
 
     end
 

data/bin/commands/show.rb

@@ -22,35 +22,27 @@ command :show do |c|
   c.arg_name 'MAX'
   c.flag %i[c count], default_value: 0, must_match: /^\d+$/, type: Integer
 
+  c.desc "Highlight search matches in output. Only affects command line output"
+  c.switch %i[h hilite], default_value: Doing.settings.dig('search', 'highlight')
+
+  c.desc "Edit matching entries with #{Doing::Util.default_editor}"
+  c.switch %i[e editor], negatable: false, default_value: false
+
   c.desc 'Age (oldest|newest)'
   c.arg_name 'AGE'
   c.flag %i[a age], default_value: :newest, type: AgeSymbol
 
-  c.desc "Highlight search matches in output. Only affects command line output"
-  c.switch %i[h hilite], default_value: Doing.settings.dig('search', 'highlight')
-
   c.desc 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
   c.flag %i[s sort], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
 
-  c.desc "Output using a template from configuration"
-  c.arg_name 'TEMPLATE_KEY'
-  c.flag [:config_template], type: TemplateName, default_value: 'default'
-
-  c.desc 'Override output format with a template string containing %placeholders'
-  c.arg_name 'TEMPLATE_STRING'
-  c.flag [:template]
-
   c.desc 'Select section or tag to display from a menu'
   c.switch %i[m menu], negatable: false, default_value: false
 
   c.desc 'Select from a menu of matching entries to perform additional operations'
   c.switch %i[i interactive], negatable: false, default_value: false
 
-  c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
-  c.arg_name 'FORMAT'
-  c.flag %i[o output]
-
+  add_options(:output_template, c)
   add_options(:time_display, c)
   add_options(:search, c)
   add_options(:tag_filter, c)
@@ -59,7 +51,7 @@ command :show do |c|
   c.action do |global_options, options, args|
     options[:fuzzy] = false
     if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
-      raise DoingRuntimeError, %(Invalid output type "#{options[:output]}")
+      raise InvalidPlugin.new('output', options[:output])
 
     end
 

data/bin/commands/since.rb

@@ -11,18 +11,7 @@ command :since do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
-  c.arg_name 'FORMAT'
-  c.flag %i[o output]
-
-  c.desc "Output using a template from configuration"
-  c.arg_name 'TEMPLATE_KEY'
-  c.flag [:config_template], type: TemplateName, default_value: 'default'
-
-  c.desc 'Override output format with a template string containing %placeholders'
-  c.arg_name 'TEMPLATE_STRING'
-  c.flag [:template]
-
+  add_options(:output_template, c)
   add_options(:time_display, c)
   add_options(:tag_filter, c)
   add_options(:search, c)

data/bin/commands/today.rb

@@ -12,23 +12,12 @@ command :today do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
-  c.arg_name 'FORMAT'
-  c.flag %i[o output]
-
-  c.desc "Output using a template from configuration"
-  c.arg_name 'TEMPLATE_KEY'
-  c.flag [:config_template], type: TemplateName, default_value: 'today'
-
-  c.desc 'Override output format with a template string containing %placeholders'
-  c.arg_name 'TEMPLATE_STRING'
-  c.flag [:template]
-
+  add_options(:output_template, c, default_template: 'today')
   add_options(:time_filter, c)
   add_options(:time_display, c)
 
   c.action do |_global_options, options, _args|
-    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    raise InvalidPlugin.new('output', options[:output]) if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort]

data/bin/commands/view.rb

@@ -59,7 +59,7 @@ command :view do |c|
   c.action do |global_options, options, args|
     options[:fuzzy] = false
     if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
-      raise DoingRuntimeError, %(Invalid output type "#{options[:output]}")
+      raise InvalidPlugin.new('output', options[:output])
 
     end
 

data/bin/commands/yesterday.rb

@@ -11,23 +11,12 @@ command :yesterday do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
-  c.arg_name 'FORMAT'
-  c.flag %i[o output]
-
-  c.desc "Output using a template from configuration"
-  c.arg_name 'TEMPLATE_KEY'
-  c.flag [:config_template], type: TemplateName, default_value: 'today'
-
-  c.desc 'Override output format with a template string containing %placeholders'
-  c.arg_name 'TEMPLATE_STRING'
-  c.flag [:template]
-
+  add_options(:output_template, c, default_template: 'today')
   add_options(:time_filter, c)
   add_options(:time_display, c)
 
   c.action do |_global_options, options, _args|
-    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    raise InvalidPlugin.new('output', options[:output]) if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     options[:sort_tags] = options[:tag_sort]
 

data/bin/doing

@@ -96,22 +96,22 @@ accept TemplateName do |value|
 end
 
 accept DateBeginString do |value|
-  if value =~ REGEX_TIME
-    res = value
-  else
-    res = value.chronify(guess: :begin, future: false)
-  end
+  res = if value =~ REGEX_TIME
+          value
+        else
+          value.chronify(guess: :begin, future: false)
+        end
   raise InvalidTimeExpression, 'Invalid start date' unless res
 
   res
 end
 
 accept DateEndString do |value|
-  if value =~ REGEX_TIME
-    res = value
-  else
-    res = value.chronify(guess: :end, future: false)
-  end
+  res = if value =~ REGEX_TIME
+          value
+        else
+          value.chronify(guess: :end, future: false)
+        end
   raise InvalidTimeExpression, 'Invalid end date' unless res
 
   res
@@ -211,18 +211,19 @@ add_commands(%w[undo redo])
 ## Hidden commands
 add_commands(%w[commands_accepting install_fzf])
 ## Optional commands
-add_commands(%w[again cancel flag meanwhile reset tags today yesterday since tag_dir colors completion plugins sections template views changes])
+add_commands(%w[again cancel flag meanwhile reset tags today yesterday since])
+add_commands(%w[tag_dir colors completion plugins sections template views changes])
 
 pre do |global, _command, _options, _args|
   # global[:pager] ||= Doing.setting('paginate')
   Doing::Pager.paginate = global[:pager]
 
   $stdout.puts "doing v#{Doing::VERSION}" if global[:version]
-  unless $stdout.isatty
-    Doing::Color.coloring = global[:pager] ? global[:color] : false
-  else
-    Doing::Color.coloring = global[:color]
-  end
+  Doing::Color.coloring = if $stdout.isatty
+                            global[:color]
+                          else
+                            global[:pager] ? global[:color] : false
+                          end
 
   # Return true to proceed; false to abort and not call the
   # chosen command
@@ -232,9 +233,16 @@ pre do |global, _command, _options, _args|
 end
 
 on_error do |exception|
-  if exception.kind_of?(GLI::UnknownCommand) && ARGV.count > 1
-    exit run(['now'].concat(ARGV.unshift(@command)))
-  elsif exception.kind_of?(SystemExit)
+  if exception.is_a?(GLI::UnknownCommand)
+    if ARGV.count > 1
+      exit run(['now'].concat(ARGV.unshift(@command)))
+    else
+      Doing::Color.coloring = $stdout.isatty
+      Doing.logger.error('Unknown Command:', @command)
+      Doing.logger.output_results
+      false
+    end
+  elsif exception.is_a?(SystemExit)
     false
   else
     # Doing.logger.error('Fatal:', exception)
@@ -243,7 +251,7 @@ on_error do |exception|
   end
 end
 
-post do |global, _command, _options, _args|
+post do |_global, _command, _options, _args|
   # Use skips_post before a command to skip this
   # block on that command only
   Doing.logger.output_results
@@ -251,23 +259,16 @@ post do |global, _command, _options, _args|
   Doing.logger.log_benchmarks
 end
 
-around do |global, command, options, arguments, code|
+around do |global, command, _options, _arguments, code|
   Doing.logger.benchmark("command_#{command.name}".to_sym, :start)
-  # Doing.logger.debug('Pager:', "Global: #{global[:pager]}, Config: #{Doing.setting('paginate')}, Pager: #{Doing::Pager.paginate}")
-  if env_log_level.nil?
-    Doing.logger.adjust_verbosity(global)
-  end
+  # pager_msg = "Global: #{global[:pager]}, Config: #{Doing.setting('paginate')}, Pager: #{Doing::Pager.paginate}"
+  # Doing.logger.debug('Pager:', pager_msg)
+  Doing.logger.adjust_verbosity(global) if env_log_level.nil?
 
-  global[:stdin] = if $stdin.stat.size.positive? || $stdin.fcntl(Fcntl::F_GETFL, 0) == 0
-                     $stdin.read.strip
-                   else
-                     nil
-                   end
+  global[:stdin] = $stdin.read.strip if $stdin.stat.size.positive? || $stdin.fcntl(Fcntl::F_GETFL, 0).zero?
   global[:stdin] = nil unless global[:stdin].good?
 
-  if global[:stdout]
-    Doing.logger.logdev = $stdout
-  end
+  Doing.logger.logdev = $stdout if global[:stdout]
 
   if global[:yes]
     Doing::Prompt.force_answer = :yes
@@ -286,8 +287,12 @@ around do |global, command, options, arguments, code|
   end
 
   if global[:config_file] && global[:config_file] != Doing.config.config_file
-    Doing.logger.warn(format('%sWARNING:%s %sThe use of --config_file is deprecated, please set the environment variable DOING_CONFIG instead.', @colors.flamingo, @colors.default, @colors.boldred))
-    Doing.logger.warn(format('%sTo set it just for the current command, use: %sDOING_CONFIG=/path/to/doingrc doing [command]%s',  @colors.red, @colors.boldwhite, @colors.default))
+    msg = Doing::Color.template(['{Rwb}WARNING:{x} {br}The use of --config_file is deprecated,',
+                                 'please set the environment variable DOING_CONFIG instead.{x}'])
+    Doing.logger.warn(msg)
+    msg = Doing::Color.template(['{r}To set it just for the current command, use:',
+                                 '{bw}DOING_CONFIG=/path/to/doingrc doing [command]{x}'])
+    Doing.logger.warn(msg)
 
     cf = File.expand_path(global[:config_file])
     raise MissingConfigFile, "Config file not found (#{global[:config_file]})" unless File.exist?(cf)
@@ -310,7 +315,7 @@ around do |global, command, options, arguments, code|
 
   code.call
 
-  Doing.logger.benchmark("command_#{command.name.to_s}".to_sym, :finish)
+  Doing.logger.benchmark("command_#{command.name}".to_sym, :finish)
 end
 
 commands_from File.expand_path(Doing.setting('plugins.command_path')) if Doing.setting('plugins.command_path')

data/docs/doc/Array.html

@@ -195,7 +195,7 @@ has content</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 12 11:56:35 2022 by
+  Generated on Tue Mar 15 11:14:29 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Clause.html

@@ -283,7 +283,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 12 11:56:36 2022 by
+  Generated on Tue Mar 15 11:14:30 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Operator.html

@@ -162,7 +162,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 12 11:56:36 2022 by
+  Generated on Tue Mar 15 11:14:30 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Query.html

@@ -407,7 +407,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 12 11:56:36 2022 by
+  Generated on Tue Mar 15 11:14:30 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/QueryParser.html

@@ -125,7 +125,7 @@ parser. In order to do that, a new "clause" node is added to the parse
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 12 11:56:36 2022 by
+  Generated on Tue Mar 15 11:14:30 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/QueryTransformer.html

@@ -114,7 +114,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 12 11:56:36 2022 by
+  Generated on Tue Mar 15 11:14:30 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser.html

@@ -105,7 +105,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 12 11:56:35 2022 by
+  Generated on Tue Mar 15 11:14:29 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>