doing 1.0.76 → 1.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b4ff1cca2f519037f002070068ed1267cd0083ae04e3b2b14e431bf8ee47baf
-  data.tar.gz: da59f5f23f01b82a37e2ca56b552c26f638854597cc0f0beac21f30b2c1dd066
+  metadata.gz: 64076f13651c82428d05f490870a3a8a2507dc783cfaeebe7658538523aaef25
+  data.tar.gz: 691df494543c3ff71911a4ca87135adba9504fb445d51180e9c5914372c5d35b
 SHA512:
-  metadata.gz: 550a05a4c6b0a432df01904d0cb2b78d7bdf9b41fa0ac8660e694f23b8f8384389395966cbb35cfbb6feb55ad248c39ec0010b8ca4e2626a892e029f553fb4dd
-  data.tar.gz: e3b3d0789d9fba0f4cd63fcc1da2910d32a14142d25e367ede83fbee3956476991cfd74fc73f99642b1cf47c744c4e78765f6df75f3933ee2d1e619de8f2a733
+  metadata.gz: be005b1f54f3e170030f88a6df19567478985965b56bb50a842fe3d5c87d7afb750e165d4888da45466f3dba16205a94d1baf5cbfe723f0a18dffe960d944d00
+  data.tar.gz: 48e5cbec09157db3c974b5d0c242c394884a77f47ce5cf4e009b7dedf47daccba581709aefb534266415884ab71fad03c0a4d22385e3abc9d3e33576f3aaad17

data/README.md

@@ -27,7 +27,7 @@ If there's something I want to look at later but doesn't need to be added to a t
 
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.75<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.76<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -268,7 +268,7 @@ You can add additional custom views. Just nest them under the `views` key (inden
         count: 5
         wrap_width: 0
         date_format: '%F %_I:%M%P'
-        template: '%date | %title%note' 
+        template: '%date | %title%note'
 
 The `section` key is the default section to pull entries from. Count and section can be overridden at runtime with the `-c` and `-s` flags. Setting `section` to `All` will combine all sections in the output.
 
@@ -505,7 +505,7 @@ You can include a `transform` section in the autotag config which contains pairs
     transform:
     - (\w+)-\d+:$1
 
-This creates a search pattern looking for a string of word characters followed by a hyphen and one or more digits, e.g. `@projecttag-12`. Do not include the @ symbol in the pattern. The replacement (`$1`) indicates that the first matched group (in parenthesis) should be used to generate the new tag, resulting in `@projecttag` being added to the entry.
+This creates a search pattern looking for a string of word characters followed by a hyphen and one or more digits, e.g. `@projecttag-12`. Do not include the @ symbol in the pattern. The replacement (`$l`) indicates that the first matched group (in parenthesis) should be used to generate the new tag, resulting in `@projecttag` being added to the entry.
 
 ##### Annotating
 

data/bin/doing

@@ -257,9 +257,9 @@ command :template do |c|
 end
 
 desc 'Display an interactive menu to perform operations (requires fzf)'
-long_desc 'Requires that `fzf` be installed and available in your path. <https://github.com/junegunn/fzf>
+long_desc 'List all entries and select with typeahead fuzzy matching.
 
-List all entries and select with typeahead fuzzy matching. Multiple selections are allowed, hit tab to add the highlighted entry to the selection. Return processes the selected entries.'
+Multiple selections are allowed, hit tab to add the highlighted entry to the selection. Return processes the selected entries.'
 command :select do |c|
   c.desc 'Select from a specific section'
   c.arg_name 'SECTION'
@@ -269,6 +269,9 @@ command :select do |c|
   c.arg_name 'TAG'
   c.flag %i[t tag]
 
+  c.desc 'Reverse -c, -f, --flag, and -t (remove instead of adding)'
+  c.switch %i[r remove], negatable: false
+
   # c.desc 'Add @done to selected item(s), using start time of next item as the finish time'
   # c.switch %i[a auto], negatable: false, default_value: false
 
@@ -279,6 +282,10 @@ command :select do |c|
   c.arg_name 'SECTION'
   c.flag %i[m move]
 
+  c.desc 'Initial search query for filtering'
+  c.arg_name 'QUERY'
+  c.flag %i[q query]
+
   c.desc 'Cancel selected items (add @done without timestamp)'
   c.switch %i[c cancel], negatable: false, default_value: false
 
@@ -294,9 +301,15 @@ command :select do |c|
   c.desc 'Add flag to selected item(s)'
   c.switch %i[flag], negatable: false, default_value: false
 
+  c.desc 'Save selected entries to file using --output format'
+  c.arg_name 'FILE'
+  c.flag %i[save_to]
+
+  c.desc 'Output format for export (doing|taskpaper|csv|html|json|template|timeline)'
+  c.arg_name 'FORMAT'
+  c.flag %i[o output], must_match: /^(?:doing|taskpaper|html|csv|json|template|timeline)$/i
+
   c.action do |_global_options, options, args|
-    section = options[:section] || 'All'
-    edit = options[:editor]
     wwid.interactive(options)
   end
 end

data/lib/doing/helpers.rb

@@ -92,7 +92,7 @@ class ::String
   def link_urls(opt = {})
     opt[:format] ||= :html
     if opt[:format] == :html
-      gsub(%r{(?mi)((http|https)://)?([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&:/~+#]*[\w\-@^=%&/~+#])?}) do |_match|
+      gsub(%r{(?mi)((http|https)://)([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&:/~+#]*[\w\-@^=%&/~+#])?}) do |_match|
         m = Regexp.last_match
         proto = m[1].nil? ? 'http://' : ''
         %(<a href="#{proto}#{m[0]}" title="Link to #{m[0]}">[#{m[3]}]</a>)

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.76'
+  VERSION = '1.0.78'
 end

data/lib/doing/wwid.rb

@@ -462,7 +462,7 @@ class WWID
   ## @return     (Bool) yes or no
   ##
   def yn(question, default_response: false)
-    default = default_response ? 'y' : 'n'
+    default = default_response ? default_response : 'n'
 
     # if this isn't an interactive shell, answer default
     return default.downcase == 'y' unless $stdout.isatty
@@ -766,6 +766,22 @@ class WWID
     all_items.max_by { |item| item['date'] }
   end
 
+  ##
+  ## @brief      Generate a menu of options and allow user selection
+  ##
+  ## @return     (String) The selected option
+  ##
+  def choose_from(options, prompt)
+    puts prompt
+    options.each_with_index do |section, i|
+      puts format('% 3d: %s', i + 1, section)
+    end
+    print "#{colors['green']}> #{colors['default']}"
+    num = STDIN.gets
+    return false if num =~ /^[a-z ]*$/i
+
+    options[num.to_i - 1]
+  end
 
   ##
   ## @brief      Display an interactive menu of entries
@@ -773,7 +789,7 @@ class WWID
   ## @param      opt   (Hash) Additional options
   ##
   def interactive(opt = {})
-    exit_now! "Select command requires that fzf be installed" unless exec_available('fzf')
+    fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
 
     section = opt[:section] ? guess_section(opt[:section]) : 'All'
 
@@ -807,7 +823,7 @@ class WWID
       out.join('')
     end
 
-    res = `echo #{Shellwords.escape(options.join("\n"))}|fzf -m --bind ctrl-a:select-all`
+    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} -m --bind ctrl-a:select-all -q "#{opt[:query]}"`
     selected = []
     res.split(/\n/).each do |item|
       idx = item.match(/^(\d+)\)/)[1].to_i
@@ -819,6 +835,59 @@ class WWID
       return
     end
 
+    unless opt[:delete] || opt[:flag] || opt[:finish] || opt[:cancel] || opt[:tag] || opt[:archive] || opt[:output] || opt[:save_to]
+      action = choose_from(
+                           [
+                            "add tag",
+                            "remove tag",
+                            "archive",
+                            "cancel",
+                            "delete",
+                            "edit",
+                            "finish",
+                            "flag",
+                            "move",
+                            "output format"
+                          ],
+                            'What do you want to do with the selected items?')
+      case action
+      when /(add|remove) tag/
+        print "Enter tag: "
+        tag = STDIN.gets
+        return if tag =~ /^ *$/
+        opt[:tag] = tag.strip
+        opt[:remove] = true if action =~ /remove tag/
+      when /output format/
+        output_format = choose_from(%w[doing taskpaper json timeline html csv], 'Which output format?')
+        return if tag =~ /^ *$/
+        opt[:output] = output_format.strip
+        res = yn("Save to file?", default_response: 'n')
+        if res
+          print "File path/name: "
+          filename = STDIN.gets.strip
+          return if filename.empty?
+          opt[:save_to] = filename
+        end
+      when /archive/
+        opt[:archive] = true
+      when /delete/
+        opt[:delete] = true
+      when /edit/
+        opt[:editor] = true
+      when /finish/
+        opt[:finish] = true
+      when /cancel/
+        opt[:cancel] = true
+      when /move/
+        section = choose_section.strip
+        return if section =~ /^ *$/
+        opt[:move] = section.strip
+      when /flag/
+        opt[:flag] = true
+      end
+    end
+
+
     if opt[:delete]
       res = yn("Delete #{selected.size} items?", default_response: 'y')
       if res
@@ -830,17 +899,35 @@ class WWID
 
     if opt[:flag]
       tag = @config['marker_tag'] || 'flagged'
-      selected.map! {|item| tag_item(item, tag, date: false) }
+      selected.map! do |item|
+        if opt[:remove]
+          untag_item(item, tag)
+        else
+          tag_item(item, tag, date: false)
+        end
+      end
     end
 
     if opt[:finish] || opt[:cancel]
       tag = 'done'
-      selected.map! {|item| tag_item(item, tag, date: !opt[:cancel])}
+      selected.map! do |item|
+        if opt[:remove]
+          untag_item(item, tag)
+        else
+          tag_item(item, tag, date: !opt[:cancel])
+        end
+      end
     end
 
     if opt[:tag]
       tag = opt[:tag]
-      selected.map! {|item| tag_item(item, tag, date: false)}
+      selected.map! do |item|
+        if opt[:remove]
+          untag_item(item, tag)
+        else
+          tag_item(item, tag, date: false)
+        end
+      end
     end
 
     if opt[:archive] || opt[:move]
@@ -891,6 +978,40 @@ class WWID
 
       write(@doing_file)
     end
+
+    if opt[:output]
+      selected.map! do |item|
+        item['title'] = "#{item['title']} @project(#{item['section']})"
+        item
+      end
+
+      @content = {'Export' => {'original' => 'Export:', 'items' => selected}}
+      options = {section: 'Export'}
+
+      if opt[:output] !~ /(doing|taskpaper)/
+        options[:output] = opt[:output]
+      else
+        options[:template] = '- %date | %title%note'
+      end
+
+      output = list_section(options)
+
+      if opt[:save_to]
+        file = File.expand_path(opt[:save_to])
+        if File.exist?(file)
+          # Create a backup copy for the undo command
+          FileUtils.cp(file, "#{file}~")
+        end
+
+        File.open(file, 'w+') do |f|
+          f.puts output
+        end
+
+        @results.push("Export saved to #{file}")
+      else
+        puts output
+      end
+    end
   end
 
   ##
@@ -1072,6 +1193,28 @@ class WWID
     @content[section]['items'] = section_items
   end
 
+  ##
+  ## @brief      Remove a tag on an item from the index
+  ##
+  ## @param      old_item  (Item) The item to tag
+  ## @param      tag       (string) The tag to remove
+  ##
+  def untag_item(old_item, tag)
+    title = old_item['title'].dup
+
+    if title =~ /@#{tag}/
+      title.chomp!
+      title.gsub!(/ +@#{tag}(\(.*?\))?/, '')
+      new_item = old_item.dup
+      new_item['title'] = title
+      update_item(old_item, new_item)
+      return new_item
+    else
+      @results.push(%(Item isn't tagged @#{tag}: "#{title}" in #{old_item['section']}))
+      return old_item
+    end
+  end
+
   ##
   ## @brief      Tag an item from the index
   ##
@@ -1079,7 +1222,7 @@ class WWID
   ## @param      tag       (string) The tag to apply
   ## @param      date      (Boolean) Include timestamp?
   ##
-  def tag_item(old_item, tag, date: false)
+  def tag_item(old_item, tag, remove: false, date: false)
     title = old_item['title'].dup
     done_date = Time.now
     if title !~ /@#{tag}/
@@ -1309,10 +1452,10 @@ class WWID
       if File.exist?(file)
         # Create a backup copy for the undo command
         FileUtils.cp(file, "#{file}~")
+      end
 
-        File.open(file, 'w+') do |f|
-          f.puts output
-        end
+      File.open(file, 'w+') do |f|
+        f.puts output
       end
 
       if @config.key?('run_after')
@@ -1526,13 +1669,16 @@ class WWID
         note ||= ''
 
         tags = []
+        attributes = {}
         skip_tags = %w[meanwhile done cancelled flagged]
         i['title'].scan(/@([^(\s]+)(?:\((.*?)\))?/).each do |tag|
           tags.push(tag[0]) unless skip_tags.include?(tag[0])
+          attributes[tag[0]] = tag[1] if tag[1]
         end
+
         if opt[:output] == 'json'
 
-          items_out << {
+          i = {
             date: i['date'],
             end_date: end_date,
             title: title.strip, #+ " #{note}"
@@ -1541,6 +1687,10 @@ class WWID
             tags: tags
           }
 
+          attributes.each { |attr, val| i[attr.to_sym] = val }
+
+          items_out << i
+
         elsif opt[:output] == 'timeline'
           new_item = {
             'id' => index + 1,
@@ -1644,7 +1794,7 @@ class WWID
 
       totals = opt[:totals] ? tag_times('html', opt[:sort_tags]) : ''
       engine = Haml::Engine.new(template)
-      puts engine.render(Object.new,
+      out = engine.render(Object.new,
                          { :@items => items_out, :@page_title => page_title, :@style => style, :@totals => totals })
     else
       items.each do |item|
@@ -1656,11 +1806,12 @@ class WWID
           reset = ''
         end
 
-        if (item.has_key?('note') && !item['note'].empty?) && @config[:include_notes]
+        if (item.key?('note') && !item['note'].empty?) && @config[:include_notes]
           note_lines = item['note'].delete_if do |line|
-                         line =~ /^\s*$/
-                       end.map { |line| "\t\t" + line.sub(/^\t*/, '').sub(/^-/, '—') + '  ' }
-          if opt[:wrap_width] && opt[:wrap_width] > 0
+            line =~ /^\s*$/
+          end
+          note_lines.map! { |line| "\t\t#{line.sub(/^\t*/, '').sub(/^-/, '—')}  " }
+          if opt[:wrap_width]&.positive?
             width = opt[:wrap_width]
             note_lines.map! do |line|
               line.strip.gsub(/(.{1,#{width}})(\s+|\Z)/, "\t\\1\n")
@@ -1673,7 +1824,7 @@ class WWID
         output = opt[:template].dup
 
         output.gsub!(/%[a-z]+/) do |m|
-          if colors.has_key?(m.sub(/^%/, ''))
+          if colors.key?(m.sub(/^%/, ''))
             colors[m.sub(/^%/, '')]
           else
             m

metadata

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