script_finder 0.2.1 → 0.2.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 1
+:patch: 2

data/lib/script_finder/script_finder.rb

@@ -1,4 +1,5 @@
 require 'ftools'
+require 'abbrev'
 
 module ScriptFinder
   DEFAULT_BIN_DIR = 'script'
@@ -69,31 +70,16 @@ module ScriptFinder
         end
       end
     end
-
-    def unique_prefixes(possibles, prefixes = {})
-      if prefixes.values.uniq.size < possibles.size
-        possibles.each do |cmd|
-          prefixes[cmd] ||= ""
-          if prefix_is_not_unique?(cmd, prefixes[cmd], possibles)
-            prefixes[cmd] += cmd[prefixes[cmd].size,1]
-          end
-        end
-        unique_prefixes(possibles, prefixes)
-      else
+    
+    def unique_prefixes(possibles)
+      all_prefixes = possibles.abbrev
+      all_prefixes.keys.sort.inject({ }) do |prefixes, abbrev|
+        prefixes[all_prefixes[abbrev]] ||= abbrev
         prefixes
       end
     end
-
-    protected
     
-    def prefix_is_not_unique?(current_cmd, current_prefix, possibles)
-      other_possibles = possibles.clone
-      other_possibles.delete(current_cmd)
-
-      (current_prefix.empty? or
-       other_possibles.inject(false) {|accum, c| accum || c[0,current_prefix.length] == current_prefix}) and
-        current_cmd.length > current_prefix.length
-    end
+    protected
     
     def bin_dir_exists_in_pwd?
       File.exists?(bin_dir) and

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: script_finder
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Tobias Crawley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 -05:00
+date: 2010-04-09 00:00:00 -04:00
 default_executable: s
 dependencies: []