na 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f912e92e3b61231275ab69102ce1dc2c1073f0417c5904409234ceaac96e0f1e
-  data.tar.gz: a1906bf77861faa3dd80dec19c813a09871c1582f7e9ca60aad1cabebece4858
+  metadata.gz: 77270e07e7c7d4332a5fb8ec87f4e9ad5496bd220d188e75adfb71026aff1180
+  data.tar.gz: a3521feaefc9573bd78344b6a16ae57719284bde611e8f9f6e664238fcc1b5c3
 SHA512:
-  metadata.gz: 887e0052681ee2ed7035aea0d7b4c8509be0e54f2699a8718350caec92632954fc0fa14ffcdfa8263f5bf03d2d0083ef5baaa6b89a17f314bef3b52a49243582
-  data.tar.gz: 3922599c050aadd8dd09de10904d9e245e7bc547bc75aa0eb985d94be14f04489adfccef17950fc3ffccfbd49d8fc723031bc20ff96a16f523bbec1a8b9f6341
+  metadata.gz: 2a714a764879036b9ad51626445e9ef920909da333e3fc6ecb18b8b3755cf8afad811c7baf1e3aea622a5d74b1ca41e1cf64c43541f772db9ae50cfc03c1de90
+  data.tar.gz: 06b865817db9731ded06c415f5c71a10a2f8b928b0f6da5ee9cca083f951e35ee716eaf6e2558daf89ec5378910286be4304fbdbe67e17756eae2be553fee0ea

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 1.2.7
+
+2022-10-28 07:29
+
+#### IMPROVED
+
+- Code refactoring
+
+#### FIXED
+
+- All_req error
+- Adding entries to project names containing hyphen
+
 ### 1.2.6
 
 2022-10-26 10:50

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.6)
+    na (1.2.7)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)

data/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 1.2.6
+The current version of `na` is 1.2.7
 .
 
 `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. 
@@ -31,9 +31,13 @@ If you don't have Ruby/RubyGems, you can install them pretty easily with Homebre
 
 
 
+### Optional Dependencies
+
+If you have [gum][] installed, na will use it for command line input when adding tasks and notes. If you have [fzf][] installed, it will be used for menus, falling back to gum if available.
+
 ### 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.
+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`. This can be modified to work with a single global file, and all of these options can be changed in the configuration.
 
 #### Easy matching
 
@@ -73,7 +77,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.6
+    1.2.7
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
@@ -479,6 +483,9 @@ EXAMPLES
 
 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.
 
+> You can see all available global options by running `na help`.
+
+
 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:
@@ -509,12 +516,14 @@ When using a global file, you can additionally include `--cwd_as TYPE` to determ
 
 #### Add tasks at the end of a project
 
-By default, tasks are added at the top of the target project (Inbox, etc.). If you prefer new tasks to go at the bottom by default, include `--add_at end` as a global option when running `initconfig`.
+By default, tasks are added at the top of the target project (Inbox, etc.). If you prefer new tasks to go at the end of the project by default, include `--add_at end` as a global option when running `initconfig`.
 
 ### 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. To install a prompt command for your current shell, just run `na prompt install`. It works with Zsh, Bash, and Fish. If you'd rather make the changes to your startup file yourself, run `na prompt show` to get the hook and instructions printed out for copying.
 
+If you're using a single global file, you'll need `--cwd_as` to be `tag` or `project` for a prompt command to work. na will detect which system you're using and provide a prompt command that lists actions based on the current directory using either project or tag.
+
 > You can also get output for shells other than the one you're currently using by adding "bash", "zsh", or "fish" to the show or install command.
 
 
@@ -523,9 +532,6 @@ You can add a prompt command to your shell to have na automatically list your ne
 
 After installing a hook, you'll need to close your terminal and start a new session to initialize the new commands.
 
-### Misc
-
-If you have [gum][] installed, na will use it for command line input when adding tasks and notes. If you have [fzf][] installed, it will be used for menus, falling back to gum if available.
 
 [fzf]: https://github.com/junegunn/fzf
 [gum]: https://github.com/charmbracelet/gum

data/bin/na

@@ -232,6 +232,7 @@ class App
         end
       elsif options[:todo]
         todo = []
+        all_req = options[:todo] !~ /[+!\-]/
         options[:todo].split(/ *, */).each do |a|
           m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           todo.push({
@@ -249,13 +250,10 @@ class App
           unless File.exist?(target)
 
             res = NA.yn(NA::Color.template("{by}Specified file not found, create #{todo}"), default: true)
-            if res
-              basename = File.basename(target, ".#{NA.extension}")
-              NA.create_todo(target, basename)
-            else
-              NA.notify('{r}Cancelled{x}', exit_code: 1)
+            NA.notify('{r}Cancelled{x}', exit_code: 1) unless res
 
-            end
+            basename = File.basename(target, ".#{NA.extension}")
+            NA.create_todo(target, basename)
           end
 
         end
@@ -271,10 +269,8 @@ class App
           end
         end
         target = files.count > 1 ? NA.select_file(files) : files[0]
-        unless files.count.positive? && File.exist?(target)
-          NA.notify('{r}Cancelled{x}', exit_code: 1)
+        NA.notify('{r}Cancelled{x}', exit_code: 1) unless files.count.positive? && File.exist?(target)
 
-        end
       end
 
       action = if args.count.positive?
@@ -1009,7 +1005,7 @@ class App
                   global[:cwd_as] =~ /^p/ ? :project : :tag
                 end
     NA.weed_cache_file
-    NA.notify("{dw}{ globals: #{NA.globals}, command_line: #{NA.command_line}, @command: #{@command}}", debug: true)
+    NA.notify("{dw}{ globals: #{NA.globals}, command_line: #{NA.command_line}, command: #{NA.command}}", debug: true)
     true
   end
 
@@ -1057,6 +1053,6 @@ ARGV.each do |arg|
     in_globals = false
   end
 end
-@command = NA.command_line[0]
+NA.command = NA.command_line[0]
 
 exit App.run(ARGV)

data/lib/na/next_action.rb

@@ -3,7 +3,7 @@
 # Next Action methods
 module NA
   class << self
-    attr_accessor :verbose, :extension, :na_tag, :command_line, :globals, :global_file, :cwd_is, :cwd, :stdin
+    attr_accessor :verbose, :extension, :na_tag, :command_line, :command, :globals, :global_file, :cwd_is, :cwd, :stdin
 
     ##
     ## Output to STDERR
@@ -116,31 +116,13 @@ module NA
     ## @param      files     [Array] The files
     ## @param      multiple  [Boolean] allow multiple selections
     ##
+    ## @return [String, Array] array if multiple
     def select_file(files, multiple: false)
-      if TTY::Which.exist?('fzf')
-        res = choose_from(files, prompt: 'Use which file?', multiple: multiple)
-        unless res
-          notify('{r}No file selected, cancelled', exit_code: 1)
-        end
+      res = choose_from(files, prompt: multiple ? 'Select files' : 'Select a file', multiple: multiple)
 
-        multiple ? res.split("\n") : res.strip
-      elsif TTY::Which.exist?('gum')
-        args = [
-          '--cursor.foreground="151"',
-          '--item.foreground=""'
-        ]
-        args.push('--no-limit') if multiple
-        res = `echo #{Shellwords.escape(files.join("\n"))}|#{TTY::Which.which('gum')} choose #{args.join(' ')}`
-        multiple ? res.split("\n") : res.strip
-      else
-        reader = TTY::Reader.new
-        puts
-        files.each.with_index do |f, i|
-          puts NA::Color.template(format("{bw}%<idx> 2d{xw}) {y}%<file>s{x}\n", idx: i + 1, file: f))
-        end
-        res = reader.read_line(NA::Color.template('{bw}Use which file? {x}')).strip.to_i
-        files[res - 1]
-      end
+      notify('{r}No file selected, cancelled', exit_code: 1) unless res && res.length.positive?
+
+      res
     end
 
     def shift_index_after(projects, idx, length = 1)
@@ -166,33 +148,12 @@ module NA
       return [projects, actions] if actions.count == 1 || all
 
       options = actions.map { |action| "#{action.line} % #{action.parent.join('/')} : #{action.action}" }
-      res = if TTY::Which.exist?('fzf')
-              choose_from(options, prompt: 'Make a selection: ', multiple: true, sorted: true)
-            elsif TTY::Which.exist?('gum')
-              args = [
-                '--cursor.foreground="151"',
-                '--item.foreground=""',
-                '--no-limit'
-              ]
-              `echo #{Shellwords.escape(options.join("\n"))}|#{TTY::Which.which('gum')} choose #{args.join(' ')}`.strip
-            else
-              reader = TTY::Reader.new
-              puts
-              options.each.with_index do |f, i|
-                puts NA::Color.template(format("{bw}%<idx> 2d{xw}) {y}%<action>s{x}\n", idx: i + 1, action: f))
-              end
-              result = reader.read_line(NA::Color.template('{bw}Use which file? {x}')).strip
-              if result && result.to_i.positive?
-                options[result.to_i - 1]
-              else
-                nil
-              end
-            end
+      res = choose_from(options, prompt: 'Make a selection: ', multiple: true, sorted: true)
 
       NA.notify('{r}Cancelled', exit_code: 1) unless res && res.length.positive?
 
       selected = []
-      res.split(/\n/).each do |result|
+      res.each do |result|
         idx = result.match(/^(\d+)(?= % )/)[1]
         action = actions.select { |a| a.line == idx.to_i }.first
         selected.push(action)
@@ -327,6 +288,7 @@ module NA
                         projects.select { |proj| proj.project =~ /^#{action.parent.join(':')}$/ }.first
                       end
 
+
         indent = "\t" * target_proj.indent
         note = note.split("\n") unless note.is_a?(Array)
         note = if note.empty?
@@ -537,7 +499,7 @@ module NA
         parent = []
         in_action = false
         content.split("\n").each.with_index do |line, idx|
-          if line =~ /^([ \t]*)([^\-@()]+?): *(@\S+ *)*$/
+          if line =~ /^([ \t]*)([^\-][^@()]+?): *(@\S+ *)*$/
             in_action = false
             proj = Regexp.last_match(2)
             indent = line.indent_level
@@ -822,21 +784,41 @@ module NA
     ## @param      sorted    [Boolean] If true, sort selections alphanumerically
     ## @param      fzf_args  [Array] Additional fzf arguments
     ##
+    ## @return [String, Array] array if multiple is true
     def choose_from(options, prompt: 'Make a selection: ', multiple: false, sorted: true, fzf_args: [])
       return nil unless $stdout.isatty
 
-      default_args = [%(--prompt="#{prompt}"), "--height=#{options.count + 2}", '--info=inline']
-      default_args << '--multi' if multiple
-      default_args << '--bind ctrl-a:select-all'
-      header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
-      default_args << %(--header="#{header}")
-      default_args.concat(fzf_args)
       options.sort! if sorted
 
-      res = `echo #{Shellwords.escape(options.join("\n"))}|#{TTY::Which.which('fzf')} #{default_args.join(' ')}`
+      res = if TTY::Which.exist?('fzf')
+              default_args = [%(--prompt="#{prompt}"), "--height=#{options.count + 2}", '--info=inline']
+              default_args << '--multi' if multiple
+              default_args << '--bind ctrl-a:select-all' if multiple
+              header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
+              default_args << %(--header="#{header}")
+              default_args.concat(fzf_args)
+              `echo #{Shellwords.escape(options.join("\n"))}|#{TTY::Which.which('fzf')} #{default_args.join(' ')}`.strip
+            elsif TTY::Which.exist?('gum')
+              args = [
+                '--cursor.foreground="151"',
+                '--item.foreground=""'
+              ]
+              args.push '--no-limit' if multiple
+              puts NS::Color.template("{bw}#{prompt}{x}")
+              `echo #{Shellwords.escape(options.join("\n"))}|#{TTY::Which.which('gum')} choose #{args.join(' ')}`.strip
+            else
+              reader = TTY::Reader.new
+              puts
+              options.each.with_index do |f, i|
+                puts NA::Color.template(format("{bw}%<idx> 2d{xw}) {y}%<action>s{x}\n", idx: i + 1, action: f))
+              end
+              result = reader.read_line(NA::Color.template("{bw}#{prompt}{x}")).strip
+              result.to_i&.positive? ? options[result.to_i - 1] : nil
+            end
+
       return false if res.strip.size.zero?
 
-      res
+      multiple ? res.split(/\n/) : res
     end
 
     def parse_search(tag, negate)

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.6'
+  VERSION = '1.2.7'
 end

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.5<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.6<!--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. 
 
@@ -30,9 +30,13 @@ If you don't have Ruby/RubyGems, you can install them pretty easily with Homebre
 
 <!--JEKYLL> You can find the na source code (MIT license) on [GitHub][].-->
 
+### Optional Dependencies
+
+If you have [gum][] installed, na will use it for command line input when adding tasks and notes. If you have [fzf][] installed, it will be used for menus, falling back to gum if available.
+
 ### 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.
+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`. This can be modified to work with a single global file, and all of these options can be changed in the configuration.
 
 #### Easy matching
 
@@ -209,6 +213,9 @@ See the help output for a list of all available actions.
 
 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.
 
+> You can see all available global options by running `na help`.
+<!--JEKYLL{:.tip}-->
+
 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:
@@ -239,12 +246,14 @@ When using a global file, you can additionally include `--cwd_as TYPE` to determ
 
 #### Add tasks at the end of a project
 
-By default, tasks are added at the top of the target project (Inbox, etc.). If you prefer new tasks to go at the bottom by default, include `--add_at end` as a global option when running `initconfig`.
+By default, tasks are added at the top of the target project (Inbox, etc.). If you prefer new tasks to go at the end of the project by default, include `--add_at end` as a global option when running `initconfig`.
 
 ### 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. To install a prompt command for your current shell, just run `na prompt install`. It works with Zsh, Bash, and Fish. If you'd rather make the changes to your startup file yourself, run `na prompt show` to get the hook and instructions printed out for copying.
 
+If you're using a single global file, you'll need `--cwd_as` to be `tag` or `project` for a prompt command to work. na will detect which system you're using and provide a prompt command that lists actions based on the current directory using either project or tag.
+
 > You can also get output for shells other than the one you're currently using by adding "bash", "zsh", or "fish" to the show or install command.
 <!--JEKYLL{:.tip}-->
 
@@ -253,9 +262,6 @@ You can add a prompt command to your shell to have na automatically list your ne
 
 After installing a hook, you'll need to close your terminal and start a new session to initialize the new commands.
 
-### Misc
-
-If you have [gum][] installed, na will use it for command line input when adding tasks and notes. If you have [fzf][] installed, it will be used for menus, falling back to gum if available.
 
 [fzf]: https://github.com/junegunn/fzf
 [gum]: https://github.com/charmbracelet/gum

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2022-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake