whichr 0.3.3 → 0.3.4

data/README

@@ -10,9 +10,9 @@ Usage:
 
    C:\>whichr ruby
    higher in the list will be executed first
-   ./ruby.bat
-   C:/Ruby/bin/ruby.exe
-   c:/cygwin/bin/ruby.exe
+   .\ruby.bat
+   C:\Ruby\bin\ruby.exe
+   c:\cygwin\bin\ruby.exe
 
    C:>whichr rub*
    higher in the list will be executed first
@@ -21,21 +21,32 @@ Usage:
    c:/ruby/bin/ruby.exe
    ...
 
+  C:>whichr rub* -a
+  higher in the list will be executed first
+  
+
 Installation:
 
    C:\>gem install rogerdpack-whichr --source http://gems.github.com 
+
+Note: if you want it to run about 10x faster please see this post:
+http://betterlogic.com/roger/?p=2364
   
 Enjoy.
 
 Feedback welcome rogerdpack on github/gmail
 
-Also Related:
+
+Related projects:
+
+If you're looking for a ruby library file, itself..
+
 http://github.com/Pistos/ruby-which discovers the location of installed ruby libraries, i.e. which gem folder they're in
+
 C:\>rwhich ruby-which
 c:/ruby/lib/ruby/gems/1.9.1/gems/Pistos-ruby-which-0.5.3/lib/ruby-which.rb
 
-Except you don't actually need it since you have
-$ gem which fileutils
-/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/fileutils.rb
+rubygems itself has a gem which command
 
-Thanks Eric!
+$ gem which fileutils
+/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/fileutils.rb

data/bin/whichr

@@ -1,5 +1,7 @@
-# whichr
+#!/usr/bin/ruby
+# whichr gem
 # reveal executable name in path
+#
 if $0 == __FILE__
  # test run
  $: << '../lib'
@@ -8,19 +10,25 @@ end
 require 'sane'
 require 'whichr.rb'
 
-if ARGV[0].in? ['--help', '-h']
-  puts "syntax: executable_name or glob, ex: whichr or which* or whichr.bat
-    [-a] for all (include non executables)
+if ARGV[0].in?(['--help', '-h']) || (ARGV.length == 0)
+  puts 
+"syntax: executable_name_or_glob [-a for all (include non executables) ]
     ex:
     $ whichr ls
-    $ whichr ls*
+    $ whichr ls\*
     $ whichr ls.exe
-    $ whichr ls -a"
+    $ whichr ls -a # print non executables, too
+"
   exit 0
 end
 
-if ARGV.include? '-a'
+
+if ARGV[-1] == '-a'
   RubyWhich.new.which(ARGV[0..-2], true, true)
 else
   RubyWhich.new.which(ARGV, false, true)
 end
+
+if File.exist? ARGV[0]
+  puts "warning: found parameter--you may need to escape your *'s in the command line, i.e. * becomes \\*"
+end

data/lib/whichr.rb

@@ -5,10 +5,13 @@ class RubyWhich
   # like ['abc'] (in windows, also searches for abc.bat)
   # or ['ab*'] (a glob, in windows, also reveals ab*.bat)
   def which( names, return_non_executables_too = false, realtime_output = false )
-    
+
     puts "higher in the list is executed first" if realtime_output
-    
+
     names = Array(names)
+    # on doze, you can't pass in * very easily
+    # it comes in as \*
+    names.map!{|name| name.dup.gsub('\*', '*') } if OS.windows?
 
     if OS.windows?
       for name in names.dup # avoid recursion
@@ -24,64 +27,64 @@ class RubyWhich
     path = ENV['PATH']
     # on windows add cwd
     path += (File::PATH_SEPARATOR + '.') if OS.windows?
-    
+
     path.split(File::PATH_SEPARATOR).each do |dir|
-      
+
       for name in names
         if OS.windows?
-    	    names2 = Dir.glob(dir.gsub("\\", "/") + '/' + name.strip)
-    	    unless return_non_executables_too
-    	      names2 = names2.select{|name| File.executable?(name)} # only real execs
-    	    end
-    	    names2.collect!{|name| File.expand_path(name)} # get the right capitalization
+          names2 = Dir.glob(dir.gsub("\\", "/") + '/' + name.strip)
+          unless return_non_executables_too
+            names2 = names2.select{|name3| File.executable?(name3) && !File.directory?(name3)} # only real execs for doze
+          end
+          names2.collect!{|name| File.expand_path(name)} # get the right capitalization
         else
-    	    names2 = Dir.glob(dir + '/' + name.strip)
-  	    end
-  	    
-  	    # expand paths
-  	    names2.collect!{|name| File.expand_path(name).gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)}
-  	    
-  	    # make sure we aren't repeating a previous
-    	  uniques = names2.select{|new|
-    	    new = new.downcase if OS.windows?
-    	    am_unique = true
-    	    all_found.each{|old|
-    	      old = old.downcase if OS.windows?
-    	      if old == new
-    	        am_unique = false
-    	        break
-    	      end
-  	      }
-  	      am_unique
-  	    }
-  	    
-  	    if realtime_output
-  	     uniques.each{ |file|
-  	       print file
-  	       
-  	       if !File.executable? file
-             print += ' (is not executable)'
-           end
-           
-           if File.directory?(file)
-             print ' (is a directory)'
-           end
-           puts
-         }
-	      end
-	      
-        all_found += uniques        
-        
+          names2 = Dir.glob(dir + '/' + name.strip)
+        end
+
+        # expand paths
+        names2.collect!{|name3| File.expand_path(name3).gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)}
+
+        # make sure we aren't repeating a previous
+        uniques = names2.select{|new|
+          new = new.downcase if OS.windows?
+          am_unique = true
+          all_found.each{|old|
+            old = old.downcase if OS.windows?
+            if old == new
+              am_unique = false
+              break
+            end
+          }
+          am_unique
+        }
+
+        if realtime_output
+          uniques.each{ |file|
+            print file
+
+            if !File.executable? file
+              print ' (is not executable)'
+            end
+
+            if File.directory?(file)
+              print ' (is a directory)'
+            end
+            puts
+          }
+        end
+
+        all_found += uniques
+
       end
     end
-    
+
     if realtime_output
       if all_found == []
-    	  puts 'none found (' + names.inspect + ')'
+        puts 'none found (' + names.inspect + ')'
       end
     end
 
-     all_found
+    all_found
   end
 
 end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: whichr
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Roger Pack
@@ -14,22 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 -07:00
+date: 2009-12-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sane
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: windows friendly which command
 email: 
 - rogerdpack@gmail.comm
@@ -53,25 +55,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: windows friendly which command