doing 1.0.61 → 1.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 406fa23f47c83c1b9b3c8fa1cd0e193761c0b13e7ec31f75fdf43b1375769d18
-  data.tar.gz: 2c7f30f6acfac0fb33266dd62ce204099c0358cef88e19de8f26c9e9a4f866f2
+  metadata.gz: 9e2384e06e56e40f7f6c2b26121d16e0caa2cf40639158fc0f079f8ae26738da
+  data.tar.gz: 9e62f0ac38c0f19082094b88382e9779b743a4885403d796dddfb21a68ea1de2
 SHA512:
-  metadata.gz: 547c64a9fbfdb026a0ecaf1b4b0ae203306907ddbdc7cff76062b82312293e36eb170b8874f3aa643e19a8f2d3310aea472f23b12128b7b9eeb300956210ca68
-  data.tar.gz: 37d3819348c3167b6c77a34f8e7e2311015c3975e8595303e04c1d89cb28d7d8a83d7dfea810440b846621d90fd8e7bd1538dd9e3f607a2002284d1405474de8
+  metadata.gz: 8cdb34a404ae818f10ee9facaba83fd44c584d06950fd2908b6fbb25b04e6a117a74a20836b765a2dca1cde480928398a42b5999e1678499013cbb1e88e5ccac
+  data.tar.gz: 5a771f4ba236518f54cd11bc99f1258b90026afe4face70db83e98f5f5ee97124eab732c7c65ccd61f1b98e18129c4034ea6c036c145e45abe298f058e25bc3e

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.60<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.61<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -167,7 +167,7 @@ The config also contains templates for various command outputs. Include placehol
     - there are some random special combo colors. Use `doing colors` to see the list
 - `%interval`: when used with the `-t` switch on the `show` command, it will display the time between a timestamp or _@start(date)_ tag and the _@done(date)_ tag, if it exists. Otherwise, it will remain empty.
 
-Date formats are based on Ruby [`strftime`](http://www.ruby-doc.org/stdlib-2.1.1/libdoc/date/rdoc/Date.html#method-i-strftime) formatting.
+Date formats are based on Ruby [`strftime`](http://www.ruby-doc.org/stdlib-2.1.1/libdoc/date/rdoc/Date.html#method-i-strftime) formatting. You can try it out [here](http://strftime.net).
 
 My normal template for the `recent` command looks like this:
 

data/bin/doing

@@ -310,7 +310,7 @@ end
 
 desc 'Add a completed item with @done(date). No argument finishes last entry.'
 arg_name 'ENTRY'
-command [:done, :did] do |c|
+command %i[done did] do |c|
   c.desc 'Remove @done tag'
   c.switch %i[r remove], negatable: false, default_value: false
 
@@ -367,7 +367,7 @@ command [:done, :did] do |c|
 
       date = options[:took] ? finish_date - took : finish_date
     elsif options[:took]
-      finish_date = date + took
+      finish_date = options[:back] ? date + took : nil
     elsif options[:back]
       finish_date = date
     else
@@ -375,7 +375,9 @@ command [:done, :did] do |c|
     end
 
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
-    donedate = options[:date] ? "(#{finish_date.strftime('%F %R')})" : ''
+    if finish_date
+      donedate = options[:date] ? "(#{finish_date.strftime('%F %R')})" : ''
+    end
 
     if options[:e]
       raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
@@ -394,8 +396,15 @@ command [:done, :did] do |c|
       if options[:r]
         wwid.tag_last({ tags: ['done'], count: 1, section: section, remove: true })
       else
-        wwid.tag_last({ tags: ['done'], count: 1, section: section, archive: options[:a], back: finish_date,
-                        date: options[:date] })
+        options = { tags: ['done'],
+          archive: options[:a],
+          back: finish_date,
+          count: 1,
+          date: options[:date],
+          section: section,
+          took: took == 0 ? nil : took
+        }
+        wwid.tag_last(options)
       end
     elsif !args.empty?
       title, note = wwid.format_input(args.join(' '))

data/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -776,6 +776,7 @@ class WWID
     opt[:remove] ||= false
     opt[:autotag] ||= false
     opt[:back] ||= false
+    opt[:took] ||= nil
 
     sec_arr = []
 
@@ -833,6 +834,8 @@ class WWID
                 else
                   done_date = item['date'] + (opt[:back] - item['date'])
                 end
+              elsif opt[:took]
+                done_date = item['date'] + opt[:took]
               else
                 done_date = Time.now
               end

metadata

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