doing 2.1.89 → 2.1.90

data/lib/doing/markdown_document_listener.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require 'time'
 require 'fileutils'
@@ -10,7 +12,7 @@ module GLI
         @exe = app.exe_name
         if File.exist?('COMMANDS.md') # Back up existing README
           FileUtils.mv('COMMANDS.md', 'COMMANDS.bak')
-          $stderr.puts "Backing up existing COMMANDS.md"
+          warn 'Backing up existing COMMANDS.md'
         end
         @io = File.new('COMMANDS.md', 'w')
         @nest = '#'
@@ -18,8 +20,7 @@ module GLI
         @parent_command = []
       end
 
-      def beginning
-      end
+      def beginning; end
 
       # Called when processing has completed
       def ending
@@ -61,32 +62,32 @@ module GLI
         @io.puts "*v#{version}*"
         @io.puts
         # Hacking in the overview file
-        if File.exist?('OVERVIEW.md')
-          @io.puts IO.read('OVERVIEW.md')
-          @io.puts
-        end
+        return unless File.exist?('OVERVIEW.md')
+
+        @io.puts IO.read('OVERVIEW.md')
+        @io.puts
       end
 
       def options
         if @nest.size == 1
-          @io.puts "## Global Options"
+          @io.puts '## Global Options'
         else
-          @io.puts header("Options", 1)
+          @io.puts header('Options', 1)
         end
         @io.puts
       end
 
       # Gives you a flag in the current context
       def flag(name, aliases, desc, long_desc, default_value, arg_name, must_match, _type)
-        invocations = ([name] + Array(aliases)).map { |_| "`" + add_dashes(_) + "`" }.join(' | ')
+        invocations = ([name] + Array(aliases)).map { |_| "`#{add_dashes(_)}`" }.join(' | ')
         usage = "#{invocations} #{arg_name || 'arg'}"
         @io.puts header(usage, 2)
         @io.puts
         @io.puts String(desc).strip
         @io.puts "\n*Default Value:* `#{default_value || 'None'}`\n" unless default_value.nil?
-        @io.puts "\n*Must Match:* `#{must_match.to_s}`\n" unless must_match.nil?
+        @io.puts "\n*Must Match:* `#{must_match}`\n" unless must_match.nil?
         cmd_desc = String(long_desc).strip
-        @io.puts "> #{cmd_desc}\n" unless cmd_desc.length == 0
+        @io.puts "> #{cmd_desc}\n" unless cmd_desc.empty?
         @io.puts
       end
 
@@ -94,22 +95,21 @@ module GLI
       def switch(name, aliases, desc, long_desc, negatable)
         if negatable
           name = "[no-]#{name}" if name.to_s.length > 1
-          aliases = aliases.map { |_|  _.to_s.length > 1 ? "[no-]#{_}" : _ }
+          aliases = aliases.map { |_| _.to_s.length > 1 ? "[no-]#{_}" : _ }
         end
-        invocations = ([name] + aliases).map { |_| "`" + add_dashes(_).strip + "`" }.join('|')
-        @io.puts header("#{invocations}", 2)
+        invocations = ([name] + aliases).map { |_| "`#{add_dashes(_).strip}`" }.join('|')
+        @io.puts header(invocations.to_s, 2)
         @io.puts
         @io.puts String(desc).strip
         cmd_desc = String(long_desc).strip
-        @io.puts "\n> #{cmd_desc}\n" unless cmd_desc.length == 0
+        @io.puts "\n> #{cmd_desc}\n" unless cmd_desc.empty?
         @io.puts
       end
 
-      def end_options
-      end
+      def end_options; end
 
       def commands
-        @io.puts header("Commands", 1)
+        @io.puts header('Commands', 1)
         @io.puts
         increment_nest
       end
@@ -124,7 +124,7 @@ module GLI
         @io.puts "*#{String(desc).strip}*"
         @io.puts
         cmd_desc = String(long_desc).strip.split("\n").map { |_| "> #{_}" }.join("\n")
-        @io.puts "#{cmd_desc}\n\n" unless cmd_desc.length == 0
+        @io.puts "#{cmd_desc}\n\n" unless cmd_desc.empty?
         increment_nest
       end
 
@@ -156,16 +156,16 @@ module GLI
         if @nest.size + increment > 6
           "**#{content}**"
         else
-          "#{@nest}#{'#'*increment} #{content}"
+          "#{@nest}#{'#' * increment} #{content}"
         end
       end
 
-      def increment_nest(increment=1)
-        @nest = "#{@nest}#{'#'*increment}"
+      def increment_nest(increment = 1)
+        @nest = "#{@nest}#{'#' * increment}"
       end
 
-      def decrement_nest(increment=1)
-        @nest.gsub!(/#{'#'*increment}$/, '')
+      def decrement_nest(increment = 1)
+        @nest.gsub!(/#{'#' * increment}$/, '')
       end
     end
   end

data/lib/doing/normalize.rb

@@ -194,7 +194,7 @@ module Doing
   ## Symbol helpers
   ##
   module SymbolNormalize
-    def normalize_tag_sort(default = :name)
+    def normalize_tag_sort(_default = :name)
       to_s.normalize_tag_sort
     end
 

data/lib/doing/pager.rb

@@ -14,9 +14,7 @@ module Doing
       # Enable/disable pagination
       #
       # @param      should_paginate  [Boolean] true to paginate
-      def paginate=(should_paginate)
-        @paginate = should_paginate
-      end
+      attr_writer :paginate
 
       # Page output. If @paginate is false, just dump to
       # STDOUT
@@ -29,48 +27,94 @@ module Doing
           return
         end
 
+        # Smart pagination: skip pager for small outputs
+        if should_skip_pager?(text)
+          puts text
+          return
+        end
+
+        # Use external pager (IO.popen for best performance and UX)
+        external_pager(text)
+      end
+
+      # External pager using IO.popen for optimal performance and UX
+      def external_pager(text)
         pager = which_pager
-        Doing.logger.debug('Pager:', "Using #{pager}")
+        Doing.logger.debug('Pager:', "Using external pager: #{pager}")
 
-        read_io, write_io = IO.pipe
+        begin
+          IO.popen(pager, 'w') do |io|
+            io.write(text)
+            io.close_write
+          end
+        rescue SystemCallError => e
+          # Fallback to direct output if pager fails
+          puts text
+          Doing.logger.debug('Pager:', "Pager failed, using direct output: #{e}")
+        end
+      end
 
-        input = $stdin
+      private
 
-        pid = Kernel.fork do
-          write_io.close
-          input.reopen(read_io)
-          read_io.close
+      # Smart pagination: skip pager for small outputs
+      def should_skip_pager?(text)
+        return true if text.nil? || text.empty?
 
-          # Wait until we have input before we start the pager
-          IO.select [input]
+        line_count = text.lines.count
 
-          begin
-            exec(pager)
-          rescue SystemCallError => e
-            raise Errors::DoingStandardError, "Pager error, #{e}"
-          end
-        end
+        # Always paginate if output is very large (more than 200 lines)
+        return false if line_count > 200
 
-        begin
-          read_io.close
-          write_io.write(text)
-          write_io.close
-        rescue SystemCallError # => e
-          # raise Errors::DoingStandardError, "Pager error, #{e}"
+        # Check if output fits within 150% of terminal height
+        term_height = terminal_height
+        if term_height > 0
+          # Only paginate if output is 150% of terminal height or more
+          # This allows scrolling up half a page for reasonable outputs
+          threshold = (term_height * 1.5).to_i
+          return true if line_count < threshold
         end
 
-        _, status = Process.waitpid2(pid)
-        status.success?
+        # Fallback: skip pager for small outputs (less than 50 lines)
+        # This covers most typical doing commands while avoiding pager overhead
+        line_count < 50
       end
 
-      private
+      # Get terminal height, with caching and fallback
+      def terminal_height
+        @terminal_height ||= begin
+          # Try TTY::Screen first (most reliable)
+          if defined?(TTY::Screen) && TTY::Screen.respond_to?(:height)
+            TTY::Screen.height
+          # Fallback to stty
+          elsif system('stty size >/dev/null 2>&1')
+            `stty size`.split.first.to_i
+          # Fallback to tput
+          elsif system('tput lines >/dev/null 2>&1')
+            `tput lines`.to_i
+          # Last resort: assume 24 lines
+          else
+            24
+          end
+        rescue StandardError
+          24
+        end
+      end
 
       def git_pager
-        TTY::Which.exist?('git') ? `#{TTY::Which.which('git')} config --get-all core.pager` : nil
+        @git_pager ||= begin
+          if TTY::Which.exist?('git')
+            result = `#{TTY::Which.which('git')} config --get-all core.pager 2>/dev/null`.strip
+            result.empty? ? nil : result
+          else
+            nil
+          end
+        rescue StandardError
+          nil
+        end
       end
 
       def pagers
-        [
+        @pagers ||= [
           Doing.setting('editors.pager'),
           ENV['PAGER'],
           'less -FXr',

data/lib/doing/plugin_manager.rb

@@ -59,7 +59,6 @@ module Doing
         paths.map { |d| File.expand_path(d) }
       end
 
-
       # Register a plugin
       #
       # @param      title  [String|Array] The name of the
@@ -209,7 +208,7 @@ module Doing
       def plugin_regex(type: :export)
         type = valid_type(type)
         pattern = []
-        plugins[type].each do |_, options|
+        plugins[type].each_value do |options|
           pattern << options[:trigger].normalize_trigger
         end
         Regexp.new("^(?:#{pattern.sort.uniq.join('|')})$", true)
@@ -227,7 +226,7 @@ module Doing
         type = valid_type(type)
         templates = []
         plugs = plugins[type].clone
-        plugs.delete_if { |_t, o| o[:templates].nil? }.each do |_, options|
+        plugs.delete_if { |_t, o| o[:templates].nil? }.each_value do |options|
           options[:templates].each do |t|
             out = t[:name]
             out += " (#{t[:format]})" if t.key?(:format)
@@ -251,7 +250,7 @@ module Doing
         type = valid_type(type)
         pattern = []
         plugs = plugins[type].clone
-        plugs.delete_if { |_, o| o[:templates].nil? }.each do |_, options|
+        plugs.delete_if { |_, o| o[:templates].nil? }.each_value do |options|
           options[:templates].each do |t|
             pattern << t[:trigger].normalize_trigger
           end
@@ -274,7 +273,7 @@ module Doing
       ## @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|
+        plugins[valid_type(type)].clone.delete_if { |_t, o| o[:templates].nil? }.each_value do |options|
           options[:templates].each do |t|
             next unless trigger =~ /^(?:#{t[:trigger].normalize_trigger})$/
 

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

@@ -38,7 +38,7 @@ module Doing
         end
       end
       width = wwid.config['plugins']['byday']['item_width'].to_i || 60
-      divider = "{wd}+{xk}#{'-' *10}{wd}+{xk}#{'-' * width}{wd}+{xk}#{'-' * 8}{wd}+{x}"
+      divider = "{wd}+{xk}#{'-' * 10}{wd}+{xk}#{'-' * width}{wd}+{xk}#{'-' * 8}{wd}+{x}"
       out = []
       out << divider
       out << "{wd}|{xm}date      {wd}|{xbw}item#{' ' * (width - 4)}{wd}|{xy}duration{wd}|{x}"

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

@@ -17,7 +17,7 @@ module Doing
     end
 
     def get_binding
-      binding()
+      binding
     end
   end
 
@@ -44,7 +44,6 @@ module Doing
     end
 
     def self.render(wwid, items, variables: {})
-
       return unless items.good?
 
       config = Doing.settings
@@ -82,15 +81,18 @@ module Doing
         tags.concat(i.tag_array).sort!.uniq!
         flagged = day_flagged = true if i.tags?(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]
+        if i.title =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+          interval = wwid.get_interval(i,
+                                       record: true)
+        end
         interval ||= false
         human_time = false
         if interval
           d, h, m = wwid.get_interval(i, formatted: false).format_time
           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_times << format('%<d>d day%<p>s', d: d, p: d == 1 ? '' : 's') if d.positive?
+          human_times << format('%<h>d hour%<p>s', h: h, p: h == 1 ? '' : 's') if h.positive?
+          human_times << format('%<m>d minute%<p>s', m: m, p: m == 1 ? '' : 's') if m.positive?
           human_time = human_times.join(', ')
         end
 
@@ -111,27 +113,24 @@ module Doing
         }
         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
+        days[date_key] ||= { tags: [], entries: [], starred: false } unless 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)
       end
 
-
       template = if config['export_templates']['dayone'] && File.exist?(File.expand_path(config['export_templates']['dayone']))
                    IO.read(File.expand_path(config['export_templates']['dayone']))
                  else
                    self.template('dayone')
                  end
 
-      totals = opt[:totals] ? wwid.tag_times(format: :markdown, sort_by: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
+      totals = if opt[:totals]
+                 wwid.tag_times(format: :markdown, sort_by: opt[:sort_tags],
+                                sort_order: opt[:tag_order])
+               else
+                 ''
+               end
 
       case digest
       when :day
@@ -162,18 +161,19 @@ module Doing
         end
       else
         to_dayone(template: template,
-                    title: variables[:page_title],
-                    items: all_items,
-                    totals: totals,
-                    date: Time.now,
-                    tags: tags,
-                    starred: flagged)
+                  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)
+    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)
@@ -201,7 +201,8 @@ module Doing
         f.puts plist.to_plist
       end
 
-      Doing.logger.count(:exported, level: :info, count: items.count, message: '%count %items exported to Day One import folder')
+      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

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

@@ -12,7 +12,7 @@ module Doing
       }
     end
 
-    def self.render(wwid, items, variables: {})
+    def self.render(_wwid, items, variables: {})
       return if items.nil?
 
       content = Doing::Items.new

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

@@ -51,7 +51,7 @@ module Doing
 
         items_out << {
           date: i.date.strftime('%a %-I:%M%p'),
-          title: title.gsub(/(@[^ (]+(\(.*?\))?)/im, '<span class="tag">\1</span>').strip, #+ " #{note}"
+          title: title.gsub(/(@[^ (]+(\(.*?\))?)/im, '<span class="tag">\1</span>').strip, # + " #{note}"
           note: note,
           time: interval,
           section: i.section
@@ -74,10 +74,10 @@ module Doing
       engine = Haml::Engine.new(template)
       Doing.logger.debug('HTML Export:', "#{items_out.count} items output to HTML")
       @out = engine.render(Object.new,
-                         { :@items => items_out, :@page_title => variables[:page_title], :@style => style, :@totals => totals })
+                           { :@items => items_out, :@page_title => variables[:page_title], :@style => style,
+                             :@totals => totals })
     end
 
     Doing::Plugins.register 'html', :export, self
   end
 end
-

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

@@ -21,10 +21,10 @@ module Doing
                  {
                    'section' => '',
                    'items' => [],
-                   'timers' => ""
+                   'timers' => ''
                  }.to_json
                when 'timeline'
-                "<html></html>"
+                 '<html></html>'
                end
       end
 
@@ -62,7 +62,7 @@ module Doing
           i = {
             date: i.date,
             end_date: end_date,
-            title: title.strip, #+ " #{note}"
+            title: title.strip, # + " #{note}"
             section: i.section,
             note: note.to_s(prefix: ''),
             time: interval.time_string(format: :clock),
@@ -78,7 +78,7 @@ module Doing
         when 'timeline'
           new_item = {
             'id' => index + 1,
-            'content' => title.strip, #+ " #{note}"
+            'content' => title.strip, # + " #{note}"
             'title' => title.strip + " (#{interval.time_string(format: :clock)})",
             'start' => i.date.strftime('%F %T'),
             'type' => 'box',
@@ -151,4 +151,3 @@ module Doing
     Doing::Plugins.register 'timeline', :export, self
   end
 end
-

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

@@ -52,7 +52,10 @@ module Doing
 
         title = "#{title} @section(#{i.section})" unless variables[:is_single]
 
-        interval = wwid.get_interval(i, record: true) if i.title =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+        if i.title =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+          interval = wwid.get_interval(i,
+                                       record: true)
+        end
         interval ||= false
 
         finished = i.title =~ /(?<= |^)@done/ ? true : false
@@ -77,7 +80,12 @@ module Doing
                    self.template(nil)
                  end
 
-      totals = opt[:totals] ? wwid.tag_times(format: :markdown, sort_by: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
+      totals = if opt[:totals]
+                 wwid.tag_times(format: :markdown, sort_by: opt[:sort_tags],
+                                sort_order: opt[:tag_order])
+               else
+                 ''
+               end
 
       mdx = MarkdownRenderer.new(variables[:page_title], all_items, totals)
       Doing.logger.debug('Markdown Export:', "#{all_items.count} items output to Markdown")

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

@@ -24,6 +24,7 @@ module Doing
       options[:tags_color] = false
       options[:output] = 'template'
       options[:template] = '- %title @date(%date)%note'
+      options[:disable_color] = true
 
       Doing.logger.debug('TaskPaper Export:', "#{items.count} items output to TaskPaper format")
       @out = wwid.list_section(options)