doing 2.1.46 → 2.1.47

data/docs/doc/top-level-namespace.html

@@ -216,7 +216,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Mar 23 08:25:50 2022 by
+  Generated on Sat Mar 26 15:03:56 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

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.1.46
+v2.1.47
 
 === Global Options
 === --config_file arg
@@ -98,7 +98,7 @@ Backdate start date for new entry to date string [4pm|20m|2h|yesterday noon]
 
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -211,7 +211,7 @@ Archive entries older than date (natural language).
 
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -354,7 +354,7 @@ Adds @done tag without datestamp so no elapsed time is recorded.
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -574,7 +574,7 @@ DEPRECATED
 
 
 ===== Commands
-====== Command: <tt>edit </tt>
+====== Command: <tt>edit|open </tt>
 Open config file in editor
 
 
@@ -758,7 +758,7 @@ Backdate completed date to date string [4pm|20m|2h|yesterday noon]
 
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -893,7 +893,7 @@ Search entries older than date (natural language). If this is only a time (8am,
 
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -1161,7 +1161,7 @@ allowing `doing last` to target historical entries.
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -1278,7 +1278,7 @@ Mark last entry as flagged
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -1426,7 +1426,7 @@ If -r is provided with no other arguments, the last note is removed.
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -1584,7 +1584,7 @@ View entries before specified time (e.g. 8am, 12:30pm, 15:00)
 
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -1881,7 +1881,7 @@ If a date string is provided as an argument, the start time will be set to the p
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -1984,7 +1984,7 @@ Rotate entries older than date
 
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -2286,7 +2286,7 @@ Show entries older than date (natural language). If this is only a time (8am, 1:
 
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -2460,7 +2460,7 @@ and "2d" would be interpreted as "two days ago."
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -2605,7 +2605,7 @@ Add (or remove) tags from the last entry, or from multiple entries
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)
@@ -2746,7 +2746,7 @@ List all tags in the current Doing file
 ===== Options
 ===== --bool BOOLEAN
 
-Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
+Boolean used to combine multiple tags (AND|OR|NOT). Use PATTERN to parse + and - as booleans
 
 [Default Value] pattern
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$)

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/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,39 @@
+# frozen_string_literal: true
+
+# title: Doing File Export
+# description: Export Doing format data
+# author: Brett Terpstra
+# url: https://brettterpstra.com
+module Doing
+  class DoingExport
+    include Doing::Util
+
+    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.47'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.46
+  version: 2.1.47
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -533,6 +533,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
@@ -669,6 +670,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