doing 2.0.13 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666eb185b6fd472aab95e2cc55e902b31935a5efd1d42f877999f4482424d9f4
-  data.tar.gz: 543c2e95e079c6037aa3e851fd0e1b3fa453413f40b5b40c37e735f47cef883b
+  metadata.gz: 9c03e8b3f5d8a08d11bf11b6303a515074a3af443fd04b5168f186f0f18b390f
+  data.tar.gz: 374e1564d045b98b58c287f10a9508c4ac5887cf61b0273ed18b7103a96aa179
 SHA512:
-  metadata.gz: 4fafa3abb7d604df5ecf3aaa40ae96ac195ba6969759a197a61056dfc3f4615402707fed3307b2fe1c51872e10b6d0fa904131622ee045fe73b8ac54d2e40324
-  data.tar.gz: 6df14adeb8187888002008751239d70054aec9c931df707c83c6eff48f28b4e9d19c0d6b3dd7c25e943096a7dda46b9779cff7befc12d12101eb096873dee4d0
+  metadata.gz: 9cc8476e9b0cfdf54b9f534c580a1681282647ddac116b8c7d3ed23bb70eae9d2cedcac2b7dc47da613e73a37cd1169f81a40ad204a8e0224e0c61bf6cf19b89
+  data.tar.gz: 334671030e776716fe4bb92fd311720fdc7ce17d2291c16e1eae76f2071dec907dd381978f85e144b3075d71bfb5a26f42e4d0934301a21b8c2fb580d4cb81ac

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.0.15
+
+- Test release to validate git flow automation
+
 ### 2.0.13
 
 #### FIXED

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.0.13)
+    doing (2.0.15)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.19, >= 2.19.2)

data/README.md

@@ -6,7 +6,7 @@ _If you're one of the rare people like me who find this useful, feel free to [bu
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.0.11<!--END VER-->.
+The current version of `doing` is <!--VER-->2.0.14<!--END VER-->.
 
 Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
 

data/bin/doing

@@ -1582,7 +1582,12 @@ command :show do |c|
 
     options[:times] = true if options[:totals]
 
-    tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
+    template = settings['templates']['default'].deep_merge({
+        'wrap_width' => settings['wrap_width'] || 0,
+        'date_format' => settings['default_date_format'],
+        'order' => settings['order'] || 'asc',
+        'tags_color' => settings['tags_color']
+      })
 
     options[:case] = options[:case].normalize_case
 
@@ -1603,7 +1608,7 @@ command :show do |c|
     opt[:tag] = nil
     opt[:tag_filter] = tag_filter
     opt[:tag_order] = options[:tag_order].normalize_order
-    opt[:tags_color] = tags_color
+    opt[:tags_color] = template['tags_color']
 
     Doing::Pager.page wwid.list_section(opt)
   end
@@ -1674,7 +1679,8 @@ command %i[grep search] do |c|
     options[:fuzzy] = false
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
-    tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
+    template = settings['templates']['default'].deep_merge(settings)
+    tags_color = template.key?('tags_color') ? template['tags_color'] : nil
 
     section = wwid.guess_section(options[:section]) if options[:section]
 
@@ -1740,7 +1746,9 @@ command :recent do |c|
 
       options[:t] = true if options[:totals]
       options[:sort_tags] = options[:tag_sort] =~ /^n/i
-      tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
+
+      template = settings['templates']['recent'].deep_merge(settings['templates']['default'])
+      tags_color = template.key?('tags_color') ? template['tags_color'] : nil
 
       opts = {
         sort_tags: options[:sort_tags],
@@ -1801,8 +1809,7 @@ command :today do |c|
       before: options[:before],
       section: options[:section],
       sort_tags: options[:sort_tags],
-      totals: options[:totals],
-      order: settings.dig('templates', 'today', 'order')
+      totals: options[:totals]
     }
     Doing::Pager.page wwid.today(options[:times], options[:output], opt).chomp
   end
@@ -2278,6 +2285,7 @@ command :view do |c|
 
       template = view.key?('template') ? view['template'] : nil
       date_format = view.key?('date_format') ? view['date_format'] : nil
+
       tags_color = view.key?('tags_color') ? view['tags_color'] : nil
       tag_filter = false
       if options[:tag]

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

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.0.13'
+  VERSION = '2.0.15'
 end

data/lib/doing/wwid.rb

@@ -1637,13 +1637,20 @@ module Doing
     ## @param      opt   [Hash] Additional Options
     ##
     def list_section(opt = {})
+      opt[:config_template] ||= 'default'
+      cfg = @config.dig('templates', opt[:config_template]).deep_merge({
+        'wrap_width' => @config['wrap_width'] || 0,
+        'date_format' => @config['default_date_format'],
+        'order' => @config['order'] || 'asc',
+        'tags_color' => @config['tags_color']
+      })
       opt[:count] ||= 0
       opt[:age] ||= 'newest'
-      opt[:format] ||= @config.dig('templates', 'default', 'date_format')
-      opt[:order] ||= @config.dig('templates', 'default', 'order') || 'asc'
+      opt[:format] ||= cfg['date_format']
+      opt[:order] ||= cfg['order'] || 'asc'
       opt[:tag_order] ||= 'asc'
-      opt[:tags_color] ||= false
-      opt[:template] ||= @config.dig('templates', 'default', 'template')
+      opt[:tags_color] ||= cfg['tags_color'] || false
+      opt[:template] ||= cfg['template']
 
       # opt[:highlight] ||= true
       title = ''
@@ -1684,7 +1691,7 @@ module Doing
 
       opt[:output] ||= 'template'
 
-      opt[:wrap_width] ||= @config['templates']['default']['wrap_width']
+      opt[:wrap_width] ||= @config['templates']['default']['wrap_width'] || 0
 
       output(items, title, is_single, opt)
     end
@@ -1729,13 +1736,18 @@ module Doing
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = @config['templates']['today']
+      cfg = @config['templates']['today'].deep_merge(@config['templates']['default']).deep_merge({
+        'wrap_width' => @config['wrap_width'] || 0,
+        'date_format' => @config['default_date_format'],
+        'order' => @config['order'] || 'asc',
+        'tags_color' => @config['tags_color']
+      })
       options = {
         after: opt[:after],
         before: opt[:before],
         count: 0,
         format: cfg['date_format'],
-        order: 'asc',
+        order: cfg['order'] || 'asc',
         output: output,
         section: opt[:section],
         sort_tags: opt[:sort_tags],
@@ -1743,7 +1755,9 @@ module Doing
         times: times,
         today: true,
         totals: opt[:totals],
-        wrap_width: cfg['wrap_width']
+        wrap_width: cfg['wrap_width'],
+        tags_color: cfg['tags_color'],
+        config_template: 'today'
       }
       list_section(options)
     end
@@ -1765,7 +1779,7 @@ module Doing
       dates = [dates, dates] if dates.instance_of?(String)
 
       list_section({ section: section, count: 0, order: 'asc', date_filter: dates, times: times,
-                     output: output, totals: opt[:totals], sort_tags: opt[:sort_tags] })
+                     output: output, totals: opt[:totals], sort_tags: opt[:sort_tags], config_template: 'default' })
     end
 
     ##
@@ -1795,7 +1809,8 @@ module Doing
         tag_order: opt[:tag_order],
         times: times,
         totals: opt[:totals],
-        yesterday: true
+        yesterday: true,
+        config_template: 'today'
       }
 
       list_section(options)
@@ -1813,14 +1828,19 @@ module Doing
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = @config['templates']['recent']
+      cfg = @config['templates']['recent'].deep_merge(@config['templates']['default']).deep_merge({
+        'wrap_width' => @config['wrap_width'] || 0,
+        'date_format' => @config['default_date_format'],
+        'order' => @config['order'] || 'asc',
+        'tags_color' => @config['tags_color']
+      })
       section ||= @config['current_section']
       section = guess_section(section)
 
       list_section({ section: section, wrap_width: cfg['wrap_width'], count: count,
                      format: cfg['date_format'], template: cfg['template'],
                      order: 'asc', times: times, totals: opt[:totals],
-                     sort_tags: opt[:sort_tags], tags_color: opt[:tags_color] })
+                     sort_tags: opt[:sort_tags], tags_color: opt[:tags_color], config_template: 'recent' })
     end
 
     ##
@@ -1831,7 +1851,12 @@ module Doing
     ##
     def last(times: true, section: nil, options: {})
       section = section.nil? || section =~ /all/i ? 'All' : guess_section(section)
-      cfg = @config['templates']['last']
+      cfg = @config['templates']['last'].deep_merge(@config['templates']['default']).deep_merge({
+        'wrap_width' => @config['wrap_width'] || 0,
+        'date_format' => @config['default_date_format'],
+        'order' => @config['order'] || 'asc',
+        'tags_color' => @config['tags_color']
+      })
 
       opts = {
         section: section,
@@ -1852,6 +1877,7 @@ module Doing
       opts[:search] = options[:search] if options[:search]
       opts[:case] = options[:case]
       opts[:not] = options[:negate]
+      opts[:config_template] = 'last'
       list_section(opts)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.15
 platform: ruby
 authors:
 - Brett Terpstra