doing 2.0.22 → 2.1.0pre

data/lib/doing.rb

@@ -7,6 +7,8 @@ require 'pp'
 require 'csv'
 require 'tempfile'
 require 'chronic'
+require 'tty-link'
+require 'tty-which'
 # require 'amatch'
 require 'haml'
 require 'json'
@@ -20,11 +22,13 @@ require 'doing/array'
 require 'doing/symbol'
 require 'doing/util'
 require 'doing/configuration'
-require 'doing/item'
+require 'doing/section'
+require 'doing/items'
 require 'doing/note'
-require 'doing/wwidfile'
+require 'doing/item'
 require 'doing/wwid'
 require 'doing/log_adapter'
+require 'doing/prompt'
 require 'doing/errors'
 require 'doing/hooks'
 require 'doing/plugin_manager'

data/lib/examples/plugins/capture_thing_import.rb

@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+# title: Capture Thing Import
+# description: Import entries from a Capture Thing folder
+# author: Brett Terpstra
+# url: https://brettterpstra.com
+module Doing
+  class CaptureThingImport
+    require 'time'
+    include Doing::Util
+    include Doing::Errors
+
+    def self.settings
+      {
+        trigger: '^cap(?:ture)?(:?thing)?'
+      }
+    end
+
+    ##
+    ## Imports a Capture Thing folder
+    ##
+    ## @param      wwid     [WWID] WWID object
+    ## @param      path     [String] Path to Capture Thing folder
+    ## @param      options  [Hash] Additional Options
+    ##
+    def self.import(wwid, path, options: {})
+      raise InvalidArgument, 'Path to Capture Thing folder required' if path.nil?
+
+      path = File.expand_path(path)
+
+      raise InvalidArgument, 'File not found' unless File.exist?(path)
+
+      raise InvalidArgument, 'Path is not a directory' unless File.directory?(path)
+
+      options[:no_overlap] ||= false
+      options[:autotag] ||= wwid.auto_tag
+
+      tags = options[:tag] ? options[:tag].split(/[ ,]+/).map { |t| t.sub(/^@?/, '') } : []
+      options[:tag] = nil
+      prefix = options[:prefix] || ''
+
+      @old_items = wwid.content.dup
+
+      new_items = read_capture_folder(path)
+
+      total = new_items.count
+
+      options[:count] = 0
+
+      new_items = wwid.filter_items(new_items, opt: options)
+
+      skipped = total - new_items.count
+      Doing.logger.debug('Skipped:' , %(#{skipped} items that didn't match filter criteria)) if skipped.positive?
+
+      imported = []
+
+      new_items.each do |item|
+        next if duplicate?(item)
+
+        title = "#{prefix} #{item.title}"
+        tags.each do |tag|
+          if title =~ /\b#{tag}\b/i
+            title.sub!(/\b#{tag}\b/i, "@#{tag}")
+          else
+            title += " @#{tag}"
+          end
+        end
+        title = wwid.autotag(title) if options[:autotag]
+        title.gsub!(/ +/, ' ')
+        title.strip!
+        section = options[:section] || item.section
+        section ||= wwid.config['current_section']
+
+        new_item = Item.new(item.date, title, section)
+        new_item.note = item.note
+
+        imported.push(new_item)
+      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])
+      overlaps = new_items.count - imported.count - dups
+      Doing.logger.debug('Skipped:', "#{overlaps} items with overlapping times") if overlaps.positive?
+
+      imported.each do |item|
+        wwid.content.add_section(item.section) unless wwid.content.section?(item.section)
+        wwid.content.push(item)
+      end
+
+      Doing.logger.info('Imported:', "#{imported.count} items")
+    end
+
+    def self.duplicate?(item)
+      @old_items.each do |oi|
+        return true if item.equal?(oi)
+      end
+
+      false
+    end
+
+    def self.parse_entry(date, entry)
+      lines = entry.strip.split(/\n/)
+
+      return nil if lines.nil?
+
+      time_line = lines.shift
+
+      return nil unless time_line =~ /^# (\d+:\d{2} [AP]M)/
+
+      m = time_line.match(/^# (\d+:\d{2} [AP]M)/)
+
+      unless m
+        Doing.logger.debug("Error parsing time #{time_line}")
+        return nil
+      end
+
+      time = m[1]
+      entry_date = Time.parse("#{date} #{time}")
+
+      title = ''
+      note = Note.new
+      lines.each_with_index do |l, i|
+        if l =~ /^-{4,}/
+          note.add(lines.slice(i + 1, lines.count - i))
+          break
+        else
+          title += l
+        end
+      end
+
+      Item.new(entry_date, title, nil, note)
+    end
+
+    def self.read_capture_folder(path)
+      folder = File.expand_path(path)
+
+      return nil unless File.exist?(folder) && File.directory?(folder)
+
+      items = []
+
+      files = Dir.glob('**/*.md', base: folder)
+
+      files.each do |file|
+        date = File.basename(file, '.md').match(/^(\d{4}-\d{2}-\d{2})/)[1]
+        input = IO.read(File.join(folder, file))
+        input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
+        entries = input.split(/^\* \* \* \* \*$/).map(&:strip).delete_if(&:empty?)
+
+        entries.each do |entry|
+          new_entry = parse_entry(date, entry)
+          items << new_entry if new_entry
+        end
+      end
+
+      items
+    end
+
+    Doing::Plugins.register 'capturething', :import, self
+  end
+end

data/rdoc_to_mmd.rb

@@ -3,18 +3,24 @@
 
 input = IO.read('doing.rdoc')
 
+input.gsub!(/^======= Options/, "###### Options\n\n")
 input.gsub!(/^===== Options/, "##### Options\n\n")
+input.gsub!(/^===== Commands/, "### Commands\n")
 input.gsub!(/^=== Commands/, "## Commands\n")
-input.gsub!(/(?<=\n)===== (.*?)\n+((.|\n)+?)(?=\n=|$)/s) do
+
+input.gsub!(/^(?<pre>={4,6}) Command: <tt>(?<cmd>.*?) (?<arg> .*?)?<\/tt>\n(?<after>.*?)$/) do
   m = Regexp.last_match
-  "`#{m[1]}`\n: #{m[2].gsub(/\|/, '\\|')}"
+  level = m['pre'].length == 6 ? '####' : '###'
+  r = "#{level} #{m['cmd'].sub(/\|(.*?)$/, ' (*or* \1)')}"
+  r += " #{m['arg']}" if m['arg']
+  r += " {##{m['cmd'].gsub(/\|.*?$/, '')}}" if m['pre'].length == 4
+  r += "\n\n"
+  "#{r}**#{m['after']}**{:.description}\n"
 end
-input.gsub!(/^==== Command: <tt>(.*?) ( .*?)?<\/tt>\n(.*?)$/) do
+
+input.gsub!(/(?<=\n)={5,7} (.*?)\n+((.|\n)+?)(?=\n=|$)/s) do
   m = Regexp.last_match
-  r = "### #{m[1].sub(/\|(.*?)$/, ' (*or* \1)')}"
-  r += " #{m[2]}" if m[2]
-  r += " {##{m[1].gsub(/\|.*?$/, '')}}\n\n"
-  "#{r}**#{m[3]}**{:.description}\n"
+  "`#{m[1]}`\n: #{m[2].gsub(/\|/, '\\|')}"
 end
 
 input.gsub!(/^=== Global Options/, "## Global Options\n")
@@ -28,7 +34,7 @@ input.gsub!(/\n  (?=\S)/, ' ')
 input.gsub!(/^([^:`\n#*](.*?))$/, "\\1\n")
 input.gsub!(/\n{3,}/, "\n\n")
 input.gsub!(/^(: .*?)\n\n(:.*?)$/, "\\1\n\\2")
-input.gsub!(/^\[Default Command\] (.*?)$/, '## Default Command: [`\1`](#\1)')
+input.gsub!(/^\[Default Command\] (.*?)$/, '> **Default Command:** [`\1`](#\1)')
 input.gsub!(/\/Users\/ttscoff\/scripts\/editor.sh/, '$EDITOR')
 input.gsub!(/\/Users\/ttscoff/, '~')
 puts %(---

data/scripts/generate_bash_completions.rb

@@ -155,7 +155,7 @@ class BashCompletions
   end
 
   def parse_option(option)
-    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>[\w_]+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
+    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>w+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
     return nil unless res
     {
       short: res['short'],

data/scripts/generate_fish_completions.rb

@@ -100,7 +100,7 @@ class FishCompletions
   end
 
   def parse_option(option)
-    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>[\w_]+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
+    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>w+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
     return nil unless res
     {
       short: res['short'],

data/scripts/generate_zsh_completions.rb

@@ -71,7 +71,7 @@ class ZshCompletions
   end
 
   def parse_option(option)
-    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>[\w_]+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
+    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>w+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
     return nil unless res
 
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.1.0pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2021-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -166,6 +166,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.3
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: tty-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -266,6 +286,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: tty-link
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: tty-which
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.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.
@@ -295,7 +355,9 @@ files:
 - doc/Array.html
 - doc/Doing.html
 - doc/Doing/Color.html
+- doc/Doing/Completion.html
 - doc/Doing/Configuration.html
+- doc/Doing/Content.html
 - doc/Doing/Errors.html
 - doc/Doing/Errors/DoingNoTraceError.html
 - doc/Doing/Errors/DoingRuntimeError.html
@@ -312,8 +374,11 @@ files:
 - doc/Doing/Note.html
 - doc/Doing/Pager.html
 - doc/Doing/Plugins.html
+- doc/Doing/Prompt.html
+- doc/Doing/Section.html
 - doc/Doing/Util.html
 - doc/Doing/WWID.html
+- doc/Doing/WWIDFile.html
 - doc/GLI.html
 - doc/GLI/Commands.html
 - doc/GLI/Commands/MarkdownDocumentListener.html
@@ -360,6 +425,7 @@ files:
 - lib/doing/hash.rb
 - lib/doing/hooks.rb
 - lib/doing/item.rb
+- lib/doing/items.rb
 - lib/doing/log_adapter.rb
 - lib/doing/markdown_document_listener.rb
 - lib/doing/note.rb
@@ -375,15 +441,17 @@ files:
 - lib/doing/plugins/import/calendar_import.rb
 - lib/doing/plugins/import/doing_import.rb
 - lib/doing/plugins/import/timing_import.rb
+- lib/doing/prompt.rb
+- lib/doing/section.rb
 - lib/doing/string.rb
 - lib/doing/symbol.rb
 - lib/doing/time.rb
 - lib/doing/util.rb
 - lib/doing/version.rb
 - lib/doing/wwid.rb
-- lib/doing/wwidfile.rb
 - lib/examples/commands/autotag.rb
 - lib/examples/commands/wiki.rb
+- lib/examples/plugins/capture_thing_import.rb
 - lib/examples/plugins/hooks.rb
 - lib/examples/plugins/say_export.rb
 - lib/examples/plugins/wiki_export/templates/wiki.css
@@ -512,9 +580,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.16
 signing_key:

data/lib/doing/wwidfile.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-module Doing
-  class Items < Array
-    def from(path)
-      return [] unless path
-      path = File.expand_path(path)
-
-      if File.exist?(path) && File.file?(path) && File.stat(path).size.positive?
-        input = IO.read(File.expand_path(input))
-        input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
-      end
-
-      section = 'Uncategorized'
-      lines = input.split(/[\n\r]/)
-      current = 0
-
-      lines.each do |line|
-        next if line =~ /^\s*$/
-
-        if line =~ /^(\S[\S ]+):\s*(@\S+\s*)*$/
-          section = Regexp.last_match(1)
-          @sections << { original: line, title: section }
-          current = 0
-        elsif line =~ /^\s*- (\d{4}-\d\d-\d\d \d\d:\d\d) \| (.*)/
-          date = Regexp.last_match(1).strip
-          title = Regexp.last_match(2).strip
-          item = Item.new(date, title, section)
-          @items.push(item)
-          current += 1
-        elsif current.zero?
-          # if content[section][:items].length - 1 == current
-          @other_content_top.push(line)
-        elsif line =~ /^\S/
-          @other_content_bottom.push(line)
-        else
-          prev_item = @items[current - 1]
-          prev_item.note = Note.new unless prev_item.note
-
-          prev_item.note.add(line)
-          # end
-        end
-      end
-      Hooks.trigger :post_read, self
-    end
-
-    def section_titles
-      @sections.map { |s| s[:title] }
-    end
-
-    ##
-    ## Adds a section.
-    ##
-    ## @param      title  [String] The new section title
-    ##
-    def add_section(title)
-      if section_titles.include?(title.cap_first)
-        Doing.logger.debug('Skipped': 'Section already exists')
-        return
-      end
-
-      @sections << { original: "#{title}:", title: title }
-      Doing.logger.info('Added section:', %("#{title.cap_first}"))
-    end
-
-    ##
-    ## Attempt to match a string with an existing section
-    ##
-    ## @param      frag     [String] The user-provided string
-    ## @param      guessed  [Boolean] already guessed and failed
-    ##
-    def guess_section(frag, guessed: false, suggest: false)
-      return 'All' if frag =~ /^all$/i
-      frag ||= wwid.config['current_section']
-
-      @sections.each { |sect| return sect[:title].cap_first if frag.downcase == sect[:title].downcase }
-
-      section = false
-      re = frag.split('').join('.*?')
-      sections.each do |sect|
-        next unless sect =~ /#{re}/i
-
-        Doing.logger.debug('Section match:', %(Assuming "#{sect}" from "#{frag}"))
-        section = sect
-        break
-      end
-
-      return section if suggest
-
-      unless section || guessed
-        alt = WWID.guess_view(frag, guessed: true, suggest: true)
-        if alt
-          meant_view = WWID.yn("Did you mean `doing view #{alt}`?", default_response: 'n')
-          raise Errors::InvalidSection, "Run again with `doing view #{alt}`" if meant_view
-        end
-
-        res = WWID.yn("Section #{frag} not found, create it", default_response: 'n')
-
-        if res
-          add_section(frag.cap_first)
-          WWID.write(@doing_file)
-          return frag.cap_first
-        end
-
-        raise Errors::InvalidSection, "Unknown section: #{frag}"
-      end
-      section ? section.cap_first : guessed
-    end
-
-    def section_items(section)
-      section = guess_section(section)
-      return @items if section =~ /all/i
-
-      @items.filter { |i| i.section == section }
-    end
-  end
-end