subwrap 0.3.6 → 0.3.7

data/ProjectInfo.rb

@@ -5,7 +5,7 @@ module Project
   PrettyName    = "Subwrap: Enhanced Subversion Command"
   Name          = "subwrap"
   RubyForgeName = "subwrap"
-  Version       = "0.3.6"
+  Version       = "0.3.7"
   Specification = Gem::Specification.new do |s|
     s.name    = Project::Name
     s.summary = "A nifty wrapper command for Subversion's command-line svn client"

data/lib/subwrap/subversion.rb

@@ -6,15 +6,18 @@ require 'rexml/document'
 require 'rexml/xpath'
 require 'rubygems'
 
-gem 'facets', '>=1.8.51'
+gem 'facets'
 require 'facets/core/kernel/require_local'
 require 'facets/core/enumerable/uniq_by'
 require 'facets/core/kernel/silence_stream'
 require 'facets/core/module/initializer'
+require 'facets/core/fileutils/which'
+require 'facets/core/fileutils/whereis'
 
-gem 'quality_extensions', '>=0.0.7'
+gem 'quality_extensions'
 require 'quality_extensions/kernel/windows_platform'
 
+
 # Had a lot of trouble getting ActiveSupport to load without giving errors! Eventually gave up on that idea since I only needed it for mattr_accessor and Facets supplies that.
 #gem 'activesupport'  # mattr_accessor
 #require 'active_support'
@@ -398,12 +401,13 @@ module Subversion
   end
 
   # The location of the executable to be used
-  # to do: We should find a smarter way to do this. (Could cache this result in .subwrap or somewhere, so we don't have to do all this work on every invocation...)
+  # to do: Is there a smarter/faster way to do this? (Could cache this result in .subwrap or somewhere, so we don't have to do all this work on every invocation...)
   def self.executable
+    # FileUtils.which('svn') would return our Ruby *wrapper* script for svn. We actually want to return here the binary/executable that we are
+    # *wrapping* so we have to use whereis and then use the first one that is ''not'' a Ruby script.
     @@executable ||=
-      ENV['PATH'].split(windows_platform? ? ';' : ':').each do |dir|
-        executable = File.join(dir, (windows_platform? ? 'svn.exe' : 'svn'))
-        if File.exist?(executable) and !self.ruby_script?(executable)               # We want to wrap the svn binary provided by Subversion, not our custom replacement for that.
+      FileUtils.whereis('svn') do |executable|
+        if !self.ruby_script?(executable)               # We want to wrap the svn binary provided by Subversion, not our custom replacement for that.
           return windows_platform? ? %{"#{executable}"} : executable
         end
       end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: subwrap
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 date: 2007-07-18 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: