rogerdpack-whichr 0.1.3 → 0.1.4

data/bin/whichr

@@ -1,50 +1,26 @@
-# stolen from the gnuplot gem
-# and then modified
+# whichr
+# reveal executable name in path
 require 'rubygems'
 require 'sane'
+require 'whichr.rb'
 
-if(ARGV[0].in?( ['-h', '--help'])) || !ARGV[0]
-  puts 'syntax: nameary_name'
-else
-  puts 'higher in the list will be executed first'
-  def which( names )
-    success = false
-    path = ENV['PATH']
-    # on windows add . [cwd]
-    path += ('.' + File::PATH_SEPARATOR) if RUBY_PLATFORM =~ /mswin|mingw/
-
-    path.split(File::PATH_SEPARATOR).each do |dir|
-      for name in names
-        candidates = Dir.glob(dir.gsub("\\", "/") + '/' + name.strip)
-        for candidate in candidates
-	  # might just match the name and not be executable
-	  candidate = Dir.glob(candidate + '*')[0] if RUBY_PLATFORM =~ /mswin|mingw/ # get the right capitalization in doze
-          if File::executable?(candidate)
-            print candidate
-            if(File.directory?(candidate))
-              print ' (is a directory)'
-            end
-            success = true
-            puts
-          elsif File::exist? candidate
-            puts candidate + ' (is not executable)'
-          end
-        end
-      end
-    end
-
-    return success
-  end
+if ARGV[0].in? ['--help', '-h']
+  puts "syntax: executable_name or glob"
+  exit 0
+end
 
-  list = [ARGV[0]]
+all = RubyWhich.new.which([ARGV[0]])
 
-  if RUBY_PLATFORM =~ /mswin|mingw/
-    # windows compat.
-    for extension in  ENV['PATHEXT'].split(';') do
-      list << ARGV[0] + extension
+for candidate in all
+  # might just match the name and not be executable
+  candidate = Dir.glob(candidate + '*')[0] if RUBY_PLATFORM =~ /mswin|mingw/ # get the right capitalization in doze
+  if File::executable?(candidate)
+    print candidate
+    if(File.directory?(candidate))
+      print ' (is a directory)'
     end
+    puts
+  elsif File::exist? candidate
+    puts candidate + ' (is not executable)'
   end
-
-  which(list)
-
 end

data/lib/whichr.rb

@@ -0,0 +1,35 @@
+# stolen from the gnuplot gem
+# and then modified
+require 'rubygems'
+require 'sane'
+
+class RubyWhich
+  # search the path for the given names
+  # like ['abc'] (in windows, also searches for abc.bat)
+  # or ['ab*'] (a glob, in windows, also reveals ab*.bat)
+  def which( names )
+
+    if RUBY_PLATFORM =~ /mswin|mingw/
+      for name in names.dup # avoid recursion
+        # windows compat.
+        for extension in  ENV['PATHEXT'].split(';') do
+          names << name + extension
+        end
+      end
+    end
+
+    all_found = []
+    path = ENV['PATH']
+    # on windows add . [the cwd]
+    path += ('.' + File::PATH_SEPARATOR) if RUBY_PLATFORM =~ /mswin|mingw/
+
+    path.split(File::PATH_SEPARATOR).each do |dir|
+      for name in names
+        all_found += Dir.glob(dir.gsub("\\", "/") + '/' + name.strip)
+      end
+    end
+
+    all_found
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rogerdpack-whichr
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Roger Pack
@@ -43,10 +43,10 @@ extra_rdoc_files: []
 
 files: 
 - bin/whichr
+- lib/whichr.rb
 - README
 has_rdoc: false
 homepage: http://github.com/rogerdpack/which_ruby
-licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: windows friendly which command