doing 1.0.87 → 1.0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2540726a17efa50ef0cddc29353d8c14a4d921a89fb302711225053faacfbc4d
-  data.tar.gz: e4f59cf1e2feda50df653bbbd981e1ab4ad75d807eaf47a8afbad9d98032d27b
+  metadata.gz: 365e58ed7377d560d531ce2a1585d115c0a1b73fc3039621a2fef230f52de5dc
+  data.tar.gz: 0efbf78887502113048946df9942e58ad751921b4fc997efd7556ba40e428bb5
 SHA512:
-  metadata.gz: dabcbefd24a3d099d71eb14c03f71250067e509b385d573405219d3cfaea8a66f6ec526a32547401f249f0fdd82774415ed0da1c95e233aada2f54135de49558
-  data.tar.gz: 5b5a5d7800110de9aeaf636b6b6b4947c1923e55ce4f455d2316483c37fcfb30461b818df78c24097ef66f574ed57bdeebf50f77e4f806161212c4d36c86eabd
+  metadata.gz: 53fba5968f465d3dc40821360d60f2ff63573b8e5b47e9eb851fbf6592a3a7baea0436efb118d08d4f92e10f035a5f9ee5fa47ae5df65aa6929c40146a0a6f5f
+  data.tar.gz: 6a98c715220355434ed2e05e4582d04ddd7eade5f4588ea4e881a025654ac5e0d90df1f845f73406a50bda14d887540f34254ffe8de50252840a2c070cbb5c75

data/README.md

@@ -2,7 +2,7 @@
 
 **A command line tool for remembering what you were doing and tracking what you've done.**
 
-_If you're one of the rare people like me who find this useful, feel free to [buy me some coffee](http://brettterpstra.com/donate/)._
+_If you're one of the rarev people like me who find this useful, feel free to [buy me some coffee](http://brettterpstra.com/donate/)._
 
 ## Contents
 
@@ -27,7 +27,7 @@ If there's something I want to look at later but doesn't need to be added to a t
 
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.86<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.90<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -104,6 +104,7 @@ A basic configuration looks like this:
     html_template:
       haml: 
       css: 
+      markdown:
 
 
 The config file is stored in `~/.doingrc`, and a skeleton file is created on the first run. Just run `doing` on its own to create the file.
@@ -114,7 +115,7 @@ Any options found in a `.doingrc` anywhere in the hierarchy between your current
 
 Possible uses:
 
-- Define custom HTML output on a per-project basis using the html_template option for custom templates. Customize time tracking reports based on project or client.
+- Define custom HTML or Markdown output on a per-project basis using the html_template option for custom templates. Customize time tracking reports based on project or client.
 - Define `default_tags` for a project so that every time you `doing now` from within that project directory or its subfolders, it gets tagged with that project automatically.
 
 Any part of the configuration can be copied into these local files and modified. You only need to include the parts you want to change or add.
@@ -191,7 +192,7 @@ And it outputs:
     12:45pm > I think this thing (doing) is ready to document and distribute
     $ 
 
-You can get pretty clever and include line breaks and other formatting inside of double quotes. If you want multiline templates, just use `\n` in the template line, and after the next run it will be rewritten as proper YAML automatically.
+You can get pretty clever and include line breaks and other formatting inside of double quotes. If you want multi-line templates, just use `\n` in the template line, and after the next run it will be rewritten as proper YAML automatically.
 
 For example, this block:
 
@@ -300,7 +301,7 @@ Outputs:
 
 ![](http://ckyp.us/XKpj+)
 
-You can also specify a default output format for a view. Most of the optional output formats override the template specification (`html`, `csv`, `json`). If the `view` command is used with the `-o` flag, it will override what's specified for the view in the config.
+You can also specify a default output format for a view. Most of the optional output formats override the template specification (`html`, `csv`, `json`, `markdown`). If the `view` command is used with the `-o` flag, it will override what's specified for the view in the config.
 
 ### Colors
 
@@ -342,13 +343,13 @@ And a few special colors you'll just have to try out to see (or just run `doing
 
 Any time you use one of the foreground colors it will reset the bold and background settings to their default automatically. You can force a reset to default terminal colors using `%default`.
 
-### HTML Templates
+### HTML/Markdown Templates
 
-For commands that provide an HTML output option, you can customize the templates used for markup and CSS. The markup uses [HAML](http://haml.info/), and the styles are pure CSS.
+For commands that provide an HTML or Markdown output option, you can customize the templates used for markup and CSS. The HTML markup uses [HAML](http://haml.info/), and the styles are pure CSS. The Markdown template uses Ruby ERB templating.
 
-To export the default configurations for customization, use `doing templates --type=[HAML|CSS]`. This will output to STDOUT where you can pipe it to a file, e.g. `doing templates --type=HAML > my_template.haml`. You can modify the markup, the CSS, or both.
+To export the default configurations for customization, use `doing templates --type=[HAML|CSS|MARKDOWN]`. This will output to STDOUT where you can pipe it to a file, e.g. `doing templates --type=HAML > my_template.haml`. You can modify the markup, the CSS, or both.
 
-Once you have either or both of the template files, edit `.doingrc` and look for the `html_template:` section. There are two subvalues, `haml:` and `css:`. Add the path to the templates you want to use. A tilde may be substituted for your home directory, e.g. `css: ~/styles/doing.css`.
+Once you have a template file prepared, edit `.doingrc` and look for the `html_template:` section. There are three sub-values, `haml:`, `css:`, and `markdown:`. Add the template paths to the appropriate keys. A tilde may be substituted for your home directory, e.g. `css: ~/styles/doing.css`.
 
 ### Autotagging
 
@@ -545,9 +546,11 @@ If you have a use for it, you can use `-o csv` on the show or view commands to o
 
 `doing yesterday` is great for stand-ups (thanks to [Sean Collins](https://github.com/sc68cal) for that!). Note that you can show yesterday's activity from an alternate section by using the section name as an argument (e.g. `doing yesterday archive`).
 
+All of the display commands (view, show, today, yesterday, search) support date ranges in addition to other filtering options. Results can be narrowed to a date/time span using `--before DATE` and `--after DATE`. The `DATE` accepts a natural language string but works best in formats like `10/20/21` or `2021-05-13 3pm` (or shortened to just `5/13 3pm`). For the `today` and `yesterday` commands the `DATE` should just be a time, e.g. `12pm` or `15:00`, and results will be filtered within the timespan for just that day. Both flags are optional, and you can use just `--before` to get everything older than a certain date, or use just `--after` to get everything newer.
+
 `doing on` allows for full date ranges and filtering. `doing on saturday`, or `doing on one month to today` will give you ranges. You can use the same terms with the `show` command by adding the `-f` or `--from` flag. `doing show @done --from "monday to friday"` will give you all of your completed items for the last week (assuming it's the weekend). There's also `doing since` a simple alias for `doing on PAST_DATE to now`, e.g. `doing since monday`.
 
-You can also show entries matching a search string with `doing grep` (synonym `doing search`). If you want to search with regular expressions or for an exact match, surround your search query with forward slashes, e.g. `doing search /project name/`. If you pass a search string without slashes, it's treated as a fuzzy search string, meaning matches can be found as long as the characters in the search string are in order and with no more than three other characters between each. By default searches are across all sections, but you can limit it to one with the `-s SECTION_NAME` flag. Searches can be displayed with the default template, or output as HTML, CSV, or JSON.
+You can also show entries matching a search string with `doing grep` (synonym `doing search`). If you want to search with regular expressions or for an exact match, surround your search query with forward slashes, e.g. `doing search /project name/`. If you pass a search string without slashes, it's treated as a fuzzy search string, meaning matches can be found as long as the characters in the search string are in order and with no more than three other characters between each. By default searches are across all sections, but you can limit it to one with the `-s SECTION_NAME` flag. Searches can be displayed with the default template, or output as HTML, Markdown, CSV, or JSON.
 
 ##### Modifying the last entry
 
@@ -616,7 +619,7 @@ Doing can currently only import tasks from Timing.app reports. If you want to sy
 7. Include short entries if desired
 8. Export the report to a new file
 
-Now you can run `doing import --type timing -s SECTION PATH`, where SECTION is the name of the section you want to import the entries to (defauts to Currently), and PATH is the path to the JSON file. You can also add a tag (or tags) to all entries, or a custom prefix.
+Now you can run `doing import --type timing -s SECTION PATH`, where SECTION is the name of the section you want to import the entries to (defaults to Currently), and PATH is the path to the JSON file. You can also add a tag (or tags) to all entries, or a custom prefix.
 
 (`--type timing` is the only option right now, so it doesn't need to be included)
 
@@ -716,7 +719,7 @@ Ruby is rife with encoding inconsistencies across platforms and versions. Feel f
 ### Support
 
 
-As a free project, `doing` isn't heavily supported, but you can get support from myself and other users on GitHub. If you run into a replicatable bug in your environment, please [post an issue](https://github.com/ttscoff/doing/issues) and include your platform, OS version, and the result of `ruby -v`, along with a copy/paste of the error message. To get a more verbose error message, try running `GLI_DEBUG=true doing [...]` for a full trace.
+As a free project, `doing` isn't heavily supported, but you can get support from myself and other users on GitHub. If you run into a replicable bug in your environment, please [post an issue](https://github.com/ttscoff/doing/issues) and include your platform, OS version, and the result of `ruby -v`, along with a copy/paste of the error message. To get a more verbose error message, try running `GLI_DEBUG=true doing [...]` for a full trace.
 
 Please try not to email me directly about GitHub projects.
 

data/bin/doing

@@ -243,23 +243,25 @@ command :meanwhile do |c|
   end
 end
 
-desc 'Output HTML and CSS templates for customization'
+desc 'Output HTML, CSS, and Markdown (ERB) templates for customization'
 long_desc %(
   Templates are printed to STDOUT for piping to a file.
   Save them and use them in the configuration file under html_template.
 
   Example `doing template HAML > ~/styles/my_doing.haml`
 )
-arg_name 'TYPE', must_match: /^(?:html|haml|css)/i
+arg_name 'TYPE', must_match: /^(?:html|haml|css|markdown|md|erb)/i
 command :template do |c|
   c.action do |_global_options, options, args|
-    exit_now! 'No type specified, use `doing template [HAML|CSS]`' if args.empty?
+    exit_now! 'No type specified, use `doing template [HAML|CSS|MARKDOWN]`' if args.empty?
 
     case args[0]
     when /html|haml/i
       $stdout.puts wwid.haml_template
     when /css/i
       $stdout.puts wwid.css_template
+    when /markdown|md|erb/i
+      $stdout.puts wwid.markdown_template
     else
       exit_now! 'Invalid type specified, must be HAML or CSS'
     end
@@ -292,10 +294,13 @@ command :select do |c|
   c.arg_name 'SECTION'
   c.flag %i[m move]
 
-  c.desc 'Initial search query for filtering'
+  c.desc 'Initial search query for filtering. Matching is fuzzy. For exact matching, start query with a single quote, e.g. `--query "\'search"'
   c.arg_name 'QUERY'
   c.flag %i[q query]
 
+  c.desc 'Use --no-menu to skip the interactive menu. Use with --query to filter items and act on results automatically. Test with `--output doing` to preview matches.'
+  c.switch %i[menu], negatable: true, default_value: true
+
   c.desc 'Cancel selected items (add @done without timestamp)'
   c.switch %i[c cancel], negatable: false, default_value: false
 
@@ -311,18 +316,20 @@ command :select do |c|
   c.desc 'Add flag to selected item(s)'
   c.switch %i[flag], negatable: false, default_value: false
 
-  c.desc 'Perform action without confirmation'
+  c.desc 'Perform action without confirmation.'
   c.switch %i[force], negatable: false, default_value: false
 
   c.desc 'Save selected entries to file using --output format'
   c.arg_name 'FILE'
   c.flag %i[save_to]
 
-  c.desc 'Output entries to format (doing|taskpaper|csv|html|json|template|timeline)'
+  c.desc 'Output entries to format (doing|taskpaper|csv|html|json|template|timeline|taskpaper|markdown)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(?:doing|taskpaper|html|csv|json|template|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:doing|taskpaper|html|csv|json|template|timeline|taskpaper|markdown|md)$/i
 
   c.action do |_global_options, options, args|
+    exit_now! "--no-menu requires --query" if !options[:menu] && !options[:query]
+
     wwid.interactive(options)
   end
 end
@@ -599,7 +606,7 @@ command :finish do |c|
   c.switch %i[u unfinished], negatable: false, default_value: false
 
   c.desc %(Auto-generate finish dates from next entry's start time.
-  Automatically generate completion dates 1 minute before next start date.
+  Automatically generate completion dates 1 minute before next item (in any section) began.
   --auto overrides the --date and --back parameters.)
   c.switch [:auto], negatable: false, default_value: false
 
@@ -733,6 +740,19 @@ command [:again, :resume] do |c|
 end
 
 desc 'Add tag(s) to last entry'
+long_desc 'Add (or remove) tags from the last entry, or from multiple entries
+          (with `--count`), entries matching a search (with `--search), or entries
+          containing another tag (with `--tag`).
+
+          When removing tags with `-r`, wildcards are allowed (`*` to match
+          multiple characters, `?` to match a single character). With `--regex`,
+          regular expressions will be interpreted instead of wildcards.
+
+          For all tag removals the match is case insensitive by default, but if
+          the tag search string contains any uppercase letters, the match will
+          become case sensitive automatically.
+
+          Tag name arguments do not need to be prefixed with @.'
 arg_name 'TAG', :multiple
 command :tag do |c|
   c.desc 'Section'
@@ -743,6 +763,10 @@ command :tag do |c|
   c.arg_name 'COUNT'
   c.flag %i[c count], default_value: 1
 
+  c.desc 'Replace existing tag with tag argument, wildcards (*,?) allowed, or use with --regex'
+  c.arg_name 'ORIG_TAG'
+  c.flag %i[rename]
+
   c.desc 'Don\'t ask permission to tag all entries when count is 0'
   c.switch %i[force], negatable: false, default_value: false
 
@@ -752,6 +776,9 @@ command :tag do |c|
   c.desc 'Remove given tag(s)'
   c.switch %i[r remove], negatable: false, default_value: false
 
+  c.desc 'Interpret tag string as regular expression (with --remove)'
+  c.switch %i[regex], negatable: false, default_value: false
+
   c.desc 'Tag last entry (or entries) not marked @done'
   c.switch %i[u unfinished], negatable: false, default_value: false
 
@@ -838,19 +865,26 @@ command :tag do |c|
       exit_now! 'Cancelled' unless res
     end
 
-    opts = {
-      autotag: options[:a],
-      count: count,
-      date: options[:date],
-      remove: options[:r],
-      search: options[:search],
-      section: section,
-      tag: search_tags,
-      tag_bool: options[:bool],
-      tags: tags,
-      unfinished: options[:unfinished]
-    }
-    wwid.tag_last(opts)
+    options[:count] = count
+    options[:section] = section
+    options[:tag] = search_tags
+    options[:tags] = tags
+    options[:tag_bool] = options[:bool]
+
+    # opts = {
+    #   autotag: options[:a],
+    #   count: count,
+    #   date: options[:date],
+    #   iregex: options[:iregex]
+    #   remove: options[:r],
+    #   search: options[:search],
+    #   section: section,
+    #   tag: search_tags,
+    #   tag_bool: options[:bool],
+    #   tags: tags,
+    #   unfinished: options[:unfinished]
+    # }
+    wwid.tag_last(options)
   end
 end
 
@@ -943,9 +977,9 @@ command :show do |c|
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
 
-  c.desc 'Output to export format (csv|html|json|template|timeline)'
+  c.desc 'Output to export format (csv|html|json|template|timeline|taskpaper|markdown)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline|taskpaper|markdown|md)$/i
   c.action do |_global_options, options, args|
     tag_filter = false
     tags = []
@@ -1063,9 +1097,9 @@ command [:grep, :search] do |c|
   c.arg_name 'DATE_STRING'
   c.flag [:after]
 
-  c.desc 'Output to export format (csv|html|json|template|timeline)'
+  c.desc 'Output to export format (csv|html|json|template|timeline|taskpaper|markdown)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline|taskpaper|markdown|md)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true, negatable: true
@@ -1173,9 +1207,9 @@ command :today do |c|
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
-  c.desc 'Output to export format (csv|html|json|template|timeline)'
+  c.desc 'Output to export format (csv|html|json|template|timeline|taskpaper|markdown)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline|taskpaper|markdown|md)$/i
 
   c.desc 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
   c.arg_name 'TIME_STRING'
@@ -1221,9 +1255,9 @@ command :on do |c|
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
-  c.desc 'Output to export format (csv|html|json|template|timeline)'
+  c.desc 'Output to export format (csv|html|json|template|timeline|taskpaper|markdown)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline|taskpaper|markdown|md)$/i
 
   c.action do |_global_options, options, args|
     exit_now! 'Missing date argument' if args.empty?
@@ -1274,9 +1308,9 @@ command :since do |c|
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
-  c.desc 'Output to export format (csv|html|json|template|timeline)'
+  c.desc 'Output to export format (csv|html|json|template|timeline|taskpaper|markdown)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline|taskpaper|markdown|md)$/i
 
   c.action do |_global_options, options, args|
     exit_now! 'Missing date argument' if args.empty?
@@ -1308,9 +1342,9 @@ command :yesterday do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Output to export format (csv|html|json|template|timeline)'
+  c.desc 'Output to export format (csv|html|json|template|timeline|taskpaper|markdown)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline|taskpaper|markdown|md)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true, negatable: true
@@ -1324,10 +1358,33 @@ command :yesterday do |c|
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
+  c.desc 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
+  c.arg_name 'TIME_STRING'
+  c.flag [:before]
+
+  c.desc 'View entries after specified time (e.g. 8am, 12:30pm, 15:00)'
+  c.arg_name 'TIME_STRING'
+  c.flag [:after]
+
+  c.desc 'Tag sort direction (asc|desc)'
+  c.arg_name 'DIRECTION'
+  c.flag [:tag_order], must_match: /^(?:a(?:sc)?|d(?:esc)?)$/i
+
   c.action do |_global_options, options, _args|
+    tag_order = if options[:tag_order]
+                  options[:tag_order] =~ /^d/i ? 'desc' : 'asc'
+                else
+                  'asc'
+                end
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
-    puts wwid.yesterday(options[:s], options[:t], options[:o],
-                        { totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
+    opt = {
+      after: options[:after],
+      before: options[:before],
+      sort_tags: options[:sort_tags],
+      tag_order: options[:tag_order],
+      totals: options[:totals]
+    }
+    puts wwid.yesterday(options[:section], options[:times], options[:output], opt).chomp
   end
 end
 
@@ -1440,9 +1497,9 @@ command :view do |c|
   c.arg_name 'COUNT'
   c.flag %i[c count], must_match: /^\d+$/, type: Integer
 
-  c.desc 'Output to export format (csv|html|json|template|timeline)'
+  c.desc 'Output to export format (csv|html|json|template|timeline|taskpaper|markdown)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline|taskpaper|markdown|md)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true, negatable: true
@@ -1904,6 +1961,7 @@ end
 post do |global, _command, _options, _args|
   # Use skips_post before a command to skip this
   # block on that command only
+
   if global[:stdout]
     $stdout.print wwid.results.join("\n")
   else

data/lib/doing/helpers.rb

@@ -1,3 +1,20 @@
+##
+## @brief      Date helpers
+##
+class ::Time
+  def relative_date
+    if self > Date.today.to_time
+      strftime('    %_I:%M%P')
+    elsif self > (Date.today - 6).to_time
+      strftime('%a %_I:%M%P')
+    elsif self.year == Date.today.year
+      strftime('%m/%d %_I:%M%P')
+    else
+      strftime('%m/%d/%Y %_I:%M%P')
+    end
+  end
+end
+
 ##
 ## @brief      Hash helpers
 ##
@@ -84,29 +101,82 @@ class ::String
   end
 
 
+  ##
+  ## @brief      Remove duplicate tags, leaving only first occurrence
+  ##
+  ## @return     Deduplicated string
+  ##
+  def dedup_tags!
+    replace dedup_tags
+  end
+
+  def dedup_tags
+    item = self.dup
+    tags = item.scan(/(?<=^| )(\@(\S+?)(\([^)]+\))?)(?=\b|$)/).uniq
+    tags.each do |tag|
+      found = false
+      item.gsub!(/( |^)#{tag[0]}\b/) do |m|
+        if found
+          ''
+        else
+          found = true
+          m
+        end
+      end
+    end
+    item
+  end
+
   ##
   ## @brief      Turn raw urls into HTML links
   ##
   ## @param      opt   (Hash) Additional Options
   ##
+  def link_urls!(opt = {})
+    replace link_urls(opt)
+  end
+
   def link_urls(opt = {})
     opt[:format] ||= :html
-    if opt[:format] == :html
-      gsub(%r{(?mi)((http|https)://)([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&amp;:/~+#]*[\w\-@^=%&amp;/~+#])?}) do |_match|
-        m = Regexp.last_match
-        proto = m[1].nil? ? 'http://' : ''
-        %(<a href="#{proto}#{m[0]}" title="Link to #{m[0]}">[#{m[3]}]</a>)
-      end.gsub(/<(\w+:.*?)>/) do |match|
+    str = self.dup
+
+    if :format == :markdown
+      # Remove <self-linked> formatting
+      str.gsub!(/<(.*?)>/) do |match|
         m = Regexp.last_match
-        if m[1] =~ /<a href/
-          match
+        if m[1] =~ /^https?:/
+          m[1]
         else
-          %(<a href="#{m[1]}" title="Link to #{m[1]}">[link]</a>)
+          match
         end
       end
-    else
-      self
     end
+
+    # Replace qualified urls
+    str.gsub!(%r{(?mi)(?<!["'\[(\\])((http|https)://)([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&amp;:/~+#]*[\w\-@^=%&amp;/~+#])?}) do |_match|
+      m = Regexp.last_match
+      proto = m[1].nil? ? 'http://' : ''
+      case opt[:format]
+      when :html
+        %(<a href="#{proto}#{m[0]}" title="Link to #{m[0]}">[#{m[3]}]</a>)
+      when :markdown
+        "[#{m[0]}](#{proto}#{m[0]})"
+      else
+        m[0]
+      end
+    end
+
+    # Clean up unlinked <urls>
+    str.gsub!(/<(\w+:.*?)>/) do |match|
+      m = Regexp.last_match
+      if m[1] =~ /<a href/
+        match
+      else
+        %(<a href="#{m[1]}" title="Link to #{m[1]}">[link]</a>)
+      end
+    end
+
+    str
   end
 end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.87'
+  VERSION = '1.0.91'
 end

data/lib/doing/wwid.rb

@@ -4,6 +4,7 @@ require 'deep_merge'
 require 'open3'
 require 'pp'
 require 'shellwords'
+require 'erb'
 
 ##
 ## @brief      Main "What Was I Doing" methods
@@ -104,6 +105,7 @@ class WWID
     @config['html_template'] ||= {}
     @config['html_template']['haml'] ||= nil
     @config['html_template']['css'] ||= nil
+    @config['html_template']['markdown'] ||= nil
 
     @config['templates'] ||= {}
     @config['templates']['default'] ||= {
@@ -233,6 +235,15 @@ class WWID
     end
   end
 
+  ##
+  ## @brief      Return the contents of the ERB template for Markdown output
+  ##
+  ## @return     (String) ERB template
+  ##
+  def markdown_template
+    IO.read(File.join(File.dirname(__FILE__), '../templates/doing-markdown.erb'))
+  end
+
   ##
   ## @brief      Return the contents of the HAML template for HTML output
   ##
@@ -817,7 +828,7 @@ class WWID
         ' | ',
         item['title']
       ]
-      if opt[:section] =~ /^all/i
+      if section =~ /^all/i
         out.concat([
           ' (',
           item['section'],
@@ -834,6 +845,12 @@ class WWID
       '--bind ctrl-a:select-all',
       %(-q "#{opt[:query]}")
     ]
+    if !opt[:menu]
+      exit_now! "Can't skip menu when no query is provided" unless opt[:query]
+
+      fzf_args.concat([%(--filter="#{opt[:query]}"), '--no-sort'])
+    end
+
     res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
     selected = []
     res.split(/\n/).each do |item|
@@ -879,8 +896,7 @@ class WWID
         when /(add|remove) tag/
           type = action =~ /^add/ ? 'add' : 'remove'
           if opt[:tag]
-            warn "'add tag' and 'remove tag' can not be used together"
-            Process.exit 1
+            exit_now! "'add tag' and 'remove tag' can not be used together"
           end
           print "#{colors['yellow']}Tag to #{type}: #{colors['reset']}"
           tag = STDIN.gets
@@ -1020,8 +1036,6 @@ class WWID
       case opt[:output]
       when /doing/
         options[:template] = '- %date | %title%note'
-      when /taskpaper/
-        options[:template] = '- %title @date(%date)%note'
       else
         options[:output] = opt[:output]
       end
@@ -1120,7 +1134,12 @@ class WWID
             else
               if opt[:sequential]
                 next_entry = next_item(item)
-                done_date = next_entry['date'] - 60 if next_entry
+
+                if next_entry.nil?
+                  done_date = Time.now
+                else
+                  done_date = next_entry['date'] - 60
+                end
               elsif opt[:took]
                 if item['date'] + opt[:took] > Time.now
                   item['date'] = Time.now - opt[:took]
@@ -1141,10 +1160,31 @@ class WWID
               title = item['title']
               opt[:tags].each do |tag|
                 tag = tag.strip
-                if opt[:remove]
-                  if title =~ /@#{tag}\b/
-                    title.gsub!(/(^| )@#{tag}(\([^)]*\))?/, '')
-                    @results.push(%(Removed @#{tag}: "#{title}" in #{section}))
+                if opt[:remove] || opt[:rename]
+                  case_sensitive = tag !~ /[A-Z]/
+                  replacement = ''
+                  if opt[:rename]
+                    replacement = tag
+                    tag = opt[:rename]
+                  end
+
+                  if opt[:regex]
+                    rx_tag = tag.gsub(/\./, '\S')
+                  else
+                    rx_tag = tag.gsub(/\?/, '.').gsub(/\*/, '\S*?')
+                  end
+
+                  if title =~ / @#{rx_tag}\b/
+                    rx = Regexp.new("(^| )@#{rx_tag}(\\([^)]*\\))?(?=\\b|$)", case_sensitive)
+                    removed_tags = []
+                    title.gsub!(rx) do |mtch|
+                      removed_tags.push(mtch.strip.sub(/\(.*?\)$/, ''))
+                      replacement
+                    end
+
+                    title.dedup_tags!
+
+                    @results.push(%(Removed #{removed_tags.join(', ')}: "#{title}" in #{section}))
                   end
                 elsif title !~ /@#{tag}/
                   title.chomp!
@@ -1191,6 +1231,15 @@ class WWID
     write(@doing_file)
   end
 
+  ##
+  ## @brief      Move item from current section to
+  ##             destination section
+  ##
+  ## @param      item     The item
+  ## @param      section  The destination section
+  ##
+  ## @return     Updated item
+  ##
   def move_item(item, section)
     old_section = item['section']
     new_item = item.dup
@@ -1215,13 +1264,15 @@ class WWID
   ## @param      old_item
   ##
   def next_item(old_item)
-    section = old_item['section']
-
-    section_items = @content[section]['items'].sort_by { |entry| entry['date'] }
-    idx = section_items.index(old_item)
+    combined = { 'items' => [] }
+    @content.each do |_k, v|
+      combined['items'] += v['items']
+    end
+    items = combined['items'].dup.sort_by { |item| item['date'] }.reverse
+    idx = items.index(old_item)
 
-    if section_items.size > idx
-      section_items[idx + 1]
+    if idx > 0
+      items[idx - 1]
     else
       nil
     end
@@ -1689,11 +1740,13 @@ class WWID
 
     # opt[:highlight] ||= true
     section = ''
+    is_single = true
     if opt[:section].nil?
       section = choose_section
       opt[:section] = @content[section]
     elsif opt[:section].instance_of?(String)
       if opt[:section] =~ /^all$/i
+        is_single = false
         combined = { 'items' => [] }
         @content.each do |_k, v|
           combined['items'] += v['items']
@@ -1780,7 +1833,7 @@ class WWID
 
     out = ''
 
-    exit_now! 'Unknown output format' if opt[:output] && (opt[:output] !~ /^(template|html|csv|json|timeline)$/i)
+    exit_now! 'Unknown output format' if opt[:output] && (opt[:output] !~ /^(template|html|csv|json|timeline|markdown|md|taskpaper)$/i)
 
     case opt[:output]
     when /^csv$/i
@@ -1856,11 +1909,11 @@ class WWID
         end
       end
       if opt[:output] == 'json'
-        out = {
+        puts JSON.pretty_generate({
           'section' => section,
           'items' => items_out,
-          'timers' => tag_times(format: 'json', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order])
-        }.to_json
+          'timers' => tag_times(format: :json, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order])
+        })
       elsif opt[:output] == 'timeline'
         template = <<~EOTEMPLATE
                     <!doctype html>
@@ -1940,10 +1993,60 @@ class WWID
                 css_template
               end
 
-      totals = opt[:totals] ? tag_times(format: 'html', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
+      totals = opt[:totals] ? tag_times(format: :html, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
       engine = Haml::Engine.new(template)
       out = engine.render(Object.new,
                          { :@items => items_out, :@page_title => page_title, :@style => style, :@totals => totals })
+    when /^taskpaper$/i
+      options = opt
+      options[:highlight] = false
+      options[:wrap_width] = 0
+      options[:tags_color] = false
+      options[:output] = nil
+      options[:template] = '- %title @date(%date)%note'
+
+      out = list_section(options)
+    when /^(md|markdown|gfm)$/i
+      page_title = section
+      all_items = []
+      items.each do |i|
+        if String.method_defined? :force_encoding
+          title = i['title'].force_encoding('utf-8').link_urls({format: :markdown})
+          note = i['note'].map { |line| line.force_encoding('utf-8').strip.link_urls({format: :markdown}) } if i['note']
+        else
+          title = i['title'].link_urls({format: :markdown})
+          note = i['note'].map { |line| line.strip.link_urls({format: :markdown}) } if i['note']
+        end
+
+        title = "#{title} @project(#{i['section']})" unless is_single
+
+        interval = get_interval(i) if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+        interval ||= false
+
+        done = i['title'] =~ /(?<= |^)@done/ ? 'x' : ' '
+
+        all_items << {
+          date: i['date'].strftime('%a %-I:%M%p'),
+          shortdate: i['date'].relative_date,
+          done: done,
+          note: note,
+          section: i['section'],
+          time: interval,
+          title: title.strip
+        }
+      end
+
+      template = if @config['html_template']['markdown'] && File.exist?(File.expand_path(@config['html_template']['markdown']))
+                   IO.read(File.expand_path(@config['html_template']['markdown']))
+                 else
+                   markdown_template
+                 end
+
+      totals = opt[:totals] ? tag_times(format: :markdown, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
+
+      mdx = MarkdownExport.new(page_title, all_items, totals)
+      engine = ERB.new(template)
+      out = engine.result(mdx.get_binding)
     else
       items.each do |item|
         if opt[:highlight] && item['title'] =~ /@#{@config['marker_tag']}\b/i
@@ -1958,7 +2061,9 @@ class WWID
           note_lines = item['note'].delete_if do |line|
             line =~ /^\s*$/
           end
-          note_lines.map! { |line| "\t\t#{line.sub(/^\t*/, '').sub(/^-/, '—')}  " }
+          note_lines.map! { |line|
+            "\t#{line.sub(/^\t*(— )?/, '').sub(/^- /, '— ')}  "
+          }
           if opt[:wrap_width]&.positive?
             width = opt[:wrap_width]
             note_lines.map! do |line|
@@ -1986,15 +2091,7 @@ class WWID
         output.sub!(/%interval/, interval)
 
         output.sub!(/%shortdate/) do
-          if item['date'] > Date.today.to_time
-            item['date'].strftime('    %_I:%M%P')
-          elsif item['date'] > (Date.today - 6).to_time
-            item['date'].strftime('%a %_I:%M%P')
-          elsif item['date'].year == Date.today.year
-            item['date'].strftime('%m/%d %_I:%M%P')
-          else
-            item['date'].strftime('%m/%d/%Y %_I:%M%P')
-          end
+          item['date'].relative_date
         end
 
         output.sub!(/%title/) do |_m|
@@ -2032,7 +2129,7 @@ class WWID
         out += "#{output}\n"
       end
 
-      out += tag_times(format: 'text', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
+      out += tag_times(format: :text, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
     end
     out
   end
@@ -2257,8 +2354,25 @@ class WWID
     opt[:totals] ||= false
     opt[:sort_tags] ||= false
     section = guess_section(section)
-    list_section({ section: section, count: 0, order: 'asc', yesterday: true, times: times,
-                   output: output, totals: opt[:totals], sort_tags: opt[:sort_tags] })
+    y = (Time.now - (60 * 60 * 24)).strftime('%Y-%m-%d')
+    opt[:after] = "#{y} #{opt[:after]}" if opt[:after]
+    opt[:before] = "#{y} #{opt[:before]}" if opt[:before]
+
+    options = {
+      after: opt[:after],
+      before: opt[:before],
+      count: 0,
+      order: 'asc',
+      output: output,
+      section: section,
+      sort_tags: opt[:sort_tags],
+      tag_order: opt[:tag_order],
+      times: times,
+      totals: opt[:totals],
+      yesterday: true
+    }
+
+    list_section(options)
   end
 
   ##
@@ -2323,7 +2437,7 @@ class WWID
   ## @param      sort_by_name  (Boolean) Sort by name if true, otherwise by time
   ## @param      sort_order    (String) The sort order (asc or desc)
   ##
-  def tag_times(format: 'text', sort_by_name: false, sort_order: 'asc')
+  def tag_times(format: :text, sort_by_name: false, sort_order: 'asc')
     return '' if @timers.empty?
 
     max = @timers.keys.sort_by { |k| k.length }.reverse[0].length + 1
@@ -2338,8 +2452,9 @@ class WWID
                        end
 
     sorted_tags_data.reverse! if sort_order =~ /^asc/i
+    case format
+    when :html
 
-    if format == 'html'
       output = <<EOS
         <table>
         <caption id="tagtotals">Tag Totals</caption>
@@ -2374,7 +2489,20 @@ EOS
       </table>
 EOS
       output + tail
-    elsif format == 'json'
+    when :markdown
+      pad = sorted_tags_data.map {|k, v| k }.group_by(&:size).max.last[0].length
+      output = <<-EOS
+| #{' ' * (pad - 7) }project | time     |
+| #{'-' * (pad - 1)}: | :------- |
+      EOS
+      sorted_tags_data.reverse.each do |k, v|
+        if v > 0
+          output += "| #{' ' * (pad - k.length)}#{k} | #{'%02d:%02d:%02d' % fmt_time(v)} |\n"
+        end
+      end
+      tail = "[Tag Totals]"
+      output + tail
+    when :json
       output = []
       sorted_tags_data.reverse.each do |k, v|
         output << {

data/lib/doing.rb

@@ -9,5 +9,6 @@ require 'chronic'
 require 'haml'
 require 'json'
 require 'doing/helpers'
+require 'doing/markdown_export'
 require 'doing/wwid'
-# require 'doing/markdown_document_listener'
+require 'doing/markdown_document_listener'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.87
+  version: 1.0.91
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2021-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake