From 4731e76830d843d8c64b5d8b56932edc66fdb85a Mon Sep 17 00:00:00 2001
From: Jon <jon.forums@gmail.com>
Date: Tue, 10 Aug 2010 13:38:17 -0400
Subject: [PATCH] Add devkit.rb helper lib and basic JRuby support.

Install a devkit.rb helper library into the appropriate site_ruby
directory to allow the DevKit to be used in cases such as:

  ruby -rdevkit extconf.rb

When installing devkit.rb in JRuby environments, place the library
in the lib/ruby/site_ruby/shared directory.
---
 resources/devkit/dk.rb | 55 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/resources/devkit/dk.rb b/resources/devkit/dk.rb
index 58296cf0..fe01c80d 100644
--- a/resources/devkit/dk.rb
+++ b/resources/devkit/dk.rb
@@ -6,6 +6,7 @@ module DevKitInstaller
 
   DEVKIT_ROOT = File.expand_path(File.dirname(__FILE__))
 
+  # TODO add JRuby installer registry key
   REG_KEYS = [
     'Software\RubyInstaller\MRI',
     'Software\RubyInstaller\Rubinius'
@@ -64,6 +65,18 @@ def self.gem_override(dk_root=DEVKIT_ROOT)
   end
   private_class_method :gem_override
 
+  def self.devkit_lib(dk_root=DEVKIT_ROOT)
+    d = dk_root.gsub('/', '\\\\\\')
+<<-EOT
+# enable RubyInstaller DevKit usage as a vendorable helper library
+unless ENV['PATH'].include?('#{d}\\\\mingw\\\\bin') then
+  puts 'Temporarily enhancing PATH to include DevKit...'
+  ENV['PATH'] = '#{d}\\\\bin;#{d}\\\\mingw\\\\bin;' + ENV['PATH']
+end
+EOT
+  end
+  private_class_method :devkit_lib
+
   def self.scan_for(key)
     ris = []
     [Win32::Registry::HKEY_LOCAL_MACHINE, Win32::Registry::HKEY_CURRENT_USER].each do |hive|
@@ -122,10 +135,10 @@ def self.review
     if File.exists?(File.expand_path(CONFIG_FILE))
       File.open(CONFIG_FILE, 'r') do |f|
         puts <<-EOT
-Based upon the results contained in your '#{CONFIG_FILE}' config
-file resulting from running 'ruby dk.rb init' and any of your
-customizations, DevKit functionality will be injected into the
-following Rubies when you run 'ruby dk.rb install'.
+Based upon the settings in the '#{CONFIG_FILE}' file generated
+from running 'ruby dk.rb init' and any of your customizations,
+DevKit functionality will be injected into the following Rubies
+when you run 'ruby dk.rb install'.
 
 EOT
         puts YAML.load(f.read)
@@ -146,12 +159,13 @@ def self.install
         next
       end
 
-      site_ruby = Dir.glob("#{path}/lib/ruby/site_ruby/**/rubygems")
-      core_ruby = Dir.glob("#{path}/lib/ruby/**/rubygems")
+      site_ruby = Dir.glob("#{path}/lib/ruby/site_ruby")
+      site_rubygems = Dir.glob("#{path}/lib/ruby/site_ruby/**/rubygems")
+      core_rubygems = Dir.glob("#{path}/lib/ruby/**/rubygems")
 
       # inject stubs if RubyGems isn't in site_ruby or core ruby, making
       # backups of any existing stubs
-      if site_ruby.empty? && core_ruby.empty?
+      if site_rubygems.empty? && core_rubygems.empty?
         puts <<-EOT
 Unable to find RubyGems in site_ruby or core Ruby. Falling back
 to installing gcc, g++, make, and sh into #{path}
@@ -169,9 +183,9 @@ def self.install
           end
         end
       else
-        # either (or both) site_ruby or core_ruby contains RubyGems; favor
-        # injecting RubyGems override into site_ruby over core_ruby
-        target_ruby = site_ruby.empty? ? core_ruby : site_ruby
+        # either (or both) site_rubygems or core_rubygems contains RubyGems;
+        # favor injecting override into site_rubygems over core_rubygems
+        target_ruby = site_rubygems.empty? ? core_rubygems : site_rubygems
 
         # inject RubyGems override file into proper site_ruby location
         # appending an existing override file
@@ -193,6 +207,27 @@ def self.install
           end
         end
       end
+
+      # inject DevKit PATH helper into site_ruby (allows for overriding)
+      # for the 'ruby -rdevkit extconf.rb' use case.
+      # TODO more robust JRuby check since can't assume JRuby is running
+      #      this script?
+      jruby_site_shared = File.join(site_ruby, 'shared')
+      if File.directory?(jruby_site_shared) && File.exist?(File.join(path, 'bin', 'jruby.bat'))
+        site_ruby =  jruby_site_shared
+      end
+
+      target = File.join(site_ruby, 'devkit.rb')
+      if File.exist?(target)
+        # Be paranoid about our 'site_ruby/devkit.rb' namespace. Either
+        # someone else has collided with it, or we've already written the
+        # helper lib. Warn the developer and skip rather than overwriting
+        # or appending.
+        puts "[WARN] DevKit helper library already exists for #{path}, skipping."
+      else
+        puts "[INFO] Installing #{target}"
+        File.open(target, 'w') { |f| f.write(devkit_lib) }
+      end
     end
   end
   private_class_method :install