doing 1.0.40 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9647740f610a441d3740aa8233e20cfa2b95cce65d047bf046233f7685b1936
-  data.tar.gz: 99a6dc7fcb96ca1e3a54cedc3e41be3f3d9bdd71f8c6d50c0d2aa4efc5c95ce4
+  metadata.gz: 8449bbc0f6d6a8d059856d77abd2f4648544c3bda9e69c75a93a69fd8dffe851
+  data.tar.gz: 90c223b97441535bd6cda1563fcbc2dd97197901b9972ceb51989b1f4ad9599c
 SHA512:
-  metadata.gz: 53d0c3b2162eaf701b4b7df557446fdf12af0834e6083c7d59b4059f73f098c0339d5a2f72249981227c13f7b3f4f21b3f3cd6286260195a44e989b5899f5f66
-  data.tar.gz: 9249e276bfd117e47e10a4832ca5ccf376b425fe39ebd34574d0c66e1503483d02655a944dc8cd231106cbbecd39b0ad47ff357713fcbce1a50bf3ce04e555bb
+  metadata.gz: a42c67cf02151718f867e98d2a6571c88a7360b2a83c5e529378730364f4b812a4811c8bc03e990b08193fc4503b6f0e3f16b572a21cac1f45d15cb562333755
+  data.tar.gz: e0bac7d7dbd30808b9d438be3e4f887ddab05db294dff84467e55b3d3846e246e769b211dd37ff66f8e28c84c97262d23daca5af0445dd25ded03a7446707fef

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,7 @@ 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
 end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.40'
+  VERSION = '1.0.45'
 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
   ##
@@ -903,14 +959,23 @@ class WWID
     if file.nil?
       $stdout.puts output
     else
-      if File.exists?(File.expand_path(file))
+      file = File.expand_path(file)
+      if File.exists?(file)
         # Create a backup copy for the undo command
         FileUtils.cp(file,file+"~")
 
-        File.open(File.expand_path(file),'w+') do |f|
+        File.open(file,'w+') do |f|
           f.puts output
         end
       end
+
+      if @config.key?('run_after')
+        script = File.expand_path(@config['run_after'])
+        if File.exist?(script)
+          # warn "Running #{script}"
+          `#{script}`
+        end
+      end
     end
   end
 
@@ -1125,7 +1190,6 @@ class WWID
       }
       out = output.join("")
     elsif opt[:output] == "json" || opt[:output] == "timeline"
-
       items_out = []
       max = items[-1]['date'].strftime('%F')
       min = items[0]['date'].strftime('%F')
@@ -1137,7 +1201,6 @@ class WWID
           title = i['title']
           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]
           end_date = Time.parse($1)
           interval = get_interval(i,false)
@@ -1152,14 +1215,16 @@ class WWID
           tags.push(tag[0]) unless skip_tags.include?(tag[0])
         }
         if opt[:output] == "json"
+
           items_out << {
             :date => i['date'],
             :end_date => end_date,
             :title => title.strip, #+ " #{note}"
-            :note => note.class == Array ? note.join("\n") : note,
+            :note => note.class == Array ? note.map(&:strip).join("\n") : note,
             :time => "%02d:%02d:%02d" % fmt_time(interval),
             :tags => tags
           }
+
         elsif opt[:output] == "timeline"
           new_item = {
             'id' => index + 1,
@@ -1280,7 +1345,7 @@ EOTEMPLATE
         end
 
         if (item.has_key?('note') && !item['note'].empty?) && @config[:include_notes]
-          note_lines = item['note'].delete_if{|line| line =~ /^\s*$/ }.map{|line| "\t" + line.sub(/^\t*/,'') + "  " }
+          note_lines = item['note'].delete_if{|line| line =~ /^\s*$/ }.map{|line| "\t\t" + line.sub(/^\t*/,'').sub(/^-/, '—') + "  " }
           if opt[:wrap_width] && opt[:wrap_width] > 0
             width = opt[:wrap_width]
             note_lines.map! {|line|
@@ -1607,7 +1672,6 @@ EOTEMPLATE
   ## @param      format  (String) return format (html, json, or text)
   ##
   def tag_times(format="text", sort_by_name = false)
-
     return "" if @timers.empty?
 
     max = @timers.keys.sort_by {|k| k.length }.reverse[0].length + 1
@@ -1722,7 +1786,7 @@ EOS
             if m.kind_of?(Array)
               index = 1
               m.each {|v|
-                new_tag = new_tag.sub('\\' + index.to_s, v)
+                new_tag = new_tag.gsub('\\' + index.to_s, v)
                 index = index + 1
               }
             end
@@ -1799,6 +1863,10 @@ EOS
     if seconds.nil?
       return [0, 0, 0]
     end
+    if seconds =~ /(\d+):(\d+):(\d+)/
+      h, m, s = [$1, $2, $3]
+      seconds = (h.to_i * 60 * 60) + (m.to_i * 60) + s.to_i
+    end
     minutes =  (seconds / 60).to_i
     hours = (minutes / 60).to_i
     days = (hours / 24).to_i

metadata

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