doing 2.1.4pre → 2.1.5pre

data/lib/doing/template_string.rb

@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+module Doing
+  ##
+  ## Template string formatting
+  ##
+  class TemplateString < String
+    class ::String
+      ##
+      ## Extract the longest valid color from a string.
+      ##
+      ## Allows %colors to bleed into other text and still
+      ## be recognized, e.g. %greensomething still finds
+      ## %green.
+      ##
+      ## @return     [String] a valid color name
+      ## @api private
+      def validate_color
+        valid_color = nil
+        compiled = ''
+        split('').each do |char|
+          compiled += char
+          valid_color = compiled if Color.attributes.include?(compiled.to_sym)
+        end
+
+        valid_color
+      end
+    end
+
+    attr_reader :original
+
+    include Color
+    def initialize(string, placeholders: {}, force_color: false, wrap_width: 0, color: '', tags_color: '', reset: '')
+      Color.coloring = true if force_color
+      @colors = nil
+      @original = string
+      super(Color.reset + string)
+
+      placeholders.each { |k, v| fill(k, v, wrap_width: wrap_width, color: color, tags_color: tags_color) }
+    end
+
+    ##
+    ## Test if string contains any valid %colors
+    ##
+    ## @return     [Boolean] True if colors, False otherwise.
+    ##
+    def colors?
+      scan(/%([a-z]+)/).each do
+        return true if Regexp.last_match(1).validate_color
+      end
+      false
+    end
+
+    def reparse
+      @parsed_colors = nil
+    end
+
+    ##
+    ## Return string with %colors replaced with escape codes
+    ##
+    ## @return     [String] colorized string
+    ##
+    def colored
+      reparse
+      parsed_colors[:string].apply_colors(parsed_colors[:colors])
+    end
+
+    ##
+    ## Remove all valid %colors from string
+    ##
+    ## @return     [String] cleaned string
+    ##
+    def raw
+      parsed_colors[:string].uncolor
+    end
+
+    def parsed_colors
+      @parsed_colors ||= parse_colors
+    end
+
+    ##
+    ## Parse a template string for %colors and return a hash
+    ## of colors and string locations
+    ##
+    ## @return     [Hash] Uncolored string and array of colors and locations
+    def parse_colors
+      working = dup
+      color_array = []
+
+      scan(/(?<!\\)(%([a-z]+))/).each do |color|
+        valid_color = color[1].validate_color
+        next unless valid_color
+
+        idx = working.match(/(?<!\\)%#{valid_color}/).begin(0)
+        color_array.push({ name: valid_color, color: Color.send(valid_color), index: idx })
+        working.sub!(/(?<!\\)%#{valid_color}/, '')
+      end
+
+      { string: working, colors: color_array }
+    end
+
+    ##
+    ## Apply a color array to a string
+    ##
+    ## @param      color_array  [Array] Array of hashes
+    ##                          containing :name, :color,
+    ##                          :index
+    ##
+    def apply_colors(color_array)
+      str = dup
+      color_array.reverse.each do |color|
+        c = color[:color].empty? ? Color.send(color[:name]) : color[:color]
+        str.insert(color[:index], c)
+      end
+      str
+    end
+
+    def fill(placeholder, value, wrap_width: 0, color: '', tags_color: '', reset: '')
+      reparse
+      rx = /(?mi)(?<!\\)%(?<width>-?\d+)?(?:\^(?<mchar>.))?(?:(?<ichar>[ _t]|[^a-z0-9])(?<icount>\d+))?(?<prefix>.[ _t]?)?#{placeholder.sub(/^%/, '')}(?<after>.*?)$/
+      ph = raw.match(rx)
+
+      return unless ph
+      placeholder_offset = ph.begin(0)
+      last_colors = parsed_colors[:colors].select { |v| v[:index] <= placeholder_offset + 4 }
+
+      last_color = last_colors.map { |v| v[:color] }.pop(3).join('')
+
+      sub!(rx) do
+        m = Regexp.last_match
+
+        after = m['after']
+
+        if value.nil? || value.empty?
+          after
+        else
+          pad = m['width'].to_i
+          mark = m['mchar'] || ''
+          if placeholder == 'shortdate' && m['width'].nil?
+            pad = 13
+          end
+          indent = nil
+          if m['ichar']
+            char = m['ichar'] =~ /t/ ? "\t" : ' '
+            indent = char * m['icount'].to_i
+          end
+          indent ||= placeholder =~ /^title/ ? '' : "\t"
+          prefix = m['prefix']
+          if placeholder =~ /^title/
+            color = last_color + color
+
+            if wrap_width.positive? || pad.positive?
+              width = pad.positive? ? pad : wrap_width
+
+              out = value.gsub(/%/, '\%').strip.wrap(width,
+                                                     pad: pad,
+                                                     indent: indent,
+                                                     offset: placeholder_offset,
+                                                     prefix: prefix,
+                                                     color: color,
+                                                     after: after,
+                                                     reset: reset,
+                                                     pad_first: false)
+              out.highlight_tags!(tags_color, last_color: color) if tags_color && !tags_color.empty?
+              out
+            else
+              out = format("%s%s%#{pad}s%s", prefix, color, value.gsub(/%/, '\%').sub(/\s*$/, ''), after)
+              out.highlight_tags!(tags_color, last_color: color) if tags_color && !tags_color.empty?
+              out
+            end
+          elsif placeholder =~ /^note/
+            if wrap_width.positive? || pad.positive?
+              width = pad.positive? ? pad : wrap_width
+              outstring = value.map do |l|
+                if l.empty?
+                  '  '
+                else
+                  line = l.gsub(/%/, '\%').strip.wrap(width, pad: pad, indent: indent, offset: 0, prefix: prefix, color: last_color, after: after, reset: reset, pad_first: true)
+                  line.highlight_tags!(tags_color, last_color: last_color) unless tags_color.nil? || tags_color.empty?
+                  "#{line}  "
+                end
+              end.join("\n")
+              "\n#{last_color}#{mark}#{outstring}  "
+            else
+              out = format("\n%s%s%s%#{pad}s%s", indent, prefix, last_color, value.join("\n#{indent}#{prefix}").gsub(/%/, '\%').sub(/\s*$/, ''), after)
+              out.highlight_tags!(tags_color, last_color: last_color) if tags_color && !tags_color.empty?
+              out
+            end
+          else
+            format("%s%#{pad}s%s", prefix, value.gsub(/%/, '\%').sub(/\s*$/, ''), after)
+          end
+        end
+      end
+      @parsed_colors = parse_colors
+    end
+  end
+end

data/lib/doing/util.rb

@@ -112,7 +112,7 @@ module Doing
         puts content
         return
       end
-
+      Doing.logger.benchmark(:write_file, :start)
       file = File.expand_path(file)
 
       Backup.write_backup(file) if backup
@@ -121,8 +121,10 @@ module Doing
         f.puts content
         Doing.logger.debug('Write:', "File written: #{file}")
       end
-
+      Doing.logger.benchmark(:_post_write_hook, :start)
       Hooks.trigger :post_write, file
+      Doing.logger.benchmark(:_post_write_hook, :finish)
+      Doing.logger.benchmark(:write_file, :finish)
     end
 
     def safe_load_file(filename)

data/lib/doing/util_backup.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'zlib'
 
 module Doing
   module Util
@@ -29,6 +30,7 @@ module Doing
       ##                       different from default
       ##
       def restore_last_backup(filename = nil, count: 1)
+        Doing.logger.benchmark(:restore_backup, :start)
         filename ||= Doing.config.settings['doing_file']
 
         result = get_backups(filename).slice(count - 1)
@@ -40,6 +42,7 @@ module Doing
         FileUtils.mv(backup_file, filename)
         prune_backups_after(File.basename(backup_file))
         Doing.logger.warn('File update:', "restored from #{result}")
+        Doing.logger.benchmark(:restore_backup, :finish)
       end
 
       ##
@@ -79,6 +82,44 @@ module Doing
         end
       end
 
+      ##
+      ## Select from recent undos. If a filename is
+      ## provided, only backups of that filename will be used.
+      ##
+      ## @param      filename  The filename to restore
+      ##
+      def select_redo(filename = nil)
+        filename ||= Doing.config.settings['doing_file']
+
+        undones = Dir.glob("undone*#{File.basename(filename)}", base: backup_dir).sort
+
+        raise DoingRuntimeError, 'End of redo history' if undones.empty?
+
+        total = undones.count
+        options = undones.each_with_object([]) do |file, arr|
+          d, _base = date_of_backup(file)
+          next if d.nil?
+
+          arr.push("#{d.time_ago}\t#{File.join(backup_dir, file)}")
+        end
+
+        backup_file = show_menu(options, filename)
+        idx = undones.index(File.basename(backup_file))
+        skipped = undones.slice!(idx, undones.count - idx)
+        undone = skipped.shift
+
+        redo_file = File.join(backup_dir, undone)
+
+        FileUtils.move(redo_file, filename)
+
+        skipped.each do |f|
+          FileUtils.mv(File.join(backup_dir, f), File.join(backup_dir, f.sub(/^undone/, '')))
+        end
+
+        Doing.logger.warn('File update:', "restored undo step #{idx}/#{total}")
+        Doing.logger.debug('Backup:', "#{total - skipped.count - 1} redos remaining")
+      end
+
       ##
       ## Select from recent backups. If a filename is
       ## provided, only backups of that filename will be used.
@@ -90,6 +131,7 @@ module Doing
 
         options = get_backups(filename).each_with_object([]) do |file, arr|
           d, _base = date_of_backup(file)
+          next if d.nil?
           arr.push("#{d.time_ago}\t#{File.join(backup_dir, file)}")
         end
 
@@ -123,13 +165,16 @@ module Doing
         end
 
         result = Doing::Prompt.choose_from(options,
+                                           prompt: 'Select a backup to restore',
                                            sorted: false,
                                            fzf_args: [
                                              '--delimiter="\t"',
                                              '--with-nth=1',
                                              %(--preview='#{preview} "#{filename}" {2} #{pipe}'),
                                              '--disabled',
-                                             '--preview-window="right,70%,nowrap,follow"'
+                                             '--height=10',
+                                             '--preview-window="right,70%,nowrap,follow"',
+                                             '--header="Select a revision to restore"'
                                            ])
         raise UserCancelled unless result
 
@@ -143,6 +188,7 @@ module Doing
       ## @param      content  The data to back up
       ##
       def write_backup(filename = nil)
+        Doing.logger.benchmark(:_write_backup, :start)
         filename ||= Doing.config.settings['doing_file']
 
         unless File.exist?(filename)
@@ -152,11 +198,15 @@ module Doing
 
         backup_file = File.join(backup_dir, "#{timestamp_filename}___#{File.basename(filename)}")
         # compressed = Zlib::Deflate.deflate(content)
+        # Zlib::GzipWriter.open(backup_file + '.gz') do |gz|
+        #   gz.write(IO.read(filename))
+        # end
 
         FileUtils.cp(filename, backup_file)
 
-        prune_backups(filename, 100)
+        prune_backups(filename, 15)
         clear_undone(filename)
+        Doing.logger.benchmark(:_write_backup, :finish)
       end
 
       private
@@ -183,7 +233,7 @@ module Doing
       ## @param      filename  The filename
       ##
       def date_of_backup(filename)
-        m = filename.match(/^(?<date>\d{4}-\d{2}-\d{2})_(?<time>\d{2}\.\d{2}\.\d{2})___(?<file>.*?)$/)
+        m = filename.match(/^(?:undone)?(?<date>\d{4}-\d{2}-\d{2})_(?<time>\d{2}\.\d{2}\.\d{2})___(?<file>.*?)$/)
         return nil if m.nil?
 
         [Time.parse("#{m['date']} #{m['time'].gsub(/\./, ':')}"), m['file']]
@@ -220,6 +270,8 @@ module Doing
       ##
       def prune_backups_after(filename)
         target_date, base = date_of_backup(filename)
+        return if target_date.nil?
+
         counter = 0
         get_backups(base).each do |file|
           date, _base = date_of_backup(file)

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.4pre'
+  VERSION = '2.1.5pre'
 end

data/lib/doing/wwid.rb

@@ -262,7 +262,7 @@ module Doing
       return frag.cap_first if @content.section?(frag)
 
       section = nil
-      re = frag.split('').join('.*?')
+      re = frag.to_rx(distance: 2, case_type: :ignore)
       sections.each do |sect|
         next unless sect =~ /#{re}/i
 
@@ -304,7 +304,7 @@ module Doing
     def guess_view(frag, guessed: false, suggest: false)
       views.each { |view| return view if frag.downcase == view.downcase }
       view = false
-      re = frag.split('').join('.*?')
+      re = frag.to_rx(distance: 2, case_type: :ignore)
       views.each do |v|
         next unless v =~ /#{re}/i
 
@@ -780,7 +780,7 @@ module Doing
 
         keep
       end
-      count = opt[:count]&.positive? ? opt[:count] : filtered_items.length
+      count = opt[:count].to_i&.positive? ? opt[:count].to_i : filtered_items.count
 
       output = Items.new
 
@@ -1427,11 +1427,11 @@ module Doing
     ##
     ## @return     [String] The selected tag name
     ##
-    def choose_tag(section = 'All', include_all: false)
-      items = @content.in_section(section)
+    def choose_tag(section = 'All', items: nil, include_all: false)
+      items ||= @content.in_section(section)
       tags = all_tags(items, counts: true).map { |t, c| "@#{t} (#{c})" }
       tags.unshift('No tag filter') if include_all
-      choice = Prompt.choose_from(tags, sorted: false, multiple: true, prompt: 'Choose a tag > ', fzf_args: ['--height=60%'])
+      choice = Prompt.choose_from(tags, sorted: false, multiple: true, prompt: 'Choose tag(s) > ', fzf_args: ['--height=60%'])
       choice ? choice.split(/\n/).map { |t| t.strip.sub(/ \(.*?\)$/, '')}.join(' ') : choice
     end
 
@@ -1482,17 +1482,25 @@ module Doing
     ##
     ## @param      opt   [Hash] Additional Options
     ##
-    def list_section(opt = {})
+    def list_section(opt = {}, items: Items.new)
       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'],
-                                                            'duration' => @config['duration'],
-                                                            'interval_format' => @config['interval_format']
-                                                          })
+
+      tpl_cfg = @config.dig('templates', opt[:config_template])
+
+      cfg = if opt[:view_template]
+              @config.dig('views', opt[:view_template]).deep_merge(tpl_cfg)
+            else
+              tpl_cfg
+            end
+
+      cfg.deep_merge({
+                       'wrap_width' => @config['wrap_width'] || 0,
+                       'date_format' => @config['default_date_format'],
+                       'order' => @config['order'] || 'asc',
+                       'tags_color' => @config['tags_color'],
+                       'duration' => @config['duration'],
+                       'interval_format' => @config['interval_format']
+                     })
       opt[:duration] ||= cfg['duration'] || false
       opt[:interval_format] ||= cfg['interval_format'] || 'text'
       opt[:count] ||= 0
@@ -1523,9 +1531,9 @@ module Doing
                 end
       end
 
-      items = filter_items(Items.new, opt: opt).reverse
+      items = filter_items(items, opt: opt)
 
-      items.reverse! if opt[:order] =~ /^d/i
+      items.reverse! unless opt[:order] =~ /^d/i
 
       if opt[:interactive]
         opt[:menu] = !opt[:force]
@@ -1924,6 +1932,7 @@ EOS
         output + tail
       when :markdown
         pad = sorted_tags_data.map {|k, v| k }.group_by(&:size).max.last[0].length
+        pad = 7 if pad < 7
         output = <<~EOS
   | #{' ' * (pad - 7) }project | time     |
   | #{'-' * (pad - 1)}: | :------- |

data/lib/doing.rb

@@ -8,10 +8,12 @@ require 'csv'
 require 'tempfile'
 require 'zlib'
 require 'base64'
+
 require 'chronic'
 require 'tty-link'
 require 'tty-which'
 require 'tty-markdown'
+require 'plist'
 # require 'amatch'
 require 'haml'
 require 'json'
@@ -19,6 +21,7 @@ require 'logger'
 require 'safe_yaml/load'
 require 'doing/hash'
 require 'doing/colors'
+require 'doing/template_string'
 require 'doing/string'
 require 'doing/string_chronify'
 require 'doing/time'

data/lib/templates/doing-dayone-entry.erb

@@ -0,0 +1,6 @@
+<% @items.each do |i| %>Doing on <%= i[:date_object].strftime('%A %m/%d/%y') %>
+
+<%= i[:title] %><% if i[:note].length.positive? %><%= "\n\n" + i[:note].map{|n| n.strip }.join("\n    ") %><% end %>
+
+<% if i[:human_time] && i[:time] != "00:00:00" %>_Took <%= i[:human_time] %>._<% end %>
+<% end %>

data/lib/templates/doing-dayone.erb

@@ -0,0 +1,5 @@
+# <%= @page_title %>
+<% @items.each do |i| %>
+- [<%= i[:done] %>] <%= i[:date] %> <%= i[:title] %> <% if i[:time] && i[:time] != "00:00:00" %>[**<%= i[:time] %>**]<% end %><% if i[:note].length.positive? %><%= "\n\n    " + i[:note].map{|n| n.strip }.join("\n    ") %><% end %><% end %>
+
+<%= @totals %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.4pre
+  version: 2.1.5pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2021-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -366,6 +366,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 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.
@@ -393,7 +413,14 @@ files:
 - _config.yml
 - bin/doing
 - doc/Array.html
+- doc/BooleanTermParser.html
+- doc/BooleanTermParser/Clause.html
+- doc/BooleanTermParser/Operator.html
+- doc/BooleanTermParser/Query.html
+- doc/BooleanTermParser/QueryParser.html
+- doc/BooleanTermParser/QueryTransformer.html
 - doc/Doing.html
+- doc/Doing/CLIFormat.html
 - doc/Doing/Color.html
 - doc/Doing/Completion.html
 - doc/Doing/Configuration.html
@@ -416,13 +443,22 @@ files:
 - doc/Doing/Plugins.html
 - doc/Doing/Prompt.html
 - doc/Doing/Section.html
+- doc/Doing/TemplateString.html
 - doc/Doing/Util.html
+- doc/Doing/Util/Backup.html
 - doc/Doing/WWID.html
 - doc/Doing/WWIDFile.html
 - doc/GLI.html
 - doc/GLI/Commands.html
 - doc/GLI/Commands/MarkdownDocumentListener.html
 - doc/Hash.html
+- doc/PhraseParser.html
+- doc/PhraseParser/Operator.html
+- doc/PhraseParser/PhraseClause.html
+- doc/PhraseParser/Query.html
+- doc/PhraseParser/QueryParser.html
+- doc/PhraseParser/QueryTransformer.html
+- doc/PhraseParser/TermClause.html
 - doc/Status.html
 - doc/String.html
 - doc/Symbol.html
@@ -474,6 +510,7 @@ files:
 - lib/doing/phrase_parser.rb
 - lib/doing/plugin_manager.rb
 - lib/doing/plugins/export/csv_export.rb
+- lib/doing/plugins/export/dayone_export.rb
 - lib/doing/plugins/export/html_export.rb
 - lib/doing/plugins/export/json_export.rb
 - lib/doing/plugins/export/markdown_export.rb
@@ -488,6 +525,7 @@ files:
 - lib/doing/string.rb
 - lib/doing/string_chronify.rb
 - lib/doing/symbol.rb
+- lib/doing/template_string.rb
 - lib/doing/time.rb
 - lib/doing/util.rb
 - lib/doing/util_backup.rb
@@ -589,6 +627,8 @@ files:
 - lib/helpers/fzf/test/fzf.vader
 - lib/helpers/fzf/test/test_go.rb
 - lib/helpers/fzf/uninstall
+- lib/templates/doing-dayone-entry.erb
+- lib/templates/doing-dayone.erb
 - lib/templates/doing-markdown.erb
 - lib/templates/doing.css
 - lib/templates/doing.haml