doing 2.1.46 → 2.1.49

data/lib/doing/add_options.rb

@@ -147,7 +147,7 @@ def add_options(type, cmd, default_template: 'default')
     cmd.desc "#{action} items that *don't* match search/tag filters"
     cmd.switch [:not], default_value: false, negatable: false
 
-    cmd.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans'
+    cmd.desc 'Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans'
     cmd.arg_name 'BOOLEAN'
     cmd.flag [:bool], must_match: REGEX_BOOL,
                       default_value: :pattern,

data/lib/doing/completion/fig_completion.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module Doing
+  module Completion
+    class ::String
+      def sanitize
+        gsub(/"/, '\"')
+      end
+    end
+
+    # Generate completions for zsh
+    class FigCompletions
+      attr_accessor :commands, :global_options
+
+      def generate_helpers
+        out=<<~EOFUNCTIONS
+        const completionSpec: Fig.Spec = {
+          name: "doing",
+          description: "A CLI for a What Was I Doing system",
+          subcommands: [
+            #{generate_subcommand_completions.join("\n    ")}
+          ],
+        };
+        export default completionSpec;
+        EOFUNCTIONS
+        @bar.advance(status: '✅')
+        @bar.finish
+        out
+      end
+
+      def generate_subcommand_completions
+        out = []
+        indent = '      '
+        @commands.each do |cmd|
+          cmd[:commands].each do |c|
+            out << <<~EOCOMMAND
+              {
+              #{indent}name: "#{c}",
+              #{indent}description: "#{cmd[:description].sanitize}",
+              #{indent}#{generate_subcommand_option_completions(cmd)}
+                  },
+            EOCOMMAND
+          end
+        end
+
+        out
+      end
+
+      def generate_subcommand_option_completions(cmd, indent: '          ')
+        out = []
+
+        @bar.advance(status: cmd[:commands].first)
+
+        data = Completion.get_help_sections(cmd[:commands].first)
+
+        option_arr = []
+
+        if data[:command_options]
+          Completion.parse_options(data[:command_options]).each do |option|
+            next if option.nil?
+
+            arg = ''
+
+            if option[:arg]
+              arg =<<~EOARG
+              args: {
+              #{indent}        name: "#{option[:arg]}",
+              #{indent}        description: "#{option[:arg]}",
+              #{indent}  },
+              EOARG
+            end
+
+            if option[:short]
+              opt_data =<<~EOOPT
+              {
+              #{indent}  name: ["-#{option[:short]}", "--#{option[:long]}"],
+              #{indent}  description: "#{option[:description].sanitize}",
+              #{indent}  #{arg}
+              #{indent}},
+              EOOPT
+            else
+              opt_data = <<~EOOPT
+              {
+              #{indent}  name: ["--#{option[:long]}"],
+              #{indent}  description: "#{option[:description].sanitize}",
+              #{indent}  #{arg}
+              #{indent}},
+              EOOPT
+            end
+
+            option_arr << opt_data
+
+          end
+
+          cmd_opts = <<~EOCMD
+            options: [
+            #{indent}#{option_arr.join("\n#{indent}")}
+                    ],
+          EOCMD
+          out << cmd_opts
+        end
+
+        out.join("\n")
+      end
+
+      def initialize
+        data = Completion.get_help_sections
+        @global_options = Completion.parse_options(data[:global_options])
+        @commands = Completion.parse_commands(data[:commands])
+        @bar = TTY::ProgressBar.new(" \033[0;0;33mGenerating Fig completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count + 1, bar_format: :square, hide_cursor: true, status: 'processing subcommands')
+        width = TTY::Screen.columns - 45
+        @bar.resize(width)
+      end
+
+      def generate_completions
+        @bar.start
+        generate_helpers
+      end
+    end
+  end
+end

data/lib/doing/completion.rb

@@ -6,6 +6,7 @@ require_relative 'completion/completion_string'
 require_relative 'completion/fish_completion'
 require_relative 'completion/zsh_completion'
 require_relative 'completion/bash_completion'
+require_relative 'completion/fig_completion'
 
 module Doing
   # Completion script generator
@@ -15,8 +16,8 @@ module Doing
     COMMAND_RX = /^(?<cmd>[^, \t]+)(?<alias>(?:, [^, \t]+)*)?\s+- (?<desc>.*?)$/.freeze
 
     class << self
-      def get_help_sections(command = '')
-        res = `doing help #{command}`.strip
+      def get_help_sections(command = "")
+        res = `doing help #{command}|command cat`.strip
         scanned = res.scan(SECTIONS_RX)
         sections = {}
         scanned.each do |sect|
@@ -85,7 +86,7 @@ module Doing
         type = normalize_type(type)
         raise InvalidArgument, 'Unrecognized shell specified' if type == :invalid
 
-        return %i[zsh bash fish].each { |t| link_default(t) } if type == :all
+        return %i[zsh bash fish fig].each { |t| link_default(t) } if type == :all
 
         install_builtin(type)
 
@@ -98,6 +99,7 @@ module Doing
 
         if File.exist?(File.join(default_dir, default_filenames[type]))
           return unless Doing::Prompt.yn("Update #{type} completion script", default_response: 'n')
+
         end
 
         FileUtils.cp(src, default_dir)
@@ -106,6 +108,8 @@ module Doing
 
       def normalize_type(type)
         case type.to_s
+        when /^fig/i
+          :fig
         when /^f/i
           :fish
         when /^b/i
@@ -123,6 +127,8 @@ module Doing
 
       def generate_type(type)
         generator = case type.to_s
+                    when /^fig/i
+                      FigCompletions.new
                     when /^f/i
                       FishCompletions.new
                     when /^b/i
@@ -149,7 +155,7 @@ module Doing
       end
 
       def default_filenames
-        { zsh: '_doing.zsh', bash: 'doing.bash', fish: 'doing.fish' }
+        { zsh: '_doing.zsh', bash: 'doing.bash', fish: 'doing.fish', fig: 'doing.ts' }
       end
 
       def default_file(type)
@@ -188,6 +194,8 @@ module Doing
         Doing.logger.warn('File written:', 'zsh completions written to lib/completion/_doing.zsh')
         generate_completion(type: 'bash', file: 'lib/completion/doing.bash', link: false)
         Doing.logger.warn('File written:', 'bash completions written to lib/completion/doing.bash')
+        generate_completion(type: 'fig', file: 'lib/completion/doing.ts', link: false)
+        Doing.logger.warn('File written:', 'Fig completions written to lib/completion/doing.ts')
       end
 
       def link_completion_type(type, file)
@@ -197,6 +205,7 @@ module Doing
           unless dir =~ %r{(\.bash_it/completion|bash_completion/completions)}
             link_completion(file, ['~/.bash_it/completion/enabled', '/usr/share/bash_completion/completions'], 'doing.bash')
           end
+        when /^fig/i
         when /^f/i
           link_completion(file, ['~/.config/fish/completions'], 'doing.fish') unless dir =~ %r{.config/fish/completions}
         when /^z/i
@@ -214,6 +223,7 @@ module Doing
 
         targets.each do |target|
           next unless File.directory?(File.expand_path(target))
+
           found = true
 
           target_file = File.join(File.expand_path(target), filename)

data/lib/doing/plugin_manager.rb

@@ -201,7 +201,7 @@ module Doing
         plugins[type].each do |_, options|
           pattern << options[:trigger].normalize_trigger
         end
-        Regexp.new("^(?:#{pattern.join('|')})$", true)
+        Regexp.new("^(?:#{pattern.sort.uniq.join('|')})$", true)
       end
 
       ##

data/lib/doing/plugins/export/doing_export.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# title: Doing File Export
+# description: Export Doing format data
+# author: Brett Terpstra
+# url: https://brettterpstra.com
+module Doing
+  class DoingExport
+    def self.settings
+      {
+        trigger: 'doing'
+      }
+    end
+
+    def self.render(wwid, items, variables: {})
+      return if items.nil?
+
+      content = Doing::Items.new
+      items.each do |item|
+        content.add_section(item.section, log: false)
+        content.push(item)
+      end
+
+      out = []
+      content.sections.each do |section|
+        out.push(section.original)
+        is = content.in_section(section.title).sort_by { |i| [i.date, i.title] }
+        is.reverse! if Doing.setting('doing_file_sort').normalize_order == :desc
+        is.each { |item| out.push(item.to_s) }
+      end
+
+      Doing::Pager.page out.join("\n")
+    end
+
+    Doing::Plugins.register 'doing', :export, self
+  end
+end

data/lib/doing/plugins/export/template_export.rb

@@ -12,7 +12,7 @@ module Doing
 
     def self.settings
       {
-        trigger: 'template|doing'
+        trigger: 'template'
       }
     end
 
@@ -50,6 +50,8 @@ module Doing
           note = []
         end
 
+        placeholders['id'] = item.id
+
         placeholders['tags'] = item.tags
 
         placeholders['date'] = item.date.strftime(opt[:format])
@@ -141,6 +143,6 @@ module Doing
       out
     end
 
-    Doing::Plugins.register ['template', 'doing'], :export, self
+    Doing::Plugins.register 'template', :export, self
   end
 end

data/lib/doing/plugins/import/doing_import.rb

@@ -29,6 +29,7 @@ module Doing
       exit_now! 'File not found' unless File.exist?(File.expand_path(path))
 
       options[:no_overlap] ||= false
+
       options[:autotag] ||= Doing.auto_tag
 
       tags = options[:tag] ? options[:tag].split(/[ ,]+/).map { |t| t.sub(/^@?/, '') } : []
@@ -47,6 +48,7 @@ module Doing
       Doing.logger.debug('Skipped:', %(#{skipped} items that didn't match filter criteria)) if skipped.positive?
 
       imported = []
+      updated = 0
 
       new_items.each do |item|
         next if duplicate?(item)
@@ -65,8 +67,7 @@ module Doing
         section = options[:section] || item.section
         section ||= Doing.setting('current_section')
 
-        new_item = Item.new(item.date, title, section)
-        new_item.note = item.note
+        new_item = Item.new(item.date, title, section, item.note, item.id)
 
         is_match = true
 
@@ -79,13 +80,21 @@ module Doing
           is_match = options[:not] ? !is_match : is_match
         end
 
-        imported.push(new_item) if is_match
+        if wwid.content.find_id(new_item.id)
+          old_index = wwid.content.index_for_id(new_item.id)
+          old_item = wwid.content[old_index].clone
+          wwid.content[old_index] = new_item
+          Hooks.trigger :post_entry_updated, self, new_item, old_item
+          updated += 1
+        else
+          imported.push(new_item) if is_match
+        end
       end
 
       dups = new_items.count - imported.count
       Doing.logger.info('Skipped:', %(#{dups} duplicate items)) if dups.positive?
 
-      imported = wwid.dedup(imported, no_overlap: !options[:overlap])
+      imported = wwid.dedup(imported, no_overlap: options[:no_overlap])
       overlaps = new_items.count - imported.count - dups
       Doing.logger.debug('Skipped:', "#{overlaps} items with overlapping times") if overlaps.positive?
 
@@ -96,6 +105,7 @@ module Doing
         Hooks.trigger :post_entry_added, self, item
       end
 
+      Doing.logger.info('Updated:', %(#{updated} items))
       Doing.logger.info('Imported:', "#{imported.count} items")
     end
 
@@ -128,10 +138,11 @@ module Doing
         when /^(\S[\S ]+):(\s+@[\w\-_.]+(?= |$))*\s*$/
           section = Regexp.last_match(1)
           current = 0
-        when /^\s*- (\d{4}-\d\d-\d\d \d\d:\d\d) \| (.*)/
+        when /^\s*- (\d{4}-\d\d-\d\d \d\d:\d\d) \| (.*?)(?: <([a-z0-9]{32})>)? *$/
           date = Regexp.last_match(1).strip
           title = Regexp.last_match(2).strip
-          item = Item.new(date, title, section)
+          id = Regexp.last_match(3)
+          item = Item.new(date, title, section, nil, id)
           items.push(item)
           current += 1
         when /^\S/

data/lib/doing/plugins/import/json_import.rb

@@ -5,6 +5,7 @@
 # author: Brett Terpstra
 # url: https://brettterpstra.com
 module Doing
+  # JSON importer
   class JSONImport
     include Doing::Util
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.46'
+  VERSION = '2.1.49'
 end

data/lib/doing/wwid/interactive.rb

@@ -355,7 +355,8 @@ module Doing
     def verify_duration(date, finish_date, title: nil)
       max_elapsed = Doing.setting('interaction.confirm_longer_than', 0)
       max_elapsed = max_elapsed.chronify_qty if max_elapsed.is_a?(String)
-      date = date.chronify(guess: :end, context: :today) if finish_date.is_a?(String)
+      date = date.chronify(guess: :end, context: :today) if date.is_a?(String)
+      finish_date = finish_date.chronify(guess: :end, context: :today) if finish_date.is_a?(String)
 
       elapsed = finish_date - date
 

data/lib/doing/wwid/modify.rb

@@ -39,7 +39,8 @@ module Doing
 
       if opt[:done] && entry.should_finish?
         if entry.should_time?
-          entry.tag('done', value: opt[:done])
+          finish = opt[:done].is_a?(String) ? opt[:done].chronify(guess: :end, context: :today) : opt[:done]
+          entry.tag('done', value: finish)
         else
           entry.tag('done')
         end
@@ -47,15 +48,11 @@ module Doing
 
       entry.note = note
 
-      items = @content.clone
       if opt[:timed]
-        items.reverse!
-        items.each_with_index do |i, x|
-          next if i.title =~ / @done/
-
-          finish_date = verify_duration(i.date, opt[:back], title: i.title)
-          items[x].tag('done', value: finish_date.strftime('%F %R'))
-          break
+        last_item = last_entry({ section: section })
+        if last_item.tags?(['done'], :not)
+          finish_date = verify_duration(last_item.date, opt[:back], title: last_item.title)
+          last_item.tag('done', value: finish_date.strftime('%F %R'))
         end
       end
 
@@ -103,7 +100,7 @@ module Doing
     def repeat_item(item, opt)
       opt ||= {}
       old_item = item.clone
-      if item.should_finish?
+      if item.unfinished? && item.should_finish?
         if item.should_time?
           finish_date = verify_duration(item.date, Time.now, title: item.title)
           item.title.tag!('done', value: finish_date.strftime('%F %R'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.46
+  version: 2.1.49
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -503,6 +503,7 @@ files:
 - docs/doc/Doing/Color.html
 - docs/doc/Doing/Completion.html
 - docs/doc/Doing/Completion/BashCompletions.html
+- docs/doc/Doing/Completion/FigCompletions.html
 - docs/doc/Doing/Completion/FishCompletions.html
 - docs/doc/Doing/Completion/StringUtils.html
 - docs/doc/Doing/Completion/ZshCompletions.html
@@ -510,6 +511,7 @@ files:
 - docs/doc/Doing/Content.html
 - docs/doc/Doing/DayOneRenderer.html
 - docs/doc/Doing/DayoneExport.html
+- docs/doc/Doing/DoingExport.html
 - docs/doc/Doing/DoingImport.html
 - docs/doc/Doing/Entry.html
 - docs/doc/Doing/Errors.html
@@ -533,6 +535,7 @@ files:
 - docs/doc/Doing/ItemTags.html
 - docs/doc/Doing/Items.html
 - docs/doc/Doing/JSONExport.html
+- docs/doc/Doing/JSONImport.html
 - docs/doc/Doing/LogAdapter.html
 - docs/doc/Doing/Logger.html
 - docs/doc/Doing/MarkdownExport.html
@@ -613,7 +616,9 @@ files:
 - docs/index.md
 - doing.gemspec
 - doing.rdoc
+- doing.ts
 - example_plugin.rb
+- export.doing
 - generate_completions.sh
 - img/doing-colors.jpg
 - img/doing-printf-wrap-800.jpg
@@ -621,6 +626,7 @@ files:
 - lib/completion/_doing.zsh
 - lib/completion/doing.bash
 - lib/completion/doing.fish
+- lib/completion/doing.ts
 - lib/doing.rb
 - lib/doing/add_options.rb
 - lib/doing/array/array.rb
@@ -642,6 +648,7 @@ files:
 - lib/doing/completion.rb
 - lib/doing/completion/bash_completion.rb
 - lib/doing/completion/completion_string.rb
+- lib/doing/completion/fig_completion.rb
 - lib/doing/completion/fish_completion.rb
 - lib/doing/completion/zsh_completion.rb
 - lib/doing/configuration.rb
@@ -669,6 +676,7 @@ files:
 - lib/doing/plugin_manager.rb
 - lib/doing/plugins/export/csv_export.rb
 - lib/doing/plugins/export/dayone_export.rb
+- lib/doing/plugins/export/doing_export.rb
 - lib/doing/plugins/export/html_export.rb
 - lib/doing/plugins/export/json_export.rb
 - lib/doing/plugins/export/markdown_export.rb