doing 2.1.25 → 2.1.26

data/docs/doc/top-level-namespace.html

@@ -102,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sun Jan 23 09:24:04 2022 by
+  Generated on Sun Jan 23 16:30:43 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.25
+v2.1.26
 
 === Global Options
 === --config_file arg
@@ -434,14 +434,24 @@ Display all versions
 
 
 
-==== Command: <tt>choose </tt>
-Select a section to display from a menu
-
-
 ==== Command: <tt>colors </tt>
 List available color variables for configuration templates and views
 
 
+==== Command: <tt>commands </tt>
+Enable and disable Doing commands
+
+
+===== Commands
+====== Command: <tt>add|enable  COMMAND [COMMAND...]</tt>
+Enable Doing commands
+
+Run without arguments to select commands from a list.
+====== Command: <tt>remove|disable </tt>
+Disable Doing commands
+
+
+[Default Command] add
 ==== Command: <tt>completion </tt>
 Generate shell completion scripts
 

data/lib/completion/_doing.zsh

@@ -16,8 +16,8 @@ function _doing() {
                   'cancel:End last X entries with no time tracked'
                   'changes:List recent changes in Doing'
                   'changelog:List recent changes in Doing'
-                  'choose:Select a section to display from a menu'
                   'colors:List available color variables for configuration templates and views'
+                  'commands:Enable and disable Doing commands'
                   'completion:Generate shell completion scripts'
                   'config:Edit the configuration file or output a value from it'
                   'done:Add a completed item with @done(date)'
@@ -93,10 +93,10 @@ function _doing() {
             changelog) 
                 args=( {-a,--all}"[Display all versions]" {-l,--lookup=}"[Look up a specific version]" {-s,--search=}"[Show changelogs matching search terms]" )
             ;;
-            choose) 
+            colors) 
                 args=(  )
             ;;
-            colors) 
+            commands) 
                 args=(  )
             ;;
             completion) 

data/lib/completion/doing.fish

@@ -141,8 +141,8 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'archive move' -d Move\ en
 complete -xc doing -n '__fish_doing_needs_command' -a 'autotag' -d Autotag\ last\ entry\ or\ filtered\ entries
 complete -xc doing -n '__fish_doing_needs_command' -a 'cancel' -d End\ last\ X\ entries\ with\ no\ time\ tracked
 complete -xc doing -n '__fish_doing_needs_command' -a 'changes changelog' -d List\ recent\ changes\ in\ Doing
-complete -xc doing -n '__fish_doing_needs_command' -a 'choose' -d Select\ a\ section\ to\ display\ from\ a\ menu
 complete -xc doing -n '__fish_doing_needs_command' -a 'colors' -d List\ available\ color\ variables\ for\ configuration\ templates\ and\ views
+complete -xc doing -n '__fish_doing_needs_command' -a 'commands' -d Enable\ and\ disable\ Doing\ commands
 complete -xc doing -n '__fish_doing_needs_command' -a 'completion' -d Generate\ shell\ completion\ scripts
 complete -xc doing -n '__fish_doing_needs_command' -a 'config' -d Edit\ the\ configuration\ file\ or\ output\ a\ value\ from\ it
 complete -xc doing -n '__fish_doing_needs_command' -a 'done did' -d Add\ a\ completed\ item\ with\ @done\(date\)

data/lib/doing/changelog/changes.rb

@@ -24,7 +24,7 @@ module Doing
     private
 
     def parse_changes(lookup, search)
-      change_rx = /(?<=\n|\A)### (\d+\.\d+\.\d+(?:\w*))(.*)(?=\n### |\Z)/m
+      change_rx = /(?<=\n|\A)### (\d+\.\d+\.\d+(?:\w*))(.*?)(?=\n### |\Z)/m
       @changes = @content.scan(change_rx).each_with_object([]) do |m, a|
         next if m[0].nil? || m[1].nil?
 

data/lib/doing/configuration.rb

@@ -29,6 +29,7 @@ module Doing
         'plugin_path' => File.join(Util.user_home, '.config', 'doing', 'plugins'),
         'command_path' => File.join(Util.user_home, '.config', 'doing', 'commands')
       },
+      'disabled_commands' => [],
       'doing_file' => '~/.local/share/doing/what_was_i_doing.md',
       'doing_file_sort' => 'desc',
       'backup_dir' => '~/.local/share/doing/doing_backup',

data/lib/doing/pager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'pathname'
 
 module Doing

data/lib/doing/prompt.rb

@@ -8,6 +8,14 @@ module Doing
 
       include Color
 
+      ##
+      ## Clear the terminal screen
+      ##
+      def clear_screen(msg = nil)
+        puts "\e[H\e[2J" if STDOUT.tty?
+        puts msg if msg.good?
+      end
+
       def force_answer
         @force_answer ||= nil
       end

data/lib/doing/version.rb

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

data/lib/examples/commands/wiki.rb

@@ -36,8 +36,7 @@ command :wiki do |c|
   c.switch [:only_timed], default_value: false, negatable: false
 
   c.action do |global, options, args|
-    wwid = global[:wwid]
-    tags = wwid.tag_groups([], opt: options)
+    tags = @wwid.tag_groups([], opt: options)
 
     wiki = Doing::Plugins.plugins.dig(:export, 'wiki', :class)
 
@@ -46,7 +45,7 @@ command :wiki do |c|
 
       raise RuntimeError, 'Missing plugin "wiki"' unless wiki
 
-      out = wiki.render(wwid, items, variables: export_options)
+      out = wiki.render(@wwid, items, variables: export_options)
 
       if out
         FileUtils.mkdir_p('doing_wiki')
@@ -56,13 +55,13 @@ command :wiki do |c|
       end
     end
 
-    template = if wwid.config['export_templates']['wiki_index'] && File.exist?(File.expand_path(wwid.config['export_templates']['wiki_index']))
-                 IO.read(File.expand_path(wwid.config['export_templates']['wiki_index']))
+    template = if @settings['export_templates']['wiki_index'] && File.exist?(File.expand_path(@settings['export_templates']['wiki_index']))
+                 IO.read(File.expand_path(@settings['export_templates']['wiki_index']))
                else
                  wiki.template('wiki_index')
                end
-    style = if wwid.config['export_templates']['wiki_css'] && File.exist?(File.expand_path(wwid.config['export_templates']['wiki_css']))
-              IO.read(File.expand_path(wwid.config['export_templates']['wiki_css']))
+    style = if @settings['export_templates']['wiki_css'] && File.exist?(File.expand_path(@settings['export_templates']['wiki_css']))
+              IO.read(File.expand_path(@settings['export_templates']['wiki_css']))
             else
               wiki.template('wiki_css')
             end

data/lib/helpers/threaded_tests.rb

@@ -18,7 +18,7 @@ class ThreadedTests
     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
@@ -27,8 +27,8 @@ class ThreadedTests
 
     tests = Dir.glob(pattern)
 
-    if max_tests > 0
-      tests = tests.slice(0, max_tests - 1)
+    if max_tests.to_i > 0
+      tests = tests.slice(0, max_tests.to_i - 1)
     end
 
     puts "#{tests.count} test files".boldcyan
@@ -89,24 +89,30 @@ 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
-  ensure
-    FileUtils.rm(@results)
   end
 
   def run_test(s)
@@ -129,10 +135,12 @@ class ThreadedTests
     end
 
     @running_tests.push(s)
-    out, _err, status = Open3.capture3(ENV, "rake test:#{s[0]} | tee #{@results}", stdin_data: nil)
-    unless status.success?
-      m = out.match(/(?<fail>\d+) failures, (?<err>\d+) errors/)
-      s[2] = ": #{m['fail'].bold.red} #{'failures'.red}, #{m['err'].bold.red} #{'errors'.red}"
+    out, _err, status = Open3.capture3(ENV, 'rake', "test:#{s[0]}", stdin_data: nil)
+    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] = ": #{count['fails'].bold.red} #{'failures'.red}, #{count['errs'].bold.red} #{'errors'.red}"
       bar.update(head: '✖'.boldred)
       bar.advance(head: '✖'.boldred, status: s[2])
 
@@ -144,8 +152,6 @@ 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/)
     s[2] = [
       ': ',
       count['tests'].green,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.25
+  version: 2.1.26
 platform: ruby
 authors:
 - Brett Terpstra
@@ -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