na 1.2.73 → 1.2.75

data/bin/commands/find.rb

@@ -2,111 +2,111 @@
 
 class App
   extend GLI::App
-  desc 'Find actions matching a search pattern'
-  long_desc 'Search tokens are separated by spaces. Actions matching all tokens in the pattern will be shown
+  desc "Find actions matching a search pattern"
+  long_desc "Search tokens are separated by spaces. Actions matching all tokens in the pattern will be shown
   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`,
-  add a - or ! to ignore matches containing that token.'
-  arg_name 'PATTERN'
+  add a - or ! to ignore matches containing that token."
+  arg_name "PATTERN"
   command %i[find grep search] do |c|
-    c.example 'na find feature idea swift', desc: 'Find all actions containing feature, idea, and swift'
-    c.example 'na find feature idea -swift', desc: 'Find all actions containing feature and idea but NOT swift'
-    c.example 'na find -x feature idea', desc: 'Find all actions containing the exact text "feature idea"'
+    c.example "na find feature idea swift", desc: "Find all actions containing feature, idea, and swift"
+    c.example "na find feature idea -swift", desc: "Find all actions containing feature and idea but NOT swift"
+    c.example "na find -x feature idea", desc: 'Find all actions containing the exact text "feature idea"'
 
-    c.desc 'Interpret search pattern as regular expression'
+    c.desc "Interpret search pattern as regular expression"
     c.switch %i[e regex], negatable: false
 
-    c.desc 'Match pattern exactly'
+    c.desc "Match pattern exactly"
     c.switch %i[x exact], negatable: false
 
-    c.desc 'Recurse to depth'
-    c.arg_name 'DEPTH'
+    c.desc "Recurse to depth"
+    c.arg_name "DEPTH"
     c.flag %i[d depth], type: :integer, must_match: /^\d+$/
 
-    c.desc 'Show actions from a specific todo file in history. May use wildcards (* and ?)'
-    c.arg_name 'TODO_PATH'
+    c.desc "Show actions from a specific todo file in history. May use wildcards (* and ?)"
+    c.arg_name "TODO_PATH"
     c.flag %i[in]
 
-    c.desc 'Include notes in output'
+    c.desc "Include notes in output"
     c.switch %i[notes], negatable: true, default_value: false
 
-    c.desc 'Include notes in search'
+    c.desc "Include notes in search"
     c.switch %i[search_notes], negatable: true, default_value: true
 
-    c.desc 'Combine search tokens with OR, displaying actions matching ANY of the terms'
+    c.desc "Combine search tokens with OR, displaying actions matching ANY of the terms"
     c.switch %i[o or], negatable: false
 
-    c.desc 'Show actions from a specific project'
-    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.desc "Show actions from a specific project"
+    c.arg_name "PROJECT[/SUBPROJECT]"
     c.flag %i[proj project]
 
-    c.desc 'Match actions containing tag. Allows value comparisons'
-    c.arg_name 'TAG'
+    c.desc "Match actions containing tag. Allows value comparisons"
+    c.arg_name "TAG"
     c.flag %i[tagged], multiple: true
 
-    c.desc 'Include @done actions'
+    c.desc "Include @done actions"
     c.switch %i[done]
 
-    c.desc 'Show actions not matching search pattern'
+    c.desc "Show actions not matching search pattern"
     c.switch %i[v invert], negatable: false
 
-    c.desc 'Save this search for future use'
-    c.arg_name 'TITLE'
+    c.desc "Save this search for future use"
+    c.arg_name "TITLE"
     c.flag %i[save]
 
-    c.desc 'Output actions nested by file'
+    c.desc "Output actions nested by file"
     c.switch %[nest], negatable: false
 
-    c.desc 'Output actions nested by file and project'
+    c.desc "Output actions nested by file and project"
     c.switch %[omnifocus], negatable: false
 
     c.action do |global_options, options, args|
       options[:nest] = true if options[:omnifocus]
 
       if options[:save]
-        title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
-        cmd = NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '').split(' ').map { |t| %("#{t}") }.join(' ')
+        title = options[:save].gsub(/[^a-z0-9]/, "_").gsub(/_+/, "_")
+        cmd = NA.command_line.join(" ").sub(/ --save[= ]*\S+/, "").split(" ").map { |t| %("#{t}") }.join(" ")
         NA.save_search(title, cmd)
       end
 
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
-                3
-              else
-                options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
-              end
+          3
+        else
+          options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
+        end
 
       if options[:exact] || options[:regex]
-        search = args.join(' ')
+        search = args.join(" ")
       else
         rx = [
           '(?<=\A|[ ,])(?<req>[+!-])?@(?<tag>[^ *=<>$*\^,@(]+)',
           '(?:\((?<value>.*?)\)| *(?<op>[=<>~]{1,2}|[*$\^]=) *',
-          '(?<val>.*?(?=\Z|[,@])))?'
-        ].join('')
-        search = args.join(' ').gsub(Regexp.new(rx)) do
+          '(?<val>.*?(?=\Z|[,@])))?',
+        ].join("")
+        search = args.join(" ").gsub(Regexp.new(rx)) do
           m = Regexp.last_match
-          string = if m['value']
-                     "#{m['req']}#{m['tag']}=#{m['value']}"
-                   else
-                     m[0]
-                   end
-          options[:tagged] << string.sub(/@/, '')
-          ''
+          string = if m["value"]
+              "#{m["req"]}#{m["tag"]}=#{m["value"]}"
+            else
+              m[0]
+            end
+          options[:tagged] << string.sub(/@/, "")
+          ""
         end
       end
 
-      search = search.gsub(/ +/, ' ').strip
+      search = search.gsub(/ +/, " ").strip
 
-      all_req = options[:tagged].join(' ') !~ /(?<=[, ])[+!-]/ && !options[:or]
+      all_req = options[:tagged].join(" ") !~ /(?<=[, ])[+!-]/ && !options[:or]
       tags = []
-      options[:tagged].join(',').split(/ *, */).each do |arg|
+      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
+                    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
 
@@ -127,9 +127,9 @@ class App
           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
+                        token: m["tok"],
+                        required: all_req || (!m["req"].nil? && m["req"] == "+"),
+                        negate: !m["req"].nil? && m["req"] =~ /[!-]/ ? true : false,
                       })
         end
       end
@@ -140,9 +140,9 @@ class App
         options[:in].split(/ *, */).each do |a|
           m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           todos.push({
-                       token: m['tok'],
-                       required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                       negate: !m['req'].nil? && m['req'] =~ /[!-]/
+                       token: m["tok"],
+                       required: all_req || (!m["req"].nil? && m["req"] == "+"),
+                       negate: !m["req"].nil? && m["req"] =~ /[!-]/,
                      })
         end
       end
@@ -157,21 +157,21 @@ class App
                             negate: options[:invert],
                             regex: options[:regex],
                             project: options[:project],
-                            require_na: false
+                            require_na: false,
                           })
 
       regexes = if tokens.is_a?(Array)
-                  tokens.delete_if { |token| token[:negate] }.map { |token| token[:token].wildcard_to_rx }
-                else
-                  [tokens]
-                end
+          tokens.delete_if { |token| token[:negate] }.map { |token| token[:token].wildcard_to_rx }
+        else
+          [tokens]
+        end
 
       todo.actions.output(depth,
-                          files: todo.files,
-                          regexes: regexes,
-                          notes: options[:notes],
-                          nest: options[:nest],
-                          nest_projects: options[:omnifocus])
+                          { files: todo.files,
+                            regexes: regexes,
+                            notes: options[:notes],
+                            nest: options[:nest],
+                            nest_projects: options[:omnifocus] })
     end
   end
 end

data/bin/commands/next.rb

@@ -2,108 +2,108 @@
 
 class App
   extend GLI::App
-  desc 'Show next actions'
+  desc "Show next actions"
   long_desc 'Next actions are actions which contain the next action tag (default @na),
   do not contain @done, and are not in the Archive project.
 
   Arguments will target a todo file from history, whether it\'s in the current
   directory or not. Todo file queries can include path components separated by /
   or :, and may use wildcards (`*` to match any text, `?` to match a single character). Multiple queries allowed (separate arguments or separated by comma).'
-  arg_name 'QUERY', optional: true
+  arg_name "QUERY", optional: true
   command %i[next show] do |c|
-    c.example 'na next', desc: 'display the next actions from any todo files in the current directory'
-    c.example 'na next -d 3', desc: 'display the next actions from the current directory, traversing 3 levels deep'
-    c.example 'na next marked', desc: 'display next actions for a project you visited in the past'
+    c.example "na next", desc: "display the next actions from any todo files in the current directory"
+    c.example "na next -d 3", desc: "display the next actions from the current directory, traversing 3 levels deep"
+    c.example "na next marked", desc: "display next actions for a project you visited in the past"
 
-    c.desc 'Recurse to depth'
-    c.arg_name 'DEPTH'
+    c.desc "Recurse to depth"
+    c.arg_name "DEPTH"
     c.flag %i[d depth], type: :integer, must_match: /^[1-9]$/
 
-    c.desc 'Show next actions from all known todo files (in any directory)'
+    c.desc "Show next actions from all known todo files (in any directory)"
     c.switch %i[all], negatable: false, default_value: false
 
-    c.desc 'Display matches from a known todo file anywhere in history (short name)'
-    c.arg_name 'TODO'
+    c.desc "Display matches from a known todo file anywhere in history (short name)"
+    c.arg_name "TODO"
     c.flag %i[in todo], multiple: true
 
-    c.desc 'Display matches from specific todo file ([relative] path)'
-    c.arg_name 'TODO_FILE'
+    c.desc "Display matches from specific todo file ([relative] path)"
+    c.arg_name "TODO_FILE"
     c.flag %i[file]
 
-    c.desc 'Alternate tag to search for'
-    c.arg_name 'TAG'
+    c.desc "Alternate tag to search for"
+    c.arg_name "TAG"
     c.flag %i[t tag]
 
-    c.desc 'Show actions from a specific project'
-    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.desc "Show actions from a specific project"
+    c.arg_name "PROJECT[/SUBPROJECT]"
     c.flag %i[proj project]
 
-    c.desc 'Match actions containing tag. Allows value comparisons'
-    c.arg_name 'TAG'
+    c.desc "Match actions containing tag. Allows value comparisons"
+    c.arg_name "TAG"
     c.flag %i[tagged], multiple: true
 
-    c.desc 'Match actions with priority, allows <>= comparison'
-    c.arg_name 'PRIORITY'
+    c.desc "Match actions with priority, allows <>= comparison"
+    c.arg_name "PRIORITY"
     c.flag %i[p prio priority], multiple: true
 
-    c.desc 'Filter results using search terms'
-    c.arg_name 'QUERY'
+    c.desc "Filter results using search terms"
+    c.arg_name "QUERY"
     c.flag %i[search find grep], multiple: true
 
-    c.desc 'Include notes in search'
+    c.desc "Include notes in search"
     c.switch %i[search_notes], negatable: true, default_value: true
 
-    c.desc 'Search query is regular expression'
+    c.desc "Search query is regular expression"
     c.switch %i[regex], negatable: false
 
-    c.desc 'Search query is exact text match (not tokens)'
+    c.desc "Search query is exact text match (not tokens)"
     c.switch %i[exact], negatable: false
 
-    c.desc 'Include notes in output'
+    c.desc "Include notes in output"
     c.switch %i[notes], negatable: true, default_value: false
 
-    c.desc 'Include @done actions'
+    c.desc "Include @done actions"
     c.switch %i[done]
 
-    c.desc 'Output actions nested by file'
+    c.desc "Output actions nested by file"
     c.switch %i[nest], negatable: false
 
-    c.desc 'No filename in output'
+    c.desc "No filename in output"
     c.switch %i[no_file], negatable: false
 
-    c.desc 'Output actions nested by file and project'
+    c.desc "Output actions nested by file and project"
     c.switch %i[omnifocus], negatable: false
 
-    c.desc 'Save this search for future use'
-    c.arg_name 'TITLE'
+    c.desc "Save this search for future use"
+    c.arg_name "TITLE"
     c.flag %i[save]
 
     c.action do |global_options, options, args|
       # For backward compatibility with na -a
       if global_options[:add]
-        cmd = ['add']
-        cmd.push('--note') if global_options[:note]
-        cmd.concat(['--priority', global_options[:priority]]) if global_options[:priority]
+        cmd = ["add"]
+        cmd.push("--note") if global_options[:note]
+        cmd.concat(["--priority", global_options[:priority]]) if global_options[:priority]
         cmd.push(NA.command_line) if NA.command_line.count > 1
         cmd.unshift(*NA.globals)
         exit run(cmd)
       end
 
       if options[:save]
-        title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
-        NA.save_search(title, "#{NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '').split(' ').map { |t| %("#{t}") }.join(' ')}")
+        title = options[:save].gsub(/[^a-z0-9]/, "_").gsub(/_+/, "_")
+        NA.save_search(title, "#{NA.command_line.join(" ").sub(/ --save[= ]*\S+/, "").split(" ").map { |t| %("#{t}") }.join(" ")}")
       end
 
       options[:nest] = true if options[:omnifocus]
 
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
-                3
-              else
-                options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
-              end
+          3
+        else
+          options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
+        end
 
       if options[:exact] || options[:regex]
-        search = options[:search].join(' ')
+        search = options[:search].join(" ")
       else
         #  This regex matches the following:
         #  @tag(value)
@@ -113,74 +113,74 @@ class App
         rx = [
           '(?<=\A|[ ,])(?<req>[+!-])?@(?<tag>[^ *=<>$~\^,@(]+)',
           '(?:\((?<value>.*?)\)| *(?<op>=~|[=<>~]{1,2}|[*$\^]=) *',
-          '(?<val>.*?(?=\Z|[,@])))?'
-        ].join('')
+          '(?<val>.*?(?=\Z|[,@])))?',
+        ].join("")
         # convert tag(value) to tag=value
-        search = options[:search].join(' ').gsub(Regexp.new(rx)) do
+        search = options[:search].join(" ").gsub(Regexp.new(rx)) do
           m = Regexp.last_match
-          string = if m['value']
-                     "#{m['req']}#{m['tag']}=#{m['value']}"
-                   else
-                     m[0]
-                   end
-          options[:tagged] << string.sub(/@/, '')
-          ''
+          string = if m["value"]
+              "#{m["req"]}#{m["tag"]}=#{m["value"]}"
+            else
+              m[0]
+            end
+          options[:tagged] << string.sub(/@/, "")
+          ""
         end
       end
 
-      search = search.gsub(/,/, '').gsub(/ +/, ' ') unless search.nil?
+      search = search.gsub(/,/, "").gsub(/ +/, " ") unless search.nil?
 
       if options[:priority].count.positive?
-        prios = options[:priority].join(',').split(/,/)
+        prios = options[:priority].join(",").split(/,/)
         options[:or] = true if prios.count > 1
         prios.map! do |p|
           p.sub(/([hml])$/) do
             case Regexp.last_match[1]
-            when 'h'
-              NA.priority_map['h']
-            when 'm'
-              NA.priority_map['m']
-            when 'l'
-              NA.priority_map['l']
+            when "h"
+              NA.priority_map["h"]
+            when "m"
+              NA.priority_map["m"]
+            when "l"
+              NA.priority_map["l"]
             end
           end
         end
         prios.each do |p|
           options[:tagged] << if p =~ /^[<>=]{1,2}/
-                                "priority#{p}"
-                              else
-                                "priority=#{p}"
-                              end
+            "priority#{p}"
+          else
+            "priority=#{p}"
+          end
         end
       end
 
-      all_req = options[:tagged].join(' ') !~ /(?<=[, ])[+!-]/ && !options[:or]
+      all_req = options[:tagged].join(" ") !~ /(?<=[, ])[+!-]/ && !options[:or]
       tags = []
-      options[:tagged].join(',').split(/ *, */).each do |arg|
+      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
+                    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
 
       args.concat(options[:in])
-      args << '*' if options[:all]
+      args << "*" if options[:all]
       if args.count.positive?
-        all_req = args.join(' ') !~ /(?<=[, ])[+!-]/
+        all_req = args.join(" ") !~ /(?<=[, ])[+!-]/
 
         tokens = []
         args.each do |arg|
           arg.split(/ *, */).each do |a|
             m = a.match(/^(?<req>[+!-])?(?<tok>.*?)$/)
             tokens.push({
-                          token: m['tok'],
-                          required: !m['req'].nil? && m['req'] == '+',
-                          negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+                          token: m["tok"],
+                          required: !m["req"].nil? && m["req"] == "+",
+                          negate: !m["req"].nil? && m["req"] =~ /[!-]/ ? true : false,
                         })
           end
         end
@@ -200,9 +200,9 @@ class App
         search.split(/ /).each do |arg|
           m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           search_tokens.push({
-                               token: m['tok'],
-                               required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                               negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+                               token: m["tok"],
+                               required: all_req || (!m["req"].nil? && m["req"] == "+"),
+                               negate: !m["req"].nil? && m["req"] =~ /[!-]/ ? true : false,
                              })
         end
       end
@@ -211,7 +211,7 @@ class App
       require_na = true
 
       tag = [{ tag: NA.na_tag, value: nil, required: true, negate: false }]
-      tag << { tag: 'done', value: nil, negate: true } unless options[:done]
+      tag << { tag: "done", value: nil, negate: true } unless options[:done]
       tag.concat(tags)
 
       file_path = options[:file] ? File.expand_path(options[:file]) : nil
@@ -231,11 +231,11 @@ class App
       end
       NA::Pager.paginate = false if options[:omnifocus]
       todo.actions.output(depth,
-                          files: todo.files,
-                          nest: options[:nest],
-                          nest_projects: options[:omnifocus],
-                          notes: options[:notes],
-                          no_files: options[:no_file])
+                          { files: todo.files,
+                            nest: options[:nest],
+                            nest_projects: options[:omnifocus],
+                            notes: options[:notes],
+                            no_files: options[:no_file] })
     end
   end
 end