doing 1.0.63 → 1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c103e507e82866174c88e6c3613f613964eaacba5f499631598b9ecbbb0cbe55
-  data.tar.gz: edb32425ba3e81c1e3ff5bfeed3d0cb0b2dd8c2a353bc3d6adee6b98bf3536e0
+  metadata.gz: 6e6ebff7b78368227b7642297b5b88c8f018f0a9049f42478fc070f545421b1c
+  data.tar.gz: bff5c3852e60db87cacaba489f30fcf93fbdb01a8b7e4cba5fd06b6fc23db936
 SHA512:
-  metadata.gz: 20b03da63cba70b6c12a2f7775429f974fba8bc12b5f7c411d7a8e4a765f6c3113d3a627cf96684e4fbdb26c1b0430e0beec196cd0d2f655dd4459ba10b0902f
-  data.tar.gz: 934a87ead078f5fa7d2b7260921bfdeb15a57ecddd7a793003ad7dabb5dbf5bc093c1048258ffaba41e0ad00f5d49ab26cbdb825cca5e7f21c30446d92e3b10e
+  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.62<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.63<!--END VER-->.
 
     $ [sudo] gem install doing
 

data/bin/doing

@@ -1391,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.63'
+  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
   ##

metadata

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