doing 1.0.38 → 1.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9638a33587192a9a5146ace1e3d8e6937efb34922b7b93c71ba088880f136ed4
-  data.tar.gz: 07bc825013ac19e6b4a1b4ef3103ac0f04ce186575ec65c724e55664b74087d6
+  metadata.gz: fa5febc2d54f2d65e4e09b1b72e65cd19c3ca19c2c5b7b155fae667071f77aeb
+  data.tar.gz: 1a8401a27918d5e1ec4b5b66ae6986e2130a3dde568f894c79e93b8b610ed8cb
 SHA512:
-  metadata.gz: '087fa6df46f96bb25ddb7904505e10669a5bb28104e0652b890a497067ed8255ec2d6ce9e3e54018372efdf86b7272bd4a81c09b1a93b99e8f90e09ed86af381'
-  data.tar.gz: e395fd115d20f77cd522d086fa19b1bde92a51ea7785cf3f8b16ae39004f490ebc918be798d70e3ce133effcc15948c774493ddf84e541fd0b3a3e83271e0d90
+  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
@@ -699,6 +714,13 @@ command [:grep,:search] do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.desc 'Only show items with recorded time intervals'
   c.default_value false
   c.switch [:only_timed], :default_value => false, :negatable => false
@@ -708,8 +730,9 @@ command [:grep,:search] do |c|
     section = wwid.guess_section(options[:s]) if options[:s]
 
     options[:t] = true if options[:totals]
+    options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-    puts wwid.list_section({:search => args.join(' '), :section => section, :output => options[:output], :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => options[:only_timed]})
+    puts wwid.list_section({:search => args.join(' '), :section => section, :output => options[:output], :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => options[:only_timed], :sort_tags => options[:sort_tags]})
 
   end
 end
@@ -730,6 +753,13 @@ command :recent do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.action do |global_options,options,args|
 
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
@@ -741,8 +771,9 @@ command :recent do |c|
         count = 10
       end
       options[:t] = true if options[:totals]
+      options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-      puts wwid.recent(count,section.cap_first,{ :times => options[:t], :totals => options[:totals] })
+      puts wwid.recent(count,section.cap_first,{ :times => options[:t], :totals => options[:totals], :sort_tags => options[:sort_tags] })
 
     end
   end
@@ -763,14 +794,22 @@ command :today do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.desc 'Output to export format (csv|html|json)'
   c.flag [:o,:output]
 
   c.action do |global_options,options,args|
 
     options[:t] = true if options[:totals]
+    options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-    puts wwid.today(options[:t],options[:output],{:totals => options[:totals], :section => options[:s]}).chomp
+    puts wwid.today(options[:t],options[:output],{:totals => options[:totals], :section => options[:s], :sort_tags => options[:sort_tags]}).chomp
 
   end
 end
@@ -792,6 +831,13 @@ command :on do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.desc 'Output to export format (csv|html|json)'
   c.flag [:o,:output]
 
@@ -815,8 +861,9 @@ command :on do |c|
     wwid.results.push(message)
 
     options[:t] = true if options[:totals]
+    options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-    puts wwid.list_date([start,finish],options[:s],options[:t],options[:output],{:totals => options[:totals]}).chomp
+    puts wwid.list_date([start, finish], options[:s], options[:t], options[:output], {:totals => options[:totals], :sort_tags => options[:sort_tags]}).chomp
 
   end
 end
@@ -839,8 +886,16 @@ command :yesterday do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.action do |global_options, options,args|
-    puts wwid.yesterday(options[:s],options[:t],options[:o],{:totals => options[:totals]}).chomp
+    options[:sort_tags] = options[:tag_sort] =~ /^n/i
+    puts wwid.yesterday(options[:s],options[:t],options[:o],{:totals => options[:totals], :sort_tags => options[:sort_tags]}).chomp
 
   end
 end
@@ -927,6 +982,13 @@ command :view do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.desc 'Only show items with recorded time intervals'
   c.default_value false
   c.switch [:only_timed], :default_value => false, :negatable => true
@@ -972,9 +1034,12 @@ command :view do |c|
       count = options[:c] ? options[:c] : view.has_key?('count') ? view['count'] : 10
       section = options[:s] ? section : view.has_key?('section') ? view['section'] : wwid.current_section
       order = view.has_key?('order') ? view['order'] : "asc"
+
       options[:t] = true if options[:totals]
       options[:output].downcase! if options[:output]
-      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:o], :tags_color => tags_color, :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => only_timed })
+      options[:sort_tags] = options[:tag_sort] =~ /^n/i
+
+      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:o], :tags_color => tags_color, :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => only_timed, :sort_tags => options[:sort_tags] })
     else
       if title.class == FalseClass
         exit_now! "Cancelled"
@@ -1162,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.38'
+  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
   ##
@@ -1125,7 +1181,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 +1192,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 +1206,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 +1336,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|
@@ -1528,8 +1584,10 @@ EOTEMPLATE
   ##
   def today(times=true,output=nil,opt={})
     opt[:totals] ||= false
+    opt[:sort_tags] ||= false
+
     cfg = @config['templates']['today']
-    list_section({:section => opt[:section], :wrap_width => cfg['wrap_width'], :count => 0, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :today => true, :times => times, :output => output, :totals => opt[:totals]})
+    list_section({:section => opt[:section], :wrap_width => cfg['wrap_width'], :count => 0, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :today => true, :times => times, :output => output, :totals => opt[:totals], :sort_tags => opt[:sort_tags]})
   end
 
   ##
@@ -1543,13 +1601,14 @@ EOTEMPLATE
   ##
   def list_date(dates,section,times=nil,output=nil,opt={})
     opt[:totals] ||= false
+    opt[:sort_tags] ||= false
     section = guess_section(section)
     # :date_filter expects an array with start and end date
     if dates.class == String
       dates = [dates, dates]
     end
 
-    list_section({:section => section, :count => 0, :order => "asc", :date_filter => dates, :times => times, :output => output, :totals => opt[:totals] })
+    list_section({:section => section, :count => 0, :order => "asc", :date_filter => dates, :times => times, :output => output, :totals => opt[:totals], :sort_tags => opt[:sort_tags] })
   end
 
   ##
@@ -1562,8 +1621,9 @@ EOTEMPLATE
   ##
   def yesterday(section,times=nil,output=nil,opt={})
     opt[:totals] ||= false
+    opt[:sort_tags] ||= false
     section = guess_section(section)
-    list_section({:section => section, :count => 0, :order => "asc", :yesterday => true, :times => times, :output => output, :totals => opt[:totals] })
+    list_section({:section => section, :count => 0, :order => "asc", :yesterday => true, :times => times, :output => output, :totals => opt[:totals], :sort_tags => opt[:sort_tags] })
   end
 
   ##
@@ -1576,10 +1636,12 @@ EOTEMPLATE
   def recent(count=10,section=nil,opt={})
     times = opt[:t] || true
     opt[:totals] ||= false
+    opt[:sort_tags] ||= false
+
     cfg = @config['templates']['recent']
     section ||= @current_section
     section = guess_section(section)
-    list_section({:section => section, :wrap_width => cfg['wrap_width'], :count => count, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :times => times, :totals => opt[:totals] })
+    list_section({:section => section, :wrap_width => cfg['wrap_width'], :count => count, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :times => times, :totals => opt[:totals], :sort_tags => opt[:sort_tags] })
   end
 
   ##
@@ -1601,7 +1663,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
@@ -1711,11 +1772,15 @@ EOS
           regex = Regexp.new('@' + rx + '\b')
 
           matches = text.scan(regex)
-
           matches.each {|m|
-            puts rx,r
-            new_tag = m[0].sub(Regexp.new(rx), r)
-            puts new_tag
+            new_tag = r
+            if m.kind_of?(Array)
+              index = 1
+              m.each {|v|
+                new_tag = new_tag.gsub('\\' + index.to_s, v)
+                index = index + 1
+              }
+            end
             tail_tags.push(new_tag)
           } if matches
         end
@@ -1789,6 +1854,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.38
+  version: 1.0.43
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake