na 1.2.74 → 1.2.76

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.74'
+  VERSION = '1.2.76'
 end

data/na.gemspec

@@ -22,14 +22,13 @@ spec = Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'na'
   s.add_development_dependency('minitest', '~> 5.14')
-  s.add_development_dependency('rake','~> 0.9.2')
   s.add_development_dependency('rdoc', '~> 4.3')
-  s.add_development_dependency('rubocop', '~> 1.74')
-  s.add_development_dependency('yard', '~> 0.9', '>= 0.9.26')
   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('git', '~> 3.0.0')
+  s.add_development_dependency('tty-spinner', '~> 0.9', '>= 0.9.0')
 end

data/scripts/generate-fish-completions.rb

@@ -0,0 +1,170 @@
+#!/usr/bin/env ruby
+require 'tty-progressbar'
+require 'shellwords'
+
+class ::String
+  def short_desc
+    split(/[,.]/)[0].sub(/ \(.*?\)?$/, '').strip
+  end
+
+  def ltrunc(max)
+    if length > max
+      sub(/^.*?(.{#{max - 3}})$/, '...\1')
+    else
+      self
+    end
+  end
+
+  def ltrunc!(max)
+    replace ltrunc(max)
+  end
+end
+
+class FishCompletions
+
+  attr_accessor :commands, :global_options
+
+  def generate_helpers
+    <<~EOFUNCTIONS
+      function __fish_na_needs_command
+        # Figure out if the current invocation already has a command.
+
+        set -l opts a-add add_at= color cwd_as= d-depth= debug ext= f-file= help include_ext n-note p-priority= pager f-recurse t-na_tag= template= version
+        set cmd (commandline -opc)
+        set -e cmd[1]
+        argparse -s $opts -- $cmd 2>/dev/null
+        or return 0
+        # These flags function as commands, effectively.
+        if set -q argv[1]
+          # Also print the command, so this can be used to figure out what it is.
+          echo $argv[1]
+          return 1
+        end
+        return 0
+      end
+
+      function __fish_na_using_command
+        set -l cmd (__fish_na_needs_command)
+        test -z "$cmd"
+        and return 1
+        contains -- $cmd $argv
+        and return 0
+      end
+
+      function __fish_na_subcommands
+        na help -c
+      end
+
+      complete -c na -f
+      complete -xc na -n '__fish_na_needs_command' -a '(__fish_na_subcommands)'
+
+      complete -xc na -n '__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from (na help -c)' -a "(na help -c)"
+    EOFUNCTIONS
+  end
+
+  def get_help_sections(command = '')
+    res = `na help #{command}`.strip
+    scanned = res.scan(/(?m-i)^([A-Z ]+)\n([\s\S]*?)(?=\n+[A-Z]+|\Z)/)
+    sections = {}
+    scanned.each do |sect|
+      title = sect[0].downcase.strip.gsub(/ +/, '_').to_sym
+      content = sect[1].split(/\n/).map(&:strip).delete_if(&:empty?)
+      sections[title] = content
+    end
+    sections
+  end
+
+  def parse_option(option)
+    res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>w+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
+    return nil unless res
+    {
+      short: res['short'],
+      long: res['long'],
+      arg: res[:arg],
+      description: res['desc'].short_desc
+    }
+  end
+
+  def parse_options(options)
+    options.map { |opt| parse_option(opt) }
+  end
+
+  def parse_command(command)
+    res = command.match(/^(?<cmd>[^, \t]+)(?<alias>(?:, [^, \t]+)*)?\s+- (?<desc>.*?)$/)
+    commands = [res['cmd']]
+    commands.concat(res['alias'].split(/, /).delete_if(&:empty?)) if res['alias']
+
+    {
+      commands: commands,
+      description: res['desc'].short_desc
+    }
+  end
+
+  def parse_commands(commands)
+    commands.map { |cmd| parse_command(cmd) }
+  end
+
+  def generate_subcommand_completions
+    out = []
+    @commands.each_with_index do |cmd, i|
+      out << "complete -xc na -n '__fish_na_needs_command' -a '#{cmd[:commands].join(' ')}' -d #{Shellwords.escape(cmd[:description])}"
+    end
+
+    out.join("\n")
+  end
+
+  def generate_subcommand_option_completions
+
+    out = []
+    need_export = []
+
+    @commands.each_with_index do |cmd, i|
+      @bar.advance
+      data = get_help_sections(cmd[:commands].first)
+
+      if data[:synopsis].join(' ').strip.split(/ /).last =~ /(path|file)/i
+        out << "complete -c na -F -n '__fish_na_using_command #{cmd[:commands].join(" ")}'"
+      end
+
+      if data[:command_options]
+        parse_options(data[:command_options]).each do |option|
+          next if option.nil?
+
+          arg = option[:arg] ? '-r' : ''
+          short = option[:short] ? "-s #{option[:short]}" : ''
+          long = option[:long] ? "-l #{option[:long]}" : ''
+          out << "complete -c na #{long} #{short} -f #{arg} -n '__fish_na_using_command #{cmd[:commands].join(' ')}' -d #{Shellwords.escape(option[:description])}"
+
+          need_export.concat(cmd[:commands]) if option[:long] == 'output'
+        end
+      end
+    end
+
+    unless need_export.empty?
+      out << "complete -f -c na -s o -l output -x -n '__fish_na_using_command #{need_export.join(' ')}' -a '(__fish_na_export_plugins)'"
+    end
+
+    # clear
+    out.join("\n")
+  end
+
+  def initialize
+    data = get_help_sections
+    @global_options = parse_options(data[:global_options])
+    @commands = parse_commands(data[:commands])
+    @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Fish completions: \033[0;35;40m[:bar]\033[0m", total: @commands.count, bar_format: :blade)
+    @bar.resize(25)
+  end
+
+  def generate_completions
+    @bar.start
+    out = []
+    out << generate_helpers
+    out << generate_subcommand_completions
+    out << generate_subcommand_option_completions
+    @bar.finish
+    out.join("\n")
+  end
+end
+
+puts FishCompletions.new.generate_completions

data/scripts/runtests.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd /planter
+bundle update
+rake test

data/src/_README.md

@@ -9,7 +9,7 @@
 _If you're one of the rare people like me who find this useful, feel free to
 [buy me some coffee][donate]._
 
-The current version of `na` is <!--VER-->1.2.73<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.75<!--END VER-->.
 
 `na` ("next action") is a command line tool designed to make it easy to see what your next actions are for any project, right from the command line. It works with TaskPaper-formatted files (but any plain text format will do), looking for `@na` tags (or whatever you specify) in todo files in your current folder. 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.74
+  version: 1.2.76
 platform: ruby
 authors:
 - Brett Terpstra
 bindir: bin
 cert_chain: []
-date: 2025-03-16 00:00:00.000000000 Z
+date: 2025-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -23,20 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.14'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -51,40 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.74'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.74'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.26
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.26
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +151,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: A tool for managing a TaskPaper file of project todos for the current
   directory. Easily create "next actions" to come back to, add tags and priorities,
   and notes. Add prompt hooks to display your next actions automatically when cd'ing
@@ -211,6 +197,8 @@ extra_rdoc_files:
 - README.md
 - na.rdoc
 files:
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -241,6 +229,14 @@ files:
 - bin/commands/undo.rb
 - bin/commands/update.rb
 - bin/na
+- docker/Dockerfile
+- docker/Dockerfile-2.6
+- docker/Dockerfile-2.7
+- docker/Dockerfile-3.0
+- docker/Dockerfile-3.3
+- docker/bash_profile
+- docker/inputrc
+- docker/sources.list
 - lib/na.rb
 - lib/na/action.rb
 - lib/na/actions.rb
@@ -260,6 +256,8 @@ files:
 - na.gemspec
 - na.rdoc
 - scripts/fixreadme.rb
+- scripts/generate-fish-completions.rb
+- scripts/runtests.sh
 - src/_README.md
 - test.md
 - test2.txt
@@ -288,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.6
 specification_version: 4
 summary: A command line tool for adding and listing project todos
 test_files: []