- Generated on Sat Jul 1 13:11:47 2023 by
+ Generated on Thu Aug 17 09:53:01 2023 by
yard
0.9.34 (ruby-3.2.0).
diff --git a/docs/doc/Time.html b/docs/doc/Time.html
index 01e9c170..4874edb4 100644
--- a/docs/doc/Time.html
+++ b/docs/doc/Time.html
@@ -411,7 +411,7 @@
diff --git a/docs/doc/TrueClass.html b/docs/doc/TrueClass.html
index 8e791630..26a4c7cd 100644
--- a/docs/doc/TrueClass.html
+++ b/docs/doc/TrueClass.html
@@ -235,7 +235,7 @@
diff --git a/docs/doc/_index.html b/docs/doc/_index.html
index 8aa8eb5e..4d07e303 100644
--- a/docs/doc/_index.html
+++ b/docs/doc/_index.html
@@ -961,7 +961,7 @@ Namespace Listing A-Z
diff --git a/docs/doc/file.README.html b/docs/doc/file.README.html
index f86986c8..05d68b92 100644
--- a/docs/doc/file.README.html
+++ b/docs/doc/file.README.html
@@ -71,7 +71,7 @@
-
The current version of doing is <!--VER-->2.1.82<!--END VER-->.
+The current version of doing is <!--VER-->2.1.83<!--END VER-->.
Find all of the documentation in the doing wiki.
@@ -153,7 +153,7 @@ Changelog
diff --git a/docs/doc/index.html b/docs/doc/index.html
index cc8cf06f..bfef9a66 100644
--- a/docs/doc/index.html
+++ b/docs/doc/index.html
@@ -71,7 +71,7 @@
-The current version of doing is <!--VER-->2.1.82<!--END VER-->.
+The current version of doing is <!--VER-->2.1.83<!--END VER-->.
Find all of the documentation in the doing wiki.
@@ -153,7 +153,7 @@ Changelog
diff --git a/docs/doc/top-level-namespace.html b/docs/doc/top-level-namespace.html
index 295a7c93..603cd73e 100644
--- a/docs/doc/top-level-namespace.html
+++ b/docs/doc/top-level-namespace.html
@@ -216,7 +216,7 @@
diff --git a/doing.rdoc b/doing.rdoc
index 238c0ece..56e0532d 100644
--- a/doing.rdoc
+++ b/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.83
+v2.1.84
=== Global Options
=== --config_file arg
diff --git a/lib/doing.rb b/lib/doing.rb
index 6c9b17f8..7ec6d248 100644
--- a/lib/doing.rb
+++ b/lib/doing.rb
@@ -106,14 +106,14 @@ def original_options
## @param default A default value to return if the
## provided path returns nil result
##
- def setting(keypath, default = nil)
+ def setting(keypath, default = nil, exact: false)
cfg = config.settings
case keypath
when Array
cfg.dig(*keypath) || default
when String
unless keypath =~ /^[.*]?$/
- real_path = config.resolve_key_path(keypath, create: false)
+ real_path = config.resolve_key_path(keypath, create: false, distance: 0, exact: exact)
return default unless real_path&.count&.positive?
cfg = cfg.dig(*real_path)
diff --git a/lib/doing/configuration.rb b/lib/doing/configuration.rb
index 66f87997..fbb32262 100644
--- a/lib/doing/configuration.rb
+++ b/lib/doing/configuration.rb
@@ -44,6 +44,15 @@ def force_answer
'timer_format' => 'text',
'interval_format' => 'text',
+ 'order' => 'asc',
+
+ 'shortdate_format' => {
+ 'today' => '%_I:%M%P',
+ 'this_week' => '%a %_I:%M%P',
+ 'this_month' => '%m/%d %_I:%M%P',
+ 'older' => '%m/%d/%y %_I:%M%P'
+ },
+
'templates' => {
'default' => {
'date_format' => '%Y-%m-%d %H:%M',
@@ -200,7 +209,7 @@ def fetch(*path, default)
## matched, first match wins)
## @return [Array] ordered array of resolved keys
##
- def resolve_key_path(keypath, create: false, distance: 2)
+ def resolve_key_path(keypath, create: false, distance: 2, exact: false)
cfg = @settings
real_path = []
unless keypath =~ /^[.*]?$/
@@ -211,7 +220,11 @@ def resolve_key_path(keypath, create: false, distance: 2)
new_cfg = nil
if cfg.is_a?(Hash)
- matches = cfg.select { |key, val| key =~ path.to_rx(distance: distance) }
+ matches = if exact
+ cfg.select { |key, _| key == path }
+ else
+ cfg.select { |key, _| key =~ path.to_rx(distance: distance) }
+ end
if matches.count.positive?
shortest = matches.keys.group_by(&:length).min.last[0]
real_path << shortest
diff --git a/lib/doing/template_string.rb b/lib/doing/template_string.rb
index ba1817d0..713c451c 100644
--- a/lib/doing/template_string.rb
+++ b/lib/doing/template_string.rb
@@ -116,7 +116,8 @@ def fill(placeholder, value, wrap_width: 0, color: '', tags_color: '', reset: ''
pad = m['width'].to_i
mark = m['mchar'] || ''
if placeholder == 'shortdate' && m['width'].nil?
- pad = 13
+ fmt_string = Doing.setting('shortdate_format.older', '%m/%d/%y %_I:%M%P', exact: true)
+ pad = Date.today.strftime(fmt_string).length
end
indent = nil
if m['ichar']
diff --git a/lib/doing/time.rb b/lib/doing/time.rb
index ef0ceaca..5179487b 100644
--- a/lib/doing/time.rb
+++ b/lib/doing/time.rb
@@ -12,13 +12,13 @@ class ::Time
#
def relative_date
if self > Date.today.to_time
- strftime('%_I:%M%P')
+ strftime(Doing.setting('shortdate_format.today', '%_I:%M%P', exact: true))
elsif self > (Date.today - 6).to_time
- strftime('%a %_I:%M%P')
+ strftime(Doing.setting('shortdate_format.this_week', '%a %_I:%M%P', exact: true))
elsif year == Date.today.year || (year + 1 == Date.today.year && month > Date.today.month)
- strftime('%m/%d %_I:%M%P')
+ strftime(Doing.setting('shortdate_format.this_month', '%m/%d %_I:%M%P', exact: true))
else
- strftime('%m/%d/%y %_I:%M%P')
+ strftime(Doing.setting('shortdate_format.older', '%m/%d/%y %_I:%M%P', exact: true))
end
end
diff --git a/lib/doing/version.rb b/lib/doing/version.rb
index a324b5f1..e87dacb4 100644
--- a/lib/doing/version.rb
+++ b/lib/doing/version.rb
@@ -1,3 +1,3 @@
module Doing
- VERSION = '2.1.83'
+ VERSION = '2.1.84'
end