doing 1.0.42 → 1.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f715c083c72c609fb2e2fc8c730cca68b8391dccbc4ca2168333dd9b30df0887
-  data.tar.gz: 3d7df2ec9624ae8d2b6822ccceed402c42f82f2a5b2e010c639880c9cd95580f
+  metadata.gz: fa5febc2d54f2d65e4e09b1b72e65cd19c3ca19c2c5b7b155fae667071f77aeb
+  data.tar.gz: 1a8401a27918d5e1ec4b5b66ae6986e2130a3dde568f894c79e93b8b610ed8cb
 SHA512:
-  metadata.gz: 4287daf5a4821ff6e295c36275d2101ecebefdc0adc962faefe82c460bd52f2e9a1a69e767e3ad59f7d68074a86807496e3e1669dd7f6f68688da903fb370309
-  data.tar.gz: 4a62305048b02bac186c63f951a6e3a7985663dc826070801c3a333b8e9388147435639910ac0f1fe24b0ad5a90e15b61510c0799ce94cf84060ca8fad097f0b
+  metadata.gz: 558ee0d409f410ec30a15f5cf99194f1a9a6c98bc6d7711ccff5d8d88492166fd9d2ff12b3b3cf304fd3c393e975bb09cda92efadb6439db8d20fe12a7a9b882
+  data.tar.gz: 638222cb9655553bbd230262127ccb03b551bb03989ab58e2cfecb9908735a654e775203c379593e3b79cebef132fcb2f8bad1d8251e73836e9758e8e7e6988d

data/bin/doing

@@ -488,6 +488,21 @@ command :finish do |c|
   end
 end
 
+desc 'Repeat last entry as new entry'
+arg_name 'section'
+command [:again,:resume] do |c|
+  c.desc 'Section'
+  c.flag [:s, :section], :default_value => "All"
+
+  c.desc 'Note'
+  c.arg_name 'note_text'
+  c.flag [:n,:note]
+
+  c.action do |global_options, options, args|
+    wwid.restart_last({ section: options[:s], note: options[:n] })
+  end
+end
+
 desc 'Tag last entry'
 arg_name 'tag1 [tag2...]'
 command :tag do |c|
@@ -555,7 +570,7 @@ command :tag do |c|
 end
 
 desc 'Mark last entry as highlighted'
-command :mark do |c|
+command [:mark,:flag] do |c|
   c.desc 'Section'
   c.default_value wwid.current_section
   c.flag [:s,:section], :default_value => wwid.current_section
@@ -1212,7 +1227,15 @@ post do |global,command,options,args|
   if global[:stdout]
     $stdout.print wwid.results.join("\n")
   else
-    $stderr.puts wwid.results.join("\n")
+    warn wwid.results.join("\n")
+  end
+
+  if wwid.config['run_after']
+    script = File.expand_path(wwid.config['run_after'])
+    if File.exist?(script)
+      warn "Running #{script}"
+      `#{script}`
+    end
   end
 end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.42'
+  VERSION = '1.0.43'
 end

data/lib/doing/wwid.rb

@@ -654,6 +654,62 @@ class WWID
     end
   end
 
+  ##
+  ## @brief      Restart the last entry
+  ##
+  ## @param      opt   (Hash) Additional Options
+  ##
+  def restart_last(opt = {})
+    opt[:section] ||= 'all'
+    opt[:note] ||= []
+
+    last = last_entry(opt)
+    if last.nil?
+      @results.push(%Q{No previous entry found})
+      return
+    end
+    # Remove @done tag
+    title = last['title'].sub!(/\s*@done(\(.*?\))?/, '').chomp
+    add_item(title, last['section'], {:note => opt[:note], :back => opt[:date], :timed => true})
+    write(@doing_file)
+  end
+
+  ##
+  ## @brief      Get the last entry
+  ##
+  ## @param      opt   (Hash) Additional Options
+  ##
+  def last_entry(opt={})
+    opt[:section] ||= @current_section
+
+    sec_arr = []
+
+    if opt[:section].nil?
+      sec_arr = [@current_section]
+    elsif opt[:section].class == String
+      if opt[:section] =~ /^all$/i
+        combined = {'items' => []}
+        @content.each {|k,v|
+          combined['items'] += v['items']
+        }
+        items = combined['items'].dup.sort_by{|item| item['date'] }.reverse
+        sec_arr.push(items[0]['section'])
+
+        sec_arr = sections
+      else
+        sec_arr = [guess_section(opt[:section])]
+      end
+    end
+
+
+    all_items = []
+    sec_arr.each do |section|
+      all_items.concat(@content[section]['items'].dup) if @content.has_key?(section)
+    end
+
+    all_items.sort_by { |item| item['date'] }.last
+  end
+
   ##
   ## @brief      Tag the last entry or X entries
   ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.42
+  version: 1.0.43
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake