doing 2.1.26 → 2.1.30

data/lib/doing.rb

@@ -22,17 +22,18 @@ require 'tty-which'
 require 'tty-markdown'
 require 'tty-reader'
 require 'tty-screen'
+require 'sys-uname'
 
 require_relative 'doing/changelog'
 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 +51,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.26
+  version: 2.1.30
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -426,6 +426,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.0
+- !ruby/object:Gem::Dependency
+  name: sys-uname
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 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.
@@ -582,14 +602,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
@@ -607,8 +632,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
@@ -625,9 +650,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
@@ -744,9 +773,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/