doing 2.1.25 → 2.1.29

data/Dockerfile

@@ -1,9 +1,9 @@
 FROM ruby:3.0.1
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN mkdir /doing
 WORKDIR /doing
-COPY ./ /doing/
+# COPY ./ /doing/
 RUN gem install bundler:2.2.17
-# RUN bundle update --bundler
-RUN bundle install
-CMD ["rake", "parallel:test"]
+RUN apt-get update -y
+RUN apt-get install -y less
+CMD ["scripts/runtests.sh"]

data/Dockerfile-2.6

@@ -1,9 +1,9 @@
 FROM ruby:2.6
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN mkdir /doing
 WORKDIR /doing
-COPY ./ /doing/
+# COPY ./ /doing/
 RUN gem install bundler:2.2.17
-# RUN bundle update --bundler
-RUN bundle install
-# ENTRYPOINT rake parallel:test
-CMD ["rake", "parallel:test"]
+RUN apt-get update -y
+RUN apt-get install -y less
+CMD ["scripts/runtests.sh"]

data/Dockerfile-2.7

@@ -1,8 +1,9 @@
 FROM ruby:2.7
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN mkdir /doing
 WORKDIR /doing
-COPY ./ /doing/
+# COPY ./ /doing/
 RUN gem install bundler:2.2.17
-# RUN bundle update --bundler
-RUN bundle install
-CMD ["rake", "parallel:test"]
+RUN apt-get update -y
+RUN apt-get install -y less
+CMD ["scripts/runtests.sh"]

data/Dockerfile-3.0

@@ -1,8 +1,9 @@
 FROM ruby:3.0.0
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN mkdir /doing
 WORKDIR /doing
-COPY ./ /doing/
+# COPY ./ /doing/
 RUN gem install bundler:2.2.17
-# RUN bundle update --bundler
-RUN bundle install
-CMD ["rake", "parallel:test"]
+RUN apt-get update -y
+RUN apt-get install -y less
+CMD ["scripts/runtests.sh"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.1.25)
+    doing (2.1.29)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.20, >= 2.20.1)

data/README.md

@@ -8,7 +8,7 @@ _If you're one of the rare people like me who find this useful, feel free to
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.1.24<!--END VER-->.
+The current version of `doing` is <!--VER-->2.1.28<!--END VER-->.
 
 Find all of the documentation in the [doing wiki][wiki].
 

data/Rakefile

@@ -77,15 +77,14 @@ task :dockertest, :version, :login do |_, args|
     file = 'Dockerfile'
   end
 
-
   puts `docker build . --file #{file} -t #{img}`
 
-  exec "docker run -it #{img} /bin/bash -l" if args[:login]
+  exec "docker run -v #{File.dirname(__FILE__)}:/doing -it #{img} /bin/bash -l" if args[:login]
 
   spinner = TTY::Spinner.new('[:spinner] Running tests ...', hide_cursor: true)
 
   spinner.auto_spin
-  res = `docker run --rm -it #{img}`
+  res = `docker run --rm -v #{File.dirname(__FILE__)}:/doing -it #{img}`
   # commit = puts `bash -c "docker commit $(docker ps -a|grep #{img}|awk '{print $1}'|head -n 1) #{img}"`.strip
   spinner.success
   spinner.stop

data/bin/commands/add_section.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# @@add_section
+desc 'Add a new section to the "doing" file'
+arg_name 'SECTION_NAME'
+command :add_section do |c|
+  c.example 'doing add_section Ideas', desc: 'Add a section called Ideas to the doing file'
+
+  c.action do |_global_options, _options, args|
+    raise InvalidArgument, "Section #{args[0]} already exists" if @wwid.sections.include?(args[0])
+
+    @wwid.content.add_section(args.join(' ').cap_first, log: true)
+    @wwid.write(@wwid.doing_file)
+  end
+end

data/bin/commands/again.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+# @@again @@resume
+desc 'Repeat last entry as new entry'
+long_desc 'This command is designed to allow multiple time intervals to be created
+           for an entry by duplicating it with a new start (and end, eventually) time'
+command %i[again resume] do |c|
+  c.example 'doing resume',
+            desc: 'Duplicate the most recent entry with a new start time, removing any @done tag'
+  c.example 'doing again',
+            desc: 'again is an alias for resume'
+  c.example 'doing resume --editor',
+            desc: 'Repeat the last entry, opening the new entry in the default editor'
+  c.example 'doing resume --tag project1 --in Projects',
+            desc: 'Repeat the last entry tagged @project1, creating the new entry in the Projects section'
+  c.example 'doing resume --interactive', desc: 'Select the entry to repeat from a menu'
+
+  c.desc 'Get last entry from a specific section'
+  c.arg_name 'NAME'
+  c.flag %i[s section], default_value: 'All'
+
+  c.desc 'Add new entry to section (default: same section as repeated entry)'
+  c.arg_name 'SECTION_NAME'
+  c.flag [:in]
+
+  c.desc 'Select item to resume from a menu of matching entries'
+  c.switch %i[i interactive], negatable: false, default_value: false
+
+  add_options(:add_entry, c)
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+
+  c.action do |_global_options, options, _args|
+    options[:fuzzy] = false
+
+    if options[:search]
+      options[:search] = options[:exact] ? options[:search].sub(/^'?/, "'") : options[:search]
+    end
+
+    if options[:back]
+      options[:date] = options[:back]
+      raise InvalidTimeExpression, 'Unable to parse date string for --back' if date.nil?
+
+    else
+      options[:date] = Time.now
+    end
+
+    note = Doing::Note.new(options[:note])
+    note.add(Doing::Prompt.read_lines(prompt: 'Add a note')) if options[:ask]
+
+    options[:note] = note
+    options[:tag] ||= []
+    options[:tag_bool] = options[:bool]
+
+    @wwid.repeat_last(options)
+  end
+end

data/bin/commands/archive.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+# @@archive @@move
+desc 'Move entries between sections'
+long_desc %(Argument can be a section name to move all entries from a section,
+or start with an "@" to move entries matching a tag.
+
+Default with no argument moves items from the "#{@settings['current_section']}" section to Archive.)
+arg_name 'SECTION_OR_TAG'
+default_value @settings['current_section']
+command %i[archive move] do |c|
+  c.example 'doing archive Currently', desc: 'Move all entries in the Currently section to Archive section'
+  c.example 'doing archive @done', desc: 'Move all entries tagged @done to Archive'
+  c.example 'doing archive --to Later @project1', desc: 'Move all entries tagged @project1 to Later section'
+  c.example 'doing move Later --tag project1 --to Currently',
+            desc: 'Move entries in Later tagged @project1 to Currently (move is an alias for archive)'
+
+  c.desc 'How many items to keep (ignored if archiving by tag or search)'
+  c.arg_name 'X'
+  c.flag %i[k keep], must_match: /^\d+$/, type: Integer
+
+  c.desc 'Move entries to'
+  c.arg_name 'SECTION_NAME'
+  c.flag %i[t to], default_value: 'Archive'
+
+  c.desc 'Label moved items with @from(SECTION_NAME)'
+  c.switch [:label], default_value: true, negatable: true
+
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+  add_options(:date_filter, c)
+
+  c.action do |_global_options, options, args|
+    options[:fuzzy] = false
+    section, tags = if args.empty?
+                      [@settings['current_section'], []]
+                    elsif args[0] =~ /^all/i
+                      ['all', []]
+                    elsif args[0] =~ /^@\S+/
+                      ['all', args.tags_to_array]
+                    else
+                      [args.shift.cap_first, args.tags_to_array]
+                    end
+
+    raise InvalidArgument, '--keep and --count can not be used together' if options[:keep] && options[:count]
+
+    tags.concat(options[:tag]) if options[:tag]
+
+    options[:search] = options[:search].sub(/^'?/, "'") if options[:search] && options[:exact]
+    options[:destination] = options[:to]
+    options[:tags] = tags
+
+    @wwid.archive(section, options)
+  end
+end

data/bin/commands/cancel.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# @@cancel
+desc 'End last X entries with no time tracked'
+long_desc 'Adds @done tag without datestamp so no elapsed time is recorded.
+           Alias for `doing finish --no-date`'
+arg_name 'COUNT'
+command :cancel do |c|
+  c.example 'doing cancel', desc: 'Cancel the last entry'
+  c.example 'doing cancel --tag project1 -u 5', desc: 'Cancel the last 5 unfinished entries containing @project1'
+
+  c.desc 'Archive entries'
+  c.switch %i[a archive], negatable: false, default_value: false
+
+  c.desc 'Section'
+  c.arg_name 'NAME'
+  c.flag %i[s section]
+
+  c.desc 'Cancel last entry (or entries) not already marked @done'
+  c.switch %i[u unfinished], negatable: false, default_value: false
+
+  c.desc 'Select item(s) to cancel from a menu of matching entries'
+  c.switch %i[i interactive], negatable: false, default_value: false
+
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+
+  c.action do |_global_options, options, args|
+    options[:fuzzy] = false
+    options[:section] = if options[:section]
+                          @wwid.guess_section(options[:section]) || options[:section].cap_first
+                        else
+                          @settings['current_section']
+                        end
+
+    raise InvalidArgument, 'Only one argument allowed' if args.length > 1
+
+    unless args.empty? || args[0] =~ /\d+/
+      raise InvalidArgument, 'Invalid argument (specify number of recent items to mark @done)'
+
+    end
+
+    options[:count] = if options[:interactive]
+                        0
+                      else
+                        args[0] ? args[0].to_i : 1
+                      end
+
+    options[:search] = options[:search].sub(/^'?/, "'") if options[:search] && options[:exact]
+
+    options[:case] = options[:case].normalize_case
+    options[:date] = false
+    options[:sequential] = false
+    options[:tag] ||= []
+    options[:tag_bool] = options[:bool].normalize_bool
+    options[:tags] = ['done']
+
+    @wwid.tag_last(options)
+  end
+end

data/bin/commands/changes.rb

@@ -0,0 +1,83 @@
+# @@changelog @@changes
+
+MARKDOWN_THEME = {
+  em: %i[white dark],
+  header: %i[cyan bold],
+  hr: :yellow,
+  link: %i[bright_cyan underline],
+  list: :yellow,
+  strong: %i[yellow bold],
+  table: :yellow,
+  quote: :yellow,
+  image: :bright_black,
+  note: :yellow,
+  comment: :bright_black
+}.deep_freeze
+
+CHANGE_RX = /^(?:(?:(?:[<>=]|p(?:rior)|b(?:efore)|o(?:lder)|s(?:ince)|a(?:fter)|n(?:ewer))? *[\d.*?]+ *)+|(?:[\d.]+ *-+ *[\d.]+))$/
+
+desc 'List recent changes in Doing'
+long_desc %(Display a formatted list of changes in recent versions.
+
+            Without flags, displays only the most recent version.
+            Use --lookup or --all for history.)
+command %i[changes changelog] do |c|
+  c.desc 'Display all versions'
+  c.switch %i[a all], default_value: false, negatable: false
+
+  c.desc %(Look up a specific version. Specify versions as "MAJ.MIN.PATCH", MIN
+           and PATCH are optional. Use > or < to see all changes since or prior
+           to a version.)
+  c.arg_name 'VERSION'
+  c.flag %i[l lookup], must_match: CHANGE_RX
+
+  c.desc %(Show changelogs matching search terms (uses pattern-based searching).
+           Add slashes to search with regular expressions, e.g. `--search "/output.*flag/"`)
+  c.flag %i[s search]
+
+  c.desc 'Sort order (asc/desc)'
+  c.arg_name 'ORDER'
+  c.flag %i[sort], must_match: REGEX_SORT_ORDER, default_value: :desc, type: OrderSymbol
+
+  c.desc 'Only output changes, no version numbers, headers, or dates'
+  c.switch %i[C changes], default_value: false, negatable: false
+
+  c.desc 'Output raw Markdown'
+  c.switch %i[m md markdown], default_value: false, negatable: false
+
+  c.desc 'Force rendered output'
+  c.switch %i[render], default_value: false, negatable: false
+
+  c.desc 'Open changelog in interactive viewer'
+  c.switch %i[i interactive], default_value: false, negatable: false
+
+  c.example 'doing changes', desc: 'View changes in the current version'
+  c.example 'doing changes --all', desc: 'See the entire changelog'
+  c.example 'doing changes --lookup 2.0.21', desc: 'See changes from version 2.0.21'
+  c.example 'doing changes --lookup "> 2.1"', desc: 'See all changes since 2.1.0'
+  c.example 'doing changes --search "tags +bool"', desc: 'See all changes containing "tags" and "bool"'
+  c.example 'doing changes -l "> 2.1" -s "pattern"', desc: 'Lookup and search can be combined'
+
+  c.action do |_global_options, options, _args|
+    cl = Doing::Changes.new(lookup: options[:lookup], search: options[:search], changes: options[:changes], sort: options[:sort])
+
+    if options[:interactive]
+      cl.interactive
+    else
+      content = if options[:all] || options[:search] || options[:lookup]
+                  cl.to_s
+                else
+                  cl.latest
+                end
+
+      parsed = if (options[:markdown] || !$stdout.isatty) && !options[:render]
+                 content
+               else
+                 TTY::Markdown.parse(content, width: 80, theme: MARKDOWN_THEME, symbols: { override: { bullet: '•' } })
+               end
+
+      Doing::Pager.paginate = true
+      Doing::Pager.page parsed
+    end
+  end
+end

data/bin/commands/choose.rb

@@ -0,0 +1,9 @@
+# @@choose
+desc 'Select a section to display from a menu'
+command :choose do |c|
+  c.action do |_global_options, _options, _args|
+    section = @wwid.choose_section
+
+    Doing::Pager.page @wwid.list_section({ section: section.cap_first, count: 0 }) if section
+  end
+end

data/bin/commands/colors.rb

@@ -0,0 +1,21 @@
+# @@colors
+desc 'List available color variables for configuration templates and views'
+command :colors do |c|
+  c.action do |_global_options, _options, _args|
+    bgs = []
+    fgs = []
+    @colors::attributes.each do |color|
+      colname = color.to_s
+      colname << " (#{color.to_s.sub(/bold/, 'bright')})" if colname =~ /bold/
+      if color.to_s =~ /bg/
+        bgs.push("#{@colors.send(color, "    ")}#{@colors.default} <-- #{colname}")
+      else
+        fgs.push("#{@colors.send(color, "XXXX")}#{@colors.default} <-- #{colname}")
+      end
+    end
+    out = []
+    out << fgs.join("\n")
+    out << bgs.join("\n")
+    Doing::Pager.page out.join("\n")
+  end
+end

data/bin/commands/commands.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+# @@commands
+desc 'Enable and disable Doing commands'
+command :commands do |c|
+  c.example 'doing commands add', desc: 'Get a menu of available commands'
+  c.example 'doing commands add COMMAND', desc: 'Specify a command to enable'
+  c.example 'doing commands remove COMMAND', desc: 'Specify a command to disable'
+
+  c.default_command :add
+
+  # @@commands.enable
+  c.desc 'Enable Doing commands'
+  c.long_desc 'Run without arguments to select commands from a list.'
+  c.arg_name 'COMMAND [COMMAND...]'
+  c.command %i[add enable] do |add|
+    add.action do |_global, _options, args|
+      cfg = @settings
+      custom_dir = @settings.dig('plugins', 'command_path')
+
+      available = cfg['disabled_commands']
+      raise UserCancelled, 'No commands available to enable' unless args.good? || available.good?
+
+      to_enable = if args.good?
+                    args
+                  else
+                    Doing::Prompt.choose_from(available,
+                                              prompt: 'Select commands to enable',
+                                              multiple: true,
+                                              sorted: true)
+                  end
+      raise UserCancelled unless to_enable
+
+      to_enable.strip.split("\n").each do |cmd|
+        default_command = File.join(File.dirname(__FILE__), "#{cmd}.rb")
+        custom_command = File.join(File.expand_path(custom_dir), "#{cmd}.rb")
+        unless File.exist?(default_command) || File.exist?(custom_command)
+          raise InvalidArgument, "Command #{cmd} not found"
+        end
+
+        raise InvalidArgument, "Command #{cmd} is not disabled" unless available.include?(cmd)
+
+        available.delete(cmd)
+      end
+
+      cfg.deep_set(['disabled_commands'], available)
+
+      Doing::Util.write_to_file(@config.config_file, YAML.dump(cfg), backup: true)
+      Doing.logger.warn('Config:', "#{@config.config_file} updated")
+    end
+  end
+
+  # @@commands.disable
+  c.desc 'Disable Doing commands'
+  c.command %i[remove disable] do |remove|
+    remove.action do |_global, _options, args|
+      available = Dir.glob(File.join(File.dirname(__FILE__), '*.rb')).map { |cmd| File.basename(cmd, '.rb') }
+      cfg = @settings
+      custom_dir = @settings.dig('plugins', 'command_path')
+      custom_commands = Dir.glob(File.join(File.expand_path(custom_dir), '*.rb'))
+      available.concat(custom_commands.map { |cmd| File.basename(cmd, '.rb') })
+      disabled = cfg['disabled_commands']
+      disabled.each { |cmd| available.delete(cmd) }
+      to_disable = if args.good?
+                     args
+                   else
+                     Doing::Prompt.choose_from(available,
+                                               prompt: 'Select commands to enable',
+                                               multiple: true,
+                                               sorted: true).strip.split("\n")
+                   end
+      to_disable.each do |cmd|
+        default_command = File.join(File.dirname(__FILE__), "#{cmd}.rb")
+        custom_command = File.join(File.expand_path(custom_dir), "#{cmd}.rb")
+        unless File.exist?(default_command) || File.exist?(custom_command)
+          raise InvalidArgument, "Command #{cmd} not found"
+
+        end
+
+        raise InvalidArgument, "Command #{cmd} is not enabled" unless available.include?(cmd)
+      end
+
+      cfg.deep_set(['disabled_commands'], disabled.concat(to_disable))
+
+      Doing::Util.write_to_file(@config.config_file, YAML.dump(cfg), backup: true)
+      Doing.logger.warn('Config:', "#{@config.config_file} updated")
+    end
+  end
+end

data/bin/commands/commands_accepting.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+# @@commands_accepting
+arg_name 'OPTION'
+command :commands_accepting do |c|
+  c.desc 'Output in single column for completion'
+  c.switch %i[c column]
+
+  c.desc 'Join multiple arguments using boolean (AND|OR|NOT)'
+  c.flag [:bool], must_match: REGEX_BOOL,
+                  default_value: :and,
+                  type: BooleanSymbol
+
+  c.action do |g, o, a|
+    cmds = []
+    commands.each { |cmd, v| cmds.push(cmd) if has_flags?(v, a, o[:bool]) }
+
+    if o[:column]
+      puts cmds.sort
+    else
+      description = "Commands "
+      description += "not " if o[:bool] == :not
+      description += "accepting "
+      description += a.map { |arg| "--#{arg}" }.join(o[:bool] == :and ? ' and ' : ' or ')
+      puts "#{description}: #{cmds.sort.join(', ')}"
+    end
+  end
+
+  def has_flags?(options, args, bool)
+    case bool
+    when :and
+      all_flags?(options, args)
+    when :not
+      no_flags?(options, args)
+    else
+      any_flags?(options, args)
+    end
+  end
+
+  def all_flags?(options, args)
+    args.each do |arg|
+      has_flag = false
+      options.flags.merge(options.switches).each do |_, flag|
+        if flag.name == arg.to_sym || flag.aliases&.include?(arg.to_sym)
+          has_flag = true
+          break
+        end
+      end
+      return false unless has_flag
+    end
+
+    true
+  end
+
+  def any_flags?(options, args)
+    args.each do |option|
+      options.flags.merge(options.switches).each do |_, flag|
+        return true if flag.name == option.to_sym || flag.aliases&.include?(option.to_sym)
+      end
+    end
+
+    false
+  end
+
+  def no_flags?(options, args)
+    args.each do |option|
+      options.flags.merge(options.switches).each do |_, flag|
+        return false if flag.name == option.to_sym || flag.aliases&.include?(option.to_sym)
+      end
+    end
+
+    true
+  end
+end
+
+

data/bin/commands/completion.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# @@completion
+desc 'Generate shell completion scripts'
+long_desc 'Generates the necessary scripts to add command line completion to various shells,
+so typing \'doing\' and hitting tab will offer completions of subcommands and their options.'
+command :completion do |c|
+  c.example 'doing completion', desc: 'Output zsh (default) to STDOUT'
+  c.example 'doing completion --type zsh --file ~/.zsh-completions/_doing.zsh',
+            desc: 'Output zsh completions to file'
+  c.example 'doing completion --type fish --file ~/.config/fish/completions/doing.fish',
+            desc: 'Output fish completions to file'
+  c.example 'doing completion --type bash --file ~/.bash_it/completion/enabled/doing.bash',
+            desc: 'Output bash completions to file'
+
+  c.desc 'Shell to generate for (bash, zsh, fish)'
+  c.arg_name 'SHELL'
+  c.flag %i[t type], must_match: /^(?:[bzf](?:[ai]?sh)?|all)$/i, default_value: 'zsh'
+
+  c.desc 'File to write output to'
+  c.arg_name 'PATH'
+  c.flag %i[f file], default_value: 'STDOUT'
+
+  c.action do |_global_options, options, _args|
+    Doing::Completion.generate_completion(type: options[:type], file: options[:file])
+  end
+end