doing 1.0.1pre → 1.0.2pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d81d4068acde0a73c9c4cc7cd51d61ed3ac082e3
-  data.tar.gz: d3d242a8ea49ad277dd37b829fc121e0bee46ca6
+  metadata.gz: 5064939efa2f734452f37eee44517c0a8d51095a
+  data.tar.gz: b0191dc3bffb802e0be53c69a29597a1d4680b49
 SHA512:
-  metadata.gz: 333bc1be56d38238b60cfcdefaa0c8b259d87fb038b798963f4e405a8d4085f95758a3dc0f9765a0ab56d1f7cced5cfe8dedd1236598988d06631a23b32fd38f
-  data.tar.gz: 75aaf396ffccd4e620e6a637a37e9d42b5ffc24c02e6a3e7e43d3210ce62627942e582cc049bf4ec20a2d843983e37ff06ea8010ffeb779d84f56a9c597ec1c2
+  metadata.gz: 073cafe680ac203949742743bc8b1fb18a92886d85758f0accca35fd363ea481fb33a468d17adb6f64b4433f01b5cf0a2a748eda30b2c35b37165ebbc14d9917
+  data.tar.gz: e1ee165879dd1640a07755e903385e1d94f60bc8a13a0dfa1a61de76b2a934cb37f9d9718a114293ec7d6bf078a7b112d6c4579f4232ae31fc0f03a9344a6f80

data/README.md

@@ -122,6 +122,8 @@ The config also contains templates for various command outputs. Include placehol
 - `%odnote`: The notes with a leading tab removed (outdented note)
 - `%hr`: a horizontal rule (`-`) the width of the terminal
 - `%hr_under`: a horizontal rule (`_`) the width of the terminal
+- `%n`: inserts a newline
+- `%t`: inserts a tab
 - `%[color]`: color can be black, red, green, blue, yellow, magenta, cyan or white
     - you can prefix "bg" to affect background colors (%bgyellow)
     - prefix "bold" and "boldbg" for strong colors (%boldgreen, %boldbgblue)

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.1pre'
+  VERSION = '1.0.2pre'
 end

data/lib/doing/wwid.rb

@@ -222,7 +222,7 @@ class WWID
   # Returns:
   # seconds(Integer)
   def chronify(input)
-    if input =~ /^(\d+)\s*([mhd])?/i
+    if input =~ /^(\d+)([mhd])?$/i
       amt = $1
       type = $2.nil? ? "m" : $2
       input = case type.downcase
@@ -250,18 +250,20 @@ class WWID
     if qty.strip =~ /^(\d+):(\d\d)$/
       minutes += $1.to_i * 60
       minutes += $2.to_i
-    elsif qty.strip =~ /\d+\s*[hmd]/
-      matches = qty.scan(/([\d\.]+)\s*([hmd])/)
-      matches.each {|m|
-        case m[1]
-        when "m"
-          minutes += m[0].to_i
-        when "h"
-          minutes += (m[0].to_f * 60).round
-        when "d"
-          minutes += (m[0].to_f * 60 * 24).round
-        end
-      }
+    elsif qty.strip =~ /^(\d+)([hmd])?$/
+      amt = $1
+      type = $2.nil? ? "m" : $2
+
+      minutes = case type.downcase
+      when 'm'
+        $1.to_i
+      when 'h'
+        ($1.to_f * 60).round
+      when 'd'
+        ($1.to_f * 60 * 24).round
+      else
+        minutes
+      end
     end
     minutes * 60
   end
@@ -739,7 +741,7 @@ EOT
         end
 
         if (item.has_key?('note') && !item['note'].empty?) && @config[:include_notes]
-          note_lines = item['note'].delete_if{|line| line =~ /^\s*$/ }.map{|line| "\t\t" + line.sub(/^\t\t/,'') }
+          note_lines = item['note'].delete_if{|line| line =~ /^\s*$/ }.map{|line| "\t" + line.sub(/^\t*/,'') + "  " }
           if opt[:wrap_width] && opt[:wrap_width] > 0
             width = opt[:wrap_width]
             note_lines.map! {|line|
@@ -799,7 +801,8 @@ EOT
           end
           o
         end
-
+        output.gsub!(/%n/,"\n")
+        output.gsub!(/%t/,"\t")
 
         out += output + "\n"
       }
@@ -879,6 +882,7 @@ EOT
       }
       @content[section]['items'] = moved_items
       @content[destination]['items'] += items
+      @results.push("Archived #{items.length} items from #{section} to #{destination}")
     else
 
       return if items.length < count
@@ -894,6 +898,7 @@ EOT
         end
       }
       @content[destination]['items'] += items[count..-1]
+      @results.push("Archived #{items.length - count} items from #{section} to #{destination}")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.1pre
+  version: 1.0.2pre
 platform: ruby
 authors:
 - Brett Terpstra