na 1.2.75 → 1.2.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60c130a4627ba88391063defb0657065187dce30063606afbe188374924657eb
-  data.tar.gz: b3fa6e217ac70d08f1e9d43f8fd6c1d49e18ce987903f495d25eb339c5dd5e22
+  metadata.gz: 0f1d84c6427569793e34ba529a78cb8394939e43e0c5553d8f50999a63acd126
+  data.tar.gz: 5e5015977befb6e2151a74a72af57847899a80d72579d49cc1171b86236fdd50
 SHA512:
-  metadata.gz: a809987215e9aaeb387ca3bdedc61dfce4a7e20141b2108e70f1986627098147c083461c443f04bc60f5d031bd0f18ab9e8dda355ac6e54cec54c9e627df2635
-  data.tar.gz: 672c81b6fbc512ee6a1ce723a506b70216cf98737af9e084c9cabe0acb500e876c01a5d32091d56d2ac024d66ada7d175e592972d0780776dc2d3c3d15bd47fe
+  metadata.gz: 80a44d88223a79478cb1d1c3e240d058507f1cf337b6dfbb8d46f9d8040ca9d8c9ca5b6acf6a11e5b104c8aeb0c8788b3fdb891e5ddda87ad2f0c6595706509f
+  data.tar.gz: d2cc5932e760da57f8fe76168b091a61361031fd778853a3b7d15390abfd0559235ab65e275dd15e06a2b0997e5154cc34aad6384b85b9bda4a73da2d3cad621

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.2.76
+
+2025-05-10 11:43
+
 ### 1.2.75
 
 2025-03-17 07:47

data/Gemfile

@@ -1,26 +1,3 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gem "bump", "~> 0.10"
-gem "bundler", "~> 2.2"
-gem "rake", "~> 13.0"
-
-gem "guard", "~> 2.16"
-gem "guard-rspec", "~> 4.5"
-gem "guard-rubocop", "~> 1.2"
-gem "guard-yard", "~> 2.1"
-
-gem "cli-test", "~> 1.0"
-gem "fuubar", "~> 2.0"
-gem "rspec", "~> 3.13"
-gem "rubocop", ">= 1.50"
-gem "rubocop-rake", ">= 0.6.0"
-gem "rubocop-rspec", ">= 2.20.0"
-gem "simplecov", "~> 0.9"
-
-gem "github-markup", "~> 1.3"
-gem "redcarpet", "~> 3.2"
-gem "yard", "~> 0.9.5"
-
+source 'https://rubygems.org'
 gemspec
+gem 'rake'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    na (1.2.75)
+    na (1.2.76)
       chronic (~> 0.10, >= 0.10.2)
+      git (~> 3.0.0)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)
       tty-reader (~> 0.9, >= 0.9.0)
@@ -12,132 +13,46 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    bump (0.10.0)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     chronic (0.10.2)
-    cli-test (1.0.0)
-    coderay (1.1.3)
-    diff-lcs (1.6.0)
-    docile (1.4.1)
-    ffi (1.17.1)
-    ffi (1.17.1-aarch64-linux-gnu)
-    ffi (1.17.1-aarch64-linux-musl)
-    ffi (1.17.1-arm-linux-gnu)
-    ffi (1.17.1-arm-linux-musl)
-    ffi (1.17.1-arm64-darwin)
-    ffi (1.17.1-x86-linux-gnu)
-    ffi (1.17.1-x86-linux-musl)
-    ffi (1.17.1-x86_64-darwin)
-    ffi (1.17.1-x86_64-linux-gnu)
-    ffi (1.17.1-x86_64-linux-musl)
-    formatador (1.1.0)
-    fuubar (2.5.1)
-      rspec-core (~> 3.0)
-      ruby-progressbar (~> 1.4)
-    github-markup (1.7.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.1)
+    drb (2.2.1)
+    git (3.0.0)
+      activesupport (>= 5.0)
+      addressable (~> 2.8)
+      process_executer (~> 1.3)
+      rchardet (~> 1.9)
     gli (2.21.5)
-    guard (2.19.1)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      logger (~> 1.6)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      ostruct (~> 0.6)
-      pry (>= 0.13.0)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.5.0)
-      guard (~> 2.0)
-      rubocop (< 2.0)
-    guard-yard (2.2.1)
-      guard (>= 1.1.0)
-      yard (>= 0.7.0)
-    json (2.10.2)
-    language_server-protocol (3.17.0.4)
-    lint_roller (1.1.0)
-    listen (3.9.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
     logger (1.6.6)
-    lumberjack (1.2.10)
     mdless (1.0.37)
-    method_source (1.1.0)
     minitest (5.25.5)
-    nenv (0.3.0)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    ostruct (0.6.1)
-    parallel (1.26.3)
-    parser (3.3.7.1)
-      ast (~> 2.4.1)
-      racc
-    pry (0.15.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.8.1)
-    rainbow (3.1.1)
+    process_executer (1.3.0)
+    public_suffix (6.0.1)
     rake (13.2.1)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
-      ffi (~> 1.0)
+    rchardet (1.9.0)
     rdoc (4.3.0)
-    redcarpet (3.6.1)
-    regexp_parser (2.10.0)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    rubocop (1.74.0)
-      json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.39.0)
-      parser (>= 3.3.1.0)
-    rubocop-rake (0.7.1)
-      lint_roller (~> 1.1)
-      rubocop (>= 1.72.1)
-    rubocop-rspec (3.5.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    ruby-progressbar (1.13.0)
-    shellany (0.0.1)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
-    simplecov_json_formatter (0.1.4)
-    strings-ansi (0.2.0)
-    thor (1.3.2)
+    securerandom (0.4.1)
     tty-cursor (0.7.1)
-    tty-progressbar (0.18.3)
-      strings-ansi (~> 0.2)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      unicode-display_width (>= 1.6, < 3.0)
     tty-reader (0.9.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
@@ -146,9 +61,10 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     tty-which (0.5.0)
-    unicode-display_width (2.6.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uri (1.0.3)
     wisper (2.0.1)
-    yard (0.9.37)
 
 PLATFORMS
   aarch64-linux-gnu
@@ -164,28 +80,11 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  bump (~> 0.10)
-  bundler (~> 2.2)
-  cli-test (~> 1.0)
-  fuubar (~> 2.0)
-  github-markup (~> 1.3)
-  guard (~> 2.16)
-  guard-rspec (~> 4.5)
-  guard-rubocop (~> 1.2)
-  guard-yard (~> 2.1)
   minitest (~> 5.14)
   na!
-  rake (~> 13.0)
+  rake
   rdoc (~> 4.3)
-  redcarpet (~> 3.2)
-  rspec (~> 3.13)
-  rubocop (>= 1.50)
-  rubocop-rake (>= 0.6.0)
-  rubocop-rspec (>= 2.20.0)
-  simplecov (~> 0.9)
-  tty-progressbar (~> 0.18, >= 0.18.3)
   tty-spinner (~> 0.9, >= 0.9.0)
-  yard (~> 0.9.5)
 
 BUNDLED WITH
    2.6.6

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.75.
+The current version of `na` is 1.2.76.
 
 `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. 
 
@@ -76,7 +76,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.75
+    1.2.76
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -93,8 +93,9 @@ GLOBAL OPTIONS
     -p, --priority=PRIORITY - Set a priority 0-5 (deprecated, for backwards compatibility) (default: none)
     --[no-]pager            - Enable pagination (default: enabled)
     -r, --[no-]recurse      - Recurse 3 directories deep (deprecated, for backwards compatability)
+    --[no-]repo             - Use a taskpaper file named after the git repository (default: enabled)
     -t, --na_tag=TAG        - Tag to consider a next action (default: na)
-    --template=PATH         - Provide a template for new/blank todo files, use initconfig to make permanent (default: none)
+    --template=arg          - Provide a template for new/blank todo files, use initconfig to make permanent (default: none)
     --version               - Display the program version
 
 COMMANDS
@@ -223,6 +224,7 @@ COMMAND OPTIONS
     -e, --regex                            - Interpret search pattern as regular expression
     --in=TODO_PATH                         - Show actions from a specific todo file in history. May use wildcards (* and ?) (default: none)
     --nest                                 - Output actions nested by file
+    --no_file                              - No filename in output
     --[no-]notes                           - Include notes in output
     -o, --or                               - Combine search tokens with OR, displaying actions matching ANY of the terms
     --omnifocus                            - Output actions nested by file and project

data/bin/commands/find.rb

@@ -56,6 +56,9 @@ class App
     c.desc "Output actions nested by file"
     c.switch %[nest], negatable: false
 
+    c.desc "No filename in output"
+    c.switch %i[no_file], negatable: false
+
     c.desc "Output actions nested by file and project"
     c.switch %[omnifocus], negatable: false
 
@@ -171,7 +174,8 @@ class App
                             regexes: regexes,
                             notes: options[:notes],
                             nest: options[:nest],
-                            nest_projects: options[:omnifocus] })
+                            nest_projects: options[:omnifocus],
+                            no_files: options[:no_file] })
     end
   end
 end

data/bin/commands/tagged.rb

@@ -62,6 +62,9 @@ class App
     c.desc "Output actions nested by file"
     c.switch %i[nest], negatable: false
 
+    c.desc "No filename in output"
+    c.switch %i[no_file], negatable: false
+
     c.desc "Output actions nested by file and project"
     c.switch %i[omnifocus], negatable: false
 
@@ -158,7 +161,8 @@ class App
                             regexes: regexes,
                             notes: options[:notes],
                             nest: options[:nest],
-                            nest_projects: options[:omnifocus] })
+                            nest_projects: options[:omnifocus],
+                            no_files: options[:no_files] })
     end
   end
 end

data/bin/na

@@ -8,6 +8,25 @@ require 'na'
 require 'fcntl'
 require 'tempfile'
 
+# Search for XDG compliant config first. Default to ~/.na.rc for compatibility
+def self.find_config_file
+  home = ENV['HOME']
+  xdg_config_home = ENV['XDG_CONFIG_HOME'] || File.join(home, '.config')
+
+  rc_paths = [
+    File.join(xdg_config_home, 'na', 'na.rc'),  # Check $XDG_CONFIG_HOME/na/na.rc first
+    File.join(xdg_config_home, 'na.rc'),        # Then check $XDG_CONFIG_HOME/na.rc
+    File.join(home, '.na.rc')                   # Finally check ~/.na.rc for compatibility
+  ]
+
+  # Return the first path that exists
+  existing_path = rc_paths.find { |path| File.exist?(path) }
+
+  # If none exist, return XDG-compliant path for creation
+  existing_path || File.join(xdg_config_home, 'na', 'na.rc')
+end
+
+
 # Main application
 class App
   extend GLI::App
@@ -56,8 +75,11 @@ class App
   arg_name 'PATH'
   flag %i[f file]
 
+  desc 'Use a taskpaper file named after the git repository'
+  arg_name 'REPO'
+  switch %i[repo], negatable: true, default_value: true
+
   desc 'Provide a template for new/blank todo files, use initconfig to make permanent'
-  arg_name 'PATH'
   flag %[template]
 
   desc 'Use current working directory as [p]roject, [t]ag, or [n]one'
@@ -101,6 +123,41 @@ class App
                 else
                   global[:cwd_as] =~ /^p/ ? :project : :tag
                 end
+
+    # start of git repo addition ==================================
+    # defaut to git repo if in a git managed directory
+    if global[:repo]
+      begin
+        require 'git'
+
+        # Check if we're in a git repo first
+        in_git_repo = system('git rev-parse --is-inside-work-tree >/dev/null 2>&1')
+
+        if in_git_repo
+          g = Git.open('.', log: Logger.new(File::NULL)) # Silence Git logs
+          repo_root = g.dir.path
+          repo_name = File.basename(repo_root)
+          taskpaper_file = File.join(repo_root, "#{repo_name}.#{NA.extension}")
+          NA.notify("Using repository taskpaper file: #{taskpaper_file}", debug: true)
+          NA.global_file = taskpaper_file
+          # Add this block to create the file if it doesn't exist
+          unless File.exist?(taskpaper_file)
+            res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Repository file not found, create #{taskpaper_file}"), default: true)
+            if res
+              NA.create_todo(taskpaper_file, repo_name, template: global[:template])
+            else
+              NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
+            end
+          end
+        else
+          NA.notify("#{NA.theme[:warning]}Not in a git repository, using default file location logic.", debug: true)
+        end
+      rescue LoadError
+        NA.notify("#{NA.theme[:error]}Git gem not installed. Run 'gem install git' to use --repo option.", exit_code: 1)
+      end
+    end
+    # end of git repo addition ====================================
+
     NA.weed_cache_file
     NA.notify("{dw}{ globals: #{NA.globals}, command_line: #{NA.command_line}, command: #{NA.command}}", debug: true)
     true

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.75'
+  VERSION = '1.2.76'
 end

data/na.gemspec

@@ -29,5 +29,6 @@ spec = Gem::Specification.new do |s|
   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/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.74<!--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.75
+  version: 1.2.76
 platform: ruby
 authors:
 - Brett Terpstra
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -151,6 +151,20 @@ 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