na 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d4f45d14fddff26b88853edcac42f9d8250de1848f5d639138d757a0ce5bfe1
-  data.tar.gz: 73057d29cf56b1a3069973f5ea1ab4c06c4fcf76778997df12e51a56baf6ca0f
+  metadata.gz: 17064787b8afa01f88d01971b93f9f28593f40666ff8c2d49ecd52dff678654c
+  data.tar.gz: f14105b3e652e320b91022a6d4fb6c8cafc0811e6bbc5f7a0888b915e1ba1f99
 SHA512:
-  metadata.gz: 1cfcd9dcf3543954f558ac25438bf84384f7c41fdde3f20ec7b6ce8970f971841e940d84b5eb003c5aa26dd17b77fde85901c10b9c30cb179a39a7ea1e26ac07
-  data.tar.gz: 824e2b356c805301fefd096bc851979e307268bb3ddc4f581c74cf03a4b8cf17de688e329a039c8754f646af99e6944f217d4cdd2e02a676fe7763ed08e93a26
+  metadata.gz: e01fa0fc9027be241d59414d555661df5f1794db2b30fa969562f7db08f22ae1abcd4289f69178a839cb18f4077213b3ae4ee106a776325016633af9f4c6cf12
+  data.tar.gz: a13918d2f66aba2b5d84622e33bb60d9404c0795b5ad6c0badcee1ea3e6fe523168d8bdcb46bc45b2fb15df7a62cc54e5f630c9f7c01929982b09fc25b60da79

data/CHANGELOG.md

@@ -1,8 +1,28 @@
+### 1.0.2
+
+2022-09-27 14:18
+
+#### IMPROVED
+
+- When using gum input, make the input field the width of the terminal
+
+#### FIXED
+
+- -a with no arguments will work for backward compatability
+
+### 1.0.1
+
+2022-09-27 12:52
+
+#### NEW
+
+- Add arguments to `na next` to query previously-seen na files in other directories
+
 ### 1.0.0
 
 2022-09-27 10:45
 
 #### IMPROVED
 
+- Initial rewrite from Bash script to Ruby gem
 - Backwards compatibility with the Bash version of NA
-

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    na (1.0.0)
+    na (1.0.2)
       gli (~> 2.21.0)
       tty-reader (~> 0.9, >= 0.9.0)
+      tty-screen (~> 0.8, >= 0.8.1)
       tty-which (~> 0.5, >= 0.5.0)
 
 GEM
@@ -20,7 +21,10 @@ GEM
       wisper (~> 2.0)
     tty-screen (0.8.1)
     tty-which (0.5.0)
+    webrick (1.7.0)
     wisper (2.0.1)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   arm64-darwin-20
@@ -30,6 +34,7 @@ DEPENDENCIES
   na!
   rake (~> 0.9.2)
   rdoc (~> 4.3)
+  yard (~> 0.9, >= 0.9.26)
 
 BUNDLED WITH
    2.2.29

data/LICENSE.txt

@@ -0,0 +1,19 @@
+MIT License Copyright (c) 2022 Brett Terpstra
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,272 @@
+# na
+
+[![Gem](https://img.shields.io/gem/v/na.svg)](https://rubygems.org/gems/na)
+[![Travis](https://app.travis-ci.com/ttscoff/na_gem.svg?branch=main)](https://travis-ci.org/makenew/na_gem)
+[![GitHub license](https://img.shields.io/github/license/ttscoff/na_gem.svg)](./LICENSE.txt)
+
+**A command line tool for adding and listing per-project todos.**
+
+_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 1.0.1.
+
+`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. 
+
+Used with Taskpaper files, it can add new todo items quickly from the command line, automatically tagging them as next actions.
+
+It can also auto-display next actions when you enter a project directory, automatically locating any todo files and listing their next actions when you `cd` to the project (optionally recursive). See the [Prompt Hooks](#prompt-hooks) section for details.
+
+### Features
+
+You can list next actions in files in the current directory by typing `na`. By default, `na` looks for `*.taskpaper` files and extracts items tagged `@na` and not `@done`. All of these can be changed in the configuration.
+
+#### Easy matching
+
+`na` features intelligent project matching. Every time it locates a todo file, it adds the project to the database. Once a project is recorded, you can list its actions by using any portion of the parent directories or file names. If your project is in `~/Sites/dev/markedapp`, you could quickly list its next actions by typing `na dev mark`. It will always look for the shortest match.
+
+#### Recursion
+
+`na` can also recurse subdirectories to find all todo files in child folders as well. Use the `-d X` to search X levels deep from the current directory. `na -r` with no arguments will recurse from your current location, looking for todo files 3 directories deep.
+
+#### Adding todos
+
+You can also quickly add todo items from the command line with the `add` subcommand. The script will look for a file in the current directory with a `.taskpaper` extension (configurable). 
+
+If found, it will try to locate an `Inbox:` project, or create one if it doesn't exist. Any arguments after `add` will be combined to create a new task in TaskPaper format. They will automatically be assigned as next actions (tagged `@na`) and will show up when `na` lists the tasks for the project.
+
+### Installation
+
+Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, use `sudo gem install na`.
+
+If you don't have Ruby/RubyGems, you can install them pretty easily with Homebrew, rvm, or asdf. I can't swear this tool is worth the time, but there _are_ a lot of great gems available...
+
+
+
+### Usage
+
+```
+NAME
+    na - Add and list next actions for the current project
+
+
+SYNOPSIS
+    na [global options] command [command options] [arguments...]
+
+
+VERSION
+    1.0.2
+
+
+
+GLOBAL OPTIONS
+    -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
+    -d, --depth=DEPTH       - Recurse to depth (default: 1)
+    --ext=FILE_EXTENSION    - File extension to consider a todo file (default: taskpaper)
+    --help                  - Show this message
+    -n, --[no-]note         - Prompt for additional notes (deprecated, for backwards compatibility)
+    --na_tag=TAG            - Tag to consider a next action (default: na)
+    -p, --priority=PRIORITY - Set a priority 0-5 (deprecated, for backwards compatibility) (default: none)
+    -r, --[no-]recurse      - Recurse 3 directories deep (deprecated, for backwards compatability)
+    --version               - Display the program version
+
+
+
+COMMANDS
+    add        - Add a new next action
+    find       - Find actions matching a search pattern
+    help       - Shows a list of commands or help for one command
+    initconfig - Initialize the config file using current global options
+    next, show - Show next actions
+    tagged     - Find actions matching a tag
+```
+
+#### Commands
+
+##### add
+
+Example: `na add This feature @idea I have`
+
+```
+NAME
+    add - Add a new next action
+
+SYNOPSIS
+
+    na [global options] add [command options] TASK
+
+DESCRIPTION
+    Provides an easy way to store todos while you work. Add quick reminders and (if you set up Prompt Hooks)   they'll automatically display next time you enter the directory.   If multiple todo files are found in the current directory, a menu will allow you to pick to which   file the action gets added. 
+
+COMMAND OPTIONS
+    -f, --file=PATH    - Specify the file to which the task should be added (default: none)
+    -n, --[no-]note    - Prompt for additional notes
+    -p, --priority=arg - Add a priority level 1-5 (default: 0)
+    -t, --tag=TAG      - Use a tag other than the default next action tag (default: none)
+
+EXAMPLES
+
+    # Add a new action to the Inbox, including a tag
+    na add "A cool feature I thought of @idea"
+
+    # Add a new action to the Inbox, set its @priority to 4, and prompt for an additional note
+    na add "A bug I need to fix" -p 4 -n
+```
+
+##### find
+
+Example: `na find cool feature idea`
+
+```
+NAME
+    find - Find actions matching a search pattern
+
+SYNOPSIS
+
+    na [global options] find [command options] PATTERN
+
+DESCRIPTION
+    Search tokens are separated by spaces. Actions matching any token in the pattern will be shown   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe` 
+
+COMMAND OPTIONS
+    -d, --depth=DEPTH - Recurse to depth (default: 1)
+    -x, --[no-]exact  - Match pattern exactly
+
+EXAMPLES
+
+    # Find all actions containing feature, idea, and swift
+    na find feature +idea +swift
+
+    # Find all actions containing the exact text "feature idea"
+    na find -x feature idea
+
+    # Find all actions 3 directories deep containing either swift or obj-c
+    na find -d 3 swift obj-c
+```
+
+##### next, show
+
+Examples: 
+
+- `na show` (list all next actions in the current directory)
+- `na show -d 3` (list all next actions in the current directory and look for additional files 3 levels deep from there)
+- `na show marked2` (show next actions from another directory you've previously used na on)
+
+```
+NAME
+    next - Show next actions
+
+SYNOPSIS
+
+    na [global options] next [command options] OPTIONAL_QUERY
+
+COMMAND OPTIONS
+    -d, --depth=DEPTH - Recurse to depth (default: none)
+    -t, --tag=arg     - Alternate tag to search for (default: na)
+
+EXAMPLES
+
+    # display the next actions from any todo files in the current directory
+    doing next
+
+    # display the next actions from the current directory and its children, 3 levels deep
+    doing next -d 3
+```
+
+##### tagged
+
+Example: `na tagged feature +maybe`
+
+```
+NAME
+    tagged - Find actions matching a tag
+
+SYNOPSIS
+
+    na [global options] tagged [command options] TAG [VALUE]
+
+DESCRIPTION
+    Finds actions with tags matching the arguments. An action is shown if it   contains any of the tags listed. Add a + before a tag to make it required,   e.g. `na tagged feature +maybe` 
+
+COMMAND OPTIONS
+    -d, --depth=DEPTH - Recurse to depth (default: 1)
+
+EXAMPLES
+
+    # Show all actions tagged @maybe
+    na tagged +maybe
+
+    # Show all actions tagged either @feature or @idea, recurse 3 levels
+    na tagged -d 3 feature idea
+```
+
+### Configuration
+
+Global options such as todo extension and default next action tag can be stored permanently by using the `na initconfig` command. Run na with the global options you'd like to set, and add `initconfig` at the end of the command. A file will be written to `~/.na.rc`. You can edit this manually, or just update it using the `initconfig --force` command to overwrite it with new settings.
+
+Example: `na --ext md --na_tag next initconfig --force`
+
+When this command is run, it doesn't include options for subcommands, but inserts placeholders for them. If you want to permanently set an option for a subcommand, you'll need to edit `~/.na.rc`. For example, if you wanted the `next` command to always recurse 2 levels deep, you could edit it to look like this:
+
+```yaml
+---
+:ext: taskpaper
+:na_tag: na
+:d: 1
+commands:
+  :next:
+    :depth: 2
+  :add: {}
+  :find: {}
+  :tagged: {}
+```
+
+Note that I created a new YAML dictionary inside of the `:next:` command, and added a `:depth:` key that matches the setting I want to make permanent.
+
+> **WARNING** Don't touch most of the settings at the top of the auto-generated file. Setting any of them to true will alter the way na interprets the commands you're running. Most of those options are there for backwards compatibility with the bash version of this tool and will eventually be removed.
+
+
+### Prompt Hooks
+
+You can add a prompt command to your shell to have na automatically list your next actions when you `cd` into a directory. Add the appropriate command to your login file for your shell:
+
+_(You can add `-r` to any of these calls to na to automatically recurse 3 directories deep)_
+
+Bash (in ~/.bash_profile):
+
+```bash
+last_command_was_cd() {
+	[[ $(history 1|sed -e "s/^[ ]*[0-9]*[ ]*//") =~ ^((cd|z|j|jump|g|f|pushd|popd|exit)([ ]|$)) ]] && na
+}
+if [[ -z "$PROMPT_COMMAND" ]]; then
+	PROMPT_COMMAND="eval 'last_command_was_cd'"
+else
+	echo $PROMPT_COMMAND | grep -v -q "last_command_was_cd" && PROMPT_COMMAND="$PROMPT_COMMAND;"'eval "last_command_was_cd"'
+fi
+```
+
+Fish (in ~/.config/fish/conf.d/*.fish):
+
+```fish
+function __should_na --on-variable PWD
+	# function __should_na --on-event fish_prompt
+	test -s (basename $PWD)".taskpaper" && na
+end
+```
+
+Zsh (in ~/.zshrc):
+
+```zsh
+chpwd() { na }
+```
+
+
+### Misc
+
+If you have [gum][] installed, na will use it for command line input when adding tasks and notes.
+
+[gum]: https://github.com/charmbracelet/gum
+[donate]: http://brettterpstra.com/donate/
+[github]: https://github.com/ttscoff/na_gem/
+
+PayPal link: [paypal.me/ttscoff](https://paypal.me/ttscoff)

data/Rakefile

@@ -5,7 +5,7 @@ require 'rdoc/task'
 require 'yard'
 
 YARD::Rake::YardocTask.new do |t|
- t.files = ['lib/doing/*.rb']
+ t.files = ['lib/na/*.rb']
  t.options = ['--markup-provider=redcarpet', '--markup=markdown', '--no-private', '-p', 'yard_templates']
  # t.stats_options = ['--list-undoc']
 end
@@ -28,4 +28,50 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/*_test.rb']
 end
 
-task :default => :test
+desc 'Development version check'
+task :ver do
+  gver = `git ver`
+  cver = IO.read(File.join(File.dirname(__FILE__), 'CHANGELOG.md')).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
+  res = `grep VERSION lib/na/version.rb`
+  version = res.match(/VERSION *= *['"](\d+\.\d+\.\d+(\w+)?)/)[1]
+  puts "git tag: #{gver}"
+  puts "version.rb: #{version}"
+  puts "changelog: #{cver}"
+end
+
+desc 'Changelog version check'
+task :cver do
+  puts IO.read(File.join(File.dirname(__FILE__), 'CHANGELOG.md')).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
+end
+
+desc 'Bump incremental version number'
+task :bump, :type do |_, args|
+  args.with_defaults(type: 'inc')
+  version_file = 'lib/na/version.rb'
+  content = IO.read(version_file)
+  content.sub!(/VERSION = '(?<major>\d+)\.(?<minor>\d+)\.(?<inc>\d+)(?<pre>\S+)?'/) do
+    m = Regexp.last_match
+    major = m['major'].to_i
+    minor = m['minor'].to_i
+    inc = m['inc'].to_i
+    pre = m['pre']
+
+    case args[:type]
+    when /^maj/
+      major += 1
+      minor = 0
+      inc = 0
+    when /^min/
+      minor += 1
+      inc = 0
+    else
+      inc += 1
+    end
+
+    $stdout.puts "At version #{major}.#{minor}.#{inc}#{pre}"
+    "VERSION = '#{major}.#{minor}.#{inc}#{pre}'"
+  end
+  File.open(version_file, 'w+') { |f| f.puts content }
+end
+
+task default: %i[test clobber package]

data/bin/na

@@ -48,7 +48,11 @@ class App
   flag %i[d depth], type: :integer, must_match: /^\d+$/
 
   desc 'Show next actions'
+  arg_name 'OPTIONAL_QUERY'
   command %i[next show] do |c|
+    c.example 'doing next', desc: 'display the next actions from any todo files in the current directory'
+    c.example 'doing next -d 3', desc: 'display the next actions from the current directory and its children, 3 levels deep'
+
     c.desc 'Recurse to depth'
     c.arg_name 'DEPTH'
     c.flag %i[d depth], type: :integer, must_match: /^\d+$/
@@ -57,16 +61,28 @@ class App
     c.default_value 'na'
     c.flag %i[t tag]
 
-    c.action do |global_options, options, _|
+    c.action do |global_options, options, args|
       if global_options[:add]
         cmd = ['add']
         cmd.push('--note') if global_options[:note]
         cmd.concat(['--priority', global_options[:priority]]) if global_options[:priority]
-        cmd.push(ARGV.unshift(@command))
-        p cmd
+        cmd.push(ARGV.unshift($first_arg)) if ARGV.count.positive?
+
         exit run(cmd)
       end
 
+
+      if args.count.positive?
+        tokens = []
+        args.each do |arg|
+          m = arg.match(/^(?<req>\+)?(?<tok>.*?)$/)
+          tokens.push({
+                        token: m['tok'],
+                        required: !m['req'].nil?
+                      })
+        end
+      end
+
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
                 3
               else
@@ -74,16 +90,27 @@ class App
               end
       tag = options[:tag] == global_options[:na_tag] ? nil : options[:tag]
       actions = NA.parse_actions(depth: depth,
+                                 query: tokens,
                                  extension: global_options[:ext],
                                  na_tag: global_options[:na_tag],
                                  tag: tag)
+
       NA.output_actions(actions, depth, global_options[:ext])
     end
   end
 
   desc 'Add a new next action'
+  long_desc 'Provides an easy way to store todos while you work. Add quick reminders and (if you set up Prompt Hooks)
+  they\'ll automatically display next time you enter the directory.
+
+  If multiple todo files are found in the current directory, a menu will allow you to pick to which
+  file the action gets added.'
   arg_name 'TASK'
   command :add do |c|
+    c.example 'na add "A cool feature I thought of @idea"', desc: 'Add a new action to the Inbox, including a tag'
+    c.example 'na add "A bug I need to fix" -p 4 -n',
+              desc: 'Add a new action to the Inbox, set its @priority to 4, and prompt for an additional note'
+
     c.desc 'Prompt for additional notes'
     c.switch %i[n note]
 
@@ -103,7 +130,7 @@ class App
       action = if args.count.positive?
                  args.join(' ').strip
                elsif TTY::Which.exist?('gum')
-                 `gum input --placeholder "Enter a task"`.strip
+                 `gum input --placeholder "Enter a task" --char-limit=500 --width=#{TTY::Screen.columns}`.strip
                else
                  puts NA::Color.template('{bm}Enter task:{x}')
                  reader.read_line(NA::Color.template('{by}> {bw}')).strip
@@ -163,6 +190,7 @@ class App
         end
       end
 
+      NA.save_working_dir(File.expand_path(target))
       NA.add_action(target, action, note)
     end
   end
@@ -172,6 +200,10 @@ class App
   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`'
   arg_name 'PATTERN'
   command %i[find] do |c|
+    c.example 'na find feature +idea +swift', desc: 'Find all actions containing feature, idea, and swift'
+    c.example 'na find -x feature idea', desc: 'Find all actions containing the exact text "feature idea"'
+    c.example 'na find -d 3 swift obj-c', desc: 'Find all actions 3 directories deep containing either swift or obj-c'
+
     c.desc 'Match pattern exactly'
     c.switch %i[x exact]
 
@@ -215,6 +247,9 @@ class App
   e.g. `na tagged feature +maybe`'
   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 either @feature or @idea, recurse 3 levels'
+
     c.desc 'Recurse to depth'
     c.arg_name 'DEPTH'
     c.default_value 1
@@ -269,7 +304,7 @@ class App
       if ARGV.count.positive?
         cmd.concat(ARGV.unshift($first_arg))
       end
-      p cmd
+
       exit run(cmd)
     when SystemExit
       false

data/lib/na/next_action.rb

@@ -83,7 +83,7 @@ module NA
       puts actions.map { |action| action.pretty(template: { output: template }) }
     end
 
-    def parse_actions(depth: 1, extension: 'taskpaper', na_tag: 'na', tag: nil, search: nil)
+    def parse_actions(depth: 1, extension: 'taskpaper', na_tag: 'na', query: nil, tag: nil, search: nil)
       actions = []
       required = []
       optional = []
@@ -112,8 +112,14 @@ module NA
 
       na_tag = "@#{na_tag.sub(/^@/, '')}"
 
-      files = find_files(depth: depth, extension: extension)
+      if query.nil?
+        files = find_files(depth: depth, extension: extension)
+      else
+        files = match_working_dir(query)
+      end
+
       files.each do |file|
+        save_working_dir(File.expand_path(file))
         content = IO.read(file)
         indent_level = 0
         parent = []
@@ -177,5 +183,52 @@ module NA
 
       res
     end
+
+    def match_working_dir(search)
+      optional = []
+      required = []
+
+      search&.each do |t|
+        new_rx = t[:token].to_s
+
+        optional.push(new_rx)
+        required.push(new_rx) if t[:required]
+      end
+
+      db_dir = File.expand_path('~/.local/share/na')
+      db_file = 'tdlist.txt'
+      file = File.join(db_dir, db_file)
+      if File.exist?(file)
+        dirs = IO.read(file).split("\n")
+        dirs.delete_if { |d| !d.matches(any: optional, all: required) }
+        dirs.sort.uniq
+      else
+        puts NA::Color.template('{r}No na database found{x}')
+        Process.exit 1
+      end
+    end
+
+    def save_working_dir(todo_file)
+      db_dir = File.expand_path('~/.local/share/na')
+      FileUtils.mkdir_p(db_dir) unless File.directory?(db_dir)
+      db_file = 'tdlist.txt'
+      file = File.join(db_dir, db_file)
+      content = File.exist?(file) ? IO.read(file) : ''
+      dirs = content.split(/\n/)
+      dirs.push(File.expand_path(todo_file))
+      dirs.sort!.uniq!
+      File.open(file, 'w') { |f| f.puts dirs.join("\n") }
+    end
+
+    def weed_cache_file
+      db_dir = File.expand_path('~/.local/share/na')
+      db_file = 'tdlist.txt'
+      file = File.join(db_dir, db_file)
+      if File.exist?(file)
+        dirs = IO.read(file).split("\n")
+        dirs.delete_if { |f| !File.exist?(f) }
+        File.open(file, 'w') { |f| f.puts dirs.join("\n") }
+      end
+    end
   end
 end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

data/lib/na.rb

@@ -2,7 +2,9 @@ require 'na/version.rb'
 
 # Add requires for other files you add to your project here, so
 # you just need to require this one file in your bin file
+require 'fileutils'
 require 'shellwords'
+require 'tty-screen'
 require 'tty-reader'
 require 'tty-which'
 require 'na/colors.rb'

data/na.gemspec

@@ -5,22 +5,29 @@ spec = Gem::Specification.new do |s|
   s.version = Na::VERSION
   s.author = 'Brett Terpstra'
   s.email = 'me@brettterpstra.com'
-  s.homepage = 'https://brettterpstra.com'
+  s.homepage = 'https://brettterpstra.com/projects/na/'
   s.platform = Gem::Platform::RUBY
   s.summary = 'A command line tool for adding and listing project todos'
+  s.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 into a directory.'
+  ].join(' ')
   s.license = 'MIT'
   s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.strip =~ %r{^((test|spec|features)/|\.git|buildnotes|.*\.taskpaper)} }
   end
   s.require_paths << 'lib'
-  s.extra_rdoc_files = ['README.rdoc','na.rdoc']
-  s.rdoc_options << '--title' << 'na' << '--main' << 'README.rdoc' << '-ri'
+  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_runtime_dependency('gli','~> 2.21.0')
   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')
 end