na 1.2.37 → 1.2.38

data/bin/commands/todos.rb

@@ -8,24 +8,34 @@ class App
   /, :, or a space, e.g. `na todos code/marked`'
   arg_name 'QUERY', optional: true
   command %i[todos] do |c|
-    c.action do |_global_options, _options, args|
-      if args.count.positive?
-        all_req = args.join(' ') !~ /[+!-]/
+    c.desc 'Open the todo database in an editor for manual modification'
+    c.switch %i[e edit]
 
-        tokens = [{ token: '*', required: all_req, negate: false }]
-        args.each do |arg|
-          arg.split(/ *, */).each do |a|
-            m = a.match(/^(?<req>[+!-])?(?<tok>.*?)$/)
-            tokens.push({
-                          token: m['tok'],
-                          required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                          negate: !m['req'].nil? && m['req'] =~ /[!-]/
-                        })
+    c.action do |_global_options, options, args|
+      if options[:edit]
+        system("#{NA::Editor.default_editor(prefer_git_editor: false)} #{NA.database_path}")
+        editor = NA::Editor.default_editor(prefer_git_editor: false).highlight_filename
+        database = NA.database_path.highlight_filename
+        NA.notify("{b}#{NA.theme[:success]}Opened #{database}#{NA.theme[:success]} in #{editor}")
+      else
+        if args.count.positive?
+          all_req = args.join(' ') !~ /(?<=[, ])[+!-]/
+
+          tokens = [{ token: '*', required: all_req, negate: false }]
+          args.each do |arg|
+            arg.split(/ *, */).each do |a|
+              m = a.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
-      end
 
-      NA.list_todos(query: tokens)
+        NA.list_todos(query: tokens)
+      end
     end
   end
 end

data/bin/commands/update.rb

@@ -111,8 +111,8 @@ class App
                  ]
                  `gum input #{opts.join(' ')}`.strip
                elsif $stdin.isatty && options[:tagged].empty?
-                 puts NA::Color.template('{bm}Enter search string:{x}')
-                 reader.read_line(NA::Color.template('{by}> {bw}')).strip
+                 NA.notify("#{NA.theme[:prompt]}Enter search string:")
+                 reader.read_line(NA::Color.template("#{NA.theme[:filename]}> #{NA.theme[:action]}")).strip
                end
 
       if action
@@ -123,35 +123,34 @@ class App
           tokens = Regexp.new(action, Regexp::IGNORECASE)
         else
           tokens = []
-          all_req = action !~ /[+!\-]/ && !options[:or]
+          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'] =~ /[!\-]/
+                          negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
                         })
           end
         end
       end
 
       if (action.nil? || action.empty?) && options[:tagged].empty?
-        puts 'Empty input, cancelled'
-        Process.exit 1
+        NA.notify("#{NA.theme[:error]}Empty input, cancelled", exit_code: 1)
       end
 
-      all_req = options[:tagged].join(' ') !~ /[+!\-]/ && !options[:or]
+      all_req = options[:tagged].join(' ') !~ /[+!-]/ && !options[:or]
       tags = []
       options[:tagged].join(',').split(/ *, */).each do |arg|
-        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>$\^]+?)(?:(?<op>[=<>]{1,2}|[*$\^]=)(?<val>.*?))?$/)
+        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'] =~ /[!\-]/
+                    negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
                   })
       end
 
@@ -170,7 +169,7 @@ class App
                       args << '--width $(tput cols)'
                       `gum write #{args.join(' ')}`.strip.split("\n")
                     else
-                      puts NA::Color.template('{bm}Enter a note, {bw}CTRL-d{bm} to end editing{bw}')
+                      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
@@ -182,13 +181,11 @@ class App
                       options[:project]
                     elsif NA.cwd_is == :project
                       NA.cwd
-                    else
-                      nil
                     end
 
       if options[:file]
         file = File.expand_path(options[:file])
-        NA.notify('{r}File not found', exit_code: 1) unless File.exist?(file)
+        NA.notify("#{NA.theme[:error]}File not found", exit_code: 1) unless File.exist?(file)
 
         targets = [file]
       elsif options[:todo]
@@ -198,7 +195,7 @@ class App
           todo.push({
                       token: m['tok'],
                       required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                      negate: !m['req'].nil? && m['req'] =~ /[!\-]/
+                      negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
                     })
         end
         dirs = NA.match_working_dir(todo)
@@ -207,25 +204,25 @@ class App
           targets = [dirs[0]]
         elsif dirs.count.positive?
           targets = NA.select_file(dirs, multiple: true)
-          NA.notify('{r}Cancelled', exit_code: 1) unless targets && targets.count.positive?
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless targets && targets.count.positive?
         else
-          NA.notify('{r}Todo not found', exit_code: 1) unless targets && targets.count.positive?
+          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: target_proj,
-                                        regex: options[:regex],
-                                        require_na: false,
-                                        search: tokens,
-                                        tag: tags
-                                      })
-        NA.notify('{r}No todo file found', exit_code: 1) if files.count.zero?
+                                         depth: options[:depth],
+                                         done: options[:done],
+                                         project: target_proj,
+                                         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('{r}Cancelled{x}', exit_code: 1) unless files.count.positive?
+        NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless files.count.positive?
 
       end
 
@@ -234,7 +231,7 @@ class App
         options[:project] = 'Archive'
       end
 
-      NA.notify('{r}No search terms provided', exit_code: 1) if tokens.nil? && options[:tagged].empty?
+      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,

data/bin/na

@@ -37,6 +37,7 @@ class App
   default_command :next
 
   NA::Color.coloring = $stdin.isatty
+  NA::Pager.paginate = $stdin.isatty
 
   desc 'Add a next action (deprecated, for backwards compatibility)'
   switch %i[a add], negatable: false
@@ -84,7 +85,7 @@ class App
 
   pre do |global, _command, _options, _args|
     NA.verbose = global[:debug]
-    NA::Pager.paginate = global[:pager]
+    NA::Pager.paginate = global[:pager] && $stdout.isatty
     NA::Color.coloring = global[:color]
     NA.extension = global[:ext]
     NA.na_tag = global[:na_tag]

data/lib/na/action.rb

@@ -26,15 +26,15 @@ module NA
         string += " @priority(#{priority})"
       end
 
-      add_tag.each do |tag|
+      remove_tag.each do |tag|
         string.gsub!(/(?<=\A| )@#{tag.gsub(/([()*?])/, '\\\\1')}(\(.*?\))?/, '')
         string.strip!
-        string += " @#{tag}"
       end
 
-      remove_tag.each do |tag|
+      add_tag.each do |tag|
         string.gsub!(/(?<=\A| )@#{tag.gsub(/([()*?])/, '\\\\1')}(\(.*?\))?/, '')
         string.strip!
+        string += " @#{tag}"
       end
 
       string = "#{string.strip} @done(#{Time.now.strftime('%Y-%m-%d %H:%M')})" if finish && string !~ /(?<=\A| )@done/
@@ -74,25 +74,14 @@ module NA
     ## @param      notes      [Boolean] Include notes
     ##
     def pretty(extension: 'taskpaper', template: {}, regexes: [], notes: false)
-      # Default colorization, can be overridden with full or partial template variable
-      default_template = {
-        file: '{xbk}',
-        parent: '{c}',
-        parent_divider: '{xw}/',
-        action: '{bg}',
-        project: '{xbk}',
-        tags: '{m}',
-        value_parens: '{m}',
-        values: '{y}',
-        output: '%filename%parents| %action',
-        note: '{dw}'
-      }
-      template = default_template.merge(template)
+      theme = NA::Theme.load_theme
+      template = theme.merge(template)
+
       # Create the hierarchical parent string
       parents = @parent.map do |par|
-        NA::Color.template("#{template[:parent]}#{par}")
+        NA::Color.template("{x}#{template[:parent]}#{par}")
       end.join(NA::Color.template(template[:parent_divider]))
-      parents = "{dc}[{x}#{parents}{dc}]{x} "
+      parents = "#{NA.theme[:bracket]}[#{NA.theme[:error]}#{parents}#{NA.theme[:bracket]}]{x} "
 
       # Create the project string
       project = NA::Color.template("#{template[:project]}#{@project}{x} ")
@@ -101,7 +90,7 @@ module NA
       file = @file.sub(%r{^\./}, '').sub(/#{ENV['HOME']}/, '~')
       file = file.sub(/\.#{extension}$/, '')
       # colorize the basename
-      file = file.sub(/#{File.basename(@file, ".#{extension}")}$/, "{dw}#{File.basename(@file, ".#{extension}")}{x}")
+      file = file.highlight_filename
       file_tpl = "#{template[:file]}#{file} {x}"
       filename = NA::Color.template(file_tpl)
 
@@ -200,13 +189,13 @@ module NA
         tag_date = Time.parse(tag_val)
         date = Chronic.parse(val)
 
+        raise ArgumentError if date.nil?
+
         unless val =~ /(\d:\d|a[mp]|now)/i
           tag_date = Time.parse(tag_date.strftime('%Y-%m-%d 12:00'))
           date = Time.parse(date.strftime('%Y-%m-%d 12:00'))
         end
 
-        # NA.notify("{dw}Comparing #{tag_date} #{tag[:comp]} #{date}{x}", debug: true)
-
         case tag[:comp]
         when /^>$/
           tag_date > date
@@ -227,7 +216,7 @@ module NA
         else
           false
         end
-      rescue
+      rescue ArgumentError
         case tag[:comp]
         when /^>$/
           tag_val.to_f > val.to_f
@@ -239,12 +228,14 @@ module NA
           tag_val.to_f >= val.to_f
         when /^==?$/
           tag_val =~ /^#{val.wildcard_to_rx}$/
+        when /^=~$/
+          tag_val =~ Regexp.new(val, Regexp::IGNORECASE)
         when /^\$=$/
           tag_val =~ /#{val.wildcard_to_rx}$/i
         when /^\*=$/
-          tag_val =~ /#{val.wildcard_to_rx}/i
+          tag_val =~ /.*?#{val.wildcard_to_rx}.*?/i
         when /^\^=$/
-          tag_val =~ /^#{val.wildcard_to_rx}/
+          tag_val =~ /^#{val.wildcard_to_rx}/i
         else
           false
         end

data/lib/na/actions.rb

@@ -20,7 +20,7 @@ module NA
       return if files.nil?
 
       if nest
-        template = '%parent%action'
+        template = NA.theme[:templates][:default]
 
         parent_files = {}
         out = []
@@ -40,7 +40,7 @@ module NA
             out.concat(NA.output_children(projects, 0))
           end
         else
-          template = '%parent%action'
+          template = NA.theme[:templates][:default]
 
           each do |action|
             if parent_files.key?(action.file)
@@ -62,22 +62,22 @@ module NA
       else
         template = if files.count.positive?
                      if files.count == 1
-                       '%parent%action'
+                       NA.theme[:templates][:single_file]
                      else
-                       '%filename%parent%action'
+                       NA.theme[:templates][:multi_file]
                      end
                    elsif NA.find_files(depth: depth).count > 1
                      if depth > 1
-                       '%filename%parent%action'
+                       NA.theme[:templates][:multi_file]
                      else
-                       '%project%parent%action'
+                       NA.theme[:templates][:single_file]
                      end
                    else
-                     '%parent%action'
+                     NA.theme[:templates][:default]
                    end
         template += '%note' if notes
 
-        files.map { |f| NA.notify("{dw}#{f}", debug: true) } if files
+        files.map { |f| NA.notify(f, debug: true) } if files
 
         output = map { |action| action.pretty(template: { output: template }, regexes: regexes, notes: notes) }
         NA::Pager.page(output.join("\n"))

data/lib/na/colors.rb

@@ -5,7 +5,7 @@ module NA
   # Terminal output color functions.
   module Color
     # Regexp to match excape sequences
-    ESCAPE_REGEX = /(?<=\[)(?:(?:(?:[349]|10)[0-9]|[0-9])?;?)+(?=m)/.freeze
+    ESCAPE_REGEX = /(?<=\[)(?:(?:(?:[349]|10)[0-9]|[0-9])?;?)+(?=m)/
 
     # All available color names. Available as methods and string extensions.
     #
@@ -214,9 +214,15 @@ module NA
       ## m: magenta, r: red, b: bold, u: underline, i: italic,
       ## x: reset (remove background, color, emphasis)
       ##
+      ## Also accepts {#RGB} and {#RRGGBB} strings. Put a b before
+      ## the hash to make it a background color
+      ##
       ## @example Convert a templated string
       ##   Color.template('{Rwb}Warning:{x} {w}you look a little {g}ill{x}')
       ##
+      ## @example Convert using RGB colors
+      ##   Color.template('{#f0a}This is an RGB color')
+      ##
       ## @param      input  [String, Array] The template
       ##                    string. If this is an array, the
       ##                    elements will be joined with a
@@ -228,6 +234,11 @@ module NA
         input = input.join(' ') if input.is_a? Array
         return input.gsub(/(?<!\\)\{(\w+)\}/i, '') unless NA::Color.coloring?
 
+        input = input.gsub(/(?<!\\)\{((?:[fb]g?)?#[a-f0-9]{3,6})\}/i) do
+                  hex = Regexp.last_match(1)
+                  rgb(hex)
+                end
+
         fmt = input.gsub(/%/, '%%')
         fmt = fmt.gsub(/(?<!\\)\{(\w+)\}/i) do
           Regexp.last_match(1).split('').map { |c| "%<#{c}>s" }.join('')
@@ -301,6 +312,17 @@ module NA
       is_bg = hex.match(/^bg?#/) ? true : false
       hex_string = hex.sub(/^([fb]g?)?#/, '')
 
+      if hex_string.length == 3
+        parts = hex_string.match(/(?<r>.)(?<g>.)(?<b>.)/)
+
+        t = []
+        %w[r g b].each do |e|
+          t << parts[e]
+          t << parts[e]
+        end
+        hex_string = t.join('')
+      end
+
       parts = hex_string.match(/(?<r>..)(?<g>..)(?<b>..)/)
       t = []
       %w[r g b].each do |e|

data/lib/na/editor.rb

@@ -1,24 +1,26 @@
 module NA
   module Editor
     class << self
-      def default_editor
-        editor ||= ENV['NA_EDITOR'] || ENV['GIT_EDITOR'] || ENV['EDITOR']
-
-        if editor.good? && TTY::Which.exist?(editor)
-          return editor
+      def default_editor(prefer_git_editor: true)
+        if prefer_git_editor
+          editor ||= ENV['NA_EDITOR'] || ENV['GIT_EDITOR'] || ENV['EDITOR']
+        else
+          editor ||= ENV['NA_EDITOR'] || ENV['EDITOR'] || ENV['GIT_EDITOR']
         end
 
-        notify('No EDITOR environment variable, testing available editors', debug: true)
+        return editor if editor&.good? && TTY::Which.exist?(editor)
+
+        NA.notify("No EDITOR environment variable, testing available editors", debug: true)
         editors = %w[vim vi code subl mate mvim nano emacs]
         editors.each do |ed|
           try = TTY::Which.which(ed)
           if try
-            notify("Using editor #{try}", debug: true)
+            NA.notify("Using editor #{try}", debug: true)
             return try
           end
         end
 
-        notify('{br}No editor found{x}', exit_code: 5)
+        NA.notify("#{NA.theme[:error]}No editor found", exit_code: 5)
 
         nil
       end
@@ -49,7 +51,7 @@ module NA
       def fork_editor(input = '', message: :default)
         # raise NonInteractive, 'Non-interactive terminal' unless $stdout.isatty || ENV['DOING_EDITOR_TEST']
 
-        notify('{br}No EDITOR variable defined in environment{x}', exit_code: 5) if default_editor.nil?
+        NA.notify("#{NA.theme[:error]}No EDITOR variable defined in environment", exit_code: 5) if default_editor.nil?
 
         tmpfile = Tempfile.new(['na_temp', '.na'])
 
@@ -97,11 +99,11 @@ module NA
       ## @return     [Array] [[String]title, [Note]note]
       ##
       def format_input(input)
-        notify('No content in entry', exit_code: 1) if input.nil? || input.strip.empty?
+        NA.notify("#{NA.theme[:error]}No content in entry", exit_code: 1) if input.nil? || input.strip.empty?
 
         input_lines = input.split(/[\n\r]+/).delete_if(&:ignore?)
         title = input_lines[0]&.strip
-        notify('{br}No content in first line{x}', exit_code: 1) if title.nil? || title.strip.empty?
+        NA.notify("#{NA.theme[:error]}No content in first line", exit_code: 1) if title.nil? || title.strip.empty?
 
         title.expand_date_tags
 

data/lib/na/hash.rb

@@ -4,4 +4,35 @@ class ::Hash
   def symbolize_keys
     each_with_object({}) { |(k, v), hsh| hsh[k.to_sym] = v.is_a?(Hash) ? v.symbolize_keys : v }
   end
+
+  ##
+  ## Freeze all values in a hash
+  ##
+  ## @return     Hash with all values frozen
+  ##
+  def deep_freeze
+    chilled = {}
+    each do |k, v|
+      chilled[k] = v.is_a?(Hash) ? v.deep_freeze : v.freeze
+    end
+
+    chilled.freeze
+  end
+
+  def deep_freeze!
+    replace deep_thaw.deep_freeze
+  end
+
+  def deep_thaw
+    chilled = {}
+    each do |k, v|
+      chilled[k] = v.is_a?(Hash) ? v.deep_thaw : v.dup
+    end
+
+    chilled.dup
+  end
+
+  def deep_thaw!
+    replace deep_thaw
+  end
 end