doing 2.1.31pre → 2.1.32

data/docs/doc/Doing/Util/Backup.html

@@ -836,7 +836,7 @@ in a hidden directory</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/Util.html

@@ -925,7 +925,7 @@ other_hash  - the other hash whose values will be persisted after the merge</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/WWID.html

@@ -4766,7 +4766,7 @@ json, or text)</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:24 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.html

@@ -119,7 +119,7 @@
         <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.31pre</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.32</span><span class='tstring_end'>&#39;</span></span></pre></dd>
       
     </dl>
   
@@ -135,7 +135,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/FalseClass.html

@@ -225,7 +225,7 @@ has content</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/GLI/Commands/Help.html

@@ -175,7 +175,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:19 2022 by
+  Generated on Fri Feb 18 09:59:24 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/GLI/Commands/MarkdownDocumentListener.html

@@ -753,7 +753,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:19 2022 by
+  Generated on Fri Feb 18 09:59:24 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/GLI/Commands.html

@@ -107,7 +107,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/GLI.html

@@ -107,7 +107,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/Hash.html

@@ -516,7 +516,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/Object.html

@@ -193,7 +193,7 @@ has content</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/PhraseParser/Operator.html

@@ -162,7 +162,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:24 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/PhraseParser/PhraseClause.html

@@ -293,7 +293,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:19 2022 by
+  Generated on Fri Feb 18 09:59:24 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/PhraseParser/Query.html

@@ -485,7 +485,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:19 2022 by
+  Generated on Fri Feb 18 09:59:24 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/PhraseParser/QueryParser.html

@@ -126,7 +126,7 @@ A phrase clause generates an Elasticsearch match_phrase query.</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:24 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/PhraseParser/QueryTransformer.html

@@ -114,7 +114,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:24 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/PhraseParser/TermClause.html

@@ -283,7 +283,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:24 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/PhraseParser.html

@@ -105,7 +105,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/Status.html

@@ -316,7 +316,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/String.html

@@ -1129,7 +1129,7 @@ be recognized, e.g. %greensomething still finds
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/Symbol.html

@@ -342,7 +342,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:24 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/Time.html

@@ -240,7 +240,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:24 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/TrueClass.html

@@ -225,7 +225,7 @@ has content</p>
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/_index.html

@@ -589,7 +589,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/file.README.html

@@ -67,7 +67,7 @@ you&#39;ve done.</strong></p>
 
 <!--README-->
 
-<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.30&lt;!--END VER--&gt;.</p>
+<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.31&lt;!--END VER--&gt;.</p>
 
 <p>Find all of the documentation in the <a href="https://github.com/ttscoff/doing/wiki">doing wiki</a>.</p>
 
@@ -149,7 +149,7 @@ with changes. Please target the <code>develop</code> branch with pull requests.<
 </div></div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/index.html

@@ -67,7 +67,7 @@ you&#39;ve done.</strong></p>
 
 <!--README-->
 
-<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.30&lt;!--END VER--&gt;.</p>
+<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.31&lt;!--END VER--&gt;.</p>
 
 <p>Find all of the documentation in the <a href="https://github.com/ttscoff/doing/wiki">doing wiki</a>.</p>
 
@@ -149,7 +149,7 @@ with changes. Please target the <code>develop</code> branch with pull requests.<
 </div></div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/top-level-namespace.html

@@ -206,7 +206,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Feb 17 13:05:18 2022 by
+  Generated on Fri Feb 18 09:59:23 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/index.md

@@ -8,7 +8,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.21.
+The current version of `doing` is 2.1.31.
 
 Find all of the documentation in the [doing wiki][wiki].
 

data/doing.gemspec

@@ -1,5 +1,5 @@
 # Ensure we require the local version and not one we might have installed already
-require File.join([File.dirname(__FILE__),'lib','doing','version.rb'])
+require File.join([File.dirname(__FILE__), 'lib', 'doing', 'version.rb'])
 spec = Gem::Specification.new do |s|
   s.name = 'doing'
   s.version = Doing::VERSION
@@ -8,13 +8,14 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'http://brettterpstra.com/project/doing/'
   s.platform = Gem::Platform::RUBY
   s.summary = 'A command line tool for managing What Was I Doing reminders'
-  s.description = 'A tool for managing a TaskPaper-like file of recent activites. Perfect for the late-night hacker on too much caffeine to remember what they accomplished at 2 in the morning.'
+  s.description = [
+    'A tool for managing a TaskPaper-like file of recent activites.',
+    'Perfect for the late-night hacker on too much caffeine to remember',
+    'what they accomplished at 2 in the morning.'
+  ].join(' ')
   s.license = 'MIT'
-# Add your other files here if you make them
   s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
-      `git ls-files -z`.split("\x0").reject { |f|
-          f.strip =~ /^((test|spec|features)\/|\.git|buildnotes)/
-      }
+    `git ls-files -z`.split("\x0").reject { |f| f.strip =~ %r{^((test|spec|features)/|\.git|buildnotes)} }
   end
   s.require_paths << 'lib'
 
@@ -22,28 +23,27 @@ spec = Gem::Specification.new do |s|
   s.rdoc_options << '--title' << 'doing' << '--main' << 'README.md' << '--markup' << 'markdown'
   s.bindir = 'bin'
   s.executables << 'doing'
-  s.add_runtime_dependency('safe_yaml', '~> 1.0')
-  s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
-  s.add_development_dependency 'rdoc', '~> 6.3.1'
-  s.add_development_dependency 'aruba', '~> 1.0.2'
-  s.add_development_dependency 'test-unit', '~> 3.4.4'
-  s.add_development_dependency 'yard', '~> 0.9', '>= 0.9.26'
-  s.add_development_dependency 'redcarpet', '~> 3.5', '>= 3.5.1'
-  s.add_development_dependency 'github-markup', '~> 4.0', '>= 4.0.0'
-  s.add_development_dependency 'parallel_tests', '~> 3.7', '>= 3.7.3'
-  s.add_development_dependency 'tty-spinner', '~> 0.9', '>= 0.9.3'
-  s.add_runtime_dependency('tty-progressbar', '~> 0.18', '>= 0.18.2')
-  s.add_runtime_dependency('gli', '~> 2.20', '>= 2.20.1')
-  s.add_runtime_dependency('haml','~>5.0.0', '>= 5.0.0')
-  s.add_runtime_dependency('chronic','~> 0.10', '>= 0.10.2')
+  s.add_development_dependency('github-markup', '~> 4.0', '>= 4.0.0')
+  s.add_development_dependency('parallel_tests', '~> 3.7', '>= 3.7.3')
+  s.add_development_dependency('rake', '~> 13.0', '>= 13.0.1')
+  s.add_development_dependency('rdoc', '~> 6.3.1')
+  s.add_development_dependency('redcarpet', '~> 3.5', '>= 3.5.1')
+  s.add_development_dependency('test-unit', '~> 3.4.4')
+  s.add_development_dependency('tty-spinner', '~> 0.9', '>= 0.9.3')
+  s.add_development_dependency('yard', '~> 0.9', '>= 0.9.26')
+  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('gli', '~> 2.20', '>= 2.20.1')
+  s.add_runtime_dependency('haml', '~>5.0.0', '>= 5.0.0')
+  s.add_runtime_dependency('parslet', '~> 2.0', '>= 2.0.0')
+  s.add_runtime_dependency('plist', '~> 3.6', '>= 3.6.0')
+  s.add_runtime_dependency('safe_yaml', '~> 1.0')
+  s.add_runtime_dependency('sys-uname', '~> 1.2', '>= 1.2.2')
   s.add_runtime_dependency('tty-link', '~> 0.1', '>= 0.1.1')
-  s.add_runtime_dependency('tty-which', '~> 0.5', '>= 0.5.0')
   s.add_runtime_dependency('tty-markdown', '~> 0.7', '>= 0.7.0')
+  s.add_runtime_dependency('tty-progressbar', '~> 0.18', '>= 0.18.2')
   s.add_runtime_dependency('tty-reader', '~> 0.9', '>= 0.9.0')
   s.add_runtime_dependency('tty-screen', '~> 0.8', '>= 0.8.1')
-  s.add_runtime_dependency('parslet', '~> 2.0', '>= 2.0.0')
-  s.add_runtime_dependency('plist', '~> 3.6', '>= 3.6.0')
-  s.add_runtime_dependency('sys-uname', '~> 1.2', '>= 1.2.2')
+  s.add_runtime_dependency('tty-which', '~> 0.5', '>= 0.5.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.1.31pre
+v2.1.32
 
 === Global Options
 === --config_file arg
@@ -620,6 +620,11 @@ Set a key's value in the config file
 
 
 ======= Options
+======= --local
+Force update to .doingrc in the current directory
+
+
+
 ======= -r|--remove
 Delete specified key
 

data/inputrc

@@ -0,0 +1,57 @@
+"\e[3~": delete-char
+"\ex": 'cd !$ \015ls\015'
+"\ez": 'cd -\015'
+"\e\C-m": '\C-a "$(\C-e|fzf)"\C-a'
+"\e/": '"$(!!|fzf)"\C-a \C-m\C-m'
+# these allow you to use alt+left/right arrow keys
+# to jump the cursor over words
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+# "\e[D": backward-word
+# "\e[C": forward-word
+"\ea": menu-complete
+# TAB: menu-complete
+# "\e[Z": "\e-1\C-i"
+
+"\e\C-l": history-and-alias-expand-line
+
+# these allow you to start typing a command and
+# use the up/down arrow to auto complete from
+# commands in your history
+"\e[B": history-search-forward
+"\e[A": history-search-backward
+"\ew": history-search-backward
+"\es": history-search-forward
+# this lets you hit tab to auto-complete a file or
+# directory name ignoring case
+set completion-ignore-case On
+set mark-symlinked-directories On
+set completion-prefix-display-length 2
+set bell-style none
+# set bell-style visible
+set meta-flag on
+set convert-meta off
+set input-meta on
+set output-meta on
+set show-all-if-ambiguous on
+set show-all-if-unmodified on
+set completion-map-case on
+set visible-stats on
+
+# Do history expansion when space entered?
+$if bash
+	Space: magic-space
+$endif
+
+# Show extra file information when completing, like `ls -F` does
+set visible-stats on
+
+# Be more intelligent when autocompleting by also looking at the text after
+# the cursor. For example, when the current line is "cd ~/src/mozil", and
+# the cursor is on the "z", pressing Tab will not autocomplete it to "cd
+# ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the
+# Readline used by Bash 4.)
+set skip-completed-text on
+
+# Use Alt/Meta + Delete to delete the preceding word
+"\e[3;3~": kill-word

data/lib/doing/changelog/changes.rb

@@ -43,7 +43,7 @@ module Doing
 
     def to_s
       if @changes_only
-        @changes.map(&:changes_only).join().force_encoding('utf-8')
+        @changes.map(&:changes_only).delete_if(&:empty?).join().gsub(/\n+/, "\n").force_encoding('utf-8')
       else
         @changes.map(&:to_s).join("\n\n").force_encoding('utf-8')
       end

data/lib/doing/configuration.rb

@@ -156,7 +156,13 @@ module Doing
     ##
     ## @return     [String] file path
     ##
-    def choose_config(create: false)
+    def choose_config(create: false, local: false)
+      if local && create
+        res = File.expand_path('.doingrc')
+        FileUtils.touch(res)
+        return res
+      end
+
       return @config_file if @force_answer
 
       if @additional_configs&.count&.positive? || create

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.31pre'
+  VERSION = '2.1.32'
 end

data/lib/helpers/threaded_tests.rb

@@ -82,6 +82,7 @@ class ThreadedTests
     @running_tests = []
 
     begin
+      finish_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       while @children.count.positive?
 
         slices = @children.slice!(0, max_threads)
@@ -89,6 +90,7 @@ class ThreadedTests
         slices.each do |s|
           @threads << Thread.new do
             run_test(s)
+            finish_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           end
         end