doing 2.1.24 → 2.1.28

data/lib/helpers/threaded_tests.rb

@@ -2,76 +2,42 @@
 
 require 'tty-spinner'
 require 'tty-progressbar'
-require './lib/doing'
 require 'open3'
 require 'shellwords'
+require 'fileutils'
 
-class ::String
-  include Doing::Color
-
-  def highlight_errors
-    cols = `tput cols`.strip.to_i
-
-    string = dup
-
-    errs = string.scan(/(?<==\n)(?:Failure|Error):.*?(?=\n=+)/m)
-
-    errs.map! do |error|
-      err = error.dup
-
-      err.gsub!(%r{^(/.*?/)([^/:]+):(\d+):in (.*?)$}) do
-        m = Regexp.last_match
-        "#{m[1].white}#{m[2].bold.white}:#{m[3].yellow}:in #{m[4].cyan}"
-      end
-      err.gsub!(/(Failure|Error): (.*?)\((.*?)\):\n  (.*?)(?=\n)/m) do
-        m = Regexp.last_match
-        [
-          m[1].bold.boldbgred.white,
-          m[3].bold.boldbgcyan.white,
-          m[2].bold.boldbgyellow.black,
-          " #{m[4]} ".bold.boldbgwhite.black.reset
-        ].join(':'.boldblack.boldbgblack.reset)
-      end
-      err.gsub!(/(<.*?>) (was expected to) (.*?)\n( *<.*?>)./m) do
-        m = Regexp.last_match
-        "#{m[1].bold.green} #{m[2].white} #{m[3].boldwhite.boldbgred.reset}\n#{m[4].bold.white}"
-      end
-      err.gsub!(/(Finished in) ([\d.]+) (seconds)/) do
-        m = Regexp.last_match
-        "#{m[1].green} #{m[2].bold.white} #{m[3].green}"
-      end
-      err.gsub!(/(\d+) (failures)/) do
-        m = Regexp.last_match
-        "#{m[1].bold.red} #{m[2].red}"
-      end
-      err.gsub!(/100% passed/) do |m|
-        m.bold.green
-      end
-
-      err
-    end
-
-    errs.join("\n#{('=' * cols).blue}\n")
-  end
-end
+$LOAD_PATH.unshift File.join(__dir__, '..')
+require 'doing'
+require 'helpers/threaded_tests_string'
 
 class ThreadedTests
   include Doing::Color
+  include ThreadedTestString
 
   def run(pattern: '*', max_threads: 8, max_tests: 0)
     start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    @results = File.expand_path('results.log')
 
-    max_threads = 1000 if max_threads == 0
+    max_threads = 1000 if max_threads.to_i == 0
 
     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)
 
-    if max_tests > 0
-      tests = tests.slice(0, max_tests - 1)
+    tests.shuffle! if shuffle
+
+    if max_tests.to_i > 0
+      tests = tests.slice(0, max_tests.to_i - 1)
     end
 
     puts "#{tests.count} test files".boldcyan
@@ -90,13 +56,21 @@ class ThreadedTests
     ].join('')
     progress = TTY::ProgressBar::Multi.new(banner,
                                            width: 12,
+                                           clear: true,
                                            hide_cursor: true)
     @children = []
     tests.each do |t|
       test_name = File.basename(t, '.rb').sub(/doing_(.*?)_test/, '\1')
       new_sp = progress.register("[#{':bar'.cyan}] #{test_name.bold.white}:status",
-                                 total: 4, width: 1, head: ' ', unknown: ' ', hide_cursor: true, clear: true)
-      @children.push([test_name, new_sp, nil])
+                                 total: tests.count + 8,
+                                 width: 1,
+                                 head: ' ',
+                                 unknown: ' ',
+                                 hide_cursor: true,
+                                 clear: true)
+      status = ': waiting'.dark.yellow.reset
+      @children.push([test_name, new_sp, status])
+      # new_sp.advance(status: ': waiting'.dark.yellow.reset)
     end
 
     @elapsed = 0.0
@@ -124,46 +98,64 @@ class ThreadedTests
       finish_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
       progress.finish
+    rescue
+      progress.stop
+    ensure
+      msg = @running_tests.map { |t| t[1].format.uncolor.sub(/^\[:bar\] (.*?):status/, "#{c.bold}#{c.white}\\1#{c.reset}#{t[2]}") }.join("\n")
+
+      Doing::Prompt.clear_screen(msg)
 
       output = []
-      if @error_out.count.positive?
-        output << c.boldred("#{@error_out.count} Issues")
-      else
-        output << c.green('Success')
-      end
+      output << if @error_out.count.positive?
+                  c.boldred("#{@error_out.count} Issues")
+                else
+                  c.green('Success')
+                end
       output << c.green("#{@test_total} tests")
       output << c.cyan("#{@assrt_total} assertions")
       output << c.yellow("#{(finish_time - start_time).round(3)}s")
       puts output.join(', ')
 
-      puts @error_out.join("\n----\n".boldwhite) if @error_out.count.positive?
-    rescue
-      progress.stop
+      if @error_out.count.positive?
+        res = Doing::Prompt.yn('Display error report?', default_response: false)
+        Doing::Pager.paginate = true
+        Doing::Pager.page(@error_out.join("\n----\n".boldwhite)) if res
+      end
     end
   end
 
   def run_test(s)
-
     bar = s[1]
-    bar.advance(status: ": #{'running'.green}")
+    s[2] = ": #{'running'.green}"
+    bar.advance(status: s[2])
 
     if @running_tests.count.positive?
-      prev_bar = @running_tests[-1][1]
-      unless prev_bar.complete?
-        prev_bar.update(head: ' ', unfinished: ' ')
-        prev_bar.advance(status: ": #{'running'.green}")
+      @running_tests.each do |b|
+        prev_bar = b[1]
+        if prev_bar.complete?
+          prev_bar.reset
+          prev_bar.advance(status: b[2])
+          prev_bar.finish
+        else
+          prev_bar.update(head: ' ', unfinished: ' ')
+          prev_bar.advance(status: b[2])
+        end
       end
     end
 
     @running_tests.push(s)
-
-
     out, _err, status = Open3.capture3(ENV, 'rake', "test:#{s[0]}", stdin_data: nil)
-    unless status.success?
-      m = out.match(/(?<fail>\d+) failures, (?<err>\d+) errors/)
-      status = ": #{m['fail'].bold.red} #{'failures'.red}, #{m['err'].bold.red} #{'errors'.red}"
+    time = out.match(/^Finished in (?<time>\d+\.\d+) seconds\./)
+    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] = 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: status)
+      bar.advance(head: '✖'.boldred, status: s[2])
 
       # errs = out.scan(/(?:Failure|Error): [\w_]+\((?:.*?)\):(?:.*?)(?=\n=======)/m)
       @error_out.push(out.highlight_errors)
@@ -173,9 +165,7 @@ class ThreadedTests
       Thread.exit
     end
 
-    time = out.match(/^Finished in (?<time>\d+\.\d+) seconds\./)
-    count = out.match(/^(?<tests>\d+) tests, (?<assrt>\d+) assertions, (?<fails>\d+) failures, (?<errs>\d+) errors/)
-    status = [
+    s[2] = [
       ': ',
       count['tests'].green,
       '/',
@@ -190,7 +180,7 @@ class ThreadedTests
       's'
     ].join('')
     bar.update(head: '✔'.boldgreen)
-    bar.advance(head: '✔'.boldgreen, status: status)
+    bar.advance(head: '✔'.boldgreen, status: s[2])
     @test_total += count['tests'].to_i
     @assrt_total += count['assrt'].to_i
     @elapsed += time['time'].to_f

data/lib/helpers/threaded_tests_string.rb

@@ -0,0 +1,50 @@
+module ThreadedTestString
+  class ::String
+    include Doing::Color
+
+    def highlight_errors
+      cols = `tput cols`.strip.to_i
+
+      string = dup
+
+      errs = string.scan(/(?<==\n)(?:Failure|Error):.*?(?=\n=+)/m)
+
+      errs.map! do |error|
+        err = error.dup
+
+        err.gsub!(%r{^(/.*?/)([^/:]+):(\d+):in (.*?)$}) do
+          m = Regexp.last_match
+          "#{m[1].white}#{m[2].bold.white}:#{m[3].yellow}:in #{m[4].cyan}"
+        end
+        err.gsub!(/(Failure|Error): (.*?)\((.*?)\):\n  (.*?)(?=\n)/m) do
+          m = Regexp.last_match
+          [
+            m[1].bold.boldbgred.white,
+            m[3].bold.boldbgcyan.white,
+            m[2].bold.boldbgyellow.black,
+            " #{m[4]} ".bold.boldbgwhite.black.reset
+          ].join(':'.boldblack.boldbgblack.reset)
+        end
+        err.gsub!(/(<.*?>) (was expected to) (.*?)\n( *<.*?>)./m) do
+          m = Regexp.last_match
+          "#{m[1].bold.green} #{m[2].white} #{m[3].boldwhite.boldbgred.reset}\n#{m[4].bold.white}"
+        end
+        err.gsub!(/(Finished in) ([\d.]+) (seconds)/) do
+          m = Regexp.last_match
+          "#{m[1].green} #{m[2].bold.white} #{m[3].green}"
+        end
+        err.gsub!(/(\d+) (failures)/) do
+          m = Regexp.last_match
+          "#{m[1].bold.red} #{m[2].red}"
+        end
+        err.gsub!(/100% passed/) do |m|
+          m.bold.green
+        end
+
+        err
+      end
+
+      errs.join("\n#{('=' * cols).blue}\n")
+    end
+  end
+end

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.24
+  version: 2.1.28
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -456,6 +456,47 @@ files:
 - README.md
 - Rakefile
 - _config.yml
+- bin/commands/add_section.rb
+- bin/commands/again.rb
+- bin/commands/archive.rb
+- bin/commands/cancel.rb
+- bin/commands/changes.rb
+- bin/commands/choose.rb
+- bin/commands/colors.rb
+- bin/commands/commands.rb
+- bin/commands/commands_accepting.rb
+- bin/commands/completion.rb
+- bin/commands/config.rb
+- bin/commands/done.rb
+- bin/commands/finish.rb
+- bin/commands/flag.rb
+- bin/commands/grep.rb
+- bin/commands/import.rb
+- bin/commands/install_fzf.rb
+- bin/commands/last.rb
+- bin/commands/meanwhile.rb
+- bin/commands/note.rb
+- bin/commands/now.rb
+- bin/commands/on.rb
+- bin/commands/open.rb
+- bin/commands/plugins.rb
+- bin/commands/recent.rb
+- bin/commands/redo.rb
+- bin/commands/reset.rb
+- bin/commands/rotate.rb
+- bin/commands/sections.rb
+- bin/commands/select.rb
+- bin/commands/show.rb
+- bin/commands/since.rb
+- bin/commands/tag.rb
+- bin/commands/tag_dir.rb
+- bin/commands/tags.rb
+- bin/commands/template.rb
+- bin/commands/today.rb
+- bin/commands/undo.rb
+- bin/commands/view.rb
+- bin/commands/views.rb
+- bin/commands/yesterday.rb
 - bin/doing
 - docs/_config.yml
 - docs/doc/Array.html
@@ -495,12 +536,14 @@ files:
 - docs/doc/Doing/Util/Backup.html
 - docs/doc/Doing/WWID.html
 - docs/doc/Doing/WWIDFile.html
+- docs/doc/FalseClass.html
 - docs/doc/GLI.html
 - docs/doc/GLI/Commands.html
 - docs/doc/GLI/Commands/Help.html
 - docs/doc/GLI/Commands/MarkdownDocumentListener.html
 - docs/doc/Hash.html
 - docs/doc/Numeric.html
+- docs/doc/Object.html
 - docs/doc/PhraseParser.html
 - docs/doc/PhraseParser/Operator.html
 - docs/doc/PhraseParser/PhraseClause.html
@@ -512,6 +555,7 @@ files:
 - docs/doc/String.html
 - docs/doc/Symbol.html
 - docs/doc/Time.html
+- docs/doc/TrueClass.html
 - docs/doc/_index.html
 - docs/doc/class_list.html
 - docs/doc/css/common.css
@@ -538,14 +582,19 @@ files:
 - lib/completion/doing.bash
 - lib/completion/doing.fish
 - lib/doing.rb
-- lib/doing/array.rb
-- lib/doing/array_chronify.rb
+- lib/doing/array/array.rb
+- lib/doing/array/nested_hash.rb
+- lib/doing/array/tags.rb
 - lib/doing/boolean_term_parser.rb
 - lib/doing/changelog.rb
 - lib/doing/changelog/change.rb
 - lib/doing/changelog/changes.rb
 - lib/doing/changelog/entry.rb
 - lib/doing/changelog/version.rb
+- lib/doing/chronify/array.rb
+- lib/doing/chronify/chronify.rb
+- lib/doing/chronify/numeric.rb
+- lib/doing/chronify/string.rb
 - lib/doing/cli_status.rb
 - lib/doing/colors.rb
 - lib/doing/completion.rb
@@ -555,6 +604,7 @@ files:
 - lib/doing/completion/zsh_completion.rb
 - lib/doing/configuration.rb
 - lib/doing/errors.rb
+- lib/doing/good.rb
 - lib/doing/hash.rb
 - lib/doing/help_monkey_patch.rb
 - lib/doing/hooks.rb
@@ -562,8 +612,8 @@ files:
 - lib/doing/items.rb
 - lib/doing/log_adapter.rb
 - lib/doing/markdown_document_listener.rb
+- lib/doing/normalize.rb
 - lib/doing/note.rb
-- lib/doing/numeric_chronify.rb
 - lib/doing/pager.rb
 - lib/doing/phrase_parser.rb
 - lib/doing/plugin_manager.rb
@@ -580,9 +630,13 @@ files:
 - lib/doing/plugins/import/timing_import.rb
 - lib/doing/prompt.rb
 - lib/doing/section.rb
-- lib/doing/string.rb
-- lib/doing/string_chronify.rb
-- lib/doing/symbol.rb
+- lib/doing/string/highlight.rb
+- lib/doing/string/query.rb
+- lib/doing/string/string.rb
+- lib/doing/string/tags.rb
+- lib/doing/string/transform.rb
+- lib/doing/string/truncate.rb
+- lib/doing/string/url.rb
 - lib/doing/template_string.rb
 - lib/doing/time.rb
 - lib/doing/types.rb
@@ -687,6 +741,7 @@ files:
 - lib/helpers/fzf/test/test_go.rb
 - lib/helpers/fzf/uninstall
 - lib/helpers/threaded_tests.rb
+- lib/helpers/threaded_tests_string.rb
 - lib/templates/doing-dayone-entry.erb
 - lib/templates/doing-dayone.erb
 - lib/templates/doing-markdown.erb
@@ -698,9 +753,11 @@ files:
 - package-lock.json
 - rdoc_to_mmd.rb
 - rdocfixer.rb
+- scripts/deploy.rb
 - scripts/generate_bash_completions.rb
 - scripts/generate_fish_completions.rb
 - scripts/generate_zsh_completions.rb
+- scripts/runtests.sh
 - scripts/sort_commands.rb
 - yard_templates/default/method_details/setup.rb
 homepage: http://brettterpstra.com/project/doing/