doing 2.1.42 → 2.1.43

data/lib/completion/doing.fish

@@ -228,6 +228,8 @@ complete -c doing -l all -s a -f  -n '__fish_doing_using_command changes changel
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command changes changelog' -d Open\ changelog\ in\ interactive\ viewer
 complete -c doing -l lookup -s l -f -r -n '__fish_doing_using_command changes changelog' -d Look\ up\ a\ specific\ version
 complete -c doing -l markdown  -f  -n '__fish_doing_using_command changes changelog' -d Output\ raw\ Markdown
+complete -c doing -l only  -f -r -n '__fish_doing_using_command changes changelog' -d Only\ show\ changes\ of\ type\(s\)
+complete -c doing -l prefix -s p -f  -n '__fish_doing_using_command changes changelog' -d Include
 complete -c doing -l render  -f  -n '__fish_doing_using_command changes changelog' -d Force\ rendered\ output
 complete -c doing -l search -s s -f -r -n '__fish_doing_using_command changes changelog' -d Show\ changelogs\ matching\ search\ terms
 complete -c doing -l sort  -f -r -n '__fish_doing_using_command changes changelog' -d Sort\ order
@@ -281,6 +283,7 @@ complete -c doing -l not  -f  -n '__fish_doing_using_command grep search' -d Sea
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command grep search' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command grep search' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command grep search' -d Section
+complete -c doing -l save  -f -r -n '__fish_doing_using_command grep search' -d Save\ all\ current\ command\ line\ options\ as\ a\ new\ view
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command grep search' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command grep search' -d Filter\ entries\ by\ tag
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command grep search' -d Tag\ sort\ direction
@@ -314,6 +317,7 @@ complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command last' -d Hig
 complete -c doing -l not  -f  -n '__fish_doing_using_command last' -d Show\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command last' -d Output\ to\ export\ format
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command last' -d Specify\ a\ section
+complete -c doing -l save  -f -r -n '__fish_doing_using_command last' -d Save\ all\ current\ command\ line\ options\ as\ a\ new\ view
 complete -c doing -l search  -f -r -n '__fish_doing_using_command last' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command last' -d Filter\ entries\ by\ tag
 complete -c doing -l template  -f -r -n '__fish_doing_using_command last' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
@@ -371,6 +375,7 @@ complete -c doing -l not  -f  -n '__fish_doing_using_command on' -d Show\ items\
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command on' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command on' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command on' -d Section
+complete -c doing -l save  -f -r -n '__fish_doing_using_command on' -d Save\ all\ current\ command\ line\ options\ as\ a\ new\ view
 complete -c doing -l search  -f -r -n '__fish_doing_using_command on' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command on' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command on' -d Filter\ entries\ by\ tag
@@ -391,6 +396,7 @@ complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command recent'
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command recent' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command recent' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command recent' -d Section
+complete -c doing -l save  -f -r -n '__fish_doing_using_command recent' -d Save\ all\ current\ command\ line\ options\ as\ a\ new\ view
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command recent' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command recent' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command recent' -d Sort\ tags\ by
@@ -461,6 +467,7 @@ complete -c doing -l not  -f  -n '__fish_doing_using_command show' -d Show\ item
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command show' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command show' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l sort -s s -f -r -n '__fish_doing_using_command show' -d Sort\ order
+complete -c doing -l save  -f -r -n '__fish_doing_using_command show' -d Save\ all\ current\ command\ line\ options\ as\ a\ new\ view
 complete -c doing -l search  -f -r -n '__fish_doing_using_command show' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command show' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command show' -d Filter\ entries\ by\ tag
@@ -478,6 +485,7 @@ complete -c doing -l not  -f  -n '__fish_doing_using_command since' -d Since\ it
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command since' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command since' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command since' -d Section
+complete -c doing -l save  -f -r -n '__fish_doing_using_command since' -d Save\ all\ current\ command\ line\ options\ as\ a\ new\ view
 complete -c doing -l search  -f -r -n '__fish_doing_using_command since' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command since' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command since' -d Filter\ entries\ by\ tag
@@ -533,6 +541,7 @@ complete -c doing -l from  -f -r -n '__fish_doing_using_command today' -d Time\
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command today' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command today' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command today' -d Specify\ a\ section
+complete -c doing -l save  -f -r -n '__fish_doing_using_command today' -d Save\ all\ current\ command\ line\ options\ as\ a\ new\ view
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command today' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command today' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command today' -d Sort\ tags\ by
@@ -549,6 +558,7 @@ complete -c doing -l bool  -f -r -n '__fish_doing_using_command view' -d Boolean
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command view' -d Count\ to\ display
 complete -c doing -l case  -f -r -n '__fish_doing_using_command view' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l color  -f  -n '__fish_doing_using_command view' -d Include\ colors\ in\ output
+complete -c doing -l config_template  -f -r -n '__fish_doing_using_command view' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l duration  -f  -n '__fish_doing_using_command view' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l from  -f -r -n '__fish_doing_using_command view' -d Date\ range
 complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command view' -d Highlight\ search\ matches\ in\ output
@@ -562,10 +572,13 @@ complete -c doing -l times -s t -f  -n '__fish_doing_using_command view' -d Show
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command view' -d Filter\ entries\ by\ tag
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command view' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command view' -d Sort\ tags\ by
+complete -c doing -l template  -f -r -n '__fish_doing_using_command view' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command view' -d Show\ intervals\ with\ totals\ at\ the\ end\ of\ output
 complete -c doing -l val  -f -r -n '__fish_doing_using_command view' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command view' -d Force\ exact\ search\ string\ matching
 complete -c doing -l column -s c -f  -n '__fish_doing_using_command views' -d List\ in\ single\ column
+complete -c doing -l editor -s e -f  -n '__fish_doing_using_command views' -d Open\ YAML\ for\ view\ in\ editor
+complete -c doing -l output -s o -f -r -n '__fish_doing_using_command views' -d Output/edit\ view\ in\ alternative\ format
 complete -c doing -l after  -f -r -n '__fish_doing_using_command wiki' -d Include\ entries\ newer\ than\ date
 complete -c doing -l bool -s b -f -r -n '__fish_doing_using_command wiki' -d Tag\ boolean
 complete -c doing -l before  -f -r -n '__fish_doing_using_command wiki' -d Include\ entries\ older\ than\ date
@@ -582,12 +595,13 @@ complete -c doing -l from  -f -r -n '__fish_doing_using_command yesterday' -d Ti
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command yesterday' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command yesterday' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command yesterday' -d Specify\ a\ section
+complete -c doing -l save  -f -r -n '__fish_doing_using_command yesterday' -d Save\ all\ current\ command\ line\ options\ as\ a\ new\ view
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command yesterday' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command yesterday' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command yesterday' -d Sort\ tags\ by
 complete -c doing -l template  -f -r -n '__fish_doing_using_command yesterday' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command yesterday' -d Show\ time\ totals\ at\ the\ end\ of\ output
-complete -f -c doing -s o -l output -x -n '__fish_doing_using_command grep search last on recent select show since today view yesterday' -a '(__fish_doing_export_plugin)'
+complete -f -c doing -s o -l output -x -n '__fish_doing_using_command grep search last on recent select show since today view views yesterday' -a '(__fish_doing_export_plugin)'
 complete -f -c doing -s b -l bool -x -n '__fish_doing_using_command again resume archive move autotag cancel finish grep search last mark flag note on reset begin rotate show since tag tags view wiki' -a 'and or not pattern'
 complete -f -c doing -l case -x -n '__fish_doing_using_command again resume archive move cancel finish grep search import last mark flag note on reset begin rotate select show since tag tags view' -a 'case-sensitive ignore smart'
 complete -f -c doing -l sort -x -n '__fish_doing_using_command changes changelog show tags' -a 'asc desc'

data/lib/doing/add_options.rb

@@ -19,6 +19,8 @@
 ##
 ## :date_filter => --before, --after, --from
 ##
+## :save => --save
+##
 ## @param      type  [Symbol] The type
 ## @param      cmd   The GLI command to which the options will be added
 ##
@@ -47,6 +49,18 @@ def add_options(type, cmd, default_template: 'default')
     cmd.arg_name 'TEMPLATE_KEY'
     cmd.flag [:config_template], type: TemplateName, default_value: default_template
 
+    cmd.desc 'Override output format with a template string containing %placeholders'
+    cmd.arg_name 'TEMPLATE_STRING'
+    cmd.flag [:template]
+  when :output_template_no_defaults
+    cmd.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
+    cmd.arg_name 'FORMAT'
+    cmd.flag %i[o output]
+
+    cmd.desc "Output using a template from configuration"
+    cmd.arg_name 'TEMPLATE_KEY'
+    cmd.flag [:config_template], type: TemplateName
+
     cmd.desc 'Override output format with a template string containing %placeholders'
     cmd.arg_name 'TEMPLATE_STRING'
     cmd.flag [:template]
@@ -138,6 +152,23 @@ def add_options(type, cmd, default_template: 'default')
     cmd.flag [:bool], must_match: REGEX_BOOL,
                       default_value: :pattern,
                       type: BooleanSymbol
+  when :tag_filter_no_defaults
+    cmd.desc 'Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)'
+    cmd.arg_name 'TAG'
+    cmd.flag [:tag], type: TagArray
+
+    cmd.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50").
+            May be used multiple times, combined with --bool'
+    cmd.arg_name 'QUERY'
+    cmd.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
+    cmd.desc "#{action} items that *don't* match search/tag filters"
+    cmd.switch [:not], negatable: false
+
+    cmd.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans'
+    cmd.arg_name 'BOOLEAN'
+    cmd.flag [:bool], must_match: REGEX_BOOL,
+                      type: BooleanSymbol
   when :time_filter
     cmd.desc 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
     cmd.arg_name 'TIME_STRING'
@@ -186,5 +217,9 @@ def add_options(type, cmd, default_template: 'default')
     end
     cmd.arg_name 'DATE_OR_RANGE'
     cmd.flag [:from], type: DateRangeString
+  when :save
+    cmd.desc 'Save all current command line options as a new view'
+    cmd.arg_name 'VIEW_NAME'
+    cmd.flag %i[save]
   end
 end

data/lib/doing/changelog/change.rb

@@ -7,9 +7,13 @@ module Doing
 
     attr_accessor :entries, :change_date
 
-    def initialize(version, content)
+    attr_writer :prefix
+
+    def initialize(version, content, prefix: false, only: %i[changed new improved fixed])
       @version = Version.new(version)
       @content = content
+      @prefix = prefix
+      @only = only
       parse_entries
     end
 
@@ -18,10 +22,10 @@ module Doing
       @change_date = Time.parse(date[0]) if date
 
       @entries = []
-      types = @content.scan(/(?<=\n|\A)#### (NEW|IMPROVED|FIXED)(.*?)(?=\n####|\Z)/m)
+      types = @content.scan(/(?<=\n|\A)#### (CHANGED|NEW|IMPROVED|FIXED)(.*?)(?=\n####|\Z)/m)
       types.each do |type|
         type[1].scan(/\s*- +(.*?)$/).each do |entry|
-          @entries << Entry.new(entry[0].strip, type[0])
+          @entries << Entry.new(entry[0].strip, type[0], prefix: @prefix)
         end
       end
     end
@@ -57,7 +61,7 @@ module Doing
     end
 
     def split_items
-      items = { new: [], improved: [], fixed: [], other: [] }
+      items = { changed: [], new: [], improved: [], fixed: [], other: [] }
 
       @entries.each do |e|
         type = e.type.downcase.to_sym
@@ -76,6 +80,8 @@ module Doing
       out = ["### __#{@version}__#{date}"]
 
       split_items.each do |type, members|
+        next unless @only.include?(type)
+
         if members.count.positive?
           out << "#### #{type.to_s.capitalize}"
           out << members.map(&:to_s).join("\n")
@@ -88,7 +94,9 @@ module Doing
     def changes_only
       out = []
 
-      split_items.each do |_, members|
+      split_items.each do |type, members|
+        next unless @only.include?(type)
+
         out << members.map(&:to_s).join("\n")
       end
 

data/lib/doing/changelog/changes.rb

@@ -6,8 +6,10 @@ module Doing
     attr_reader :changes
     attr_writer :changes_only
 
-    def initialize(lookup: nil, search: nil, changes: false, sort: :desc)
+    def initialize(lookup: nil, search: nil, changes: false, sort: :desc, prefix: false, only: %i[changed new improved fixed])
       @changes_only = changes
+      @prefix = prefix
+      @only = only
       changelog = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'CHANGELOG.md'))
       raise 'Error locating changelog' unless File.exist?(changelog)
 
@@ -56,9 +58,10 @@ module Doing
       @changes = @content.scan(change_rx).each_with_object([]) do |m, a|
         next if m[0].nil? || m[1].nil?
 
-        a << Change.new(m[0], m[1].strip)
+        a << Change.new(m[0], m[1].strip, prefix: @prefix)
       end
 
+      select_type
       lookup(lookup) unless lookup.nil?
       search(search) unless search.nil?
     end
@@ -98,5 +101,11 @@ module Doing
 
       @changes.delete_if { |c| c.nil? || c.entries.nil? }
     end
+
+    def select_type
+      @changes.map do |c|
+        c.entries.delete_if { |e| !@only.include?(e.type.normalize_change_type) }
+      end
+    end
   end
 end

data/lib/doing/changelog/entry.rb

@@ -5,17 +5,24 @@ module Doing
   class Entry
     attr_reader :type, :string
 
-    def initialize(string, type)
+    attr_writer :prefix
+
+    def initialize(string, type, prefix: false)
       @string = string
       @type = type
+      @prefix = prefix
     end
 
     def clean(string)
       string.gsub(/\|/, '\|')
     end
 
+    def print_prefix
+      @prefix ? "#{@type}: " : ''
+    end
+
     def to_s
-      "- #{clean(@string)}"
+      "- #{print_prefix}#{clean(@string)}"
     end
   end
 end

data/lib/doing/configuration.rb

@@ -361,6 +361,23 @@ module Doing
       config
     end
 
+    ##
+    ## Save a set of options to the `views` configuration
+    ##
+    ## @param      view   [Hash] view options
+    ## @param      title  [String] view title
+    ##
+    def save_view(view, title)
+      title.downcase!
+      user_config = Util.safe_load_file(config_file)
+      user_config['views'] = {} unless user_config.key?('views')
+      user_config['views'][title] = view
+      Util.write_to_file(config_file, YAML.dump(user_config), backup: true)
+      Doing.logger.warn('Config:', %(View "#{title}" saved to #{config_file}))
+      Doing.logger.info('Config:', %(to use, run `doing view #{title}`))
+      Hooks.trigger :post_config, self
+    end
+
     # @private
     def inspect
       %(<Doing::Configuration #{@settings.hash}>)

data/lib/doing/hash.rb

@@ -40,14 +40,46 @@ module Doing
 
     # Turn all keys into string
     #
-    # Return a copy of the hash where all its keys are strings
+    # If the hash has both a string and a symbol for key,
+    # keep the string value, discarding the symnbol value
+    #
+    # @return     [Hash] a copy of the hash where all its
+    #             keys are strings
+    #
     def stringify_keys
-      each_with_object({}) { |(k, v), hsh| hsh[k.to_s] = v.is_a?(Hash) ? v.stringify_keys : v }
+      each_with_object({}) do |(k, v), hsh|
+        next if k.is_a?(Symbol) && key?(k.to_s)
+
+        hsh[k.to_s] = v.is_a?(Hash) ? v.stringify_keys : v
+      end
     end
 
     # Turn all keys into symbols
+    #
+    # If the hash has both a string and a symbol for a key,
+    # keep the symbol value and discard the string value
+    #
+    # @return     [Hash] a copy of the hash where all its
+    #             keys are symbols
+    #
     def symbolize_keys
-      each_with_object({}) { |(k, v), hsh| hsh[k.to_sym] = v.is_a?(Hash) ? v.symbolize_keys : v }
+      each_with_object({}) do |(k, v), hsh|
+        next if k.is_a?(String) && key?(k.to_sym)
+
+        hsh[k.to_sym] = v.is_a?(Hash) ? v.symbolize_keys : v
+      end
+    end
+
+    def stringify_values
+      transform_values do |v|
+        if v.is_a?(Hash)
+          v.stringify_values
+        elsif v.is_a?(Symbol)
+          v.to_s
+        else
+          v
+        end
+      end
     end
 
     # Set a nested hash value using an array
@@ -61,30 +93,102 @@ module Doing
     #
     def deep_set(path, value)
       if path.count == 1
-        unless value.nil? || value =~ /^ *$/
-          self[path[0]] = value
-        else
+        if value.nil? || value =~ /^ *$/
           delete(path[0])
+        else
+          self[path[0]] = value
         end
+      elsif value
+        self.default_proc = ->(h, k) { h[k] = Hash.new(&h.default_proc) }
+        dig(*path[0..-2])[path.fetch(-1)] = value
       else
-        if value
-          self.default_proc = ->(h, k) { h[k] = Hash.new(&h.default_proc) }
-          dig(*path[0..-2])[path.fetch(-1)] = value
-        else
-          return self unless dig(*path)
-
-          dig(*path[0..-2]).delete(path.fetch(-1))
-          path.pop
-          cleaned = self
-          path.each do |key|
-            if cleaned[key].empty?
-              cleaned.delete(key)
-              break
-            end
-            cleaned = cleaned[key]
+        return self unless dig(*path)
+
+        dig(*path[0..-2]).delete(path.fetch(-1))
+        path.pop
+        cleaned = self
+        path.each do |key|
+          if cleaned[key].empty?
+            cleaned.delete(key)
+            break
           end
-          empty? ? nil : self
+          cleaned = cleaned[key]
         end
+        empty? ? nil : self
+      end
+    end
+
+    ##
+    ## Rename a key, deleting old key
+    ##
+    ## @param      old_key  The original key
+    ## @param      new_key  The new key
+    ## @param      keep     [Boolean] if true, keep old key
+    ##                      in addition to new key
+    ##
+    def rename_key(old_key, new_key, keep: false)
+      return unless key?(old_key)
+
+      self[new_key] = self[old_key]
+      self[new_key.to_s] = self[old_key] if key?(new_key.to_s)
+      delete(old_key) unless keep
+    end
+
+    ##
+    ## Rename keys in batch
+    ##
+    ## @param      pairs  [Array] pairs of old and new keys
+    ##
+    def rename_keys(*pairs)
+      pairs.each { |p| rename_key(p[0], p[1]) }
+    end
+
+    ##
+    ## Remove keys with empty values
+    ##
+    def remove_empty
+      delete_if { |k, v| !v.is_a?(FalseClass) && !v.good? }
+    end
+
+    def tag_filter_to_options
+      hsh = dup
+      if hsh.key?(:tag_filter)
+        hsh[:tags] = hsh[:tag_filter][:tags]
+        hsh[:bool] = hsh[:tag_filter][:bool]
+        hsh.delete(:tag_filter)
+      end
+      replace hsh
+    end
+
+    ##
+    ## Convert an options hash to a view config
+    ##
+    ## @return     [Hash] View representation of the object.
+    ##
+    def to_view
+      hsh = symbolize_keys
+      %w[x save c a s o h e editor m menu i interactive d delete t fuzzy time_filter sort_tags].each do |key|
+        hsh.delete(key.to_sym) if hsh.key?(key.to_sym)
+      end
+
+      hsh.delete_unless_key(:tag, %i[bool])
+      hsh.delete_unless_key(:search, %i[exact case])
+      hsh.rename_keys(%i[not negate], %i[tag tags])
+      hsh.tag_filter_to_options
+
+      hsh = hsh.remove_empty.stringify_keys.stringify_values
+      hsh.keys.sort.each_with_object({}) { |k, out| out[k] = hsh[k] }
+    end
+
+    ##
+    ## Delete array of keys unless key exists
+    ##
+    ## @param      key        The key to verify
+    ## @param      to_delete  [Array] the keys to delete if key doesn't exist
+    ##
+    def delete_unless_key(key, to_delete)
+      unless key?(key)
+        to_delete.each { |k| delete(k) }
       end
     end
   end

data/lib/doing/normalize.rb

@@ -155,6 +155,19 @@ module Doing
     def normalize_trigger!
       replace normalize_trigger
     end
+
+    def normalize_change_type
+      case self
+      when /^c/i
+        :changed
+      when /^i/i
+        :improved
+      when /^f/i
+        :fixed
+      when /^n/i
+        :new
+      end
+    end
   end
 
   ##

data/lib/doing/pager.rb

@@ -73,7 +73,7 @@ module Doing
         [
           Doing.setting('editors.pager'),
           ENV['PAGER'],
-          'less -Xr',
+          'less -FXr',
           ENV['GIT_PAGER'],
           git_pager,
           'more -r'

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.42'
+  VERSION = '2.1.43'
 end

data/lib/doing/wwid/wwid.rb

@@ -100,10 +100,28 @@ module Doing
     ##
     ## @param      title  [String] The title of the view to retrieve
     ##
-    def get_view(title)
-      return Doing.setting(['views', title], nil)
+    def get_view(title, fallback: nil)
+      Doing.setting(['views', title], fallback)
+    end
+
+    def rename_view_keys(view)
+      options = view.symbolize_keys
+      # options.rename_key(:tags, :tag, keep: true)
+      options.rename_key(:output_format, :output)
+      options.rename_key(:tags_bool, :bool)
+      options.rename_key(:tag_sort, :sort_tags)
+      options.rename_key(:negate, :not)
+      options.rename_key(:order, :sort)
+
+      options
+    end
 
-      false
+    def view_to_options(title)
+      view = rename_view_keys(get_view(guess_view(title)))
+      view.deep_merge(rename_view_keys(get_view(guess_view(view[:parent]), fallback: {}))) if view.key?(:parent)
+      view.deep_merge(rename_view_keys(get_view(view[:config_template], fallback: {}))) if view.key?(:config_template)
+      view.deep_merge(Doing.setting('templates.default').symbolize_keys)
+      view
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.42
+  version: 2.1.43
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -489,6 +489,7 @@ files:
 - docs/doc/BooleanTermParser/QueryParser.html
 - docs/doc/BooleanTermParser/QueryTransformer.html
 - docs/doc/Doing.html
+- docs/doc/Doing/ArrayCleanup.html
 - docs/doc/Doing/ArrayNestedHash.html
 - docs/doc/Doing/ArrayTags.html
 - docs/doc/Doing/CLIFormat.html