doing 2.1.26 → 2.1.27

data/lib/doing/string/url.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Doing
+  ##
+  ## URL linking and formatting
+  ##
+  class ::String
+    ##
+    ## Turn raw urls into HTML links
+    ##
+    ## @param      opt   [Hash] Additional Options
+    ##
+    ## @option opt [Symbol] :format can be :markdown or
+    ## :html (default)
+    ##
+    def link_urls(**opt)
+      fmt = opt.fetch(:format, :html)
+      return self unless fmt
+
+      str = dup
+
+      str = str.remove_self_links if fmt == :markdown
+
+      str.replace_qualified_urls(format: fmt).clean_unlinked_urls
+    end
+
+    ## @see #link_urls
+    def link_urls!(**opt)
+      fmt = opt.fetch(:format, :html)
+      replace link_urls(format: fmt)
+    end
+
+    # Remove <self-linked> formatting
+    def remove_self_links
+      gsub(/<(.*?)>/) do |match|
+        m = Regexp.last_match
+        if m[1] =~ /^https?:/
+          m[1]
+        else
+          match
+        end
+      end
+    end
+
+    # Replace qualified urls
+    def replace_qualified_urls(**options)
+      fmt = options.fetch(:format, :html)
+      gsub(%r{(?mi)(?x:
+      (?<!["'\[(\\])
+      (?<protocol>(?:http|https)://)
+      (?<domain>[\w\-]+(?:\.[\w\-]+)+)
+      (?<path>[\w\-.,@?^=%&;:/~+#]*[\w\-@^=%&;/~+#])?
+      )}) do |_match|
+        m = Regexp.last_match
+        url = "#{m['domain']}#{m['path']}"
+        proto = m['protocol'].nil? ? 'http://' : m['protocol']
+        case fmt
+        when :terminal
+          TTY::Link.link_to("#{proto}#{url}", "#{proto}#{url}")
+        when :html
+          %(<a href="#{proto}#{url}" title="Link to #{m['domain']}">[#{url}]</a>)
+        when :markdown
+          "[#{url}](#{proto}#{url})"
+        else
+          m[0]
+        end
+      end
+    end
+
+    # Clean up unlinked <urls>
+    def clean_unlinked_urls
+      gsub(/<(\w+:.*?)>/) do |match|
+        m = Regexp.last_match
+        if m[1] =~ /<a href/
+          match
+        else
+          %(<a href="#{m[1]}" title="Link to #{m[1]}">[link]</a>)
+        end
+      end
+    end
+  end
+end

data/lib/doing/template_string.rb

@@ -5,28 +5,6 @@ module Doing
   ## Template string formatting
   ##
   class TemplateString < String
-    class ::String
-      ##
-      ## Extract the longest valid color from a string.
-      ##
-      ## Allows %colors to bleed into other text and still
-      ## be recognized, e.g. %greensomething still finds
-      ## %green.
-      ##
-      ## @return     [String] a valid color name
-      ## @api private
-      def validate_color
-        valid_color = nil
-        compiled = ''
-        split('').each do |char|
-          compiled += char
-          valid_color = compiled if Color.attributes.include?(compiled.to_sym)
-        end
-
-        valid_color
-      end
-    end
-
     attr_reader :original
 
     include Color

data/lib/doing/types.rb

@@ -2,6 +2,8 @@
 
 module Doing
   module Types
+    REGEX_CASE = /^[cis].*?$/i.freeze
+    REGEX_TAG_SORT = /^(?:n(?:ame)?|t(?:ime)?)$/i.freeze
     REGEX_BOOL = /^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$/i.freeze
     REGEX_SORT_ORDER = /^(?:a(?:sc)?|d(?:esc)?)$/i.freeze
     REGEX_VALUE_QUERY = /^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$/.freeze
@@ -22,5 +24,11 @@ module Doing
     DateRangeString = Class.new(Array)
     DateRangeOptionalString = Class.new(Array)
     DateIntervalString = Class.new(DateTime)
+    BooleanSymbol = Class.new(Symbol)
+    CaseSymbol = Class.new(Symbol)
+    AgeSymbol = Class.new(String)
+    OrderSymbol = Class.new(Symbol)
+    TagSortSymbol = Class.new(Symbol)
+    MatchingSymbol = Class.new(Symbol)
   end
 end

data/lib/doing/util.rb

@@ -170,29 +170,33 @@ module Doing
 
       if editor_config[editor_for]
         editor = editor_config[editor_for]
-        # Doing.logger.debug('Editor:', "Using #{editor} from config 'editors->#{editor_for}'")
-        return editor unless editor.good?
+        Doing.logger.debug('Editor:', "Using #{editor} from config 'editors.#{editor_for}' for #{editor_for}")
+        return editor if editor.good?
       end
 
       if editor_for != 'editor' && editor_config['default']
         editor = editor_config['default']
-        # Doing.logger.debug('Editor:', "Using #{editor} from config: 'editors->default'")
-        return editor unless editor.good?
+        Doing.logger.debug('Editor:', "Using #{editor} from config: 'editors.default' for #{editor_for}")
+        return editor if editor.good?
       end
 
       editor ||= ENV['DOING_EDITOR'] || ENV['GIT_EDITOR'] || ENV['EDITOR']
 
-      unless editor.good?
-        # Doing.logger.debug('Editor:', "Found editor in environment variables: #{editor}")
+      if editor.good?
+        Doing.logger.debug('Editor:', "Found editor in environment variables: #{editor} for #{editor_for}")
         return editor
       end
 
-      Doing.logger.debug('ENV:', 'No EDITOR environment variable, testing available editors')
+      Doing.logger.debug('Editor:', 'No EDITOR environment variable, testing available editors')
       editors = %w[vim vi code subl mate mvim nano emacs]
       editors.each do |ed|
-        return TTY::Which.which(ed) if TTY::Which.which(ed)
+        try = TTY::Which.which(ed)
+        if try
+          Doing.logger.debug('Editor:', "Using editor #{try} for #{editor_for}")
+          return try
+        end
 
-        Doing.logger.debug('ENV:', "#{ed} not available")
+        Doing.logger.debug('Editor:', "#{ed} not available")
       end
 
       nil

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.26'
+  VERSION = '2.1.27'
 end

data/lib/doing/wwid.rb

@@ -659,6 +659,7 @@ module Doing
     ## @option opt [Array] :val (nil) Array of tag value queries
     ##
     def filter_items(items = Items.new, opt: {})
+      logger.benchmark(:filter_items, :start)
       time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
 
       if items.nil? || items.empty?
@@ -810,6 +811,8 @@ module Doing
         output.concat(filtered_items.reverse.slice(0, count))
       end
 
+      logger.benchmark(:filter_items, :finish)
+
       output
     end
 
@@ -1211,6 +1214,7 @@ module Doing
       opt[:sequential] ||= false
       opt[:date] ||= false
       opt[:remove] ||= false
+      opt[:update] ||= false
       opt[:autotag] ||= false
       opt[:back] ||= false
       opt[:unfinished] ||= false
@@ -1323,7 +1327,7 @@ module Doing
             else
               old_title = item.title.dup
               should_date = opt[:date] && item.should_time?
-              item.title.tag!('done', remove: true) if tag =~ /done/ && !should_date
+              item.title.tag!('done', remove: true) if tag =~ /done/ && (!should_date || opt[:update])
               item.title.tag!(tag, value: should_date ? done_date.strftime('%F %R') : nil)
               added << tag if old_title != item.title
             end
@@ -1619,6 +1623,7 @@ module Doing
     ## @param      opt   [Hash] Additional Options
     ##
     def list_section(opt, items: Items.new)
+      logger.benchmark(:list_section, :start)
       opt[:config_template] ||= 'default'
 
       tpl_cfg = @config.dig('templates', opt[:config_template])
@@ -1632,7 +1637,7 @@ module Doing
       cfg.deep_merge({
                        'wrap_width' => @config['wrap_width'] || 0,
                        'date_format' => @config['default_date_format'],
-                       'order' => @config['order'] || 'asc',
+                       'order' => @config['order'] || :asc,
                        'tags_color' => @config['tags_color'],
                        'duration' => @config['duration'],
                        'interval_format' => @config['interval_format']
@@ -1644,8 +1649,8 @@ module Doing
       opt[:age] ||= :newest
       opt[:age] = opt[:age].normalize_age
       opt[:format] ||= cfg['date_format']
-      opt[:order] ||= cfg['order'] || 'asc'
-      opt[:tag_order] ||= 'asc'
+      opt[:order] ||= cfg['order'] || :asc
+      opt[:tag_order] ||= :asc
       opt[:tags_color] = cfg['tags_color'] || false if opt[:tags_color].nil?
       opt[:template] ||= cfg['template']
 
@@ -1671,7 +1676,7 @@ module Doing
 
       items = filter_items(items, opt: opt)
 
-      items.reverse! unless opt[:order] =~ /^d/i
+      items.reverse! unless opt[:order].normalize_order == :desc
 
       if opt[:delete]
         delete_items(items, force: opt[:force])
@@ -1694,6 +1699,7 @@ module Doing
       opt[:output] ||= 'template'
       opt[:wrap_width] ||= @config['templates']['default']['wrap_width'] || 0
 
+      logger.benchmark(:list_section, :finish)
       output(items, title, is_single, opt)
     end
 
@@ -1721,7 +1727,7 @@ module Doing
       destination = guess_section(destination)
 
       if @content.section?(destination) && (@content.section?(section) || archive_all)
-        do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before] })
+        do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before], after: options[:after], from: options[:from] })
         write(doing_file)
       else
         raise InvalidArgument, 'Either source or destination does not exist'
@@ -1743,7 +1749,7 @@ module Doing
       cfg = @config['templates'][opt[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
-        'order' => @config['order'] || 'asc',
+        'order' => @config['order'] || :asc,
         'tags_color' => @config['tags_color'],
         'duration' => @config['duration'],
         'interval_format' => @config['interval_format']
@@ -1762,7 +1768,7 @@ module Doing
         from: opt[:from],
         format: cfg['date_format'],
         interval_format: opt[:interval_format],
-        order: cfg['order'] || 'asc',
+        order: cfg['order'] || :asc,
         output: output,
         section: opt[:section],
         sort_tags: opt[:sort_tags],
@@ -1797,7 +1803,7 @@ module Doing
       list_section({
                      section: section,
                      count: 0,
-                     order: 'asc',
+                     order: :asc,
                      date_filter: dates,
                      times: times,
                      output: output,
@@ -1863,7 +1869,7 @@ module Doing
       cfg = @config['templates'][opt[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
-        'order' => @config['order'] || 'asc',
+        'order' => @config['order'] || :asc,
         'tags_color' => @config['tags_color'],
         'duration' => @config['duration'],
         'interval_format' => @config['interval_format']
@@ -1879,7 +1885,7 @@ module Doing
       opt[:count] = count
       opt[:format] = cfg['date_format']
       opt[:template] = opt[:template] || cfg['template']
-      opt[:order] = 'asc'
+      opt[:order] = :asc
       opt[:times] = times
 
       list_section(opt)
@@ -1896,7 +1902,7 @@ module Doing
       cfg = @config['templates'][options[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
-        'order' => @config['order'] || 'asc',
+        'order' => @config['order'] || :asc,
         'tags_color' => @config['tags_color'],
         'duration' => @config['duration'],
         'interval_format' => @config['interval_format']
@@ -2043,10 +2049,10 @@ module Doing
     ##
     ## @param      format        [String] return format (html,
     ##                           json, or text)
-    ## @param      sort_by_name  [Boolean] Sort by name if true, otherwise by time
-    ## @param      sort_order    [String] The sort order (asc or desc)
+    ## @param      sort_by       [Symbol] Sort by :name or :time
+    ## @param      sort_order    [Symbol] The sort order (:asc or :desc)
     ##
-    def tag_times(format: :text, sort_by_name: false, sort_order: 'asc')
+    def tag_times(format: :text, sort_by: :time, sort_order: :asc)
       return '' if @timers.empty?
 
       max = @timers.keys.sort_by { |k| k.length }.reverse[0].length + 1
@@ -2054,13 +2060,13 @@ module Doing
       total = @timers.delete('All')
 
       tags_data = @timers.delete_if { |_k, v| v == 0 }
-      sorted_tags_data = if sort_by_name
+      sorted_tags_data = if sort_by.normalize_tag_sort == :name
                            tags_data.sort_by { |k, _v| k }
                          else
                            tags_data.sort_by { |_k, v| v }
                          end
 
-      sorted_tags_data.reverse! if sort_order =~ /^asc/i
+      sorted_tags_data.reverse! if sort_order.normalize_order == :asc
       case format
       when :html
 
@@ -2210,9 +2216,9 @@ EOS
         Doing.config_with(ENV['DOING_CONFIG'], { ignore_local: true })
       end
 
-      Doing.logger.benchmark(:configure, :start)
+      logger.benchmark(:configure, :start)
       config = Doing.config
-      Doing.logger.benchmark(:configure, :finish)
+      logger.benchmark(:configure, :finish)
 
       config.settings['backup_dir'] = ENV['DOING_BACKUP_DIR'] if ENV['DOING_BACKUP_DIR']
       @config = config.settings
@@ -2266,6 +2272,7 @@ EOS
     ##             template trigger
     ##
     def output(items, title, is_single, opt)
+      logger.benchmark(:output, :start)
       opt ||= {}
       out = nil
 
@@ -2283,7 +2290,7 @@ EOS
       end
 
       logger.debug('Output:', "#{items.count} #{items.count == 1 ? 'item' : 'items'} shown")
-
+      logger.benchmark(:output, :finish)
       out
     end
 
@@ -2327,26 +2334,37 @@ EOS
       section_items = @content.in_section(section)
       max = section_items.count - count.to_i
 
+      opt[:after] = opt[:from][0] if opt[:from]
+      opt[:before] = opt[:from][1] if opt[:from]
+
+      time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
+
+      if opt[:before].is_a?(String) && opt[:before] =~ time_rx
+        opt[:before] = opt[:before].chronify(guess: :end, future: false)
+      end
+
+      if opt[:after].is_a?(String) && opt[:after] =~ time_rx
+        opt[:after] = opt[:after].chronify(guess: :begin, future: false)
+      end
+
       counter = 0
 
       @content.map do |item|
         break if counter >= max
-        if opt[:before]
-          time_string = opt[:before]
-          cutoff = time_string.chronify(guess: :begin)
-        end
 
-        if (item.section.downcase != section.downcase && section != /^all$/i) || item.section.downcase == destination.downcase
-          item
-        elsif ((!tags.empty? && !item.tags?(tags, bool)) || (opt[:search] && !item.search(opt[:search].to_s)) || (opt[:before] && item.date >= cutoff))
-          item
-        else
-          counter += 1
-          old_item = item.clone
-          item.move_to(destination, label: label, log: false)
-          Hooks.trigger :post_entry_updated, self, item, old_item
-          item
-        end
+        next if item.section.downcase == destination.downcase
+
+        next if item.section.downcase != section.downcase && section != /^all$/i
+
+        next if (opt[:before] && item.date > opt[:before]) || (opt[:after] && item.date < opt[:after])
+
+        next if (!tags.empty? && !item.tags?(tags, bool)) || (opt[:search] && !item.search(opt[:search].to_s))
+
+        counter += 1
+        old_item = item.clone
+        item.move_to(destination, label: label, log: false)
+        Hooks.trigger :post_entry_updated, self, item, old_item
+        item
       end
 
       if counter.positive?

data/lib/doing.rb

@@ -28,11 +28,11 @@ require_relative 'doing/hash'
 require_relative 'doing/types'
 require_relative 'doing/colors'
 require_relative 'doing/template_string'
-require_relative 'doing/string'
+require_relative 'doing/string/string'
 require_relative 'doing/time'
-require_relative 'doing/array'
+require_relative 'doing/array/array'
 require_relative 'doing/good'
-require_relative 'doing/symbol'
+require_relative 'doing/normalize'
 require_relative 'doing/util'
 require_relative 'doing/util_backup'
 require_relative 'doing/configuration'
@@ -50,9 +50,7 @@ require_relative 'doing/pager'
 require_relative 'doing/completion'
 require_relative 'doing/boolean_term_parser'
 require_relative 'doing/phrase_parser'
-require_relative 'doing/array_chronify'
-require_relative 'doing/numeric_chronify'
-require_relative 'doing/string_chronify'
+require_relative 'doing/chronify/chronify'
 # require 'doing/markdown_document_listener'
 
 # Main doing module

data/lib/examples/plugins/wiki_export/wiki_export.rb

@@ -74,7 +74,7 @@ module Doing
                 self.template('wiki_css')
               end
 
-      totals = opt[:totals] ? wwid.tag_times(format: :html, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
+      totals = opt[:totals] ? wwid.tag_times(format: :html, sort_by: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
       engine = Haml::Engine.new(template)
       Doing.logger.debug('Wiki Export:', "#{items_out.count} items output to #{variables[:page_title]} wiki page")
       @out = engine.render(Object.new,

data/lib/helpers/threaded_tests.rb

@@ -23,10 +23,19 @@ class ThreadedTests
     c = Doing::Color
     c.coloring = true
 
-    pattern = "test/doing_*#{pattern}*_test.rb"
+    shuffle = false
+
+    unless pattern =~ /shuffle/i
+      pattern = "test/doing_*#{pattern}*_test.rb"
+    else
+      pattern = "test/doing_*_test.rb"
+      shuffle = true
+    end
 
     tests = Dir.glob(pattern)
 
+    tests.shuffle! if shuffle
+
     if max_tests.to_i > 0
       tests = tests.slice(0, max_tests.to_i - 1)
     end
@@ -140,7 +149,11 @@ class ThreadedTests
     count = out.match(/^(?<tests>\d+) tests, (?<assrt>\d+) assertions, (?<fails>\d+) failures, (?<errs>\d+) errors/)
 
     unless status.success? && !count['fails'].to_i.positive? && !count['errs'].to_i.positive?
-      s[2] = ": #{count['fails'].bold.red} #{'failures'.red}, #{count['errs'].bold.red} #{'errors'.red}"
+      s[2] = if count
+               ": #{count['fails'].bold.red} #{'failures'.red}, #{count['errs'].bold.red} #{'errors'.red}"
+             else
+               ": #{'Unknown Error'.bold.red}"
+             end
       bar.update(head: '✖'.boldred)
       bar.advance(head: '✖'.boldred, status: s[2])
 

data/scripts/deploy.rb

@@ -0,0 +1,107 @@
+#!/usr/bin/env ruby
+
+require 'tty-spinner'
+require 'tty-cursor'
+require 'pastel'
+require 'fileutils'
+
+pastel = Pastel.new
+format = "[#{pastel.yellow(':spinner')}] " + pastel.white("Release Gem")
+spinners = TTY::Spinner::Multi.new(format, format: :dots, success_mark: pastel.green('✔'), error_mark: pastel.red('✖'))
+sp_v = spinners.register "[#{pastel.cyan(':spinner')}] :msg"
+sp_t = spinners.register "[#{pastel.cyan(':spinner')}] Run tests :msg"
+sp_c = spinners.register "[#{pastel.cyan(':spinner')}] Generate completions"
+sp_d = spinners.register "[#{pastel.cyan(':spinner')}] Generate docs"
+sp_w = spinners.register "[#{pastel.cyan(':spinner')}] Update wiki :msg"
+spinners.auto_spin
+
+$version = nil
+sp_v.update(msg: 'Get version')
+sp_t.update(msg: '')
+sp_w.update(msg: '')
+sp_v.run do |spinner|
+  spinner.update(msg: 'Getting version')
+  versions = `rake ver`.strip
+  version = versions.match(/version\.rb: ([\d.]+(\w+\d*)?)/)[1]
+  changelog_version = versions.match(/changelog: ([\d.]+(\w+\d*)?)/)[1]
+  git_version = versions.match(/git tag: ([\d.]+(\w+\d*)?)/)[1]
+
+  if git_version == version
+    spinner.update(msg: "Error: Git version (#{git_version}) is the same as version.rb (#{version})")
+    spinner.error
+    spinners.stop
+    Process.exit
+  end
+
+  unless version == changelog_version
+    spinner.update(msg: "Error: version.rb (#{version}) and Changelog (#{changelog_version}) do not match")
+    spinner.error
+    spinners.stop
+    Process.exit
+  end
+
+  $version = version
+
+  spinner.update(msg: "Version #{version}")
+  spinner.success
+end
+
+
+sp_t.run do |spinner|
+  spinner.update(msg: '')
+  start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  unless system('rake parallel:test &> results.log')
+    spinner.update(msg: '- Unit tests failed')
+    spinner.error
+    spinners.stop
+    Process.exit
+  end
+
+  finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  spinner.update(msg: "- passed in #{(finish - start).round(4)} seconds")
+  spinner.success
+end
+
+sp_c.auto_spin
+`./generate_completions.sh &> results.log`
+sp_c.success
+
+sp_d.auto_spin
+`bundle exec bin/doing _doc &> results.log`
+`./rdoc_to_mmd.rb > /Users/ttscoff/Sites/dev/bt/source/doing_all_commands.md`
+`rake yard &> results.log`
+sp_d.success
+
+
+sp_w.run do |spinner|
+  spinner.update(msg: '- Updating All Commands')
+  `./rdoc_to_mmd.rb > /Users/ttscoff/Desktop/Code/doing.wiki/commands.source`
+  prev_dir = Dir.pwd
+  Dir.chdir('/Users/ttscoff/Desktop/Code/doing.wiki/')
+  `./reformat_commands.rb &> results.log`
+  spinner.update(msg: '- Committing and Pushing')
+  `git commit -a -m "#{$version} update" &> results.log`
+  `git pull &> results.log`
+  `FORCE_PUSH=true git push &> results.log`
+  spinner.update(msg: '- Tagging Release')
+  `git release create -m "v#{$version}" $version &> results.log`
+  spinner.update(msg: '- Done')
+  Dir.chdir(prev_dir)
+  sp_w.success
+end
+
+sp_r = spinners.register "[:spinner] Releasing gem :msg"
+
+sp_r.run do |spinner|
+  spinner.update(msg: '- Preparing git release')
+  `git commit -a -m "#{$version} release prep" &> results.log`
+  `git pull &> results.log`
+  `FORCE_PUSH=true git push &> results.log`
+  spinner.update(msg: '- Running releasegem script')
+  `/Users/ttscoff/scripts/releasegem &> results.log`
+  spinner.update(msg: '- Bumping gem version')
+  `rake bump[patch] &> results.log`
+  sp_r.success
+end
+
+FileUtils.rm('results.log')

data/scripts/runtests.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+bundle install
+rake test