doing 2.1.4pre → 2.1.7

data/lib/doing/log_adapter.rb

@@ -38,6 +38,7 @@ module Doing
       rotated
       skipped
       updated
+      exported
     ].freeze
 
     #
@@ -265,6 +266,31 @@ module Doing
       end
     end
 
+    def benchmark(key, state)
+      return unless ENV['DOING_BENCHMARK']
+
+      @benchmarks ||= {}
+      @benchmarks[key] ||= { start: nil, finish: nil }
+      @benchmarks[key][state] = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
+
+    def log_benchmarks
+      if ENV['DOING_BENCHMARK']
+        output = []
+        @benchmarks.each do |k, timers|
+          if timers[:finish] && timers[:start]
+            output << "#{k}: #{timers[:finish] - timers[:start]}"
+          else
+            output << "#{k}: error"
+          end
+        end
+        output.each do |msg|
+          $stdout.puts color_message(:debug, 'Benchmark:', msg)
+        end
+      end
+    end
+
+
     def log_change(tags_added: [], tags_removed: [], count: 1, item: nil, single: false)
       if tags_added.empty? && tags_removed.empty?
         count(:skipped, level: :debug, message: '%count %items with no change', count: count)
@@ -319,6 +345,8 @@ module Doing
         ['Archived:',  data[:message] || 'completed and archived %count %items']
       when :skipped
         ['Skipped:', data[:message] || '%count %items were unchanged']
+      when :exported
+        ['Exported:', data[:message] || '%count %items were exported']
       end
     end
 

data/lib/doing/note.rb

@@ -22,7 +22,7 @@ module Doing
     ## Add note contents, optionally replacing existing note
     ##
     ## @param      note     [Array] The note to add, can be
-    ##                      string or array (Note)
+    ##                      String, Array, or Note
     ## @param      replace  [Boolean] replace existing
     ##                      content
     ##
@@ -36,32 +36,7 @@ module Doing
     end
 
     ##
-    ## Append an array of strings to note
-    ##
-    ## @param      lines  [Array] Array of strings
-    ##
-    def append(lines)
-      concat(lines)
-      replace compress
-    end
-
-    ##
-    ## Append a string to the note content
-    ##
-    ## @param      input  [String] The input string,
-    ##                    newlines will be split
-    ##
-    def append_string(input)
-      concat(input.split(/\n/).map(&:strip))
-      replace compress
-    end
-
-    def compress!
-      replace compress
-    end
-
-    ##
-    ## Remove blank lines and comment lines (#)
+    ## Remove blank lines and comments (#)
     ##
     ## @return     [Array] compressed array
     ##
@@ -69,8 +44,8 @@ module Doing
       delete_if { |l| l =~ /^\s*$/ || l =~ /^#/ }
     end
 
-    def strip_lines!
-      replace strip_lines
+    def compress!
+      replace compress
     end
 
     ##
@@ -83,6 +58,10 @@ module Doing
       map(&:strip)
     end
 
+    def strip_lines!
+      replace strip_lines
+    end
+
     ##
     ## Note as multi-line string
     def to_s
@@ -101,11 +80,33 @@ module Doing
     ## @param      other  [Note] The other Note
     ##
     ## @return     [Boolean] true if equal
-    ##
     def equal?(other)
       return false unless other.is_a?(Note)
 
       to_s == other.to_s
     end
+
+    private
+
+    ##
+    ## Append an array of strings to note
+    ##
+    ## @param      lines  [Array] Array of strings
+    ##
+    def append(lines)
+      concat(lines)
+      replace compress
+    end
+
+    ##
+    ## Append a string to the note content
+    ##
+    ## @param      input  [String] The input string,
+    ##                    newlines will be split
+    ##
+    def append_string(input)
+      concat(input.split(/\n/).map(&:strip))
+      replace compress
+    end
   end
 end

data/lib/doing/plugin_manager.rb

@@ -28,26 +28,30 @@ module Doing
         plugins
       end
 
-      # Public: Setup the plugin search path
+      # Setup the plugin search path
+      #
+      # @param      add_dir  [String] optional additional
+      #                      path to include
+      #
+      # @return     [Array] Returns an Array of plugin search paths
       #
-      # Returns an Array of plugin search paths
       def plugins_path(add_dir = nil)
         paths = Array(File.join(File.dirname(__FILE__), 'plugins'))
         paths << File.join(add_dir) if add_dir
         paths.map { |d| File.expand_path(d) }
       end
 
-      ##
+
       # Register a plugin
       #
-      # param: +[String|Array]+ title  The name of the plugin (can be an array of names)
-      #
-      # param: +type+ The plugin type (:import, :export)
+      # @param      title  [String|Array] The name of the
+      #                    plugin (can be an array of names)
+      # @param      type   [Symbol] The plugin type
+      #                    (:import, :export)
+      # @param      klass  [Class] The class responding to
+      #                    :render or :import
       #
-      # param: +klass+ The class responding to :render or :import
-      #
-      #
-      # returns: Success boolean
+      # @return     [Boolean] Success boolean
       #
       def register(title, type, klass)
         type = validate_plugin(title, type, klass)
@@ -90,6 +94,15 @@ module Doing
         type
       end
 
+      ##
+      ## Converts a partial symbol to a valid plugin type,
+      ## e.g. :imp => :import
+      ##
+      ## @param      type     [Symbol] the symbol to test
+      ## @param      default  [Symbol] fallback value
+      ##
+      ## @return     [Symbol] :import or :export
+      ##
       def valid_type(type, default: nil)
         type ||= default
 
@@ -154,10 +167,13 @@ module Doing
       end
 
       ##
-      ## Return a regular expression of all
-      ##             plugin triggers for type
+      ## Return a regular expression of all plugin triggers
+      ## for type
+      ##
+      ## @param      type  [Symbol] The type :import or
+      ##                   :export
       ##
-      ## @param      type  The type :import or :export
+      ## @return     [Regexp] regular expression
       ##
       def plugin_regex(type: :export)
         type = valid_type(type)
@@ -168,24 +184,43 @@ module Doing
         Regexp.new("^(?:#{pattern.join('|')})$", true)
       end
 
+      ##
+      ## Return array of available template names
+      ##
+      ## @param      type  [Symbol] Plugin type (:import,
+      ##                   :export)
+      ##
+      ## @return     [Array<String>] template names
+      ##
       def plugin_templates(type: :export)
         type = valid_type(type)
         templates = []
         plugs = plugins[type].clone
         plugs.delete_if { |_t, o| o[:templates].nil? }.each do |_, options|
           options[:templates].each do |t|
-            templates << t[:name]
+            out = t[:name]
+            out += " (#{t[:format]})" if t.key?(:format)
+            templates << out
           end
         end
 
-        templates
+        templates.sort.uniq
       end
 
+      ##
+      ## Return a regular expression of all template
+      ## triggers for type
+      ##
+      ## @param      type  [Symbol] The type :import or
+      ##                   :export
+      ##
+      ## @return     [Regexp] regular expression
+      ##
       def template_regex(type: :export)
         type = valid_type(type)
         pattern = []
         plugs = plugins[type].clone
-        plugs.delete_if { |_t, o| o[:templates].nil? }.each do |_, options|
+        plugs.delete_if { |_, o| o[:templates].nil? }.each do |_, options|
           options[:templates].each do |t|
             pattern << t[:trigger].normalize_trigger
           end
@@ -193,16 +228,44 @@ module Doing
         Regexp.new("^(?:#{pattern.join('|')})$", true)
       end
 
-      def template_for_trigger(trigger, type: :export)
-        type = valid_type(type)
-        plugs = plugins[type].clone
-        plugs.delete_if { |_t, o| o[:templates].nil? }.each do |_, options|
+      ##
+      ## Find and return the appropriate template for a
+      ## trigger string. Outputs a string that can be
+      ## written out to the terminal for redirection
+      ##
+      ## @param      trigger  [String] The trigger to test
+      ## @param      type     [Symbol] the plugin type
+      ##                      (:import, :export)
+      ##
+      ## @return     [String] string content of template for trigger
+      ##
+      def template_for_trigger(trigger, type: :export, save_to: nil)
+        plugins[valid_type(type)].clone.delete_if { |_t, o| o[:templates].nil? }.each do |_, options|
           options[:templates].each do |t|
-            return options[:class].template(trigger) if trigger =~ /^(?:#{t[:trigger].normalize_trigger})$/
+            next unless trigger =~ /^(?:#{t[:trigger].normalize_trigger})$/
+
+            tpl = options[:class].template(trigger)
+            return tpl unless save_to
+
+            raise PluginException.new('No default filename defined', :export, t[:name]) unless t.key?(:filename)
+
+            return save_template(tpl, save_to, t[:filename])
           end
         end
         raise Errors::InvalidArgument, "No template type matched \"#{trigger}\""
       end
+
+      def save_template(tpl, dir, filename)
+        dir = File.expand_path(dir)
+        FileUtils.mkdir_p(dir) unless File.exist?(dir)
+        raise DoingRuntimeError, "Path #{dir} exists but is not a directory" unless File.directory?(dir)
+
+        file = File.join(dir, filename)
+        File.open(file, 'w') do |f|
+          f.puts(tpl)
+          Doing.logger.warn('File update:', "Template written to #{file}")
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,209 @@
+# frozen_string_literal: true
+
+require 'securerandom'
+
+# title: Day One Export
+# description: Export entries to Day One plist for auto import
+# author: Brett Terpstra
+# url: https://brettterpstra.com
+module Doing
+  class DayOneRenderer
+    attr_accessor :items, :page_title, :totals
+
+    def initialize(page_title, items, totals)
+      @page_title = page_title
+      @items = items
+      @totals = totals
+    end
+
+    def get_binding
+      binding()
+    end
+  end
+
+  class DayoneExport
+    include Doing::Util
+
+    def self.settings
+      {
+        trigger: 'day(?:one)?(?:-(?:days?|entries))?',
+        templates: [
+          { name: 'dayone', trigger: 'day(?:one)?$', format: 'erb', filename: 'dayone.erb' },
+          { name: 'dayone_entry', trigger: 'day(?:one)-entr(?:y|ies)?$', format: 'erb', filename: 'dayone-entry.erb' }
+        ]
+      }
+    end
+
+    def self.template(trigger)
+      case trigger
+      when /day(?:one)-entr(?:y|ies)?$/
+        IO.read(File.join(File.dirname(__FILE__), '../../../templates/doing-dayone-entry.erb'))
+      else
+        IO.read(File.join(File.dirname(__FILE__), '../../../templates/doing-dayone.erb'))
+      end
+    end
+
+    def self.render(wwid, items, variables: {})
+
+      return if items.nil?
+
+      opt = variables[:options]
+      trigger = opt[:output]
+      digest = case trigger
+               when /-days?$/
+                 :day
+               when /-entries$/
+                 :entries
+               else
+                 :digest
+               end
+
+      all_items = []
+      days = {}
+      flagged = false
+      tags = []
+
+      items.each do |i|
+        day_flagged = false
+        date_key = i.date.strftime('%Y-%m-%d')
+
+        if String.method_defined? :force_encoding
+          title = i.title.force_encoding('utf-8').link_urls(format: :markdown)
+          note = i.note.map { |line| line.force_encoding('utf-8').strip.link_urls(format: :markdown) } if i.note
+        else
+          title = i.title.link_urls(format: :markdown)
+          note = i.note.map { |line| line.strip.link_urls(format: :markdown) } if i.note
+        end
+
+        title = "#{title} @project(#{i.section})" unless variables[:is_single]
+
+        tags.concat(i.tag_array).sort!.uniq!
+        flagged = day_flagged = true if i.tags?(wwid.config['marker_tag'])
+
+        interval = wwid.get_interval(i, record: true) if i.title =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+        interval ||= false
+        human_time = false
+        if interval
+          d, h, m = wwid.format_time(wwid.get_interval(i, formatted: false))
+          human_times = []
+          human_times << format('%<d>d day%<p>s', d: d, p: d == 1 ? '' : 's') if d > 0
+          human_times << format('%<h>d hour%<p>s', h: h, p: h == 1 ? '' : 's') if h > 0
+          human_times << format('%<m>d minute%<p>s', m: m, p: m == 1 ? '' : 's') if m > 0
+          human_time = human_times.join(', ')
+        end
+
+        done = i.tags?('done') ? ' ' : ' '
+
+        item = {
+          date_object: i.date,
+          date: i.date.strftime('%a %-I:%M%p'),
+          shortdate: i.date.relative_date,
+          done: done,
+          note: note,
+          section: i.section,
+          time: interval,
+          human_time: human_time,
+          title: title.strip,
+          starred: day_flagged,
+          tags: i.tag_array
+        }
+        all_items << item
+
+
+        if days.key?(date_key)
+          days[date_key][:starred] = true if day_flagged
+          days[date_key][:tags] = days[date_key][:tags].concat(i.tag_array).sort.uniq
+          days[date_key][:entries].push(item)
+        else
+          days[date_key] ||= { tags: [], entries: [], starred: false }
+          days[date_key][:starred] = true if day_flagged
+          days[date_key][:tags] = days[date_key][:tags].concat(i.tag_array).sort.uniq
+          days[date_key][:entries].push(item)
+        end
+      end
+
+
+      template = if wwid.config['export_templates']['dayone'] && File.exist?(File.expand_path(wwid.config['export_templates']['dayone']))
+                   IO.read(File.expand_path(wwid.config['export_templates']['dayone']))
+                 else
+                   self.template('dayone')
+                 end
+
+      totals = opt[:totals] ? wwid.tag_times(format: :markdown, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
+
+      case digest
+      when :day
+        days.each do |k, hsh|
+          title = "#{k}: #{variables[:page_title]}"
+          to_dayone(template: template,
+                    title: title,
+                    items: hsh[:entries],
+                    totals: '',
+                    date: Time.parse(k),
+                    tags: tags,
+                    starred: hsh[:starred])
+        end
+      when :entries
+        entry_template = if wwid.config['export_templates']['dayone_entry'] && File.exist?(File.expand_path(wwid.config['export_templates']['dayone_entry']))
+                           IO.read(File.expand_path(wwid.config['export_templates']['dayone_entry']))
+                         else
+                           self.template('dayone-entry')
+                         end
+        all_items.each do |item|
+          to_dayone(template: entry_template,
+                    title: '',
+                    items: [item],
+                    totals: '',
+                    date: item[:date_object],
+                    tags: item[:tags],
+                    starred: item[:starred])
+        end
+      else
+        to_dayone(template: template,
+                    title: variables[:page_title],
+                    items: all_items,
+                    totals: totals,
+                    date: Time.now,
+                    tags: tags,
+                    starred: flagged)
+      end
+
+      @out = ''
+    end
+
+    def self.to_dayone(template: self.template(nil), title: 'doing', items: [], totals: '', date: Time.now, tags: [], starred: false)
+      mdx = DayOneRenderer.new(title, items, totals)
+
+      engine = ERB.new(template)
+      content = engine.result(mdx.get_binding)
+
+      uuid = SecureRandom.uuid
+      # uuid = `uuidgen`.strip
+
+      plist = {
+        'Creation Date' => date,
+        'Creator' => { 'Software Agent' => 'Doing/2.0.0' },
+        'Entry Text' => content,
+        'Starred' => starred,
+        'Tags' => tags.sort.uniq.delete_if { |t| t =~ /(done|cancell?ed|from)/ },
+        'UUID' => uuid
+      }
+
+      container = File.expand_path('~/Library/Group Containers/')
+      dayone_dir = Dir.glob('*.dayoneapp2', base: container).first
+      import_dir = File.join(container, dayone_dir, 'Data', 'Auto Import', 'Default Journal.dayone', 'entries')
+      FileUtils.mkdir_p(import_dir) unless File.exist?(import_dir)
+      entry_file = File.join(import_dir, "#{uuid}.doentry")
+      Doing.logger.debug('Day One Export:', "Exporting to #{entry_file}")
+      File.open(entry_file, 'w') do |f|
+        f.puts plist.to_plist
+      end
+
+      Doing.logger.count(:exported, level: :info, count: items.count, message: '%count %items exported to Day One import folder')
+    end
+
+    Doing::Plugins.register 'dayone', :export, self
+    Doing::Plugins.register 'dayone-days', :export, self
+    Doing::Plugins.register 'dayone-entries', :export, self
+  end
+end

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

@@ -12,8 +12,8 @@ module Doing
       {
         trigger: 'html?|web(?:page)?',
         templates: [
-          { name: 'haml', trigger: 'h[ta]ml?|web' },
-          { name: 'css', trigger: 'css|styl(?:e|us)' }
+          { name: 'html', trigger: 'h[ta]ml?|web', format: 'haml', filename: 'html_export.haml' },
+          { name: 'html_style', trigger: 'css|styl(?:e|us)', format: 'css', filename: 'html_export.css' }
         ]
       }
     end

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

@@ -134,6 +134,7 @@ module Doing
       end
     end
 
+    Doing::Plugins.register 'json', :export, self
     Doing::Plugins.register 'timeline', :export, self
   end
 end

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

@@ -25,7 +25,7 @@ module Doing
     def self.settings
       {
         trigger: 'markdown|mk?d|gfm',
-        templates: [{ name: 'markdown', trigger: 'mk?d|markdown' }]
+        templates: [{ name: 'markdown', trigger: 'mk?d|markdown', format: 'erb', filename: 'doing-markdown.erb' }]
       }
     end