doing 2.1.1pre → 2.1.5pre

data/lib/doing/wwid.rb

@@ -183,7 +183,25 @@ module Doing
 
       date = nil
       iso_rx = /\d{4}-\d\d-\d\d \d\d:\d\d/
-      done_rx = /(?<=^| )@(?<tag>done|finished|completed?)\((?<date>.*?)\)/i
+      watch_tags = [
+        'start(?:ed)?',
+        'beg[ia]n',
+        'done',
+        'finished',
+        'completed?',
+        'waiting',
+        'defer(?:red)?'
+      ]
+      if @config['date_tags']
+        date_tags = @config['date_tags']
+        date_tags = date_tags.split(/ *, */) if date_tags.is_a?(String)
+        date_tags.map! do |tag|
+          tag.sub(/^@/, '').gsub(/\((?!\?:)(.*?)\)/, '(?:\1)').strip
+        end
+        watch_tags.concat(date_tags).uniq!
+      end
+
+      done_rx = /(?<=^| )@(?<tag>#{watch_tags.join('|')})\((?<date>.*?)\)/i
       date_rx = /^(?:\s*- )?(?<date>.*?) \| (?=\S)/
 
       title.gsub!(done_rx) do
@@ -244,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
 
@@ -286,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
 
@@ -423,8 +441,9 @@ module Doing
     # @param      item    [Item] the item to reset/resume
     # @param      resume  [Boolean] removing @done tag if true
     #
-    def reset_item(item, resume: false)
-      item.date = Time.now
+    def reset_item(item, date: nil, resume: false)
+      date ||= Time.now
+      item.date = date
       item.tag('done', remove: true) if resume
       logger.info('Reset:', %(Reset #{resume ? 'and resumed ' : ''} "#{item.title}" in #{item.section}))
       item
@@ -528,10 +547,25 @@ module Doing
       last_entry
     end
 
-    def all_tags(items, opt: {})
-      all_tags = []
-      items.each { |item| all_tags.concat(item.tags).uniq! }
-      all_tags.sort
+    def all_tags(items, opt: {}, counts: false)
+      if counts
+        all_tags = {}
+        items.each do |item|
+          item.tags.each do |tag|
+            if all_tags.key?(tag.downcase)
+              all_tags[tag.downcase] += 1
+            else
+              all_tags[tag.downcase] = 1
+            end
+          end
+        end
+
+        all_tags.sort_by { |tag, count| count }
+      else
+        all_tags = []
+        items.each { |item| all_tags.concat(item.tags.map(&:downcase)).uniq! }
+        all_tags.sort
+      end
     end
 
     def tag_groups(items, opt: {})
@@ -656,6 +690,7 @@ module Doing
         end
 
         if keep && opt[:tag]
+          opt[:tag_bool] = opt[:bool].normalize_bool if opt[:bool]
           opt[:tag_bool] ||= :and
           tag_match = opt[:tag].nil? || opt[:tag].empty? ? true : item.tags?(opt[:tag], opt[:tag_bool])
           keep = false unless tag_match
@@ -666,7 +701,7 @@ module Doing
           search_match = if opt[:search].nil? || opt[:search].empty?
                            true
                          else
-                           item.search(opt[:search], case_type: opt[:case].normalize_case, fuzzy: opt[:fuzzy])
+                           item.search(opt[:search], case_type: opt[:case].normalize_case)
                          end
 
           keep = false unless search_match
@@ -708,7 +743,7 @@ module Doing
 
         keep = false if keep && opt[:only_timed] && !item.interval
 
-        if keep && opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
+        if keep && opt[:tag_filter]
           keep = item.tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool'])
           keep = opt[:not] ? !keep : keep
         end
@@ -745,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
 
@@ -914,12 +949,19 @@ module Doing
         if opt[:resume] && !opt[:reset]
           repeat_item(item, { editor: opt[:editor] })
         elsif opt[:reset]
+          res = Prompt.enter_text('Start date (blank for current time)', default_response: '')
+          if res =~ /^ *$/
+            date = Time.now
+          else
+            date = res.chronify(guess: :begin)
+          end
+
           res = if item.tags?('done', :and) && !opt[:resume]
                   opt[:force] ? true : Prompt.yn('Remove @done tag?', default_response: 'y')
                 else
                   opt[:resume]
                 end
-          @content.update_item(item, reset_item(item, resume: res))
+          @content.update_item(item, reset_item(item, date: date, resume: res))
         end
         write(@doing_file)
 
@@ -1309,20 +1351,6 @@ module Doing
       end
     end
 
-    ##
-    ## Restore a backed up version of a file
-    ##
-    ## @param      file  [String] The filepath to restore
-    ##
-    def restore_backup(file)
-      if File.exist?("#{file}~")
-        FileUtils.cp("#{file}~", file)
-        logger.warn('File update:', "Restored #{file.sub(/^#{Util.user_home}/, '~')}")
-      else
-        logger.error('Restore error:', 'No backup file found')
-      end
-    end
-
     ##
     ## Rename doing file with date and start fresh one
     ##
@@ -1387,8 +1415,35 @@ module Doing
     ##
     ## @return     [String] The selected section name
     ##
-    def choose_section
-      choice = Prompt.choose_from(@content.section_titles.sort, prompt: 'Choose a section > ', fzf_args: ['--height=60%'])
+    def choose_section(include_all: false)
+      options = @content.section_titles.sort
+      options.unshift('All') if include_all
+      choice = Prompt.choose_from(options, prompt: 'Choose a section > ', fzf_args: ['--height=60%'])
+      choice ? choice.strip : choice
+    end
+
+    ##
+    ## Generate a menu of tags and allow user selection
+    ##
+    ## @return     [String] The selected tag name
+    ##
+    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 tag(s) > ', fzf_args: ['--height=60%'])
+      choice ? choice.split(/\n/).map { |t| t.strip.sub(/ \(.*?\)$/, '')}.join(' ') : choice
+    end
+
+    ##
+    ## Generate a menu of sections and tags and allow user selection
+    ##
+    ## @return     [String] The selected section or tag name
+    ##
+    def choose_section_tag
+      options = @content.section_titles.sort
+      options.concat(@content.all_tags.sort.map { |t| "@#{t}" })
+      choice = Prompt.choose_from(options, prompt: 'Choose a section or tag > ', fzf_args: ['--height=60%'])
       choice ? choice.strip : choice
     end
 
@@ -1427,22 +1482,33 @@ 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']
-      })
+
+      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
       opt[:age] ||= 'newest'
       opt[:format] ||= cfg['date_format']
       opt[:order] ||= cfg['order'] || 'asc'
       opt[:tag_order] ||= 'asc'
-      if opt[:tags_color].nil?
-        opt[:tags_color] = cfg['tags_color'] || false
-      end
+      opt[:tags_color] = cfg['tags_color'] || false if opt[:tags_color].nil?
       opt[:template] ||= cfg['template']
 
       # opt[:highlight] ||= true
@@ -1452,22 +1518,22 @@ module Doing
         opt[:section] = choose_section
         title = opt[:section]
       elsif opt[:section].instance_of?(String)
-        if opt[:section] =~ /^all$/i
-          title = if opt[:page_title]
+        title = if opt[:section] =~ /^all$/i
+                  if opt[:page_title]
                     opt[:page_title]
                   elsif opt[:tag_filter] && opt[:tag_filter]['bool'].normalize_bool != :not
                     opt[:tag_filter]['tags'].map { |tag| "@#{tag}" }.join(' + ')
                   else
                     'doing'
                   end
-        else
-          title = guess_section(opt[:section])
-        end
+                else
+                  guess_section(opt[:section])
+                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]
@@ -1531,15 +1597,22 @@ module Doing
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
-        'tags_color' => @config['tags_color']
+        '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'
+
       options = {
         after: opt[:after],
         before: opt[:before],
         count: 0,
+        duration: opt[:duration],
         from: opt[:from],
         format: cfg['date_format'],
+        interval_format: opt[:interval_format],
         order: cfg['order'] || 'asc',
         output: output,
         section: opt[:section],
@@ -1571,8 +1644,18 @@ module Doing
       # :date_filter expects an array with start and end date
       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], config_template: 'default' })
+      list_section({
+                     section: section,
+                     count: 0,
+                     order: 'asc',
+                     date_filter: dates,
+                     times: times,
+                     output: output,
+                     totals: opt[:totals],
+                     duration: opt[:duration],
+                     sort_tags: opt[:sort_tags],
+                     config_template: 'default'
+                   })
     end
 
     ##
@@ -1595,6 +1678,7 @@ module Doing
         after: opt[:after],
         before: opt[:before],
         count: 0,
+        duration: opt[:duration],
         from: opt[:from],
         order: opt[:order],
         output: output,
@@ -1626,8 +1710,13 @@ module Doing
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
-        'tags_color' => @config['tags_color']
+        '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'
+
       section ||= @config['current_section']
       section = guess_section(section)
 
@@ -1649,8 +1738,12 @@ module Doing
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
-        'tags_color' => @config['tags_color']
+        'tags_color' => @config['tags_color'],
+        'duration' => @config['duration'],
+        'interval_format' => @config['interval_format']
       })
+      options[:duration] ||= cfg['duration'] || false
+      options[:interval_format] ||= cfg['interval_format'] || 'text'
 
       opts = {
         section: section,
@@ -1658,7 +1751,12 @@ module Doing
         count: 1,
         format: cfg['date_format'],
         template: cfg['template'],
-        times: times
+        times: times,
+        duration: options[:duration],
+        interval_format: options[:interval_format],
+        case: options[:case],
+        not: options[:negate],
+        config_template: 'last'
       }
 
       if options[:tag]
@@ -1669,9 +1767,7 @@ module Doing
       end
 
       opts[:search] = options[:search] if options[:search]
-      opts[:case] = options[:case]
-      opts[:not] = options[:negate]
-      opts[:config_template] = 'last'
+
       list_section(opts)
     end
 
@@ -1836,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

@@ -6,9 +6,14 @@ require 'yaml'
 require 'pp'
 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'
@@ -16,12 +21,14 @@ 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'
 require 'doing/array'
 require 'doing/symbol'
 require 'doing/util'
+require 'doing/util_backup'
 require 'doing/configuration'
 require 'doing/section'
 require 'doing/items'
@@ -35,6 +42,8 @@ require 'doing/hooks'
 require 'doing/plugin_manager'
 require 'doing/pager'
 require 'doing/completion'
+require 'doing/boolean_term_parser'
+require 'doing/phrase_parser'
 # require 'doing/markdown_document_listener'
 
 # Main doing module

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.1pre
+  version: 2.1.5pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-27 00:00:00.000000000 Z
+date: 2021-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -326,6 +326,66 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: tty-markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: parslet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !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.
@@ -353,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
@@ -376,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
@@ -413,6 +489,7 @@ files:
 - lib/completion/doing.fish
 - lib/doing.rb
 - lib/doing/array.rb
+- lib/doing/boolean_term_parser.rb
 - lib/doing/cli_status.rb
 - lib/doing/colors.rb
 - lib/doing/completion.rb
@@ -430,8 +507,10 @@ files:
 - lib/doing/markdown_document_listener.rb
 - lib/doing/note.rb
 - lib/doing/pager.rb
+- 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
@@ -446,8 +525,10 @@ 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
 - lib/doing/version.rb
 - lib/doing/wwid.rb
 - lib/examples/commands/autotag.rb
@@ -546,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