doing 2.1.31pre → 2.1.35

data/bin/commands/since.rb

@@ -11,20 +11,6 @@ command :since do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true, negatable: true
-
-  c.desc 'Show elapsed time on entries without @done tag'
-  c.switch [:duration]
-
-  c.desc 'Show time totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: false
-
-  c.desc 'Sort tags by (name|time)'
-  default = Doing.setting('tag_sort').normalize_tag_sort || :name
-  c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
-
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
   c.flag %i[o output]
@@ -37,6 +23,10 @@ command :since do |c|
   c.arg_name 'TEMPLATE_STRING'
   c.flag [:template]
 
+  add_options(:time_display, c)
+  add_options(:tag_filter, c)
+  add_options(:search, 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)
 
@@ -57,7 +47,6 @@ command :since do |c|
     options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort]
 
-    Doing::Pager.page @wwid.list_date([start, finish], options[:section], options[:times], options[:output],
-                        { template: options[:template], config_template: options[:config_template], duration: options[:duration], totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
+    Doing::Pager.page @wwid.list_date([start, finish], options[:section], options[:times], options[:output], options).chomp
   end
 end

data/bin/commands/tag_dir.rb

@@ -5,7 +5,7 @@ subdirectories will be tagged with the default tags. You can modify these any ti
 manually editing the .doingrc file.'
 arg_name 'TAG [TAG..]'
 command :tag_dir do |c|
-  c.example 'doing tag_dir project1 project2', desc: 'Add @project1 and @project to to any entries in the current directory'
+  c.example 'doing tag_dir project1 project2', desc: 'Add @project1 and @project2 to to any entries created from the current directory'
   c.example 'doing tag_dir --remove', desc: 'Clear the default tags for the directory'
 
   c.desc 'Remove all default_tags from the local .doingrc'
@@ -16,14 +16,38 @@ command :tag_dir do |c|
 
     cfg_cmd = commands[:config]
     set_cmd = cfg_cmd.commands[:set]
-    set_options = {}
+
+    set_options = { local: true }
     if options[:remove]
       set_args = ['default_tags']
       set_options[:remove] = true
     else
+      current_tags = Doing.setting('default_tags')
+
+      tags.delete_if do |tag|
+        if current_tags.include?(tag)
+          Doing.logger.info('Skipped:', "#{tag} is already applied by existing config")
+          true
+        else
+          false
+        end
+      end
+
+      raise EmptyInput, 'No new tags provided' if tags.empty?
+
+      if File.exist?('.doingrc')
+        local = Doing::Util.safe_load_file('.doingrc')
+        dir_tags = local['default_tags'] || []
+
+        tags.concat(dir_tags)
+        tags.sort!.uniq!
+
+        raise UserCancelled, 'Tag(s) already exist for directory' if tags == dir_tags.sort
+      end
+
       set_args = ['default_tags', tags.join(',')]
     end
     action = set_cmd.send(:get_action, nil)
-    return action.call(global, set_options, set_args)
+    action.call(global, set_options, set_args)
   end
 end

data/bin/commands/today.rb

@@ -12,20 +12,6 @@ command :today do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true, negatable: true
-
-  c.desc 'Show elapsed time on entries without @done tag'
-  c.switch [:duration]
-
-  c.desc 'Show time totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: false
-
-  c.desc 'Sort tags by (name|time)'
-  default = Doing.setting('tag_sort').normalize_tag_sort || :name
-  c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
-
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
   c.flag %i[o output]
@@ -38,26 +24,15 @@ command :today do |c|
   c.arg_name 'TEMPLATE_STRING'
   c.flag [:template]
 
-  c.desc 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
-  c.arg_name 'TIME_STRING'
-  c.flag [:before]
-
-  c.desc 'View entries after specified time (e.g. 8am, 12:30pm, 15:00)'
-  c.arg_name 'TIME_STRING'
-  c.flag [:after]
-
-  c.desc %(
-    Time range to show `doing today --from "12pm to 4pm"`
-  )
-  c.arg_name 'TIME_RANGE'
-  c.flag [:from], type: DateRangeString
+  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)
 
     options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort]
-    filter_options = %i[after before duration from section sort_tags totals template config_template].each_with_object({}) { |k, hsh| hsh[k] = options[k] }
+    filter_options = %i[after before times duration from section sort_tags totals tag_order template config_template only_timed].each_with_object({}) { |k, hsh| hsh[k] = options[k] }
 
     Doing::Pager.page @wwid.today(options[:times], options[:output], filter_options).chomp
   end

data/bin/commands/yesterday.rb

@@ -23,47 +23,14 @@ command :yesterday do |c|
   c.arg_name 'TEMPLATE_STRING'
   c.flag [:template]
 
-  c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true, negatable: true
-
-  c.desc 'Show elapsed time on entries without @done tag'
-  c.switch [:duration]
-
-  c.desc 'Show time totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: false
-
-  c.desc 'Sort tags by (name|time)'
-  default = Doing.setting('tag_sort').normalize_tag_sort || :name
-  c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
-
-  c.desc 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
-  c.arg_name 'TIME_STRING'
-  c.flag [:before]
-
-  c.desc 'View entries after specified time (e.g. 8am, 12:30pm, 15:00)'
-  c.arg_name 'TIME_STRING'
-  c.flag [:after]
-
-  c.desc 'Time range to show, e.g. `doing yesterday --from "1am to 8am"`'
-  c.arg_name 'TIME_RANGE'
-  c.flag [:from], must_match: REGEX_TIME_RANGE
-
-  c.desc 'Tag sort direction (asc|desc)'
-  c.arg_name 'DIRECTION'
-  c.flag [:tag_order], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
+  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)
 
     options[:sort_tags] = options[:tag_sort]
 
-    if options[:from]
-      options[:from] = options[:from].split(/#{REGEX_RANGE_INDICATOR}/).map do |time|
-        "yesterday #{time.sub(/(?mi)(^.*?(?=\d+)|(?<=[ap]m).*?$)/, '')}"
-      end.join(' to ').split_date_range
-    end
-
     opt = options.clone
     opt[:order] = Doing.setting(['templates', options[:config_template], 'order'])
 

data/bin/doing

@@ -63,7 +63,6 @@ Doing.set('backup_dir', ENV['DOING_BACKUP_DIR']) if ENV['DOING_BACKUP_DIR']
 
 # Set up class vars for backwards compatibility
 @settings = Doing.settings
-@wwid.config = Doing.settings
 
 accept BooleanSymbol do |value|
   value.normalize_bool(:pattern)
@@ -144,8 +143,6 @@ accept TagArray do |value|
   value.gsub(/[, ]+/, ' ').split(' ').map { |tag| tag.sub(/^@/, '') }.map(&:strip)
 end
 
-commands_from File.expand_path(Doing.setting('plugins.command_path')) if Doing.setting('plugins.command_path')
-
 program_desc 'A CLI for a What Was I Doing system'
 program_long_desc %(Doing uses a TaskPaper-like formatting to keep a plain text
 record of what you've been doing, complete with tag-based time tracking. The
@@ -214,7 +211,7 @@ 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 add_section tag_dir colors completion plugins sections template views changes])
+add_commands(%w[again cancel flag meanwhile reset tags today yesterday since tag_dir colors completion plugins sections template views changes])
 
 pre do |global, _command, _options, _args|
   # global[:pager] ||= Doing.setting('paginate')
@@ -235,8 +232,8 @@ pre do |global, _command, _options, _args|
 end
 
 on_error do |exception|
-  if exception.kind_of?(GLI::UnknownCommand)
-    exit run(['now'].concat(ARGV))
+  if exception.kind_of?(GLI::UnknownCommand) && ARGV.count > 1
+    exit run(['now'].concat(ARGV.unshift(@command)))
   elsif exception.kind_of?(SystemExit)
     false
   else
@@ -255,7 +252,7 @@ post do |global, _command, _options, _args|
 end
 
 around do |global, command, options, arguments, code|
-  Doing.logger.benchmark("command_#{command.name.to_s}".to_sym, :start)
+  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)
@@ -298,7 +295,7 @@ around do |global, command, options, arguments, code|
     @wwid.init_doing_file
   end
   Doing.logger.benchmark(:init, :finish)
-  @wwid.auto_tag = !global[:noauto]
+  Doing.auto_tag = !global[:noauto]
 
   Doing.set('include_notes', false) unless global[:notes]
 
@@ -309,4 +306,8 @@ around do |global, command, options, arguments, code|
   Doing.logger.benchmark("command_#{command.name.to_s}".to_sym, :finish)
 end
 
+commands_from File.expand_path(Doing.setting('plugins.command_path')) if Doing.setting('plugins.command_path')
+
+@command = ARGV[0]
+
 exit run(ARGV)

data/docs/doc/Array.html

@@ -195,7 +195,7 @@ has content</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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 Thu Feb 17 13:05:19 2022 by
+  Generated on Mon Feb 21 14:59:54 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 Thu Feb 17 13:05:19 2022 by
+  Generated on Mon Feb 21 14:59:54 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 Thu Feb 17 13:05:19 2022 by
+  Generated on Mon Feb 21 14:59:54 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 Thu Feb 17 13:05:19 2022 by
+  Generated on Mon Feb 21 14:59:54 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 Thu Feb 17 13:05:19 2022 by
+  Generated on Mon Feb 21 14:59:54 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 Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Color.html

@@ -518,7 +518,7 @@ ANSI-sequences are stripped from the string.</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Completion.html

@@ -526,7 +526,7 @@ stdout</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Configuration.html

@@ -372,7 +372,7 @@
         <li class="public ">
   <span class="summary_signature">
     
-      <a href="#choose_config-instance_method" title="#choose_config (instance method)">#<strong>choose_config</strong>(create: false)  &#x21d2; String </a>
+      <a href="#choose_config-instance_method" title="#choose_config (instance method)">#<strong>choose_config</strong>(create: false, local: false)  &#x21d2; String </a>
     
 
     
@@ -771,7 +771,7 @@
       <div class="method_details ">
   <h3 class="signature " id="choose_config-instance_method">
   
-    #<strong>choose_config</strong>(create: false)  &#x21d2; <tt><span class='object_link'><a href="../String.html" title="String (class)">String</a></span></tt> 
+    #<strong>choose_config</strong>(create: false, local: false)  &#x21d2; <tt><span class='object_link'><a href="../String.html" title="String (class)">String</a></span></tt> 
   
 
   
@@ -1139,7 +1139,7 @@ matched, first match wins)</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Errors/DoingNoTraceError.html

@@ -176,7 +176,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Errors/DoingRuntimeError.html

@@ -176,7 +176,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Errors/DoingStandardError.html

@@ -176,7 +176,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Errors/EmptyInput.html

@@ -176,7 +176,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Errors/NoResults.html

@@ -176,7 +176,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Errors/PluginException.html

@@ -238,7 +238,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Errors/UserCancelled.html

@@ -176,7 +176,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Errors/WrongCommand.html

@@ -176,7 +176,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Errors.html

@@ -181,7 +181,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Hooks.html

@@ -354,7 +354,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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/Doing/Item.html

@@ -337,7 +337,7 @@
         <li class="public ">
   <span class="summary_signature">
     
-      <a href="#equal%3F-instance_method" title="#equal? (instance method)">#<strong>equal?</strong>(other)  &#x21d2; Boolean </a>
+      <a href="#equal%3F-instance_method" title="#equal? (instance method)">#<strong>equal?</strong>(other, match_section: false)  &#x21d2; Boolean </a>
     
 
     
@@ -1145,7 +1145,7 @@ the item belongs</p>
       <div class="method_details ">
   <h3 class="signature " id="equal?-instance_method">
   
-    #<strong>equal?</strong>(other)  &#x21d2; <tt>Boolean</tt> 
+    #<strong>equal?</strong>(other, match_section: false)  &#x21d2; <tt>Boolean</tt> 
   
 
   
@@ -1177,6 +1177,23 @@ the item belongs</p>
       
     </li>
   
+    <li>
+      
+        <span class='name'>match_section</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>false</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'><p>If true, require item sections to match</p>
+</div>
+      
+    </li>
+  
 </ul>
 
 <p class="tag_title">Returns:</p>
@@ -2353,7 +2370,7 @@ thus should not receive a date on the @done tag</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Mon Feb 21 14:59:53 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>