doing 1.0.79 → 1.0.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24a207b31d2f64fc81c00b1484f62a5ab2609ded162fc9733cb54463c652d63e
-  data.tar.gz: dfc767b0d8cec0229e9ad3823f5853d81c343261198c6638e364331920dc7989
+  metadata.gz: 83c61397f2a1827dbe04f16255c1739c8d6a194b636afa4b1181437ffaca2ee8
+  data.tar.gz: b5da9fcae50fb7c90ba70a4b3d28948f551945c92170559f8bb693cda921894b
 SHA512:
-  metadata.gz: 1f64972ed2d157a0b52afa882d257190d236ebb5805d0ff8049d3ab65ca92974a1cbe2e11ba2ee1ea9cd04b751bd4cc6874f409d442cdfb9347c37bacb6fc47c
-  data.tar.gz: 9d3432a35cd14d44474ef32e90df40943a2a9ed7eb7c232a2361816aba255b7ed39992dc7b4cfa000afb93abbe4cea3036c9eec244a2fe141f7dca70ce400095
+  metadata.gz: 181eb1fa0f18e0f4c7678e48b2ae8daf07a85e88842accdf3de7c522dbc022c175067e0226d9faa21e493a654175c80595df1853d97027d6708884cbe24f82e6
+  data.tar.gz: a472b2013051b3525af41577ea0020b5f43e720e2b5d8598eb07b229555310dadd7a1b2cc0a106763def82f2b1920a9acf41f9ac07d077f35543b0b90ed2a631

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.78<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.79<!--END VER-->.
 
     $ [sudo] gem install doing
 

data/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -772,15 +772,11 @@ class WWID
   ## @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
+    fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
+    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} --prompt "#{prompt}"`
+    return false if res.strip.size.zero?
 
-    options[num.to_i - 1]
+    res
   end
 
   ##
@@ -847,32 +843,32 @@ class WWID
     unless has_action
       action = choose_from(
                            [
-                            "add tag",
-                            "remove tag",
-                            "archive",
-                            "cancel",
-                            "delete",
-                            "edit",
-                            "finish",
-                            "flag",
-                            "move",
-                            "output format"
+                            'add tag',
+                            'remove tag',
+                            'archive',
+                            'cancel',
+                            'delete',
+                            'edit',
+                            'finish',
+                            'flag',
+                            'move',
+                            'output format'
                           ],
-                            'What do you want to do with the selected items?')
+                            'What do you want to do with the selected items? > ')
       case action
       when /(add|remove) tag/
-        print "Enter 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?')
+        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')
+        res = yn('Save to file?', default_response: 'n')
         if res
-          print "File path/name: "
+          print 'File path/name: '
           filename = STDIN.gets.strip
           return if filename.empty?
           opt[:save_to] = filename
@@ -1507,14 +1503,7 @@ class WWID
   ## @return     (String) The selected section name
   ##
   def choose_section
-    sections.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
-
-    sections[num.to_i - 1]
+    choose_from(sections, 'Choose a section > ').strip
   end
 
   ##
@@ -1532,14 +1521,7 @@ class WWID
   ## @return     (String) The selected view name
   ##
   def choose_view
-    views.each_with_index do |view, i|
-      puts format('% 3d: %s', i + 1, view)
-    end
-    print '> '
-    num = STDIN.gets
-    return false if num =~ /^[a-z ]*$/i
-
-    views[num.to_i - 1]
+    choose_from(views, 'Choose a view > ').strip
   end
 
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.79
+  version: 1.0.80
 platform: ruby
 authors:
 - Brett Terpstra