na 1.2.73 → 1.2.75

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.72<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.74<!--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,28 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.73
+  version: 1.2.75
 platform: ruby
 authors:
 - Brett Terpstra
 bindir: bin
 cert_chain: []
-date: 2025-03-15 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -38,67 +38,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.14'
-- !ruby/object:Gem::Dependency
-  name: yard
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.26
-  type: :development
+        version: 0.10.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.26
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.74'
-  type: :development
+        version: 2.21.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.74'
+        version: 2.21.0
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: mdless
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.21.0
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.21.0
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.32
 - !ruby/object:Gem::Dependency
   name: tty-reader
   requirement: !ruby/object:Gem::Requirement
@@ -160,45 +152,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.2
-- !ruby/object:Gem::Dependency
-  name: mdless
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.32
-  type: :runtime
+        version: 0.9.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.32
+        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 +183,8 @@ extra_rdoc_files:
 - README.md
 - na.rdoc
 files:
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -241,6 +215,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 +242,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 +272,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: []