na 1.2.63 → 1.2.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8913d21ba15ed1f470aa073fbdd6a9d3cb081e1d7d99f09bbb11a56b4bac7167
-  data.tar.gz: ed3bff3d476c30cb44d2c1d5a0ddb553278f496952a2459585c15ed1f402af30
+  metadata.gz: 34efff84dbba9e86c4cfbd4fc0c36f0c153cb024e42a887a93012f41b18774ce
+  data.tar.gz: 4db0cd0d3067c119ccdf34ae8481bc08c75acc3dd79dc30e11661b15530a0864
 SHA512:
-  metadata.gz: 68f9d3099ff4e2903e612252f17f56fe7c936b1eb2f854ce87f6866464b1a206eec80518ef673dc4f91e30c070a84b11165cd5f442c65f5c4c94593416cf2748
-  data.tar.gz: 0340b85bdac9837612ad361cd9da0fe96af557697f8e38ac77097a6dd5da0e22031e098c67348de035a95982c7f27445df5fa8bbab0087e6030ab87d6c22a014
+  metadata.gz: 78c9b862f5962fe23fb0a7452044d26f6eac92208634857b21881e1c74a7277ea086fa7d0e663b61b0883adc3f3f731cb12e4af92860aa4534f72373e0c2205c
+  data.tar.gz: e8819f6ec109c3903c5c51b53e2009deb86a385f5465816825fad39c5794285a48cd693cb3876f2b43e7d39c6cb6006299896c76b6103884aed206127b422f95

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.2.64
+
+2024-06-22 12:06
+
+#### FIXED
+
+- Handle file searches where the filename matches the dirname and previously returned a "FILE is a directory" error by testing with an extension or a DIRNAME/BASENAME/BASENAME.EXT
+
+#### NEW
+
+- `na move ACTION --to PROJECT` command to allow quickly moving actions around
+
 ### 1.2.63
 
 2023-12-14 13:56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.63)
+    na (1.2.65)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)
@@ -23,7 +23,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-which (0.5.0)
     wisper (2.0.1)
     yard (0.9.34)

data/README.md

@@ -9,8 +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.63
-.
+The current version of `na` is 1.2.64.
 
 `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. 
 
@@ -77,7 +76,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.63
+    1.2.65
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -109,6 +108,7 @@ COMMANDS
     help                - Shows a list of commands or help for one command
     init, create        - Create a new todo file in the current directory
     initconfig          - Initialize the config file using current global options
+    move                - Move an existing action to a different section
     next, show          - Show next actions
     open                - Open a todo file in the default editor
     projects            - Show list of projects for a file
@@ -264,6 +264,48 @@ EXAMPLES
     na init warpspeed
 ```
 
+##### move
+
+Move an action between projects. Argument is a search term, if left blank a prompt will allow you to enter terms. If no `--to` project is specified, a menu will be shown of projects in the target file.
+
+Examples:
+
+- `na move` (enter a search term, select a file/destination)
+- `na move "Bug description"` (find matching action and show a menu of project destinations)
+- `na move "Bug description" --to Bugs (move matching action to Bugs project)
+
+```
+NAME
+    move - Move an existing action to a different section
+
+SYNOPSIS
+
+    na [global options] move [command options] ACTION
+
+DESCRIPTION
+    Provides an easy way to move an action.   If multiple todo files are found in the current directory, a menu will   allow you to pick which file to act on. 
+
+COMMAND OPTIONS
+    --all                       - Act on all matches immediately (no menu)
+    --at=POSITION               - When moving task, add at [s]tart or [e]nd of target project (default: none)
+    -d, --depth=DEPTH           - Search for files X directories deep (default: 1)
+    -e, --regex                 - Interpret search pattern as regular expression
+    --file=PATH                 - Specify the file to search for the task (default: none)
+    --from=PROJECT[/SUBPROJECT] - Search for actions in a specific project (default: none)
+    --in, --todo=TODO_FILE      - Use a known todo file, partial matches allowed (default: none)
+    -n, --note                  - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
+    -o, --overwrite             - Overwrite note instead of appending
+    --[no-]search_notes         - Include notes in search (default: enabled)
+    --tagged=TAG                - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
+    --to=PROJECT                - Move action to specific project. If not provided, a menu will be shown (default: none)
+    -x, --exact                 - Match pattern exactly
+
+EXAMPLE
+
+    # Find "A bug in inbox" action and move it to section Bugs
+    na move "A bug in inbox" --to Bugs
+```
+
 ##### next, show
 
 Examples:

data/Rakefile

@@ -28,6 +28,23 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/*_test.rb']
 end
 
+desc 'Install current gem in all versions of asdf-controlled ruby'
+task :install do
+  Rake::Task['clobber'].invoke
+  Rake::Task['package'].invoke
+  Dir.chdir 'pkg'
+  file = Dir.glob('*.gem').last
+
+  current_ruby = `asdf current ruby`.match(/(\d.\d+.\d+)/)[1]
+
+  `asdf list ruby`.split.map { |ruby| ruby.strip.sub(/^*/, '') }.each do |ruby|
+    `asdf shell ruby #{ruby}`
+    puts `gem install #{file}`
+  end
+
+  `asdf shell ruby #{current_ruby}`
+end
+
 desc 'Development version check'
 task :ver do
   gver = `git ver`

data/bin/commands/move.rb

@@ -0,0 +1,203 @@
+# frozen_string_literal: true
+
+class App
+  extend GLI::App
+  desc 'Move an existing action to a different section'
+  long_desc 'Provides an easy way to move an action.
+
+  If multiple todo files are found in the current directory, a menu will
+  allow you to pick which file to act on.'
+  arg_name 'ACTION'
+  command %i[move] do |c|
+    c.example 'na move "A bug in inbox" --to Bugs',
+              desc: 'Find "A bug in inbox" action and move it to section Bugs'
+
+    c.desc 'Prompt for additional notes. Input will be appended to any existing note.
+    If STDIN input (piped) is detected, it will be used as a note.'
+    c.switch %i[n note], negatable: false
+
+    c.desc 'Overwrite note instead of appending'
+    c.switch %i[o overwrite], negatable: false
+
+    c.desc 'Move action to specific project. If not provided, a menu will be shown'
+    c.arg_name 'PROJECT'
+    c.flag %i[to]
+
+    c.desc 'When moving task, add at [s]tart or [e]nd of target project'
+    c.arg_name 'POSITION'
+    c.flag %i[at], must_match: /^[sbea].*?$/i
+
+    c.desc 'Search for actions in a specific project'
+    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.flag %i[from]
+
+    c.desc 'Use a known todo file, partial matches allowed'
+    c.arg_name 'TODO_FILE'
+    c.flag %i[in todo]
+
+    c.desc 'Specify the file to search for the task'
+    c.arg_name 'PATH'
+    c.flag %i[file]
+
+    c.desc 'Search for files X directories deep'
+    c.arg_name 'DEPTH'
+    c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
+
+    c.desc 'Include notes in search'
+    c.switch %i[search_notes], negatable: true, default_value: true
+
+    c.desc 'Match actions containing tag. Allows value comparisons'
+    c.arg_name 'TAG'
+    c.flag %i[tagged], multiple: true
+
+    c.desc 'Act on all matches immediately (no menu)'
+    c.switch %i[all], negatable: false
+
+    c.desc 'Interpret search pattern as regular expression'
+    c.switch %i[e regex], negatable: false
+
+    c.desc 'Match pattern exactly'
+    c.switch %i[x exact], negatable: false
+
+    c.action do |global_options, options, args|
+      reader = TTY::Reader.new
+
+      args.concat(options[:search]) unless options[:search].nil?
+
+      append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/i
+
+      options[:done] = true
+
+      action = if args.count.positive?
+                 args.join(' ').strip
+               else
+                 NA.request_input(options, prompt: 'Enter a task to search for')
+               end
+      if action
+        tokens = nil
+        if options[:exact]
+          tokens = action
+        elsif options[:regex]
+          tokens = Regexp.new(action, Regexp::IGNORECASE)
+        else
+          tokens = []
+          all_req = action !~ /[+!-]/ && !options[:or]
+
+          action.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'] =~ /[!-]/ ? true : false
+                        })
+          end
+        end
+      end
+
+      if (action.nil? || action.empty?) && options[:tagged].empty?
+        NA.notify("#{NA.theme[:error]}Empty input, cancelled", exit_code: 1)
+      end
+
+      all_req = options[:tagged].join(' ') !~ /[+!-]/ && !options[:or]
+      tags = []
+      options[:tagged].join(',').split(/ *, */).each do |arg|
+        m = arg.match(/^(?<req>[+!-])?(?<tag>[^ =<>$~\^]+?) *(?:(?<op>[=<>~]{1,2}|[*$\^]=) *(?<val>.*?))?$/)
+
+        tags.push({
+                    tag: m['tag'].wildcard_to_rx,
+                    comp: m['op'],
+                    value: m['val'],
+                    required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                    negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+                  })
+      end
+
+      stdin_note = NA.stdin ? NA.stdin.split("\n") : []
+
+      line_note = if options[:note] && $stdin.isatty
+                    puts stdin_note unless stdin_note.nil?
+                    if TTY::Which.exist?('gum')
+                      args = ['--placeholder "Enter a note, CTRL-d to save"']
+                      args << '--char-limit 0'
+                      args << '--width $(tput cols)'
+                      gum = TTY::Which.which('gum')
+                      `#{gum} write #{args.join(' ')}`.strip.split("\n")
+                    else
+                      NA.notify("#{NA.theme[:prompt]}Enter a note, {bw}CTRL-d#{NA.theme[:prompt]} to end editing:#{NA.theme[:action]}")
+                      reader.read_multiline
+                    end
+                  end
+
+      note = stdin_note.empty? ? [] : stdin_note
+      note.concat(line_note) unless line_note.nil? || line_note.empty?
+
+      if options[:file]
+        file = File.expand_path(options[:file])
+        NA.notify("#{NA.theme[:error]}File not found", exit_code: 1) unless File.exist?(file)
+
+        targets = [file]
+      elsif options[:todo]
+        todo = []
+        options[:todo].split(/ *, */).each do |a|
+          m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
+          todo.push({
+                      token: m['tok'],
+                      required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                      negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+                    })
+        end
+        dirs = NA.match_working_dir(todo)
+
+        if dirs.count == 1
+          targets = [dirs[0]]
+        elsif dirs.count.positive?
+          targets = NA.select_file(dirs, multiple: true)
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless targets && targets.count.positive?
+        else
+          NA.notify("#{NA.theme[:error]}Todo not found", exit_code: 1) unless targets && targets.count.positive?
+
+        end
+      else
+        files = NA.find_files_matching({
+                                         depth: options[:depth],
+                                         done: options[:done],
+                                         project: options[:from],
+                                         regex: options[:regex],
+                                         require_na: false,
+                                         search: tokens,
+                                         tag: tags
+                                       })
+        NA.notify("#{NA.theme[:error]}No todo file found", exit_code: 1) if files.count.zero?
+
+        targets = files.count > 1 ? NA.select_file(files, multiple: true) : [files[0]]
+        NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless files.count.positive?
+      end
+
+      target_proj = if options[:to]
+                      options[:to]
+                    else
+                      todo = NA::Todo.new(require_na: false, file_path: targets[0])
+                      projects = todo.projects
+                      menu = projects.each_with_object([]) { |proj, arr| arr << proj.project }
+
+                      NA.choose_from(menu, prompt: 'Move to: ', multiple: false, sorted: false)
+                    end
+
+      NA.notify("#{NA.theme[:error]}No target selected", exit_code: 1) unless target_proj
+
+      NA.notify("#{NA.theme[:error]}No search terms provided", exit_code: 1) if tokens.nil? && options[:tagged].empty?
+
+      targets.each do |target|
+        NA.update_action(target, tokens,
+                         all: options[:all],
+                         append: append,
+                         move: target_proj,
+                         note: note,
+                         overwrite: options[:overwrite],
+                         project: options[:from],
+                         search_note: options[:search_notes],
+                         tagged: tags)
+      end
+    end
+  end
+end

data/lib/na/next_action.rb

@@ -425,7 +425,7 @@ module NA
     end
 
     def project_hierarchy(actions)
-      parents = { actions: []}
+      parents = { actions: [] }
       actions.each do |a|
         parent = a.parent
         current_parent = parents
@@ -513,6 +513,7 @@ module NA
       }
       opts = defaults.merge(options)
       files = find_files(depth: options[:depth])
+
       files.delete_if do |file|
         cmd_options = {
           depth: options[:depth],
@@ -958,7 +959,7 @@ module NA
             end
 
       return false if res&.strip&.size&.zero?
-      pp NA::Color.uncolor(NA::Color.template(res))
+      # pp NA::Color.uncolor(NA::Color.template(res))
       multiple ? NA::Color.uncolor(NA::Color.template(res)).split(/\n/) : NA::Color.uncolor(NA::Color.template(res))
     end
 

data/lib/na/string.rb

@@ -39,7 +39,15 @@ class ::String
     file = File.expand_path(self)
     raise "Missing file #{file}" unless File.exist?(file)
 
-    NA.notify("#{NA.theme[:error]}#{file} is a directory", exit_code: 2) if File.directory?(file)
+    if File.directory?(file)
+      if File.exist?("#{file}.#{NA.extension}")
+        file = "#{file}.#{NA.extension}"
+      elsif File.exist?("#{file}/#{File.basename(file)}.#{NA.extension}")
+        file = "#{file}/#{File.basename(file)}.#{NA.extension}"
+      else
+        NA.notify("#{NA.theme[:error]}#{file} is a directory", exit_code: 2)
+      end
+    end
 
     # IO.read(file).force_encoding('ASCII-8BIT').encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
     IO.read(file).force_encoding('utf-8')

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.63'
+  VERSION = '1.2.65'
 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.62<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.63<!--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. 
 
@@ -112,6 +112,20 @@ Unless `--exact` is specified, search is tokenized and combined with AND, so `na
 @cli(bundle exec bin/na help init)
 ```
 
+##### move
+
+Move an action between projects. Argument is a search term, if left blank a prompt will allow you to enter terms. If no `--to` project is specified, a menu will be shown of projects in the target file.
+
+Examples:
+
+- `na move` (enter a search term, select a file/destination)
+- `na move "Bug description"` (find matching action and show a menu of project destinations)
+- `na move "Bug description" --to Bugs (move matching action to Bugs project)
+
+```
+@cli(bundle exec bin/na help move)
+```
+
 ##### next, show
 
 Examples:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.63
+  version: 1.2.65
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -199,7 +199,6 @@ extra_rdoc_files:
 - na.rdoc
 files:
 - ".travis.yml"
-- '0'
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -216,6 +215,7 @@ files:
 - bin/commands/edit.rb
 - bin/commands/find.rb
 - bin/commands/init.rb
+- bin/commands/move.rb
 - bin/commands/next.rb
 - bin/commands/open.rb
 - bin/commands/projects.rb
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A command line tool for adding and listing project todos