doing 1.0.60 → 1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd894959b5ebbff0cd1f08537ec0b754f5a1cc85bce8dbda3f59788ac4f0c230
-  data.tar.gz: eb490a0bdaf48e7197dd1f2257d13142b6e2ec7629bf923aeb87a42c57dc0ec0
+  metadata.gz: 6e6ebff7b78368227b7642297b5b88c8f018f0a9049f42478fc070f545421b1c
+  data.tar.gz: bff5c3852e60db87cacaba489f30fcf93fbdb01a8b7e4cba5fd06b6fc23db936
 SHA512:
-  metadata.gz: 762db76fac95e65bf0d684ac0f88d7ce7e0af7b22fd77792424d73f237d0501e111f4b2d892f74a6f7ca0564470f1a823c4f6843b1def0496502bf3f7f5d2ac0
-  data.tar.gz: 9df0af7494c8a550119249dc6f30d5d6208e6adcea50dc1cd41b12749447eb042450eb29a144ef82a0235db99b71d4b5e0dc9aa23f331932be88cf157bb817b3
+  metadata.gz: 3c987d7c4a54bb331a3d9db464c5e35b86b1bcc777418547067b8f3bf609756663990c42b53b12d0f36a536f86b3041943eacd539d4d0cf8d1610ff7f3333801
+  data.tar.gz: 514fa3c1e8acefc9ebfde3e71e517918648b57c6b52c6d2c86bc9fe79d555d158edae4a9a2dc54c91bbfc32962280e328d97e26875114d4e1b0c98f693923b04

data/README.md

@@ -29,7 +29,7 @@ _Side note:_ I actually use the library behind this utility as part of another s
 
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.59<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.63<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -167,7 +167,7 @@ The config also contains templates for various command outputs. Include placehol
     - there are some random special combo colors. Use `doing colors` to see the list
 - `%interval`: when used with the `-t` switch on the `show` command, it will display the time between a timestamp or _@start(date)_ tag and the _@done(date)_ tag, if it exists. Otherwise, it will remain empty.
 
-Date formats are based on Ruby [`strftime`](http://www.ruby-doc.org/stdlib-2.1.1/libdoc/date/rdoc/Date.html#method-i-strftime) formatting.
+Date formats are based on Ruby [`strftime`](http://www.ruby-doc.org/stdlib-2.1.1/libdoc/date/rdoc/Date.html#method-i-strftime) formatting. You can try it out [here](http://strftime.net).
 
 My normal template for the `recent` command looks like this:
 
@@ -394,24 +394,41 @@ Note that you can include a tag with synonyms in the whitelist as well to tag it
 
 #### Adding entries:
 
-    now, did      - Add an entry
+    now, next     - Add an entry
     later         - Add an item to the Later section
-    done          - Add a completed item with @done(date). No argument finishes last entry.
+    done, did     - Add a completed item with @done(date). No argument finishes last entry.
     meanwhile     - Finish any @meanwhile tasks and optionally create a new one
     again, resume - Duplicate the last entry as new entry (without @done tag)
 
-The `doing now` command can accept `-s section_name` to send the new entry straight to a non-default section. It also accepts `--back=AMOUNT` to let you specify a start date in the past using "natural language." For example, `doing now --back=25m ENTRY` or `doing now --back="yesterday 3:30pm" ENTRY`.
+##### now
 
-If you want to use `--back` with `doing done` but want the end time to be different than the start time, you can either use `--took` in addition, or just use `--took` on its own as it will backdate the start time such that the end time is now and the duration is equal to the value of the `--took` argument.
+The `doing now` command adds an entry to the "Currently" section by default. It accepts `-s section_name` to send the new entry straight to a non-default section. It also accepts `--back=AMOUNT` to let you specify a start date in the past using "natural language." For example, `doing now --back=25m ENTRY` or `doing now --back="yesterday 3:30pm" ENTRY`.
 
 You can finish the last unfinished task when starting a new one using `doing now` with the `-f` switch. It will look for the last task not marked _@done_ and add the _@done_ tag with the start time of the new task (either the current time or what you specified with `--back`).
 
-`doing done` is used to add an entry that you've already completed. Like `now`, you can specify a section with `-s section_name`. You can also skip straight to Archive with `-a`.
+> __Examples:__
+> 
+> - `doing now Working on project X` --- Add a new entry at the current time
+> - `doing now --section=Projects Working on @projectX` --- Add a new entry to a section titled "Projects"
+> - `doing now --back 30m` --- Add a new entry with a backdated start time, indicating you've been working on it for 30 minutes already
+> - `doing now --back 8am` --- Backdate a new entry to a specific time
+> - `doing now -f Starting the next thing` --- Add a new entry at the current time, and add a @done tag to the previous item with the current time as its completion date
+> - `doing now -f --back 30m Working on something new` --- Add a new entry and complete the last entry, but use a timestamp from 30 minutes ago for both.
 
-`doing done` can also backdate entries using natural language with `--back 15m` or `--back "3/15 3pm"`. That will modify the starting timestamp of the entry. You can also use `--took 1h20m` or `--took 1:20` to set the finish date based on a "natural language" time interval. If `--took` is used without `--back`, then the start date is adjusted (`--took` interval is subtracted) so that the completion date is the current time.
+##### done/finish
+
+`doing done` is used to add an entry that you've already completed. Like `now`, you can specify a section with `-s section_name`. You can also skip straight to the Archive with `-a`.
+
+`doing done` can also backdate entries using natural language with `--back 15m` or `--back "3/15 3pm"`. That will modify the starting timestamp of the entry. Used on its own, it will set the start date, and the finish date will be the current time. You can also use `--took 1h20m` or `--took 1:20` to set the finish date based on a "natural language" time interval. If `--took` is used without `--back`, then the start date is adjusted (`--took` interval is subtracted) so that the completion date is the current time.
 
 When used with `doing done`, `--back` and `--took` allow time intervals to be accurately counted when entering items after the fact. `--took` is also available for the `doing finish` command, but cannot be used in conjunction with `--back`. (In `finish` they both set the end date, and neither has priority. `--back` allows specific days/times, `--took` uses time intervals.)
 
+> __Examples:__
+>
+> - `doing done --back 1h The thing I just did` --- Add an entry for a completed task that you started an hour ago and just finished 
+> - `doing done --back 1h --took 20m The thing I just finished` --- Record an entry you started an hour ago and finished 20 minutes later
+> - `doing done --took 20m` --- Finish the last task but change the finish date so that the total elapsed time is only 20 minutes (if the finish date would be in the future, start date will be adjusted accordingly)
+
 All of these commands accept a `-e` argument. This opens your command line editor (as defined in the environment variable `$EDITOR`). Add your entry, save the temp file, and close it. The new entry is added. Anything after the first line is included as a note on the entry.
 
 `doing again` (or `doing resume`) will duplicate the last @done entry (most recently completed) with a new start date (and without the @done tag). To resume the last entry matching specific tags, use `--tag=TAG`. You can specify multiple tags by separating with a comma. Multiple tags are combined with 'AND' by default (all tags must exist on the entry to match), but you can use `--bool=` to set it to 'OR' or 'NOT'. By default the new entry will be added to the same section as the matching entry, but you can specify a section with `--in=SECTION`.
@@ -429,7 +446,7 @@ See `doing help meanwhile` for more options.
 
 ##### Finishing
 
-`doing finish` by itself is the same as `doing done` by itself. It adds _@done(timestamp)_ to the last entry. It also accepts a numeric argument to complete X number of tasks back in history. Add `-a` to also archive the affected entries.
+`doing finish` by itself is the same as `doing done` by itself. It adds _@done(timestamp)_ to the last entry. It also accepts a numeric argument to complete X number of tasks back in history (0 affects all entries). Add `-a` to also archive the affected entries.
 
 `doing finish` also provides an `--auto` flag, which you can use to set the end time of any entry to 1 minute before the start time of the next. Running a command such as `doing finish --auto 10` will go through the last 10 entries and sequentially update any without a _@done_ tag with one set to the time just before the next entry in the list.
 
@@ -445,6 +462,8 @@ You can change the boolean using `--bool=OR` (last entry containing any of the s
 
 You can also include a `--no-date` switch to add `@done` without a finish date, meaning no time is tracked for the task. `doing cancel` is an alias for this. Like `finish`, `cancel` accepts a count to act on the last X entries, as well as `--archive` and `--section` options. `cancel` also accepts the `--tag` and `--bool` flags for tag filtering.
 
+By default `doing finish` works on a single entry, the last entry or the most recent entry matching a `--tag` or `--search` query. Specifying `doing finish 10` would finish any unfinished entries within the last 10 entries. In the case of `--tag` or `--search` queries, the count serves as the maximum number of matches doing will act on, sorted in reverse date order (most recent first). A count of 0 will disable the limit entirely, acting on all matching entries.
+
 
 ##### Tagging and Autotagging
 

data/bin/doing

@@ -310,7 +310,7 @@ end
 
 desc 'Add a completed item with @done(date). No argument finishes last entry.'
 arg_name 'ENTRY'
-command [:done, :did] do |c|
+command %i[done did] do |c|
   c.desc 'Remove @done tag'
   c.switch %i[r remove], negatable: false, default_value: false
 
@@ -367,15 +367,18 @@ command [:done, :did] do |c|
 
       date = options[:took] ? finish_date - took : finish_date
     elsif options[:took]
-      finish_date = date + took
+      finish_date = options[:back] ? date + took : nil
     elsif options[:back]
       finish_date = date
     else
       finish_date = Time.now
     end
 
+    if finish_date
+      donedate = options[:date] ? "(#{finish_date.strftime('%F %R')})" : ''
+    end
+
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
-    donedate = options[:date] ? "(#{finish_date.strftime('%F %R')})" : ''
 
     if options[:e]
       raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
@@ -394,8 +397,15 @@ command [:done, :did] do |c|
       if options[:r]
         wwid.tag_last({ tags: ['done'], count: 1, section: section, remove: true })
       else
-        wwid.tag_last({ tags: ['done'], count: 1, section: section, archive: options[:a], back: finish_date,
-                        date: options[:date] })
+        options = { tags: ['done'],
+          archive: options[:a],
+          back: finish_date,
+          count: 1,
+          date: options[:date],
+          section: section,
+          took: took == 0 ? nil : took
+        }
+        wwid.tag_last(options)
       end
     elsif !args.empty?
       title, note = wwid.format_input(args.join(' '))
@@ -1230,14 +1240,17 @@ desc 'Move entries between sections'
 arg_name 'SECTION_NAME'
 default_value wwid.current_section
 command :archive do |c|
-  c.desc 'Count to keep (ignored if archiving by tag)'
-  c.arg_name 'COUNT'
-  c.flag %i[k keep], default_value: 5, must_match: /^\d+$/, type: Integer
+  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
+
   c.desc 'Tag filter, combine multiple tags with a comma. Added for compatibility with other commands.'
   c.arg_name 'TAG'
   c.flag [:tag]
@@ -1246,21 +1259,36 @@ command :archive do |c|
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: /(and|or|not)/i, default_value: 'AND'
 
+  c.desc 'Search filter'
+  c.arg_name 'QUERY'
+  c.flag [:search]
+
   c.action do |_global_options, options, args|
     if args.empty?
       section = wwid.current_section
       tags = []
+    elsif args[0] =~ /^all/i
+      section = 'all'
     elsif args[0] =~ /^@\S+/
       section = 'all'
       tags = args.map { |t| t.sub(/^@/, '').strip }
     else
       section = args[0].cap_first
-      tags = args.length > 1 ? args[1..].map { |t| t.sub(/^@/, '').strip } : nil
+      tags = args.length > 1 ? args[1..].map { |t| t.sub(/^@/, '').strip } : []
     end
 
+    raise '--keep and --count can\'t be used together' if options[:keep] && options[:count]
+
     tags.concat(options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if options[:tag]
 
-    wwid.archive(section, options[:keep], options[:to], tags, options[:bool])
+    opts = {
+      bool: options[:bool],
+      destination: options[:to],
+      keep: options[:keep],
+      search: options[:search],
+      tags: tags
+    }
+    wwid.archive(section, opts)
   end
 end
 
@@ -1363,6 +1391,41 @@ command :undo do |c|
   end
 end
 
+desc 'Import entries from an external source'
+long_desc 'Imports entries from other sources. Currently only handles JSON reports exported from Timing.app.'
+arg_name 'PATH'
+command [:import] do |c|
+  c.desc 'Import type'
+  c.arg_name 'TYPE'
+  c.flag [:type], default_value: 'timing'
+
+  c.desc 'Target section'
+  c.arg_name 'NAME'
+  c.flag %i[s section], default_value: wwid.current_section
+
+  c.desc 'Tag all imported entries'
+  c.arg_name 'TAGS'
+  c.flag [:tag]
+
+  c.desc 'Prefix entries with'
+  c.arg_name 'PREFIX'
+  c.flag [:prefix]
+
+  c.action do |_global_options, options, args|
+
+    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+
+    if options[:type] =~ /^tim/i
+      args.each do |path|
+        wwid.import_timing(path, { section: section, tag: options[:tag], prefix: options[:prefix] })
+        wwid.write(wwid.doing_file)
+      end
+    else
+      raise 'Invalid import type'
+    end
+  end
+end
+
 pre do |global, _command, _options, _args|
   if global[:config_file] && global[:config_file] != wwid.config_file
     wwid.config_file = global[:config_file]

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.60'
+  VERSION = '1.0.64'
 end

data/lib/doing/wwid.rb

@@ -310,7 +310,7 @@ class WWID
       else
         @content[section]['items'][current - 1]['note'] = [] unless @content[section]['items'][current - 1].key? 'note'
 
-        @content[section]['items'][current - 1]['note'].push(line.gsub(/ *$/, ''))
+        @content[section]['items'][current - 1]['note'].push(line.chomp)
         # end
       end
     end
@@ -667,6 +667,55 @@ class WWID
     @results.push(%(Added "#{entry['title']}" to #{section}))
   end
 
+  ##
+  ## @brief      Imports a Timing report
+  ##
+  ## @param      path     (String) Path to JSON report file
+  ## @param      section  (String) The section to add to
+  ## @param      opt      (Hash) Additional Options
+  ##
+  def import_timing(path, opt = {})
+    section = opt[:section] || @current_section
+    add_section(section) unless @content.has_key?(section)
+
+    add_tags = opt[:tag] ? opt[:tag].split(/[ ,]+/).map { |t| t.sub(/^@?/, '@') }.join(' ') : ''
+    prefix = opt[:prefix] ? opt[:prefix] : '[Timing.app]'
+    raise "File not found" unless File.exist?(File.expand_path(path))
+
+    data = JSON.parse(IO.read(File.expand_path(path)))
+    new_items = []
+    data.each do |entry|
+      # Only process task entries
+      next if entry.key?('activityType') && entry['activityType'] != 'Task'
+      # Only process entries with a start and end date
+      next unless entry.key?('startDate') && entry.key?('endDate')
+
+      start_time = Time.parse(entry['startDate'])
+      end_time = Time.parse(entry['endDate'])
+      next unless start_time && end_time
+      tags = entry['project'].split(/ ▸ /).map {|proj| proj.gsub(/ +/, '').downcase }
+      title = "#{prefix} "
+      title += entry.key?('activityTitle') && entry['activityTitle'] != '(Untitled Task)' ? entry['activityTitle'] : 'Working on'
+      tags.each do |tag|
+        if title =~ /\b#{tag}\b/i
+          title.sub!(/\b#{tag}\b/i, "@#{tag}")
+        else
+          title += " @#{tag}"
+        end
+      end
+      title = autotag(title) if @auto_tag
+      title += " @done(#{end_time.strftime('%Y-%m-%d %H:%M')})"
+      title.gsub!(/ +/, ' ')
+      title.strip!
+      new_entry = { 'title' => title, 'date' => start_time, 'section' => section }
+      new_entry['note'] = entry['notes'].split(/\n/).map(&:chomp) if entry.key?('notes')
+      new_items.push(new_entry)
+    end
+
+    @content[section]['items'].concat(new_items)
+    @results.push(%(Imported #{new_items.count} items to #{section}))
+  end
+
   ##
   ## @brief      Return the content of the last note for a given section
   ##
@@ -776,6 +825,7 @@ class WWID
     opt[:remove] ||= false
     opt[:autotag] ||= false
     opt[:back] ||= false
+    opt[:took] ||= nil
 
     sec_arr = []
 
@@ -833,6 +883,13 @@ class WWID
                 else
                   done_date = item['date'] + (opt[:back] - item['date'])
                 end
+              elsif opt[:took]
+                if item['date'] + opt[:took] > Time.now
+                  item['date'] = Time.now - opt[:took]
+                  done_date = Time.now
+                else
+                  done_date = item['date'] + opt[:took]
+                end
               else
                 done_date = Time.now
               end
@@ -1551,31 +1608,24 @@ class WWID
   ##             section
   ##
   ## @param      section      (String) The source section
-  ## @param      count        (Integer) The count
-  ## @param      destination  (String) The destination section
-  ## @param      tags         (Array) Tags to archive
-  ## @param      bool         (String) Tag boolean combinator
+  ## @param      options      (Hash) Options
   ##
-  def archive(section = 'Currently', count = 5, destination = nil, tags = nil, bool = nil, _export = nil)
+  def archive(section = 'Currently', options = {})
+    count       = options[:keep] || 0
+    destination = options[:destination] || 'Archive'
+    tags        = options[:tags] || []
+    bool        = options[:bool] || 'AND'
+
     section = choose_section if section.nil? || section =~ /choose/i
-    archive_all = section =~ /all/i # && !(tags.nil? || tags.empty?)
+    archive_all = section =~ /^all$/i # && !(tags.nil? || tags.empty?)
     section = guess_section(section) unless archive_all
 
-    add_section('Archive') if destination =~ /archive/i && !sections.include?('Archive')
+    add_section('Archive') if destination =~ /^archive$/i && !sections.include?('Archive')
 
     destination = guess_section(destination)
 
     if sections.include?(destination) && (sections.include?(section) || archive_all)
-      if archive_all
-        to_archive = sections.dup
-        to_archive.delete(destination)
-        to_archive.each do |source, _v|
-          do_archive(source, destination, { count: count, tags: tags, bool: bool, label: true })
-        end
-      else
-        do_archive(section, destination, { count: count, tags: tags, bool: bool, label: true })
-      end
-
+      do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label] })
       write(doing_file)
     else
       raise 'Either source or destination does not exist'
@@ -1589,74 +1639,69 @@ class WWID
   ## @param      destination  (String) The destination section
   ## @param      opt          (Hash) Additional Options
   ##
-  def do_archive(section, destination, opt = {})
-    count = opt[:count] || 5
-    tags = opt[:tags] || []
-    bool = opt[:bool] || 'AND'
-    label = opt[:label] || false
+  def do_archive(sect, destination, opt = {})
+    count = opt[:count] || 0
+    tags  = opt[:tags] || []
+    bool  = opt[:bool] || 'AND'
+    label = opt[:label] || true
 
-    items = @content[section]['items']
-    moved_items = []
+    if sect =~ /^all$/i
+      all_sections = sections.dup
+      all_sections.delete(destination)
+    else
+      all_sections = [sect]
+    end
 
-    if tags && !tags.empty?
-      items.delete_if do |item|
-        case bool
-        when /(AND|ALL)/i
-          score = 0
-          tags.each do |tag|
-            score += 1 if item['title'] =~ /@#{tag}/i
-          end
-          res = score < tags.length
-          moved_items.push(item) if res
-          res
-        when /NONE/i
-          del = false
-          tags.each do |tag|
-            del = true if item['title'] =~ /@#{tag}/i
+    counter = 0
+
+    all_sections.each do |section|
+      items = @content[section]['items']
+
+      moved_items = []
+      if !tags.empty? || opt[:search]
+        items.delete_if do |item|
+          if (!tags.empty? && item.has_tags?(tags, bool) || (opt[:search] && item.matches_search?(opt[:search].to_s)))
+            moved_items.push(item)
+            counter += 1
+            true
+          else
+            false
           end
-          moved_items.push(item) if del
-          del
-        when /(OR|ANY)/i
-          del = true
-          tags.each do |tag|
-            del = false if item['title'] =~ /@#{tag}/i
+        end
+        moved_items.each do |item|
+          if label && section != 'Currently'
+            item['title'] =
+              item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
           end
-          moved_items.push(item) if del
-          del
         end
-      end
-      moved_items.each do |item|
-        if label && section != 'Currently'
-          item['title'] =
-            item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
+
+        @content[section]['items'] = items
+        @content[destination]['items'].concat(moved_items)
+        @results.push("Archived #{moved_items.length} items from #{section} to #{destination}")
+      else
+        count = items.length if count == 0 || items.length < count
+
+        @content[section]['items'] = if count.zero?
+                                       []
+                                     else
+                                       items[0..count - 1]
+                                     end
+
+        items.map! do |item|
+          if label && section != 'Currently'
+            item['title'] =
+              item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
+          end
+          item
         end
-      end
-      @content[section]['items'] = moved_items
-      @content[destination]['items'] += items
-      @results.push("Archived #{items.length} items from #{section} to #{destination}")
-    else
-      count = items.length if items.length < count
-
-      @content[section]['items'] = if count.zero?
-                                     []
-                                   else
-                                     items[0..count - 1]
-                                   end
-
-      items.map! do |item|
-        if label && section != 'Currently'
-          item['title'] =
-            item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
+        if items.count > count
+          @content[destination]['items'].concat(items[count..-1])
+        else
+          @content[destination]['items'].concat(items)
         end
-        item
-      end
-      if items.count > count
-        @content[destination]['items'].concat(items[count..-1])
-      else
-        @content[destination]['items'].concat(items)
-      end
 
-      @results.push("Archived #{items.length - count} items from #{section} to #{destination}")
+        @results.push("Archived #{items.length - count} items from #{section} to #{destination}")
+      end
     end
   end
 

metadata

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