doing 2.1.34 → 2.1.37

data/docs/doc/Object.html

@@ -193,7 +193,7 @@ has content</p>
 </div>
 
       <div id="footer">
-  Generated on Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:35 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 Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:36 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 Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:36 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 Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:36 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 Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:36 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 Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:36 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 Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:36 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 Sun Feb 20 09:36:51 2022 by
+  Generated on Sat Mar 12 11:56:35 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 Sun Feb 20 09:36:51 2022 by
+  Generated on Sat Mar 12 11:56:35 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 Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:35 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 Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:35 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 Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:35 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 Sun Feb 20 09:36:52 2022 by
+  Generated on Sat Mar 12 11:56:35 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 Sun Feb 20 09:36:51 2022 by
+  Generated on Sat Mar 12 11:56:35 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.31&lt;!--END VER--&gt;.</p>
+<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.36&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 Sun Feb 20 09:36:51 2022 by
+  Generated on Sat Mar 12 11:56:35 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.31&lt;!--END VER--&gt;.</p>
+<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.36&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 Sun Feb 20 09:36:51 2022 by
+  Generated on Sat Mar 12 11:56:35 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 Sun Feb 20 09:36:51 2022 by
+  Generated on Sat Mar 12 11:56:35 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/doing.gemspec

@@ -38,7 +38,6 @@ spec = Gem::Specification.new do |s|
   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-markdown', '~> 0.7', '>= 0.7.0')
   s.add_runtime_dependency('tty-progressbar', '~> 0.18', '>= 0.18.2')

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.34
+v2.1.37
 
 === Global Options
 === --config_file arg

data/lib/doing/chronify/string.rb

@@ -43,8 +43,8 @@ module Doing
         Doing.logger.debug('Parser:', %(date/time string "#{self}" interpreted as #{res} (#{secs_ago} seconds ago)))
       else
         date_string = dup
-        date_string = 'today' if date_string.match(REGEX_DAY) && now.strftime('%a') =~ /^#{Regexp.last_match(1)}/i
-        date_string = "#{options[:context].to_s} #{date_string}" if date_string =~ REGEX_TIME && options[:context]
+        date_string = 'today' if date_string.match(Types::REGEX_DAY) && now.strftime('%a') =~ /^#{Regexp.last_match(1)}/i
+        date_string = "#{options[:context].to_s} #{date_string}" if date_string =~ Types::REGEX_TIME && options[:context]
 
         res = Chronic.parse(date_string, {
                               guess: options.fetch(:guess, :begin),
@@ -176,7 +176,7 @@ module Doing
     ##   "mon 3pm to mon 5pm".split_date_range
     ##
     def split_date_range
-      time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
+      time_rx = /^(\d{1,2}(:\d{1,2})?( *(am|pm))?|midnight|noon)$/
       range_rx = / (to|through|thru|(?:un)?til|-+) /
 
       date_string = dup
@@ -187,12 +187,13 @@ module Doing
         inclusive = true
 
         dates = date_string.split(range_rx)
+
         if dates[0].strip =~ time_rx && dates[-1].strip =~ time_rx
           start = dates[0].strip
           finish = dates[-1].strip
         else
           start = dates[0].chronify(guess: :begin, future: false)
-          finish = dates[-1].chronify(guess: inclusive ? :end : :begin, future: false)
+          finish = dates[-1].chronify(guess: inclusive ? :end : :begin, future: true)
         end
 
         raise Errors::InvalidTimeExpression, 'Unrecognized date string' if start.nil? || finish.nil?

data/lib/doing/prompt.rb

@@ -62,7 +62,9 @@ module Doing
         prompt_text << boldgreen(prompt.sub(/:?$/, ':'))
         prompt_text << yellow(' Enter a blank line (')
         prompt_text << boldwhite('return twice')
-        prompt_text << yellow(') to end editing')
+        prompt_text << yellow(') to end editing and save, ')
+        prompt_text << boldwhite('CTRL-C')
+        prompt_text << yellow(' to cancel')
         puts prompt_text.join('')
 
         res = []

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.34'
+  VERSION = '2.1.37'
 end

data/lib/doing.rb

@@ -15,6 +15,7 @@ require 'haml'
 require 'json'
 require 'logger'
 require 'safe_yaml/load'
+require 'fcntl'
 
 require 'chronic'
 require 'tty-link'
@@ -22,7 +23,6 @@ require 'tty-which'
 require 'tty-markdown'
 require 'tty-reader'
 require 'tty-screen'
-require 'sys-uname'
 
 require_relative 'doing/changelog'
 require_relative 'doing/hash'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.34
+  version: 2.1.37
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-20 00:00:00.000000000 Z
+date: 2022-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -292,26 +292,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: sys-uname
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: tty-link
   requirement: !ruby/object:Gem::Requirement