From a1bb73a7e431639b04cbfd24bbd466a9cd0c70a1 Mon Sep 17 00:00:00 2001
From: Brett Terpstra <me@brettterpstra.com>
Date: Thu, 9 Aug 2018 07:47:09 -0500
Subject: [PATCH] Fix Fixnum error, update dependencies

---
 bin/doing            | 2 ++
 doing.gemspec        | 6 +++---
 lib/doing/version.rb | 2 +-
 lib/doing/wwid.rb    | 9 +++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/bin/doing b/bin/doing
index bb198c22..adbf10a6 100755
--- a/bin/doing
+++ b/bin/doing
@@ -331,6 +331,8 @@ command :done do |c|
 
     if options[:took]
       finish_date = date + took
+    elsif options[:back]
+      finish_date = date
     else
       finish_date = Time.now
     end
diff --git a/doing.gemspec b/doing.gemspec
index a2f034ca..c24915b8 100644
--- a/doing.gemspec
+++ b/doing.gemspec
@@ -26,9 +26,9 @@ lib/doing/wwid.rb
   s.add_development_dependency 'rake', '~> 0'
   s.add_development_dependency 'rdoc', '~> 4.1', '>= 4.1.1'
   s.add_development_dependency 'aruba', '~> 0'
-  s.add_runtime_dependency('gli','~> 2.17.1')
+  s.add_runtime_dependency 'gli', '~> 2.17', '>= 2.17.1'
   s.add_runtime_dependency('haml','4.0.3')
   s.add_runtime_dependency('chronic','~> 0.10', '>= 0.10.2')
-  s.add_runtime_dependency('deep_merge')
-  s.add_runtime_dependency('json', '~> 1.8.1')
+  s.add_runtime_dependency 'deep_merge', '~> 0'
+  s.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.1'
 end
diff --git a/lib/doing/version.rb b/lib/doing/version.rb
index 54cb842c..1ef604a3 100644
--- a/lib/doing/version.rb
+++ b/lib/doing/version.rb
@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.10pre'
+  VERSION = '1.0.11pre'
 end
diff --git a/lib/doing/wwid.rb b/lib/doing/wwid.rb
index 765e0660..b92fa3df 100755
--- a/lib/doing/wwid.rb
+++ b/lib/doing/wwid.rb
@@ -1,6 +1,7 @@
 #!/usr/bin/ruby
 
 require 'deep_merge'
+require 'pp'
 
 class String
   def cap_first
@@ -448,7 +449,7 @@ def tag_last(opt={})
     opt[:date] ||= false
     opt[:remove] ||= false
     opt[:autotag] ||= false
-    opt[:back] ||= Time.now
+    opt[:back] ||= false
 
 
     sec_arr = []
@@ -479,10 +480,10 @@ def tag_last(opt={})
             if opt[:sequential]
               done_date = next_start - 1
               next_start = item['date']
-            elsif opt[:back].instance_of? Fixnum
-              done_date = item['date'] + opt[:back]
+            elsif opt[:back]
+              done_date = item['date'] + (opt[:back] - item['date'])
             else
-              done_date = opt[:back]
+              done_date = Time.now
             end
 
             title = item['title']