doing 1.0.80 → 1.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83c61397f2a1827dbe04f16255c1739c8d6a194b636afa4b1181437ffaca2ee8
-  data.tar.gz: b5da9fcae50fb7c90ba70a4b3d28948f551945c92170559f8bb693cda921894b
+  metadata.gz: 860b1b1c3f8f1ffd33fc344cabb37a7a060cdcb80d54f65a8f3598450b4c22cf
+  data.tar.gz: 83767946e503d9bd2515aa99a7e11de87c2910f48a1b2c6e5a745c9e7dada0be
 SHA512:
-  metadata.gz: 181eb1fa0f18e0f4c7678e48b2ae8daf07a85e88842accdf3de7c522dbc022c175067e0226d9faa21e493a654175c80595df1853d97027d6708884cbe24f82e6
-  data.tar.gz: a472b2013051b3525af41577ea0020b5f43e720e2b5d8598eb07b229555310dadd7a1b2cc0a106763def82f2b1920a9acf41f9ac07d077f35543b0b90ed2a631
+  metadata.gz: d78baf84b0bef668b7c877e908b6f1ee4ea05ce3914735f8d2e069abed215dfe5c9fc1fc3a9eb0dc5e4f5e251420d2454fb14a1b7465a5df8cf688e4b16b24ef
+  data.tar.gz: b38cf4b873baeb35ecab15ef10b3c1b8be4a7d2e28f9b34511d30f50def0b47ef127829bc5755bb0b2ba424183959dd009a222958df03ee8e54680e2ce267ab6

data/bin/doing

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -W1
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
@@ -301,6 +301,9 @@ command :select do |c|
   c.desc 'Add flag to selected item(s)'
   c.switch %i[flag], negatable: false, default_value: false
 
+  c.desc 'Perform action without confirmation'
+  c.switch %i[force], negatable: false, default_value: false
+
   c.desc 'Save selected entries to file using --output format'
   c.arg_name 'FILE'
   c.flag %i[save_to]
@@ -1306,7 +1309,8 @@ desc 'Select a section to display from a menu'
 command :choose do |c|
   c.action do |_global_options, _options, _args|
     section = wwid.choose_section
-    puts wwid.list_section({ section: section.cap_first, count: 0 })
+
+    puts wwid.list_section({ section: section.cap_first, count: 0 }) if section
   end
 end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.80'
+  VERSION = '1.0.81'
 end

data/lib/doing/wwid.rb

@@ -757,7 +757,7 @@ class WWID
       all_items.concat(@content[section]['items'].dup) if @content.key?(section)
     end
 
-    if opt[:tag] && opt[:tag].length.positive?
+    if opt[:tag]&.length
       all_items.select! { |item| item.has_tags?(opt[:tag], opt[:tag_bool]) }
     elsif opt[:search]&.length
       all_items.select! { |item| item.matches_search?(opt[:search]) }
@@ -771,9 +771,14 @@ class WWID
   ##
   ## @return     (String) The selected option
   ##
-  def choose_from(options, prompt)
+  def choose_from(options, prompt: 'Make a selection: ', multiple: false, fzf_args: [])
     fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
-    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} --prompt "#{prompt}"`
+    fzf_args << '-1'
+    fzf_args << %(--prompt "#{prompt}")
+    fzf_args << '--multi' if multiple
+    header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
+    fzf_args << %(--header "#{header}")
+    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
     return false if res.strip.size.zero?
 
     res
@@ -807,7 +812,7 @@ class WWID
         ') ',
         item['date'],
         ' | ',
-        item['title'],
+        item['title']
       ]
       if opt[:section] =~ /^all/i
         out.concat([
@@ -818,8 +823,15 @@ class WWID
       end
       out.join('')
     end
-
-    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} --header="Arrows to navigate, tab to mark for selection, enter to perform action" --prompt="Select entries to act on> " -m --bind ctrl-a:select-all -q "#{opt[:query]}"`
+    fzf_args = [
+      %(--header="Arrows: navigate, tab: mark for selection, ctrl-a: select all, enter: commit"),
+      %(--prompt="Select entries to act on > "),
+      '-1',
+      '-m',
+      '--bind ctrl-a:select-all',
+      %(-q "#{opt[:query]}")
+    ]
+    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
     selected = []
     res.split(/\n/).each do |item|
       idx = item.match(/^(\d+)\)/)[1].to_i
@@ -841,62 +853,71 @@ class WWID
     end
 
     unless has_action
-      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
+      choice = choose_from([
+                             'add tag',
+                             'remove tag',
+                             'cancel',
+                             'delete',
+                             'finish',
+                             'flag',
+                             'archive',
+                             'move',
+                             'edit',
+                             'output formatted'
+                           ],
+                           prompt: 'What do you want to do with the selected items? > ',
+                           multiple: true,
+                           fzf_args: ['--height=60%', '--tac', '--no-sort'])
+      return unless choice
+
+      to_do = choice.strip.split(/\n/)
+      to_do.each do |action|
+        case action
+        when /(add|remove) tag/
+          type = action =~ /^add/ ? 'add' : 'remove'
+          if opt[:tag]
+            warn "'add tag' and 'remove tag' can not be used together"
+            Process.exit 1
+          end
+          print "#{colors['yellow']}Tag to #{type}: #{colors['reset']}"
+          tag = STDIN.gets
+          return if tag =~ /^ *$/
+          opt[:tag] = tag.strip.sub(/^@/, '')
+          opt[:remove] = true if type == 'remove'
+        when /output formatted/
+          output_format = choose_from(%w[doing taskpaper json timeline html csv].sort, prompt: 'Which output format? > ', fzf_args: ['--height=60%', '--tac', '--no-sort'])
+          return if tag =~ /^ *$/
+          opt[:output] = output_format.strip
+          res = opt[:force] ? false : yn('Save to file?', default_response: 'n')
+          if res
+            print "#{colors['yellow']}File path/name: #{colors['reset']}"
+            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
+          opt[:move] = section.strip unless section =~ /^ *$/
+        when /flag/
+          opt[:flag] = true
         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')
+      res = opt[:force] ? true : yn("Delete #{selected.size} items?", default_response: 'y')
       if res
-        selected.each {|item| delete_item(item) }
+        selected.each { |item| delete_item(item) }
         write(@doing_file)
       end
       return
@@ -990,13 +1011,16 @@ class WWID
         item
       end
 
-      @content = {'Export' => {'original' => 'Export:', 'items' => selected}}
-      options = {section: 'Export'}
+      @content = { 'Export' => { 'original' => 'Export:', 'items' => selected } }
+      options = { section: 'Export' }
 
-      if opt[:output] !~ /(doing|taskpaper)/
-        options[:output] = opt[:output]
-      else
+      case opt[:output]
+      when /doing/
         options[:template] = '- %date | %title%note'
+      when /taskpaper/
+        options[:template] = '- %title @date(%date)%note'
+      else
+        options[:output] = opt[:output]
       end
 
       output = list_section(options)
@@ -1078,7 +1102,6 @@ class WWID
         count = (opt[:count]).zero? ? items.length : opt[:count]
         items.map! do |item|
           break if idx == count
-
           finished = opt[:unfinished] && item.has_tags?('done', :and)
           tag_match = opt[:tag].nil? || opt[:tag].empty? ? true : item.has_tags?(opt[:tag], opt[:tag_bool])
           search_match = opt[:search].nil? || opt[:search].empty? ? true : item.matches_search?(opt[:search])
@@ -1503,7 +1526,8 @@ class WWID
   ## @return     (String) The selected section name
   ##
   def choose_section
-    choose_from(sections, 'Choose a section > ').strip
+    choice = choose_from(sections.sort, prompt: 'Choose a section > ', fzf_args: ['--height=60%'])
+    choice ? choice.strip : choice
   end
 
   ##
@@ -1521,7 +1545,8 @@ class WWID
   ## @return     (String) The selected view name
   ##
   def choose_view
-    choose_from(views, 'Choose a view > ').strip
+    choice = choose_from(views.sort, prompt: 'Choose a view > ', fzf_args: ['--height=60%'])
+    choice ? choice.strip : choice
   end
 
   ##

data/lib/doing.rb

@@ -8,5 +8,6 @@ require 'tempfile'
 require 'chronic'
 require 'haml'
 require 'json'
-require 'doing/helpers.rb'
-require 'doing/wwid.rb'
+require 'doing/helpers'
+require 'doing/wwid'
+require 'doing/markdown_document_listener'

metadata

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