na 1.2.73 → 1.2.75

data/bin/commands/tagged.rb

@@ -2,121 +2,121 @@
 
 class App
   extend GLI::App
-  desc 'Find actions matching a tag'
+  desc "Find actions matching a tag"
   long_desc 'Finds actions with tags matching the arguments. An action is shown if it
   contains all of the tags listed. Add a + before a tag to make it required
   and others optional. You can specify values using TAG=VALUE pairs.
   Use <, >, and = for numeric comparisons, and *=, ^=, $=, or =~ (regex) for text comparisons.
   Date comparisons use natural language (`na tagged "due<=today"`) and
   are detected automatically.'
-  arg_name 'TAG[=VALUE]'
+  arg_name "TAG[=VALUE]"
   command %i[tagged] do |c|
-    c.example 'na tagged maybe', desc: 'Show all actions tagged @maybe'
-    c.example 'na tagged -d 3 "feature, idea"', desc: 'Show all actions tagged @feature AND @idea, recurse 3 levels'
-    c.example 'na tagged --or "feature, idea"', desc: 'Show all actions tagged @feature OR @idea'
-    c.example 'na tagged "priority>=4"', desc: 'Show actions with @priority(4) or @priority(5)'
-    c.example 'na tagged "due<in 2 days"', desc: 'Show actions with a due date coming up in the next 2 days'
-
-    c.desc 'Recurse to depth'
-    c.arg_name 'DEPTH'
+    c.example "na tagged maybe", desc: "Show all actions tagged @maybe"
+    c.example 'na tagged -d 3 "feature, idea"', desc: "Show all actions tagged @feature AND @idea, recurse 3 levels"
+    c.example 'na tagged --or "feature, idea"', desc: "Show all actions tagged @feature OR @idea"
+    c.example 'na tagged "priority>=4"', desc: "Show actions with @priority(4) or @priority(5)"
+    c.example 'na tagged "due<in 2 days"', desc: "Show actions with a due date coming up in the next 2 days"
+
+    c.desc "Recurse to depth"
+    c.arg_name "DEPTH"
     c.default_value 1
     c.flag %i[d depth], type: :integer, must_match: /^\d+$/
 
-    c.desc 'Show actions from a specific todo file in history. May use wildcards (* and ?)'
-    c.arg_name 'TODO_PATH'
+    c.desc "Show actions from a specific todo file in history. May use wildcards (* and ?)"
+    c.arg_name "TODO_PATH"
     c.flag %i[in]
 
-    c.desc 'Include notes in output'
+    c.desc "Include notes in output"
     c.switch %i[notes], negatable: true, default_value: false
 
-    c.desc 'Combine tags with OR, displaying actions matching ANY of the tags'
+    c.desc "Combine tags with OR, displaying actions matching ANY of the tags"
     c.switch %i[o or], negatable: false
 
-    c.desc 'Show actions from a specific project'
-    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.desc "Show actions from a specific project"
+    c.arg_name "PROJECT[/SUBPROJECT]"
     c.flag %i[proj project]
 
-    c.desc 'Filter results using search terms'
-    c.arg_name 'QUERY'
+    c.desc "Filter results using search terms"
+    c.arg_name "QUERY"
     c.flag %i[search find grep], multiple: true
 
-    c.desc 'Include notes in search'
+    c.desc "Include notes in search"
     c.switch %i[search_notes], negatable: true, default_value: true
 
-    c.desc 'Search query is regular expression'
+    c.desc "Search query is regular expression"
     c.switch %i[regex], negatable: false
 
-    c.desc 'Search query is exact text match (not tokens)'
+    c.desc "Search query is exact text match (not tokens)"
     c.switch %i[exact], negatable: false
 
-    c.desc 'Include @done actions'
+    c.desc "Include @done actions"
     c.switch %i[done]
 
-    c.desc 'Show actions not matching tags'
+    c.desc "Show actions not matching tags"
     c.switch %i[v invert], negatable: false
 
-    c.desc 'Save this search for future use'
-    c.arg_name 'TITLE'
+    c.desc "Save this search for future use"
+    c.arg_name "TITLE"
     c.flag %i[save]
 
-    c.desc 'Output actions nested by file'
+    c.desc "Output actions nested by file"
     c.switch %i[nest], negatable: false
 
-    c.desc 'Output actions nested by file and project'
+    c.desc "Output actions nested by file and project"
     c.switch %i[omnifocus], negatable: false
 
     c.action do |global_options, options, args|
       options[:nest] = true if options[:omnifocus]
 
       if options[:save]
-        title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
-        cmd = NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '').split(' ').map { |t| %("#{t}") }.join(' ')
+        title = options[:save].gsub(/[^a-z0-9]/, "_").gsub(/_+/, "_")
+        cmd = NA.command_line.join(" ").sub(/ --save[= ]*\S+/, "").split(" ").map { |t| %("#{t}") }.join(" ")
         NA.save_search(title, cmd)
       end
 
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
-                3
-              else
-                options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
-              end
+          3
+        else
+          options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
+        end
 
       tags = []
 
-      all_req = args.join(' ') !~ /(?<=[, ])[+!-]/ && !options[:or]
-      args.join(',').split(/ *, */).each do |arg|
+      all_req = args.join(" ") !~ /(?<=[, ])[+!-]/ && !options[:or]
+      args.join(",").split(/ *, */).each do |arg|
         m = arg.match(/^(?<req>[+!-])?(?<tag>[^ =<>$~\^]+?) *(?:(?<op>[=<>~]{1,2}|[*$\^]=) *(?<val>.*?))?$/)
         next if m.nil?
 
         tags.push({
-                    tag: m['tag'].sub(/^@/, '').wildcard_to_rx,
-                    comp: m['op'],
-                    value: m['val'],
-                    required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                    negate: !m['req'].nil? && m['req'] =~ /[!-]/
+                    tag: m["tag"].sub(/^@/, "").wildcard_to_rx,
+                    comp: m["op"],
+                    value: m["val"],
+                    required: all_req || (!m["req"].nil? && m["req"] == "+"),
+                    negate: !m["req"].nil? && m["req"] =~ /[!-]/,
                   })
       end
 
       search_for_done = false
       tags.each { |tag| search_for_done = true if tag[:tag] =~ /done/ }
-      tags.push({ tag: 'done', value: nil, negate: true }) unless search_for_done || options[:done]
+      tags.push({ tag: "done", value: nil, negate: true }) unless search_for_done || options[:done]
       options[:done] = true if search_for_done
 
       tokens = nil
       if options[:search]
         if options[:exact]
-          tokens = options[:search].join(' ')
+          tokens = options[:search].join(" ")
         elsif options[:regex]
-          tokens = Regexp.new(options[:search].join(' '), Regexp::IGNORECASE)
+          tokens = Regexp.new(options[:search].join(" "), Regexp::IGNORECASE)
         else
           tokens = []
-          all_req = options[:search].join(' ') !~ /(?<=[, ])[+!-]/ && !options[:or]
+          all_req = options[:search].join(" ") !~ /(?<=[, ])[+!-]/ && !options[:or]
 
-          options[:search].join(' ').split(/ /).each do |arg|
+          options[:search].join(" ").split(/ /).each do |arg|
             m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
             tokens.push({
-                          token: m['tok'],
-                          required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                          negate: !m['req'].nil? && m['req'] =~ /[!-]/
+                          token: m["tok"],
+                          required: all_req || (!m["req"].nil? && m["req"] == "+"),
+                          negate: !m["req"].nil? && m["req"] =~ /[!-]/,
                         })
           end
         end
@@ -129,9 +129,9 @@ class App
         options[:in].split(/ *, */).each do |a|
           m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           todos.push({
-                       token: m['tok'],
-                       required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                       negate: !m['req'].nil? && m['req'] =~ /[!-]/
+                       token: m["tok"],
+                       required: all_req || (!m["req"].nil? && m["req"] == "+"),
+                       negate: !m["req"].nil? && m["req"] =~ /[!-]/,
                      })
         end
       end
@@ -149,16 +149,16 @@ class App
                             require_na: false })
 
       regexes = if tokens.is_a?(Array)
-                  tokens.delete_if { |token| token[:negate] }.map { |token| token[:token] }
-                else
-                  [tokens]
-                end
+          tokens.delete_if { |token| token[:negate] }.map { |token| token[:token] }
+        else
+          [tokens]
+        end
       todo.actions.output(depth,
-                          files: todo.files,
-                          regexes: regexes,
-                          notes: options[:notes],
-                          nest: options[:nest],
-                          nest_projects: options[:omnifocus])
+                          { files: todo.files,
+                            regexes: regexes,
+                            notes: options[:notes],
+                            nest: options[:nest],
+                            nest_projects: options[:omnifocus] })
     end
   end
 end

data/docker/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:3.1.3-slim
+RUN mkdir /na
+WORKDIR /na
+RUN gem install bundler:2.2
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y less vim
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/na/scripts/runtests.sh"]

data/docker/Dockerfile-2.6

@@ -0,0 +1,11 @@
+FROM ruby:2.6
+RUN mkdir /na
+WORKDIR /na
+RUN gem install bundler:2.2
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y sudo || true
+RUN sudo apt-get install -y less vim || true
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/na/scripts/runtests.sh"]

data/docker/Dockerfile-2.7

@@ -0,0 +1,11 @@
+FROM ruby:2.7
+RUN mkdir /na
+WORKDIR /na
+RUN gem install bundler:2.2
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y sudo || true
+RUN sudo apt-get install -y less vim || true
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/na/scripts/runtests.sh"]

data/docker/Dockerfile-3.0

@@ -0,0 +1,11 @@
+FROM ruby:3.0.0
+RUN mkdir /na
+WORKDIR /na
+RUN gem install bundler:2.2
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y sudo || true
+RUN sudo apt-get install -y less vim || true
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/na/scripts/runtests.sh"]

data/docker/Dockerfile-3.3

@@ -0,0 +1,12 @@
+FROM ruby:3.3.0
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /na
+WORKDIR /na
+RUN gem install bundler:2.2
+COPY ./docker/sources.list /etc/apt/sources.list
+RUN apt-get update -y --allow-insecure-repositories || true
+RUN apt-get install -y sudo || true
+RUN sudo apt-get install -y less vim || true
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["/na/scripts/runtests.sh"]

data/docker/bash_profile

@@ -0,0 +1,17 @@
+#!/bin/bash
+export GLI_DEBUG=true
+export EDITOR="/usr/bin/vim"
+alias b="bundle exec bin/na"
+alias be="bundle exec"
+alias quit="exit"
+
+shopt -s nocaseglob
+shopt -s histappend
+shopt -s histreedit
+shopt -s histverify
+shopt -s cmdhist
+
+cd /na
+bundle update
+gem update --system
+gem install pkg/*.gem

data/docker/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

data/docker/sources.list

@@ -0,0 +1,11 @@
+deb http://archive.ubuntu.com/ubuntu/ focal main restricted
+deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted
+deb http://archive.ubuntu.com/ubuntu/ focal universe
+deb http://archive.ubuntu.com/ubuntu/ focal-updates universe
+deb http://archive.ubuntu.com/ubuntu/ focal multiverse
+deb http://archive.ubuntu.com/ubuntu/ focal-updates multiverse
+deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
+
+deb http://security.ubuntu.com/ubuntu focal-security main restricted
+deb http://security.ubuntu.com/ubuntu focal-security universe
+deb http://security.ubuntu.com/ubuntu focal-security multiversesudo apt update

data/lib/na/actions.rb

@@ -11,80 +11,82 @@ module NA
     ##
     ## Pretty print a list of actions
     ##
-    ## @param      actions  [Array] The actions
-    ## @param      depth    [Number] The depth
-    ## @param      files    [Array] The files actions originally came from
-    ## @param      regexes  [Array] The regexes used to gather actions
+    ## @param depth [Integer] The depth of the action
+    ## @param config [Hash] The configuration options
     ##
-    def output(depth, files: nil, regexes: [], notes: false, nest: false, nest_projects: false, no_files: false)
-      return if files.nil?
+    ## @option config [Array] :files The files to include in the output
+    ## @option config [Array] :regexes The regexes to match against
+    ## @option config [Boolean] :notes Whether to include notes in the output
+    ## @option config [Boolean] :nest Whether to nest the output
+    ## @option config [Boolean] :nest_projects Whether to nest projects in the output
+    ## @option config [Boolean] :no_files Whether to include files in the output
+    ##
+    ## @return [String] The output string
+    ##
+    def output(depth, config = {})
+      defaults = {
+        files: nil,
+        regexes: [],
+        notes: false,
+        nest: false,
+        nest_projects: false,
+        no_files: false,
+      }
+      config = defaults.merge(config)
 
-      if nest
+      return if config[:files].nil?
+
+      if config[:nest]
         template = NA.theme[:templates][:default]
-        template = NA.theme[:templates][:no_file] if no_files
+        template = NA.theme[:templates][:no_file] if config[:no_files]
 
         parent_files = {}
         out = []
 
-        if nest_projects
+        if config[:nest_projects]
           each do |action|
-            if parent_files.key?(action.file)
-              parent_files[action.file].push(action)
-            else
-              parent_files[action.file] = [action]
-            end
+            parent_files[action.file] ||= []
+            parent_files[action.file].push(action)
           end
 
           parent_files.each do |file, acts|
             projects = NA.project_hierarchy(acts)
-            out.push("#{file.sub(%r{^./}, '').shorten_path}:")
+            out.push("#{file.sub(%r{^./}, "").shorten_path}:")
             out.concat(NA.output_children(projects, 0))
           end
         else
           template = NA.theme[:templates][:default]
-          template = NA.theme[:templates][:no_file] if no_files
+          template = NA.theme[:templates][:no_file] if config[:no_files]
 
           each do |action|
-            if parent_files.key?(action.file)
-              parent_files[action.file].push(action)
-            else
-              parent_files[action.file] = [action]
-            end
+            parent_files[action.file] ||= []
+            parent_files[action.file].push(action)
           end
 
-          parent_files.each do |k, v|
-            out.push("#{k.sub(%r{^\./}, '')}:")
-            v.each do |a|
-              out.push("\t- [#{a.parent.join('/')}] #{a.action}")
+          parent_files.each do |file, acts|
+            out.push("#{file.sub(%r{^\./}, "")}:")
+            acts.each do |a|
+              out.push("\t- [#{a.parent.join("/")}] #{a.action}")
               out.push("\t\t#{a.note.join("\n\t\t")}") unless a.note.empty?
             end
           end
         end
         NA::Pager.page out.join("\n")
       else
-        template =
-                    if no_files
-                      NA.theme[:templates][:no_file]
-                    elsif files.count.positive?
-                     if files.count == 1
-                       NA.theme[:templates][:single_file]
-                     else
-                       NA.theme[:templates][:multi_file]
-                     end
-                   elsif NA.find_files(depth: depth).count > 1
-                     if depth > 1
-                       NA.theme[:templates][:multi_file]
-                     else
-                       NA.theme[:templates][:single_file]
-                     end
-                   else
-                     NA.theme[:templates][:default]
-                   end
-        template += '%note' if notes
+        template = if config[:no_files]
+            NA.theme[:templates][:no_file]
+          elsif config[:files].count.positive?
+            config[:files].count == 1 ? NA.theme[:templates][:single_file] : NA.theme[:templates][:multi_file]
+          elsif NA.find_files(depth: depth).count > 1
+            depth > 1 ? NA.theme[:templates][:multi_file] : NA.theme[:templates][:single_file]
+          else
+            NA.theme[:templates][:default]
+          end
+        template += "%note" if config[:notes]
 
-        files.map { |f| NA.notify(f, debug: true) } if files
+        config[:files].map { |f| NA.notify(f, debug: true) } if config[:files]
 
-        output = map { |action| action.pretty(template: { templates: { output: template } }, regexes: regexes, notes: notes) }
+        output = map { |action| action.pretty(template: { templates: { output: template } }, regexes: config[:regexes], notes: config[:notes]) }
         NA::Pager.page(output.join("\n"))
       end
     end

data/lib/na/next_action.rb

@@ -519,7 +519,7 @@ module NA
         search: nil,
         tag: nil
       }
-      opts = defaults.merge(options)
+      options = defaults.merge(options)
       files = find_files(depth: options[:depth])
 
       files.delete_if do |file|

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.73'
+  VERSION = '1.2.75'
 end

data/na.gemspec

@@ -17,19 +17,17 @@ spec = Gem::Specification.new do |s|
   s.license = 'MIT'
   s.files =`git ls-files -z`.split("\x0").reject { |f| f.strip =~ %r{^((test|spec|features)/|\.git|buildnotes|.*\.taskpaper)} }
   s.require_paths << 'lib'
-  s.extra_rdoc_files = ['README.md','na.rdoc']
+  s.extra_rdoc_files = ['README.md', 'na.rdoc']
   s.rdoc_options << '--title' << 'na' << '--main' << 'README.md' << '--markup' << 'markdown'
   s.bindir = 'bin'
   s.executables << 'na'
-  s.add_development_dependency('rake','~> 0.9.2')
-  s.add_development_dependency('rdoc', '~> 4.3')
   s.add_development_dependency('minitest', '~> 5.14')
-  s.add_development_dependency('yard', '~> 0.9', '>= 0.9.26')
-  s.add_development_dependency('rubocop', '~> 1.74')
+  s.add_development_dependency('rdoc', '~> 4.3')
+  s.add_runtime_dependency('chronic', '~> 0.10', '>= 0.10.2')
   s.add_runtime_dependency('gli','~> 2.21.0')
+  s.add_runtime_dependency('mdless', '~> 1.0', '>= 1.0.32')
   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('tty-which', '~> 0.5', '>= 0.5.0')
-  s.add_runtime_dependency('chronic', '~> 0.10', '>= 0.10.2')
-  s.add_runtime_dependency('mdless', '~> 1.0', '>= 1.0.32')
+  s.add_development_dependency('tty-spinner', '~> 0.9', '>= 0.9.0')
 end