doing 2.1.29 → 2.1.33

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

@@ -97,12 +97,116 @@
 
 
 
+  
+    <h2>
+      Instance Method Summary
+      <small><a href="#" class="summary_toggle">collapse</a></small>
+    </h2>
+
+    <ul class="summary">
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="top-level-namespace.html#add_options-instance_method" title="#add_options (instance method)">#<strong>add_options</strong>(type, cmd)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'><p>Add presets of flags and switches to a command.</p>
+</div></span>
+  
+</li>
 
+      
+    </ul>
+  
+
+
+
+  <div id="instance_method_details" class="method_details_list">
+    <h2>Instance Method Details</h2>
+
+    
+      <div class="method_details first">
+  <h3 class="signature first" id="add_options-instance_method">
+  
+    #<strong>add_options</strong>(type, cmd)  &#x21d2; <tt><span class='object_link'><a href="Object.html" title="Object (class)">Object</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    <p>Add presets of flags and switches to a command.</p>
+
+<p>:add_entry =&gt; --noauto, --note, --ask, --editor, --back</p>
+
+<p>:search =&gt; --search, --case, --exact</p>
+
+<p>:tag_filter =&gt; --tag, --bool, --not, --val</p>
+
+<p>:date_filter =&gt; --before, --after, --from</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>type</span>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="Symbol.html" title="Symbol (class)">Symbol</a></span></tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'><p>The type</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>cmd</span>
+      
+      
+        <span class='type'></span>
+      
+      
+      
+        &mdash;
+        <div class='inline'><p>The GLI command to which the options will be added</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+
+</div>
+</div>
+    
+  </div>
 
 </div>
 
       <div id="footer">
-  Generated on Mon Feb 14 14:34:40 2022 by
+  Generated on Fri Feb 18 12:22:34 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/docs/index.md

@@ -8,7 +8,7 @@ _If you're one of the rare people like me who find this useful, feel free to
 
 
 
-The current version of `doing` is 2.1.21.
+The current version of `doing` is 2.1.31.
 
 Find all of the documentation in the [doing wiki][wiki].
 

data/doing.gemspec

@@ -1,5 +1,5 @@
 # Ensure we require the local version and not one we might have installed already
-require File.join([File.dirname(__FILE__),'lib','doing','version.rb'])
+require File.join([File.dirname(__FILE__), 'lib', 'doing', 'version.rb'])
 spec = Gem::Specification.new do |s|
   s.name = 'doing'
   s.version = Doing::VERSION
@@ -8,13 +8,14 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'http://brettterpstra.com/project/doing/'
   s.platform = Gem::Platform::RUBY
   s.summary = 'A command line tool for managing What Was I Doing reminders'
-  s.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.'
+  s.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.'
+  ].join(' ')
   s.license = 'MIT'
-# Add your other files here if you make them
   s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
-      `git ls-files -z`.split("\x0").reject { |f|
-          f.strip =~ /^((test|spec|features)\/|\.git|buildnotes)/
-      }
+    `git ls-files -z`.split("\x0").reject { |f| f.strip =~ %r{^((test|spec|features)/|\.git|buildnotes)} }
   end
   s.require_paths << 'lib'
 
@@ -22,27 +23,27 @@ spec = Gem::Specification.new do |s|
   s.rdoc_options << '--title' << 'doing' << '--main' << 'README.md' << '--markup' << 'markdown'
   s.bindir = 'bin'
   s.executables << 'doing'
-  s.add_runtime_dependency('safe_yaml', '~> 1.0')
-  s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
-  s.add_development_dependency 'rdoc', '~> 6.3.1'
-  s.add_development_dependency 'aruba', '~> 1.0.2'
-  s.add_development_dependency 'test-unit', '~> 3.4.4'
-  s.add_development_dependency 'yard', '~> 0.9', '>= 0.9.26'
-  s.add_development_dependency 'redcarpet', '~> 3.5', '>= 3.5.1'
-  s.add_development_dependency 'github-markup', '~> 4.0', '>= 4.0.0'
-  s.add_development_dependency 'parallel_tests', '~> 3.7', '>= 3.7.3'
-  s.add_development_dependency 'tty-spinner', '~> 0.9', '>= 0.9.3'
-  s.add_runtime_dependency('tty-progressbar', '~> 0.18', '>= 0.18.2')
-  s.add_runtime_dependency('gli', '~> 2.20', '>= 2.20.1')
-  s.add_runtime_dependency('haml','~>5.0.0', '>= 5.0.0')
-  s.add_runtime_dependency('chronic','~> 0.10', '>= 0.10.2')
+  s.add_development_dependency('github-markup', '~> 4.0', '>= 4.0.0')
+  s.add_development_dependency('parallel_tests', '~> 3.7', '>= 3.7.3')
+  s.add_development_dependency('rake', '~> 13.0', '>= 13.0.1')
+  s.add_development_dependency('rdoc', '~> 6.3.1')
+  s.add_development_dependency('redcarpet', '~> 3.5', '>= 3.5.1')
+  s.add_development_dependency('test-unit', '~> 3.4.4')
+  s.add_development_dependency('tty-spinner', '~> 0.9', '>= 0.9.3')
+  s.add_development_dependency('yard', '~> 0.9', '>= 0.9.26')
+  s.add_runtime_dependency('chronic', '~> 0.10', '>= 0.10.2')
   s.add_runtime_dependency('deep_merge', '~> 1.2', '>= 1.2.1')
+  s.add_runtime_dependency('gli', '~> 2.20', '>= 2.20.1')
+  s.add_runtime_dependency('haml', '~>5.0.0', '>= 5.0.0')
+  s.add_runtime_dependency('parslet', '~> 2.0', '>= 2.0.0')
+  s.add_runtime_dependency('plist', '~> 3.6', '>= 3.6.0')
+  s.add_runtime_dependency('safe_yaml', '~> 1.0')
+  s.add_runtime_dependency('sys-uname', '~> 1.2', '>= 1.2.2')
   s.add_runtime_dependency('tty-link', '~> 0.1', '>= 0.1.1')
-  s.add_runtime_dependency('tty-which', '~> 0.5', '>= 0.5.0')
   s.add_runtime_dependency('tty-markdown', '~> 0.7', '>= 0.7.0')
+  s.add_runtime_dependency('tty-progressbar', '~> 0.18', '>= 0.18.2')
   s.add_runtime_dependency('tty-reader', '~> 0.9', '>= 0.9.0')
   s.add_runtime_dependency('tty-screen', '~> 0.8', '>= 0.8.1')
-  s.add_runtime_dependency('parslet', '~> 2.0', '>= 2.0.0')
-  s.add_runtime_dependency('plist', '~> 3.6', '>= 3.6.0')
+  s.add_runtime_dependency('tty-which', '~> 0.5', '>= 0.5.0')
   # s.add_runtime_dependency('amatch', '~> 0.4', '>= 0.4.0')
 end

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.29
+v2.1.33
 
 === Global Options
 === --config_file arg
@@ -440,10 +440,10 @@ Display a formatted list of changes in recent versions.
 
 Look up a specific version. Specify versions as "MAJ.MIN.PATCH", MIN
            and PATCH are optional. Use > or < to see all changes since or prior
-           to a version.
+           to a version. Wildcards (*?) accepted unless using < or >.
 
 [Default Value] None
-[Must Match] (?-mix:^(?:(?:(?:[<>=]|p(?:rior)|b(?:efore)|o(?:lder)|s(?:ince)|a(?:fter)|n(?:ewer))? *[\d.*?]+ *)+|(?:[\d.]+ *-+ *[\d.]+))$)
+[Must Match] (?-mix:^(?:(?:(?:[<>=]+|p(?:rior)|b(?:efore)|o(?:lder)|s(?:ince)|a(?:fter)|n(?:ewer))? *[0-9.*?]+ *)+|(?:[\d.]+ *(?:-|to)+ *[0-9.]+))$)
 
 
 ===== -s|--search arg
@@ -506,26 +506,42 @@ Disable Doing commands
 
 [Default Command] add
 ==== Command: <tt>completion </tt>
-Generate shell completion scripts
+Generate shell completion scripts for doing
 
 Generates the necessary scripts to add command line completion to various shells,
 so typing 'doing' and hitting tab will offer completions of subcommands and their options.
 ===== Options
-===== -f|--file PATH
+===== -t|--type arg
 
-File to write output to
+Deprecated, specify shell as argument to subcommand
 
-[Default Value] STDOUT
+[Default Value] None
+[Must Match] (?i-mx:^(?:[bzf](?:[ai]?sh)?|all)$)
 
 
-===== -t|--type SHELL
+===== Commands
+====== Command: <tt>generate  [zsh|bash|fish|all]</tt>
+Generate completion scripts, including custom plugins and command options
+
+Argument specifies which shell to install for: zsh, bash, fish, all
+======= Options
+======= -f|--file PATH
+
+Alternative file to write output to
+
+[Default Value] None
+Argument specifies which shell to install for: zsh, bash, fish, all
+
+======= --stdout
+Output result to STDOUT only
 
-Shell to generate for (bash, zsh, fish)
 
-[Default Value] zsh
-[Must Match] (?i-mx:^(?:[bzf](?:[ai]?sh)?|all)$)
 
+====== Command: <tt>install  [zsh|bash|fish]</tt>
+Install default completion scripts
 
+Argument specifies which shell to install for: zsh, bash, fish, or all
+[Default Command] generate
 ==== Command: <tt>config </tt>
 Edit the configuration file or output a value from it
 
@@ -604,6 +620,11 @@ Set a key's value in the config file
 
 
 ======= Options
+======= --local
+Force update to .doingrc in the current directory
+
+
+
 ======= -r|--remove
 Delete specified key
 
@@ -646,7 +667,7 @@ Start and end times as a date/time range `doing done --from "1am to 8am"`.
         Overrides other date flags.
 
 [Default Value] None
-[Must Match] (?i-mx:^\S+ +(?:to|through|thru|(?:un)?til|-+) ++\S+)
+[Must Match] (?i-mx:^\S+.*? +(?:to|through|thru|(?:un)?til|-+) +\S+.*?$)
 
 
 ===== -n|--note TEXT
@@ -1530,7 +1551,7 @@ Show time totals at the end of output
 ==== Command: <tt>open </tt>
 Open the "doing" file in an editor
 
-`doing open` defaults to using the editors->doing_file setting
+`doing open` defaults to using the editors.doing_file setting
 in /Users/ttscoff/.config/doing/config.yml (TaskPaper).
 ===== Options
 ===== -a|--app APP_NAME

data/example_plugin.rb

@@ -54,7 +54,7 @@ module Doing
     ##   automatically be added for the user to override
     ##   The config key will be available at:
     ##
-    ##       wwid.config['export_templates'][PLUGIN_NAME]
+    ##       Doing.config.settings['export_templates'][PLUGIN_NAME]
     ##
     ## config:    (optional) A Hash which will be
     ## added to the main configuration in the plugins section.
@@ -65,7 +65,7 @@ module Doing
     ##
     ##   The configuration keys will be available at:
     ##
-    ##      wwid.config['plugins'][PLUGIN_NAME][KEY]
+    ##      Doing.config.settings['plugins'][PLUGIN_NAME][KEY]
     ##
     ## Method to return plugin settings (required)
     ##
@@ -125,6 +125,8 @@ module Doing
     def self.render(wwid, items, variables: {})
       return unless items.good?
 
+      config = Doing.config.settings
+
       # the :options key includes the flags passed to the
       # command that called the plugin use `puts
       # variables.inspect` to see properties and methods
@@ -162,8 +164,8 @@ module Doing
       title = i.title.gsub(/@/, 'hashtag ')
       tpl = template('say')
 
-      if wwid.config['export_templates'].key?('say')
-        cfg_tpl = wwid.config['export_templates']['say']
+      if config['export_templates'].key?('say')
+        cfg_tpl = config['export_templates']['say']
         tpl = cfg_tpl if cfg_tpl.good?
       end
       output = tpl.dup
@@ -188,7 +190,7 @@ module Doing
       Doing.logger.info('Spoke the last entry. Did you hear it?')
 
       # This export runs a command for fun, most plugins won't
-      voice = wwid.config['plugins']['say']['say_voice'] || 'Alex'
+      voice = config['plugins']['say']['say_voice'] || 'Alex'
       `say -v "#{voice}" "#{output}"`
 
       # Return the result (don't output to terminal with puts or print)

data/inputrc

@@ -0,0 +1,57 @@
+"\e[3~": delete-char
+"\ex": 'cd !$ \015ls\015'
+"\ez": 'cd -\015'
+"\e\C-m": '\C-a "$(\C-e|fzf)"\C-a'
+"\e/": '"$(!!|fzf)"\C-a \C-m\C-m'
+# these allow you to use alt+left/right arrow keys
+# to jump the cursor over words
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+# "\e[D": backward-word
+# "\e[C": forward-word
+"\ea": menu-complete
+# TAB: menu-complete
+# "\e[Z": "\e-1\C-i"
+
+"\e\C-l": history-and-alias-expand-line
+
+# these allow you to start typing a command and
+# use the up/down arrow to auto complete from
+# commands in your history
+"\e[B": history-search-forward
+"\e[A": history-search-backward
+"\ew": history-search-backward
+"\es": history-search-forward
+# this lets you hit tab to auto-complete a file or
+# directory name ignoring case
+set completion-ignore-case On
+set mark-symlinked-directories On
+set completion-prefix-display-length 2
+set bell-style none
+# set bell-style visible
+set meta-flag on
+set convert-meta off
+set input-meta on
+set output-meta on
+set show-all-if-ambiguous on
+set show-all-if-unmodified on
+set completion-map-case on
+set visible-stats on
+
+# Do history expansion when space entered?
+$if bash
+	Space: magic-space
+$endif
+
+# Show extra file information when completing, like `ls -F` does
+set visible-stats on
+
+# Be more intelligent when autocompleting by also looking at the text after
+# the cursor. For example, when the current line is "cd ~/src/mozil", and
+# the cursor is on the "z", pressing Tab will not autocomplete it to "cd
+# ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the
+# Readline used by Bash 4.)
+set skip-completed-text on
+
+# Use Alt/Meta + Delete to delete the preceding word
+"\e[3;3~": kill-word