interact 0.4.3 → 0.4.4

data/lib/interact/interactive.rb

@@ -245,15 +245,22 @@ module Interactive
         [true, options[:default]]
       end
     elsif choices = options[:choices]
-      matches = choices.select { |x| x.start_with? ans }
+      matches = choices.select { |x|
+        choice_completion(x, options).start_with? ans
+      }
 
       if matches.size == 1
         [true, matches.first]
       elsif choices and ans =~ /^\s*\d+\s*$/ and \
-              res = choices.to_a[ans.to_i - 1]
+              ans.to_i - 1 >= 0 and res = choices.to_a[ans.to_i - 1]
         [true, res]
       elsif matches.size > 1
-        puts "Please disambiguate: #{matches.join " or "}?"
+        matches_list = matches.collect { |m|
+          show_choice(m, options)
+        }.join " or "
+
+        puts "Please disambiguate: #{matches_list}?"
+
         [false, nil]
       else
         puts "Unknown answer, please try again!"
@@ -268,8 +275,30 @@ module Interactive
     return unless options[:indexed]
 
     choices.each_with_index do |o, i|
-      puts "#{i + 1}: #{o}"
+      puts "#{i + 1}: #{show_choice(o, options)}"
+    end
+  end
+
+  def show_choice(choice, options = {})
+    display = options[:display] || proc(&:to_s)
+    display.call(choice)
+  end
+
+  def choice_completion(choice, options = {})
+    complete = options[:complete] || options[:display] || proc(&:to_s)
+    complete.call(choice)
+  end
+
+  def common_prefix(*strs)
+    longest = strs.sort_by(&:size).last
+    longest.size.times do |i|
+      sub = longest[0..(-1 - i)]
+      if strs.all? { |s| s.start_with?(sub) }
+        return sub
+      end
     end
+
+    ""
   end
 
   def handler(which, state)
@@ -286,7 +315,11 @@ module Interactive
     when :tab
       matches =
         if choices = state.options[:choices]
-          choices.select { |c| c.start_with? ans }
+          choices.collect { |c|
+            choice_completion(c, state.options)
+          }.select { |c|
+            c.start_with? ans
+          }
         else
           matching_paths(ans)
         end
@@ -295,6 +328,8 @@ module Interactive
         ans = state.answer = matches[0].dup
         state.display(ans[pos .. -1])
       else
+        ans = state.answer = common_prefix(*matches)
+        state.display(ans[pos .. -1])
         print("\a") # bell
       end
 

data/lib/interact/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2011 Alex Suraci
 
 module Interact
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: interact
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-25 00:00:00 Z
+date: 2012-07-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake