doing 1.0.62 → 1.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e2384e06e56e40f7f6c2b26121d16e0caa2cf40639158fc0f079f8ae26738da
-  data.tar.gz: 9e62f0ac38c0f19082094b88382e9779b743a4885403d796dddfb21a68ea1de2
+  metadata.gz: 6e02c8453f718dfa428e578ab1b125528aa07ffee1390bbe8222fb425abd63fa
+  data.tar.gz: 333707321b7e92312ee8a2874292b45df782c83eff2ddcdb5279b648b14730ff
 SHA512:
-  metadata.gz: 8cdb34a404ae818f10ee9facaba83fd44c584d06950fd2908b6fbb25b04e6a117a74a20836b765a2dca1cde480928398a42b5999e1678499013cbb1e88e5ccac
-  data.tar.gz: 5a771f4ba236518f54cd11bc99f1258b90026afe4face70db83e98f5f5ee97124eab732c7c65ccd61f1b98e18129c4034ea6c036c145e45abe298f058e25bc3e
+  metadata.gz: 187ce7735035b86ae1233d08dd154f502c7b2def0fc1fd11532de5256647c8cce57bd4ea73ca3fa704c2dfb4a307b94f339222a476e3fd30ba991fea77daa190
+  data.tar.gz: 29f7123aa51cb8a5754bca68854dbbb606f69533d8cdbd90a7a2187ca1cc29dd09131aed0787f72fd680e2d04fe9e47a92555cf90c1327b74cba23cc8a2fab2b

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.61<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.65<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -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
 
@@ -576,6 +595,29 @@ Example: Archive all Currently items for _@client_ that are marked _@done_
 
     doing archive @client @done
 
+##### Importing
+
+Doing can currently only import tasks from Timing.app reports. If you want to sync up your Doing file with Timing's tracking:
+
+1. Open Timing and go to Reports
+2. Set the date span you want to import into doing
+3. Group by Project, Then by None
+4. Include Tasks with Title, (not as subgroup), Timespan, and Notes
+5. Uncheck App Usage
+6. Set File Format to JSON and Duration format to "XX:YY:ZZ"
+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.
+
+(`--type timing` is the only option right now, so it doesn't need to be included)
+
+    # Import entries to Projects section and add @timing to all new entries
+    doing import -s Projects --tag=timing "~/Desktop/All Activities.json"
+
+    # Import to default section (Currently) and prefix entries with '[Imported]'
+    doing import --prefix="[Imported]" "~/Desktop/All Activities.json"
+
 ---
 
 ## Extras

data/bin/doing

@@ -52,7 +52,7 @@ flag %i[f doing_file]
 
 desc 'Add an entry'
 arg_name 'ENTRY'
-command [:now, :next] do |c|
+command %i[now next] do |c|
   c.desc 'Section'
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: wwid.current_section
@@ -105,7 +105,8 @@ command [:now, :next] do |c|
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:f] })
       wwid.write(wwid.doing_file)
     elsif $stdin.stat.size.positive?
-      title, note = wwid.format_input($stdin.read)
+      input = $stdin.read
+      title, note = wwid.format_input(input)
       note.push(options[:n]) if options[:n]
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:f] })
       wwid.write(wwid.doing_file)
@@ -239,7 +240,7 @@ long_desc %(
 
   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)/i
 command :template do |c|
   c.action do |_global_options, options, args|
     raise 'No type specified, use `doing template [HAML|CSS]`' if args.empty?
@@ -374,11 +375,12 @@ command %i[done did] do |c|
       finish_date = Time.now
     end
 
-    section = wwid.guess_section(options[:s]) || options[:s].cap_first
     if finish_date
       donedate = options[:date] ? "(#{finish_date.strftime('%F %R')})" : ''
     end
 
+    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+
     if options[:e]
       raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
@@ -442,7 +444,7 @@ command :cancel do |c|
 
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.action do |_global_options, options, args|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
@@ -451,7 +453,16 @@ command :cancel do |c|
       tags = []
     else
       tags = options[:tag].split(/ *, */).map { |t| t.strip.sub(/^@/, '') }
-      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+      options[:bool] = case options[:bool]
+                       when /(and|all)/i
+                        'AND'
+                       when /(any|or)/i
+                        'OR'
+                       when /(not|none)/i
+                        'NOT'
+                       else
+                        'AND'
+                       end
     end
 
     raise 'Only one argument allowed' if args.length > 1
@@ -499,7 +510,7 @@ command :finish do |c|
 
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc %(Auto-generate finish dates from next entry's start time.
   Automatically generate completion dates 1 minute before next start date.
@@ -536,7 +547,16 @@ command :finish do |c|
       tags = []
     else
       tags = options[:tag].split(/ *, */).map { |t| t.strip.sub(/^@/, '') }
-      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+      options[:bool] = case options[:bool]
+                             when /(and|all)/i
+                              'AND'
+                             when /(any|or)/i
+                              'OR'
+                             when /(not|none)/i
+                              'NOT'
+                             else
+                              'AND'
+                             end
     end
 
     raise 'Only one argument allowed' if args.length > 1
@@ -581,7 +601,7 @@ command [:again, :resume] do |c|
 
   c.desc 'Boolean used to combine multiple tags'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc 'Note'
   c.arg_name 'TEXT'
@@ -589,6 +609,16 @@ command [:again, :resume] do |c|
 
   c.action do |_global_options, options, _args|
     tags = options[:tag].nil? ? [] : options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }
+    options[:bool] = case options[:bool]
+                     when /(and|all)/i
+                      'AND'
+                     when /(any|or)/i
+                      'OR'
+                     when /(not|none)/i
+                      'NOT'
+                     else
+                      'AND'
+                     end
     opts = {
       in: options[:in],
       note: options[:n],
@@ -693,9 +723,9 @@ command :show do |c|
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Tag boolean (AND,OR,NONE)'
+  c.desc 'Tag boolean (AND,OR,NOT)'
   c.arg_name 'BOOLEAN'
-  c.flag %i[b bool], must_match: /^(and|or|not)$/i, default_value: 'OR'
+  c.flag %i[b bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'OR'
 
   c.desc 'Max count to show'
   c.arg_name 'MAX'
@@ -707,7 +737,7 @@ command :show do |c|
 
   c.desc 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
-  c.flag %i[s sort], must_match: /^(a|d)/i, default_value: 'ASC'
+  c.flag %i[s sort], must_match: /^(?:a|d)/i, default_value: 'ASC'
 
   c.desc %(
     Date range to show, or a single day to filter date on.
@@ -727,14 +757,14 @@ command :show do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)/i, default_value: default
 
   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.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)$/i
   c.action do |_global_options, options, args|
     tag_filter = false
     tags = []
@@ -756,13 +786,9 @@ command :show do |c|
       end
       if args.length.positive?
         args.each do |arg|
-          if arg =~ /,/
-            arg.split(/,/).each do |tag|
-              tags.push(tag.strip.sub(/^@/, ''))
-            end
-          else
-            tags.push(arg.strip.sub(/^@/, ''))
-          end
+          arg.split(/,/).each do |tag|
+                        tags.push(tag.strip.sub(/^@/, ''))
+                      end
         end
       end
     else
@@ -770,11 +796,21 @@ command :show do |c|
     end
 
     tags.concat(options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if options[:tag]
+    options[:bool] = case options[:bool]
+                     when /(and|all)/i
+                      'AND'
+                     when /(any|or)/i
+                      'OR'
+                     when /(not|none)/i
+                      'NOT'
+                     else
+                      'AND'
+                     end
 
     unless tags.empty?
       tag_filter = {
         'tags' => tags,
-        'bool' => options[:b]
+        'bool' => options[:bool]
       }
     end
 
@@ -831,7 +867,7 @@ command [:grep, :search] do |c|
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   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)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true
@@ -843,7 +879,7 @@ command [:grep, :search] do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
@@ -890,7 +926,7 @@ command :recent do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.action do |global_options, options, args|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
@@ -930,11 +966,11 @@ command :today do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   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)$/i
 
   c.action do |_global_options, options, _args|
     options[:t] = true if options[:totals]
@@ -965,11 +1001,11 @@ command :on do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   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)$/i
 
   c.action do |_global_options, options, args|
     exit_now! 'Missing date argument' if args.empty?
@@ -1007,7 +1043,7 @@ command :yesterday do |c|
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   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)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true
@@ -1019,7 +1055,7 @@ command :yesterday do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.action do |_global_options, options, _args|
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
@@ -1043,7 +1079,7 @@ command :last do |c|
 
   c.desc 'Tag boolean'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /(and|or|not)/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc 'Search filter, surround with slashes for regex (/query/)'
   c.arg_name 'QUERY'
@@ -1056,7 +1092,15 @@ command :last do |c|
       tags = []
     else
       tags = options[:tag].split(/ *, */).map { |t| t.strip.sub(/^@/, '') }
-      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+      options[:bool] = case options[:bool]
+                       when /(any|or)/i
+                        :or
+                       when /(not|none)/i
+                        :not
+                       else
+                        :and
+                       end
+
     end
 
     if options[:e]
@@ -1129,7 +1173,7 @@ command :view do |c|
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   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)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true
@@ -1144,7 +1188,7 @@ command :view do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: true
@@ -1177,7 +1221,7 @@ command :view do |c|
                              else
                                view['tags'].gsub(/[, ]+/, ' ').split(' ').map(&:strip)
                              end
-        tag_filter['bool'] = view.key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].upcase : 'OR'
+        tag_filter['bool'] = view.key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].normalize_bool : :or
       end
 
       # If the -o/--output flag was specified, override any default in the view template
@@ -1256,7 +1300,7 @@ command :archive do |c|
 
   c.desc 'Tag boolean (AND|OR|NOT)'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /(and|or|not)/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc 'Search filter'
   c.arg_name 'QUERY'
@@ -1280,6 +1324,16 @@ command :archive do |c|
 
     tags.concat(options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if options[:tag]
 
+    options[:bool] = case options[:bool]
+                     when /(and|all)/i
+                      'AND'
+                     when /(any|or)/i
+                      'OR'
+                     when /(not|none)/i
+                      'NOT'
+                     else
+                      'AND'
+                     end
     opts = {
       bool: options[:bool],
       destination: options[:to],
@@ -1390,6 +1444,44 @@ 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.desc 'Allow entries that overlap existing times'
+  c.switch [:overlap], negatable: true
+
+  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], no_overlap: !options[:overlap] })
+        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.rb

@@ -8,4 +8,5 @@ require 'tempfile'
 require 'chronic'
 require 'haml'
 require 'json'
+require 'doing/helpers.rb'
 require 'doing/wwid.rb'

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.62'
+  VERSION = '1.0.66'
 end

data/lib/doing/wwid.rb

@@ -4,92 +4,6 @@ require 'deep_merge'
 require 'open3'
 require 'pp'
 
-##
-## @brief      Hash helpers
-##
-class Hash
-  def has_tags?(tags, bool = 'AND')
-    tags = tags.split(/ *, */) if tags.is_a? String
-    item = self
-    case bool
-    when 'AND'
-      result = true
-      tags.each do |tag|
-        unless item['title'] =~ /@#{tag}/
-          result = false
-          break
-        end
-      end
-      result
-    when 'NOT'
-      result = true
-      tags.each do |tag|
-        if item['title'] =~ /@#{tag}/
-          result = false
-          break
-        end
-      end
-      result
-    else
-      result = false
-      tags.each do |tag|
-        if item['title'] =~ /@#{tag}/
-          result = true
-          break
-        end
-      end
-      result
-    end
-  end
-
-  def matches_search?(search)
-    item = self
-    text = item['note'] ? item['title'] + item['note'].join(' ') : item['title']
-    pattern = if search.strip =~ %r{^/.*?/$}
-                search.sub(%r{/(.*?)/}, '\1')
-              else
-                search.split('').join('.{0,3}')
-              end
-    text =~ /#{pattern}/i ? true : false
-  end
-end
-
-##
-## @brief      String helpers
-##
-class String
-  def cap_first
-    sub(/^\w/) do |m|
-      m.upcase
-    end
-  end
-
-  ##
-  ## @brief      Turn raw urls into HTML links
-  ##
-  ## @param      opt   (Hash) Additional Options
-  ##
-  def link_urls(opt = {})
-    opt[:format] ||= :html
-    if opt[:format] == :html
-      gsub(%r{(?mi)((http|https)://)?([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&:/~+#]*[\w\-@^=%&/~+#])?}) 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|
-        m = Regexp.last_match
-        if m[1] =~ /<a href/
-          match
-        else
-          %(<a href="#{m[1]}" title="Link to #{m[1]}">[link]</a>)
-        end
-      end
-    else
-      self
-    end
-  end
-end
-
 ##
 ## @brief      Main "What Was I Doing" methods
 ##
@@ -310,7 +224,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 +581,96 @@ class WWID
     @results.push(%(Added "#{entry['title']}" to #{section}))
   end
 
+  def same_time?(item_a, item_b)
+    item_a['date'] == item_b['date'] ? get_interval(item_a, false) == get_interval(item_b, false) : false
+  end
+
+  def overlapping_time?(item_a, item_b)
+    return true if same_time?(item_a, item_b)
+
+    start_a = item_a['date']
+    interval = get_interval(item_a, false)
+    end_a = interval ? start_a + interval.to_i : start_a
+    start_b = item_b['date']
+    interval = get_interval(item_b, false)
+    end_b = interval ? start_b + interval.to_i : start_b
+    (start_a >= start_b && start_a <= end_b) || (end_a >= start_b && end_a <= end_b) || (start_a < start_b && end_a > end_b)
+  end
+
+  def dedup(items, no_overlap = false)
+
+    combined = []
+    @content.each do |_k, v|
+      combined += v['items']
+    end
+
+    items.delete_if do |item|
+      duped = false
+      combined.each do |comp|
+        duped = no_overlap ? overlapping_time?(item, comp) : same_time?(item, comp)
+        break if duped
+      end
+      # warn "Skipping overlapping entry: #{item['title']}" if duped
+      duped
+    end
+  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
+    opt[:no_overlap] ||= false
+
+    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')
+
+      # Round down seconds and convert UTC to local time
+      start_time = Time.parse(entry['startDate'].sub(/:\d\dZ$/, ':00Z')).getlocal
+      end_time = Time.parse(entry['endDate'].sub(/:\d\dZ$/, ':00Z')).getlocal
+      next unless start_time && end_time
+
+      tags = entry['project'].split(/ ▸ /).map {|proj| proj.gsub(/[^a-z0-9]+/i, '').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
+    total = new_items.count
+    new_items = dedup(new_items, opt[:no_overlap])
+    dups = total - new_items.count
+    @results.push(%(Skipped #{dups} items with overlapping times)) if dups > 0
+    @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
   ##
@@ -701,7 +705,7 @@ class WWID
     opt[:section] ||= 'all'
     opt[:note] ||= []
     opt[:tag] ||= []
-    opt[:tag_bool] ||= 'AND'
+    opt[:tag_bool] ||= :and
 
     last = last_entry(opt)
     if last.nil?
@@ -727,7 +731,7 @@ class WWID
   ## @param      opt   (Hash) Additional Options
   ##
   def last_entry(opt = {})
-    opt[:tag_bool] ||= 'AND'
+    opt[:tag_bool] ||= :and
     opt[:section] ||= @current_section
 
     sec_arr = []
@@ -835,7 +839,12 @@ class WWID
                   done_date = item['date'] + (opt[:back] - item['date'])
                 end
               elsif opt[:took]
-                done_date = item['date'] + 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
@@ -1213,7 +1222,7 @@ class WWID
         @content.each do |_k, v|
           combined['items'] += v['items']
         end
-        section = if opt[:tag_filter] && opt[:tag_filter]['bool'] != 'NONE'
+        section = if opt[:tag_filter] && opt[:tag_filter]['bool'].normalize_bool != :not
                     opt[:tag_filter]['tags'].map do |tag|
                       "@#{tag}"
                     end.join(' + ')
@@ -1244,31 +1253,7 @@ class WWID
     end
 
     if opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
-      items.delete_if do |item|
-        case opt[:tag_filter]['bool']
-        when /(AND|ALL)/
-          del = false
-          opt[:tag_filter]['tags'].each do |tag|
-            unless item['title'] =~ /@#{tag}/
-              del = true
-              break
-            end
-          end
-          del
-        when /NONE/
-          del = false
-          opt[:tag_filter]['tags'].each do |tag|
-            del = true if item['title'] =~ /@#{tag}/
-          end
-          del
-        when /(OR|ANY)/
-          del = true
-          opt[:tag_filter]['tags'].each do |tag|
-            del = false if item['title'] =~ /@#{tag}/
-          end
-          del
-        end
-      end
+      items.select! { |item| item.has_tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool']) }
     end
 
     if opt[:search]
@@ -1560,7 +1545,7 @@ class WWID
     count       = options[:keep] || 0
     destination = options[:destination] || 'Archive'
     tags        = options[:tags] || []
-    bool        = options[:bool] || 'AND'
+    bool        = options[:bool] || :and
 
     section = choose_section if section.nil? || section =~ /choose/i
     archive_all = section =~ /^all$/i # && !(tags.nil? || tags.empty?)
@@ -1588,7 +1573,7 @@ class WWID
   def do_archive(sect, destination, opt = {})
     count = opt[:count] || 0
     tags  = opt[:tags] || []
-    bool  = opt[:bool] || 'AND'
+    bool  = opt[:bool] || :and
     label = opt[:label] || true
 
     if sect =~ /^all$/i
@@ -1601,7 +1586,7 @@ class WWID
     counter = 0
 
     all_sections.each do |section|
-      items = @content[section]['items']
+      items = @content[section]['items'].dup
 
       moved_items = []
       if !tags.empty? || opt[:search]
@@ -1625,13 +1610,7 @@ class WWID
         @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
+        count = items.length if items.length < count
 
         items.map! do |item|
           if label && section != 'Currently'
@@ -1640,12 +1619,19 @@ class WWID
           end
           item
         end
+
         if items.count > count
           @content[destination]['items'].concat(items[count..-1])
         else
           @content[destination]['items'].concat(items)
         end
 
+        @content[section]['items'] = if count.zero?
+                                       []
+                                     else
+                                       items[0..count - 1]
+                                     end
+
         @results.push("Archived #{items.length - count} items from #{section} to #{destination}")
       end
     end

metadata

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