doing 1.0.8pre → 1.0.10pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe65d7638817ae91c0b28db474b25e1db315c32d
-  data.tar.gz: 2f3f3b3100bd5b9495be019787201b773d7f9e16
+  metadata.gz: f80fbe9f636b31d608391b7723a14407b515dbe7
+  data.tar.gz: 9aefb646ddc4465ed3b86a0dfc3403d3e1fc69be
 SHA512:
-  metadata.gz: 945b6b6794717f6dfaa41b180209e28cf5cd219852c2098a862e940cb6989010c3aa79fdec5010bfffc82c43bc177667988d6357427d4f6c936efa26950b77e9
-  data.tar.gz: afcc84a5dd4b5723e0b003aa68c444a44ead9b99b56e7e625508482bdd92982acb4c8dcee2859191b912cc3c0500c1dc5d7d37896c569f657c13314a5ffe0fc7
+  metadata.gz: fc9e0fa945d7cebb0402b3098a0879373907323b3ce6c6a3a5e26a710a2a11d3ec57bd1f1d9a1d3f0a0ec4ebc17b226f92f61f32faa4187e276ce029d43f90be
+  data.tar.gz: d559d691bd3ba1c9a360d08500b720790a99267c84ae05cd7962764b1cddf137f60197bae59fe418f9079609427420b12a9bc959f9e26dc66175e6cf6b8c6e5b

data/README.md

@@ -89,7 +89,13 @@ A basic configuration looks like this:
     :include_notes: true
 
 
-The config file is stored in "~/.doingrc", and is created on the first run. 
+The config file is stored in "~/.doingrc", and is created on the first run.
+
+### Per-folder configuration
+
+Any options found in a `.doingrc` anywhere in the hierarchy between your current folder and your home folder will be appended to the base configuration, overriding or extending existing options. This allows you to put a `.doingrc` file into the base of a project and add specific configurations (such as default tags) when working in that project on the command line.
+
+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.
 
 ### Doing file location
 
@@ -125,6 +131,7 @@ The config also contains templates for various command outputs. Include placehol
 - `%note`: Any note in the entry will be included here, a newline and tabs are automatically added.
 - `%odnote`: The notes with a leading tab removed (outdented note)
 - `%chompnote`: Notes on one line, beginning and trailing whitespace removed.
+- `%section`: The section/project the entry is currently in
 - `%hr`: a horizontal rule (`-`) the width of the terminal
 - `%hr_under`: a horizontal rule (`_`) the width of the terminal
 - `%n`: inserts a newline
@@ -322,7 +329,7 @@ As mentioned above, `finish` also accepts `--back "2 hours"` (sets the finish da
 
 ... will mark the last three entries as "@client @cancelled." Add `-r` as a switch to remove the listed tags instead.
 
-You can optionally define keywords for common tasks and projects in your `.doingrc` file. When these keywords appear in an item title, they'll automatically be converted into @tags. The "whitelist" tags are exact (but case insensitive) matches. You can also define "synonyms" which will add a tag at the end based on keywords associated with it.
+You can optionally define keywords for common tasks and projects in your `.doingrc` file. When these keywords appear in an item title, they'll automatically be converted into @tags. The "whitelist" tags are exact (but case insensitive) matches. You can also define "synonyms" which will add a tag at the end based on keywords associated with it. When defining synonym keys, be sure to indent but _not_ hyphenate the keys themselves, while hyphenating the list of synonyms at the same indent level as their key. See "playing" and "writing" in the list below for illustration. Follow standard yaml syntax.
 
 To add autotagging, include a section like this in your `~/.doingrc` file:
 
@@ -489,7 +496,7 @@ Please try not to email me directly about GitHub projects.
 
 I'll try to document some of the code structure as I flesh it out. I'm currently working on adding a CLI reporting structure and logging methods, as well as santizing and standardizing all the flags and switches for consistency. Feel free to [poke around](http://github.com/ttscoff/doing/), I'll try to add more comments in the future (and retroactively).
 
-### Changelog
+## Changelog
 
 #### 1.0.8pre
 

data/bin/doing

@@ -1,17 +1,29 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
 require 'gli'
 require 'doing'
 require 'tempfile'
 
-if RUBY_VERSION.to_f > 1.9
-  Encoding.default_external = Encoding::UTF_8
-  Encoding.default_internal = Encoding::UTF_8
+def class_exists?(class_name)
+  klass = Module.const_get(class_name)
+  return klass.is_a?(Class)
+rescue NameError
+  return false
 end
 
+if class_exists? 'Encoding'
+  Encoding.default_external = Encoding::UTF_8 if Encoding.respond_to?('default_external')
+  Encoding.default_internal = Encoding::UTF_8 if Encoding.respond_to?('default_internal')
+end
+
+
 include GLI::App
 version Doing::VERSION
 
 wwid = WWID.new
+wwid.user_home = %x{echo $HOME}.strip
+wwid.configure
+
 
 program_desc 'A CLI for a What Was I Doing system'
 
@@ -120,7 +132,7 @@ command :note do |c|
 
       input = args.length > 0 ? args.join(" ") : ""
 
-      prev_input = wwid.last_note(section)
+      prev_input = wwid.last_note(section) || ""
       if prev_input.class == Array
         prev_input = prev_input.join("\n")
       end
@@ -726,8 +738,13 @@ command :on do |c|
       start = wwid.chronify(date_string)
       finish = false
     end
+
     exit_now! "Unrecognized date string" unless start
 
+    message = "Date interpreted as #{start}"
+    message += " to #{finish}" if finish
+    wwid.results.push(message)
+
     options[:t] = true if options[:totals]
 
     puts wwid.list_date([start,finish],options[:s],options[:t],options[:output],{:totals => options[:totals]}).chomp
@@ -993,22 +1010,22 @@ command :config do |c|
   c.action do |global_options,options,args|
     if `uname` =~ /Darwins/
       if options[:x]
-        %x{open -a "#{wwid.config['editor_app']}" "#{File.join(Dir.home, DOING_CONFIG_NAME)}"}
+        %x{open -a "#{wwid.config['editor_app']}" "#{File.join(Dir.home, wwid.default_config_file)}"}
       elsif options[:a] || options[:b]
         if options[:a]
-          %x{open -a "#{options[:a]}" "#{File.join(Dir.home, DOING_CONFIG_NAME)}"}
+          %x{open -a "#{options[:a]}" "#{File.join(Dir.home, wwid.default_config_file)}"}
         elsif options[:b]
-          %x{open -b #{options[:b]} "#{File.join(Dir.home, DOING_CONFIG_NAME)}"}
+          %x{open -b #{options[:b]} "#{File.join(Dir.home, wwid.default_config_file)}"}
         end
       else
         raise "No EDITOR variable defined in environment" if options[:e].nil? && ENV['EDITOR'].nil?
         editor = options[:e].nil? ? ENV['EDITOR'] : options[:e]
-        system %Q{#{editor} "#{File.expand_path(DOING_CONFIG)}"}
+        system %Q{#{editor} "#{File.join(Dir.home, wwid.default_config_file)}"}
       end
     else
       raise "No EDITOR variable defined in environment" if options[:e].nil? && ENV['EDITOR'].nil?
       editor = options[:e].nil? ? ENV['EDITOR'] : options[:e]
-      system %Q{#{editor} "#{File.join(Dir.home, DOING_CONFIG_NAME)}"}
+      system %Q{#{editor} "#{File.join(Dir.home, wwid.default_config_file)}"}
     end
   end
 end
@@ -1047,7 +1064,7 @@ end
 post do |global,command,options,args|
   # Use skips_post before a command to skip this
   # block on that command only
-  puts wwid.results.join("\n")
+  $stderr.puts wwid.results.join("\n")
 end
 
 on_error do |exception|

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.8pre'
+  VERSION = '1.0.10pre'
 end

data/lib/doing/wwid.rb

@@ -9,18 +9,47 @@ class String
     end
   end
 
+  def link_urls(opt={})
+    opt[:format] ||= :html
+    if opt[:format] == :html
+      self.gsub(/(?mi)((http|https):\/\/)?([\w\-_]+(\.[\w\-_]+)+)([\w\-\.,\@?^=%&:\/~\+#]*[\w\-\@^=%&\/~\+#])?/) {|match|
+        m = Regexp.last_match
+        proto = m[1].nil? ? "http://" : ""
+        %Q{<a href="#{proto}#{m[0]}" title="link to #{m[0]}">[#{m[3]}]</a>}
+      }.gsub(/\<(\w+:.*?)\>/) {|match|
+        m = Regexp.last_match
+        unless m[1] =~ /<a href/
+          %Q{<a href="#{m[1]}" title="Link to #{m[1]}">[link]</a>}
+        else
+          match
+        end
+      }
+    else
+      self
+    end
+  end
 end
 
 class WWID
-  attr_accessor :content, :sections, :current_section, :doing_file, :config, :results
-
+  attr_accessor :content, :sections, :current_section, :doing_file, :config, :user_home, :default_config_file, :results
 
   def initialize
     @content = {}
+    @doingrc_needs_update = false
+    @default_config_file = '.doingrc'
+  end
+
+  def configure(opt={})
     @timers = {}
+    @config_file == File.join(@user_home, @default_config_file)
+
     @config = read_config
+    user_config = @config.dup
     @results = []
 
+    @config['autotag'] ||= {}
+    @config['autotag']['whitelist'] ||= []
+    @config['autotag']['synonyms'] ||= {}
     @config['doing_file'] ||= "~/what_was_i_doing.md"
     @config['current_section'] ||= 'Currently'
     @config['editor_app'] ||= nil
@@ -75,11 +104,19 @@ class WWID
 
     @config[:include_notes] ||= true
 
-    File.open(home_config, 'w') { |yf| YAML::dump(config, yf) }
+    File.open(@config_file, 'w') { |yf| YAML::dump(@config, yf) } if @config != user_config || @doingrc_needs_update
+
+
+    @config = @config.deep_merge(@local_config)
+
+    @current_section = @config['current_section']
+    @default_template = @config['templates']['default']['template']
+    @default_date_format = @config['templates']['default']['date_format']
+
   end
 
   def init_doing_file(input=nil)
-    @doing_file = File.expand_path(config['doing_file'])
+    @doing_file = File.expand_path(@config['doing_file'])
 
     if input.nil?
       create(@doing_file) unless File.exists?(@doing_file)
@@ -114,7 +151,7 @@ class WWID
       elsif line =~ /^\s*- (\d{4}-\d\d-\d\d \d\d:\d\d) \| (.*)/
         date = Time.parse($1)
         title = $2
-        @content[section]['items'].push({'title' => title, 'date' => date})
+        @content[section]['items'].push({'title' => title, 'date' => date, 'section' => section})
         current += 1
       else
         # if content[section]['items'].length - 1 == current
@@ -127,7 +164,7 @@ class WWID
               unless @content[section]['items'][current - 1].has_key? 'note'
                 @content[section]['items'][current - 1]['note'] = []
               end
-              @content[section]['items'][current - 1]['note'].push(line)
+              @content[section]['items'][current - 1]['note'].push(line.gsub(/ *$/,''))
             end
           end
         # end
@@ -146,27 +183,42 @@ class WWID
     end
   end
 
-  def home_config
-    if Dir.respond_to?('home')
-      File.join(Dir.home, DOING_CONFIG_NAME)
-    else
-      File.join(File.expand_path("~"), DOING_CONFIG_NAME)
-    end
-  end
+  def find_local_config
 
-  def read_config
     config = {}
     dir = Dir.pwd
-    while(dir != '/')
-      if File.exists? File.join(dir, DOING_CONFIG_NAME)
-        config = YAML.load_file(File.join(dir, DOING_CONFIG_NAME)).deep_merge!(config)
+
+    local_config_file = nil
+
+    while (dir != '/' && (dir =~ /[A-Z]:\//) == nil)
+      if File.exists? File.join(dir, @default_config_file)
+        return File.join(dir, @default_config_file)
       end
+
       dir = File.dirname(dir)
     end
-    if config.empty? && File.exists?(home_config)
-      config = YAML.load_file(home_config)
+
+    false
+  end
+
+  def read_config
+    if Dir.respond_to?('home')
+      @config_file = File.join(Dir.home, @default_config_file)
+    else
+      @config_file = File.join(File.expand_path("~"), @default_config_file)
+    end
+    @doingrc_needs_update = true if File.exists? @config_file
+    additional = find_local_config
+
+    begin
+      @config = YAML.load_file(@config_file) || {} if File.exists?(@config_file)
+      @local_config = YAML.load_file(additional) || {} if additional
+      @config.deep_merge(@local_config)
+    rescue
+      @config = {}
+      @local_config = {}
+      # raise "error reading config"
     end
-    config
   end
 
   def fork_editor(input="")
@@ -220,38 +272,31 @@ class WWID
     [title, note]
   end
 
-  # Converts simple strings into seconds that can be added to a Time object
-  # Params:
-  # +qty+:: HH:MM or XX[dhm][[XXhm][XXm]] (1d2h30m, 45m, 1.5d, 1h20m, etc.)
-  # Returns:
-  # seconds(Integer)
+  # Converts `input` string into a Time object when `input` takes on the
+  # following formats:
+  # - interval format e.g. '1d2h30m', '45m' etc.
+  # - a semantic phrase e.g. 'yesterday 5:30pm'
+  # - a strftime e.g. '2016-03-15 15:32:04 PDT'
   def chronify(input)
+    now = Time.now
+    raise "Invalid time expression #{input.inspect}" if input.to_s.strip == ""
+    secs_ago = if input.match /^(\d+)$/
+      # plain number, assume minutes
+      $1.to_i * 60
+    elsif (m = input.match /^((?<day>\d+)d)?((?<hour>\d+)h)?((?<min>\d+)m)?$/i)
+      # day/hour/minute format e.g. 1d2h30m
+      [[m['day'], 24*3600],
+       [m['hour'], 3600],
+       [m['min'], 60]].map {|qty, secs| qty ? (qty.to_i * secs) : 0 }.reduce(0, :+)
+    end
 
-    had_to_try = Time.parse(input) rescue false
-
-    if had_to_try.class == FalseClass
-      if input =~ /^(\d+)([mhd])?$/i
-        amt = $1
-        type = $2.nil? ? "m" : $2
-        input = case type.downcase
-        when 'm'
-          amt + " minutes ago"
-        when 'h'
-          amt + " hours ago"
-        when 'd'
-          amt + " days ago"
-        else
-          input
-        end
-      end
-
-      Chronic.parse(input, {:context => :past, :ambiguous_time_range => 8})
+    if secs_ago
+      now - secs_ago
     else
-      had_to_try
+      Chronic.parse(input, {:context => :past, :ambiguous_time_range => 8})
     end
   end
 
-
   # Converts simple strings into seconds that can be added to a Time object
   # Params:
   # +qty+:: HH:MM or XX[dhm][[XXhm][XXm]] (1d2h30m, 45m, 1.5d, 1h20m, etc.)
@@ -308,13 +353,13 @@ class WWID
         input = STDIN.gets
         if input =~ /^y/i
           add_section(frag.cap_first)
-          write(doing_file)
+          write(@doing_file)
           return frag.cap_first
         end
         raise "Unknown section: #{frag}"
       end
     end
-    section ? section.cap_first : section
+    section ? section.cap_first : guessed
   end
 
   def guess_view(frag,guessed=false)
@@ -349,9 +394,21 @@ class WWID
 
     title = [title.strip.cap_first] + @config['default_tags'].map{|t| '@' + t.sub(/^ *@/,'').chomp}
     title = autotag(title.join(' '))
-    entry = {'title' => title, 'date' => opt[:back]}
+    unless @config['default_tags'].empty?
+      title += @config['default_tags'].map{|t|
+        unless t.nil?
+          dt = t.sub(/^ *@/,'').chomp
+          if title =~ /@#{dt}/
+            ""
+          else
+            '@' + dt
+          end
+        end
+      }.delete_if {|t| t == "" }.join(" ")
+    end
+    entry = {'title' => title.strip, 'date' => opt[:back]}
     unless opt[:note] =~ /^\s*$/s
-      entry['note'] = opt[:note]
+      entry['note'] = opt[:note].map {|n| n.gsub(/ *$/,'')}
     end
     items = @content[section]['items']
     if opt[:timed]
@@ -462,7 +519,9 @@ class WWID
 
         if opt[:archive] && section != "Archive" && opt[:count] > 0
           # concat [count] items from [section] and archive section
-          archived = @content[section]['items'][0..opt[:count]-1].concat(@content['Archive']['items'])
+          archived = @content[section]['items'][0..opt[:count]-1].map {|i|
+            i['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{i['section']}")
+          }.concat(@content['Archive']['items'])
           # chop [count] items off of [section] items
           @content[opt[:section]]['items'] = @content[opt[:section]]['items'][opt[:count]..-1]
           # overwrite archive section with concatenated array
@@ -543,7 +602,9 @@ class WWID
 
         if opt[:archive] && opt[:section] != "Archive"
           @results.push(%Q{Completed and archived "#{@content[opt[:section]]['items'][i]['title']}"})
-          @content['Archive']['items'].push(@content[opt[:section]]['items'][i])
+          archive_item = @content[opt[:section]]['items'][i]
+          archive_item['title'] = i['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{i['section']}")
+          @content['Archive']['items'].push(archive_item)
           @content[opt[:section]]['items'].delete_at(i)
         else
           @results.push(%Q{Completed "#{@content[opt[:section]]['items'][i]['title']}"})
@@ -555,9 +616,9 @@ class WWID
 
     if opt[:new_item]
       title, note = format_input(opt[:new_item])
-      note.push(opt[:note]) if opt[:note]
+      note.push(opt[:note].gsub(/ *$/,'')) if opt[:note]
       title += " @#{tag}"
-      add_item(title.cap_first, opt[:section], {:note => note, :back => opt[:back]})
+      add_item(title.cap_first, opt[:section], {:note => note.gsub(/ *$/,''), :back => opt[:back]})
     end
 
     write(@doing_file)
@@ -748,7 +809,7 @@ class WWID
       raise "Unknown output format" unless opt[:output] =~ /(template|html|csv|json|timeline)/
     end
     if opt[:output] == "csv"
-      output = [CSV.generate_line(['date','title','note','timer'])]
+      output = [CSV.generate_line(['date','title','note','timer','section'])]
       items.each {|i|
         note = ""
         if i['note']
@@ -759,7 +820,7 @@ class WWID
           interval = get_interval(i, false)
         end
         interval ||= 0
-        output.push(CSV.generate_line([i['date'],i['title'],note,interval]))
+        output.push(CSV.generate_line([i['date'],i['title'],note,interval,i['section']]))
       }
       out = output.join("")
     elsif opt[:output] == "json" || opt[:output] == "timeline"
@@ -768,12 +829,12 @@ class WWID
       max = items[-1]['date'].strftime('%F')
       min = items[0]['date'].strftime('%F')
       items.each_with_index {|i,index|
-        if RUBY_VERSION.to_f > 1.8
+        if String.method_defined? :force_encoding
           title = i['title'].force_encoding('utf-8')
           note = i['note'].map {|line| line.force_encoding('utf-8').strip } if i['note']
         else
           title = i['title']
-          note = i['note'].map { |line| line.strip }
+          note = i['note'].map { |line| line.strip } if i['note']
         end
 
         if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
@@ -869,12 +930,12 @@ EOTEMPLATE
         # else
         #   note = ''
         # end
-        if RUBY_VERSION.to_f > 1.8
-          title = i['title'].force_encoding('utf-8')
-          note = i['note'].map {|line| line.force_encoding('utf-8').strip } if i['note']
+        if String.method_defined? :force_encoding
+          title = i['title'].force_encoding('utf-8').link_urls
+          note = i['note'].map {|line| line.force_encoding('utf-8').strip.link_urls } if i['note']
         else
-          title = i['title']
-          note = i['note'].map { |line| line.strip }
+          title = i['title'].link_urls
+          note = i['note'].map { |line| line.strip.link_urls } if i['note']
         end
 
         if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
@@ -886,11 +947,12 @@ EOTEMPLATE
           :date => i['date'].strftime('%a %-I:%M%p'),
           :title => title.gsub(/(@[^ \(]+(\(.*?\))?)/im,'<span class="tag">\1</span>').strip, #+ " #{note}"
           :note => note,
-          :time => interval
+          :time => interval,
+          :section => i['section']
         }
       }
 
-      style = "body{background:#fff;color:#333;font-family:Helvetica,arial,freesans,clean,sans-serif;font-size:16px;line-height:120%;text-align:justify;padding:20px}h1{text-align:left;position:relative;left:220px;margin-bottom:1em}ul{list-style-position:outside;position:relative;left:170px;margin-right:170px;text-align:left}ul li{list-style-type:none;border-left:solid 1px #ccc;padding-left:10px;line-height:2;position:relative}ul li .date{font-size:14px;position:absolute;left:-122px;color:#7d9ca2;text-align:right;width:110px;line-height:2}ul li .tag{color:#999}ul li .note{display:block;color:#666;padding:0 0 0 22px;line-height:1.4;font-size:15px}ul li .note:before{content:'\\25BA';font-weight:300;position:absolute;left:40px;font-size:8px;color:#aaa;line-height:3}ul li:hover .note{display:block}span.time{color:#729953;float:left;position:relative;padding:0 5px;font-size:15px;border-bottom:dashed 1px #ccc;text-align:right;background:#f9fced;margin-right:4px}table td{border-bottom:solid 1px #ddd;height:24px}caption{text-align:left;border-bottom:solid 1px #aaa;margin:10px 0}table{width:400px;margin:50px 0 0 211px}th{padding-bottom:10px}th,td{padding-right:20px}table{max-width:400px;margin:50px 0 0 221px}"
+      style = "body{background:#fff;color:#333;font-family:Helvetica,arial,freesans,clean,sans-serif;font-size:16px;line-height:120%;text-align:justify;padding:20px}h1{text-align:left;position:relative;left:220px;margin-bottom:1em}ul{list-style-position:outside;position:relative;left:170px;margin-right:170px;text-align:left}ul li{list-style-type:none;border-left:solid 1px #ccc;padding-left:10px;line-height:2;position:relative}ul li .date{font-size:14px;position:absolute;left:-122px;color:#7d9ca2;text-align:right;width:110px;line-height:2}ul li .tag{color:#999}ul li .note{display:block;color:#666;padding:0 0 0 22px;line-height:1.4;font-size:15px}ul li .note:before{content:'\\25BA';font-weight:300;position:absolute;left:40px;font-size:8px;color:#aaa;line-height:3}ul li:hover .note{display:block}span.time{color:#729953;float:left;position:relative;padding:0 5px;font-size:15px;border-bottom:dashed 1px #ccc;text-align:right;background:#f9fced;margin-right:4px}table td{border-bottom:solid 1px #ddd;height:24px}caption{text-align:left;border-bottom:solid 1px #aaa;margin:10px 0}table{width:400px;margin:50px 0 0 211px}th{padding-bottom:10px}th,td{padding-right:20px}table{max-width:400px;margin:50px 0 0 221px}ul li .section{color:#dbbfad;border-left:solid 1px #dbbfad;border-right:solid 1px #dbbfad;border-radius:25px;padding:0 4px;line-height:1 !important;font-size:.8em}ul li .section:hover{color:#c5753f}ul li a:link{color:#64a9a5;text-decoration:none;background-color:rgba(203,255,251,.15)}"
       template =<<EOT
 !!!
 %html
@@ -908,6 +970,7 @@ EOTEMPLATE
         %li
           %span.date= i[:date]
           = i[:title]
+          %span.section= i[:section]
           - if i[:time] && i[:time] != "00:00:00"
             %span.time= i[:time]
           - if i[:note]
@@ -977,6 +1040,9 @@ EOT
             flag+item['title'].chomp+reset
           end
         }
+
+        output.sub!(/%section/,item['section']) if item['section']
+
         if opt[:tags_color]
           output.gsub!(/\s(@\S+(?:\(.*?\))?)/," #{colors[opt[:tags_color]]}\\1")
         end
@@ -1066,7 +1132,8 @@ EOT
       }
       moved_items.each {|item|
         if label
-          item['title'] += " @from(#{section})" unless section == "Currently" || item['title'] =~ /@from\(/
+          item['title'] = item['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{section}")  unless section == "Currently"
+          # item['title'] += " @from(#{section})" unless section == "Currently" || item['title'] =~ /@from\(/
         end
       }
       @content[section]['items'] = moved_items
@@ -1083,9 +1150,11 @@ EOT
 
       items.each{|item|
         if label
-          item['title'] += " @from(#{section})" unless section == "Currently"
+          item['title'] = item['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{section}")  unless section == "Currently"
+          # item['title'] += " @from(#{section})" unless section == "Currently"
         end
       }
+
       @content[destination]['items'] += items[count..-1]
       @results.push("Archived #{items.length - count} items from #{section} to #{destination}")
     end
@@ -1254,7 +1323,10 @@ EOS
   def autotag(title)
     return unless title
     @config['autotag']['whitelist'].each {|tag|
-      title.sub!(/(?<!@)(#{tag.strip})\b/i,'@\1') unless title =~ /@#{tag}\b/i
+      title.sub!(/(?<!@)(#{tag.strip})\b/i) do |m|
+        m.downcase! if tag =~ /[a-z]/
+        "@#{m}"
+      end unless title =~ /@#{tag}\b/i
     }
     tail_tags = []
     @config['autotag']['synonyms'].each {|tag, v|
@@ -1264,7 +1336,11 @@ EOS
         end
       }
     }
-    title + tail_tags.uniq.map {|t| '@'+t }.join(' ')
+    if tail_tags.length > 0
+    title + ' ' + tail_tags.uniq.map {|t| '@'+t }.join(' ')
+    else
+      title
+    end
   end
 
   def autotag_item(item)
@@ -1293,7 +1369,7 @@ EOS
     seconds = (done - start).to_i
 
     item['title'].scan(/(?mi)@(\S+?)(\(.*\))?(?=\s|$)/).each {|m|
-      k = m[0] == "done" ? "All" : m[0]
+      k = m[0] == "done" ? "All" : m[0].downcase
       if @timers.has_key?(k)
         @timers[k] += seconds
       else
@@ -1310,8 +1386,9 @@ EOS
     minutes =  (seconds / 60).to_i
     hours = (minutes / 60).to_i
     days = (hours / 24).to_i
-    hours = (hours % 60).to_i
+    hours = (hours % 24).to_i
     minutes = (minutes % 60).to_i
     [days, hours, minutes]
   end
+
 end

data/lib/doing.rb

@@ -10,4 +10,3 @@ require 'haml'
 require 'json'
 require 'doing/wwid.rb'
 
-DOING_CONFIG_NAME = ".doingrc"

metadata

@@ -1,77 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.8pre
+  version: 1.0.10pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.17.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -90,48 +90,48 @@ dependencies:
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
 description: A tool for managing a TaskPaper-like file of recent activites. Perfect
@@ -155,29 +155,29 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - doing
-- --main
+- "--main"
 - README.md
-- --markup
+- "--markup"
 - markdown
-- -ri
+- "-ri"
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A command line tool for managing What Was I Doing reminders