na 1.2.86 → 1.2.87

data/Rakefile

@@ -1,70 +1,70 @@
-require "rake/clean"
-require "rubygems"
-require "rubygems/package_task"
-require "rdoc/task"
-require "bump/tasks"
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "rubocop/rake_task"
-require "yard"
-require "tty-spinner"
-require "English"
+require 'rake/clean'
+require 'rubygems'
+require 'rubygems/package_task'
+require 'rdoc/task'
+require 'bump/tasks'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+require 'yard'
+require 'tty-spinner'
+require 'English'
 
 YARD::Rake::YardocTask.new do |t|
-  t.files = ["lib/na/*.rb"]
-  t.options = ["--markup-provider=redcarpet", "--markup=markdown", "--no-private", "-p", "yard_templates"]
-  t.stats_options = ["--list-undoc"] # Uncommented this line for stats options
+  t.files = ['lib/na/*.rb']
+  t.options = ['--markup-provider=redcarpet', '--markup=markdown', '--no-private', '-p', 'yard_templates']
+  t.stats_options = ['--list-undoc'] # Uncommented this line for stats options
 end
 
 ## Docker error class
 class DockerError < StandardError
   def initialize(msg = nil)
-    msg = msg ? "Docker error: #{msg}" : "Docker error"
-    super(msg)
+    msg = msg ? "Docker error: #{msg}" : 'Docker error'
+    super
   end
 end
 
 task default: %i[test yard]
 
-desc "Run test suite"
+desc 'Run test suite'
 task test: %i[rubocop spec]
 
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = "--format documentation"
+  t.rspec_opts = '--format documentation'
 end
 
 RuboCop::RakeTask.new do |t|
-  t.formatters = ["progress"]
+  t.formatters = ['progress']
 end
 
 task :doc, [*Rake.application[:yard].arg_names] => [:yard]
 
 Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb", "bin/**/*")
-  rd.title = "na"
+  rd.main = 'README.rdoc'
+  rd.rdoc_files.include('README.rdoc', 'lib/**/*.rb', 'bin/**/*')
+  rd.title = 'na'
 end
 
-spec = eval(File.read("na.gemspec"))
+spec = eval(File.read('na.gemspec'))
 
 Gem::PackageTask.new(spec) do |pkg|
 end
-require "rake/testtask"
+require 'rake/testtask'
 Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/*_test.rb"]
+  t.libs << 'test'
+  t.test_files = FileList['test/*_test.rb']
 end
 
-desc "Install current gem in all versions of asdf-controlled ruby"
+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
+  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 list ruby`.split.map { |ruby| ruby.strip.sub(/^*/, '') }.each do |ruby|
     `asdf shell ruby #{ruby}`
     puts `gem install #{file}`
   end
@@ -72,10 +72,10 @@ task :install do
   `asdf shell ruby #{current_ruby}`
 end
 
-desc "Development version check"
+desc 'Development version check'
 task :ver do
   gver = `git ver`
-  cver = IO.read(File.join(File.dirname(__FILE__), "CHANGELOG.md")).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
+  cver = IO.read(File.join(File.dirname(__FILE__), 'CHANGELOG.md')).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
   res = `grep VERSION lib/na/version.rb`
   version = res.match(/VERSION *= *['"](\d+\.\d+\.\d+(\w+)?)/)[1]
   puts "git tag: #{gver}"
@@ -83,22 +83,22 @@ task :ver do
   puts "changelog: #{cver}"
 end
 
-desc "Changelog version check"
+desc 'Changelog version check'
 task :cver do
-  puts IO.read(File.join(File.dirname(__FILE__), "CHANGELOG.md")).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
+  puts IO.read(File.join(File.dirname(__FILE__), 'CHANGELOG.md')).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
 end
 
-desc "Bump incremental version number"
+desc 'Bump incremental version number'
 task :bump, :type do |_, args|
-  args.with_defaults(type: "inc")
-  version_file = "lib/na/version.rb"
+  args.with_defaults(type: 'inc')
+  version_file = 'lib/na/version.rb'
   content = IO.read(version_file)
   content.sub!(/VERSION = '(?<major>\d+)\.(?<minor>\d+)\.(?<inc>\d+)(?<pre>\S+)?'/) do
     m = Regexp.last_match
-    major = m["major"].to_i
-    minor = m["minor"].to_i
-    inc = m["inc"].to_i
-    pre = m["pre"]
+    major = m['major'].to_i
+    minor = m['minor'].to_i
+    inc = m['inc'].to_i
+    pre = m['pre']
 
     case args[:type]
     when /^maj/
@@ -115,73 +115,73 @@ task :bump, :type do |_, args|
     $stdout.puts "At version #{major}.#{minor}.#{inc}#{pre}"
     "VERSION = '#{major}.#{minor}.#{inc}#{pre}'"
   end
-  File.open(version_file, "w+") { |f| f.puts content }
+  File.open(version_file, 'w+') { |f| f.puts content }
 end
 
 # task default: %i[test clobber package]
 
-desc "Remove packages"
+desc 'Remove packages'
 task :clobber_packages do
-  FileUtils.rm_f "pkg/*"
+  FileUtils.rm_f 'pkg/*'
 end
 # Make a prerequisite of the preexisting clobber task
-desc "Clobber files"
+desc 'Clobber files'
 task clobber: :clobber_packages
 
-desc "Get Script Version"
+desc 'Get Script Version'
 task :sver do
   res = `grep VERSION lib/na/version.rb`
   version = res.match(/VERSION *= *['"](\d+\.\d+\.\d+(\w+)?)/)[1]
   print version
 end
 
-desc "Run tests in Docker"
+desc 'Run tests in Docker'
 task :dockertest, :version, :login, :attempt do |_, args|
-  args.with_defaults(version: "all", login: false, attempt: 1)
+  args.with_defaults(version: 'all', login: false, attempt: 1)
   `open -a Docker`
 
-  Rake::Task["clobber"].reenable
-  Rake::Task["clobber"].invoke
-  Rake::Task["build"].reenable
-  Rake::Task["build"].invoke
+  Rake::Task['clobber'].reenable
+  Rake::Task['clobber'].invoke
+  Rake::Task['build'].reenable
+  Rake::Task['build'].invoke
 
   case args[:version]
   when /^a/
     %w[6 7 3].each do |v|
-      Rake::Task["dockertest"].reenable
-      Rake::Task["dockertest"].invoke(v, false)
+      Rake::Task['dockertest'].reenable
+      Rake::Task['dockertest'].invoke(v, false)
     end
     Process.exit 0
   when /^3\.?3/
-    img = "natest33"
-    file = "docker/Dockerfile-3.3"
+    img = 'natest33'
+    file = 'docker/Dockerfile-3.3'
   when /^3/
-    version = "3.0"
-    img = "natest3"
-    file = "docker/Dockerfile-3.0"
+    version = '3.0'
+    img = 'natest3'
+    file = 'docker/Dockerfile-3.0'
   when /6$/
-    version = "2.6"
-    img = "natest26"
-    file = "docker/Dockerfile-2.6"
+    version = '2.6'
+    img = 'natest26'
+    file = 'docker/Dockerfile-2.6'
   when /(^2|7$)/
-    version = "2.7"
-    img = "natest27"
-    file = "docker/Dockerfile-2.7"
+    version = '2.7'
+    img = 'natest27'
+    file = 'docker/Dockerfile-2.7'
   else
-    version = "3.0.1"
-    img = "natest"
-    file = "docker/Dockerfile"
+    version = '3.0.1'
+    img = 'natest'
+    file = 'docker/Dockerfile'
   end
 
   puts `docker build . --file #{file} -t #{img}`
 
-  raise DockerError, "Error building docker image" unless $CHILD_STATUS.success?
+  raise DockerError, 'Error building docker image' unless $CHILD_STATUS.success?
 
   dirs = {
-    File.dirname(__FILE__) => "/na",
-    File.expand_path("~/.config") => "/root/.config"
+    File.dirname(__FILE__) => '/na',
+    File.expand_path('~/.config') => '/root/.config'
   }
-  dir_args = dirs.map { |s, d| " -v '#{s}:#{d}'" }.join(" ")
+  dir_args = dirs.map { |s, d| " -v '#{s}:#{d}'" }.join(' ')
   exec "docker run #{dir_args} -it #{img} /bin/bash -l" if args[:login]
 
   spinner = TTY::Spinner.new("[:spinner] Running tests (#{version})...", hide_cursor: true)
@@ -197,15 +197,15 @@ task :dockertest, :version, :login, :attempt do |_, args|
   # puts res
   # puts commit&.empty? ? "Error commiting Docker tag #{img}" : "Committed Docker tag #{img}"
 rescue DockerError
-  raise StandardError.new("Docker not responding") if args[:attempt] > 3
+  raise StandardError.new('Docker not responding') if args[:attempt] > 3
 
   `open -a Docker`
   sleep 3
-  Rake::Task["dockertest"].reenable
-  Rake::Task["dockertest"].invoke(args[:version], args[:login], args[:attempt] + 1)
+  Rake::Task['dockertest'].reenable
+  Rake::Task['dockertest'].invoke(args[:version], args[:login], args[:attempt] + 1)
 end
 
-desc "alias for build"
+desc 'alias for build'
 task package: :build
 
 desc 'Run tests with coverage'

data/bin/commands/add.rb

@@ -11,6 +11,17 @@ class App
   allow you to pick to which file the action gets added.'
   arg_name "ACTION"
   command :add do |c|
+    c.desc "Started time (natural language or ISO)"
+    c.arg_name "DATE"
+    c.flag %i[started], type: :date_begin
+
+    c.desc "End/Finished time (natural language or ISO)"
+    c.arg_name "DATE"
+    c.flag %i[end finished], type: :date_end
+
+    c.desc "Duration (e.g. 45m, 2h, 1d2h30m, or minutes)"
+    c.arg_name "DURATION"
+    c.flag %i[duration], type: :duration
     c.example 'na add "A cool feature I thought of @idea"', desc: "Add a new action to the Inbox, including a tag"
     c.example 'na add "A bug I need to fix" -p 4 -n',
               desc: "Add a new action to the Inbox, set its @priority to 4, and prompt for an additional note."
@@ -181,7 +192,26 @@ class App
       note.<< split_note unless split_note.nil?
       note.concat(line_note) unless line_note.nil?
 
-      NA.add_action(target, options[:project], action, note, finish: options[:finish], append: append)
+      # Compute started/done based on flags
+      started_at = options[:started]
+      started_at = NA::Types.parse_date_begin(started_at) if started_at && !started_at.is_a?(Time)
+      done_at = options[:end] || options[:finished]
+      done_at = NA::Types.parse_date_end(done_at) if done_at && !done_at.is_a?(Time)
+      duration_seconds = options[:duration]
+
+      NA.notify("ADD parsed started_at=#{started_at.inspect} done_at=#{done_at.inspect} duration=#{duration_seconds.inspect}", debug: true)
+
+      # Ensure @started is present in the action text if a start time was provided
+      if started_at
+        started_str = started_at.strftime('%Y-%m-%d %H:%M')
+        # remove any existing @start/@started tag before appending
+        action = action.gsub(/(?<=\A| )@start(?:ed)?\(.*?\)/i, '').strip
+        action = "#{action} @started(#{started_str})"
+      end
+
+      NA.add_action(target, options[:project], action, note,
+                    finish: options[:finish], append: append,
+                    started_at: started_at, done_at: done_at, duration_seconds: duration_seconds)
     end
   end
 end

data/bin/commands/changes.rb

@@ -9,6 +9,7 @@ class App
       pagers = [
         'mdless',
         'mdcat',
+        'glow',
         'bat',
         ENV['PAGER'],
         'less -FXr',

data/bin/commands/complete.rb

@@ -5,6 +5,17 @@ class App
   desc 'Find and mark an action as @done'
   arg_name 'ACTION'
   command %i[complete finish] do |c|
+    c.desc 'Started time (natural language or ISO)'
+    c.arg_name 'DATE'
+    c.flag %i[started], type: :date_begin
+
+    c.desc 'End/Finished time (natural language or ISO)'
+    c.arg_name 'DATE'
+    c.flag %i[end finished], type: :date_end
+
+    c.desc 'Duration (e.g. 45m, 2h, 1d2h30m, or minutes)'
+    c.arg_name 'DURATION'
+    c.flag %i[duration], type: :duration
     c.example 'na complete "An existing task"',
               desc: 'Find "An existing task" and mark @done'
     c.example 'na finish "An existing task"',

data/bin/commands/find.rb

@@ -29,6 +29,12 @@ class App
     c.desc "Include notes in output"
     c.switch %i[notes], negatable: true, default_value: false
 
+    c.desc "Show per-action durations and total"
+    c.switch %i[times], negatable: false
+
+    c.desc "Format durations in human-friendly form"
+    c.switch %i[human], negatable: false
+
     c.desc "Include notes in search"
     c.switch %i[search_notes], negatable: true, default_value: true
 
@@ -175,7 +181,9 @@ class App
                             notes: options[:notes],
                             nest: options[:nest],
                             nest_projects: options[:omnifocus],
-                            no_files: options[:no_file] })
+                            no_files: options[:no_file],
+                            times: options[:times],
+                            human: options[:human] })
     end
   end
 end

data/bin/commands/next.rb

@@ -65,6 +65,21 @@ class App
     c.desc "Include notes in output"
     c.switch %i[notes], negatable: true, default_value: false
 
+    c.desc "Show per-action durations and total"
+    c.switch %i[times], negatable: false
+
+    c.desc "Format durations in human-friendly form"
+    c.switch %i[human], negatable: false
+
+    c.desc "Show only actions that have a duration (@started and @done)"
+    c.switch %i[only_timed], negatable: false
+
+    c.desc "Output times as JSON object (implies --times and --done)"
+    c.switch %i[json_times], negatable: false
+
+    c.desc "Output only elapsed time totals (implies --times and --done)"
+    c.switch %i[only_times], negatable: false
+
     c.desc "Include @done actions"
     c.switch %i[done]
 
@@ -189,7 +204,20 @@ class App
         end
       end
 
-      options[:done] = true if tags.any? { |tag| tag[:tag] =~ /done/ }
+      if options[:json_times]
+        options[:times] = true
+        options[:done] = true
+      elsif options[:only_times]
+        options[:times] = true
+        options[:done] = true
+      elsif options[:only_timed]
+        options[:times] = true
+        options[:done] = true
+      elsif options[:times]
+        options[:done] = true
+      else
+        options[:done] = true if tags.any? { |tag| tag[:tag] =~ /done/ }
+      end
 
       search_tokens = nil
       if options[:exact]
@@ -239,7 +267,12 @@ class App
                             nest: options[:nest],
                             nest_projects: options[:omnifocus],
                             notes: options[:notes],
-                            no_files: options[:no_file] })
+                            no_files: options[:no_file],
+                            times: options[:times],
+                            human: options[:human],
+                            only_timed: options[:only_timed],
+                            json_times: options[:json_times],
+                            only_times: options[:only_times] })
     end
   end
 end