rake-compiler 0.5.0 → 0.6.0

data/History.txt

@@ -1,3 +1,33 @@
+=== 0.6.x (in Git)
+
+* Enhancements
+  * Implemented 'fat-binaries' generation for cross compiling
+    (for now). Thanks to Aaron Patterson for the suggestion and
+    original idea.
+
+      rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1
+
+    Will package extensions for 1.8 and 1.9 versions of Ruby.
+  * Can now cross compile extensions for 1.9 using 1.8.x as base.
+    Be warned: works from 1.8 to 1.9, but not if your default ruby is 1.9
+
+      rake cross compile RUBY_CC_VERSION=1.9.1
+
+  * Allow simultaneous versions of Ruby to compile extensions.
+    This change allow 1.8.x compiles co-exist with 1.9.x ones
+    and don't override each other.
+    
+    Please perform <tt>rake clobber</tt> prior compiling again.
+  * Allow optional source file URL for cross-compile tasks.
+    (Thanks to deepj for the patches)
+
+      rake-compiler cross-ruby VERSION=1.9.1-p0 SOURCE=http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p0.tar.bz2 
+
+* Bugfixes
+  * Removed strict versioning for gems since it clash with fat binaries.
+    From now on, if your gem only targets a specific version of Ruby, please
+    indicate it in the Gem::Specification (<tt>required_ruby_version</tt>)
+
 === 0.5.0 / 2009-04-25
 
 * Enhancements

data/README.rdoc

@@ -1,12 +1,12 @@
 = rake-compiler
 
 rake-compiler aims to help Gem developers while dealing with Ruby C
-extensions, simplifiying the code and reducing the duplication.
+extensions, simplifying the code and reducing the duplication.
 
-It follows *convention over configuration* and set an standarized 
+It follows *convention over configuration* and set an standardized 
 structure to build and package C extensions in your gems.
 
-This is the result of expriences dealing with several Gems that required 
+This is the result of experiences dealing with several Gems that required 
 native extensions across platforms and different user configurations 
 where details like portability and clarity of code were lacking.
 
@@ -160,7 +160,7 @@ personalize several settings for <tt>Rake::ExtensionTask</tt>:
 
 == Future is now: Cross compilation
 
-rake-compiler provides now an standarized way to generate, from Linux or OSX
+rake-compiler provides now an standardized way to generate, from Linux or OSX
 both extensions and gem binaries for Windows!
 
 It takes advantages from GCC host/target to build binaries (for target) on 
@@ -171,12 +171,12 @@ different OS (hosts).
 Besides having the development tool chain installed (GCC), you should install
 also <tt>mingw32</tt> cross compilation package.
 
-Dependending on your operating system distribution, a simple <tt>apt-get install mingw32</tt>
-will be enough.
+This depends on your operating system distribution, a simple 
+<tt>apt-get install mingw32</tt> will be enough.
 
 Please check OSX documentation about installing mingw32 from macports.
 
-=== I have my toolchain, now what?
+=== I have my tool-chain, now what?
 
 You need to build Ruby for Windows.
 
@@ -194,7 +194,7 @@ supply a <tt>VERSION</tt>:
 
 === Let's build some gems!
 
-Now, you only need to use additional options in your extension defintion:
+Now, you only need to use additional options in your extension definition:
 
     Rake::ExtensionTask.new('my_extension', gem_spec) do |ext|
       ext.cross_compile = true                # enable cross compilation (requires cross compile toolchain)
@@ -225,11 +225,26 @@ And you're done, yeah.
 
 You can specify against with version of Ruby you want to build the extension:
 
-  rake cross compile RUBY_CC_VERSION=1.8
+  rake cross compile RUBY_CC_VERSION=1.8.6
 
 If you installed <tt>1.9.1</tt>, you can do:
 
-  rake cross compile RUBY_CC_VERSION=1.9
+  rake cross compile RUBY_CC_VERSION=1.9.1
+
+Even more, you can target multiple versions (ie. 1.8.6 and 1.9.1):
+
+  rake cross compile RUBY_CC_VERSION=1.8.6:1.9.1
+
+And more exiting, bundle both binaries in one "fat" Gem:
+
+  rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1
+
+That will place binaries for 1.8 and 1.9 versions of ruby inside <tt>lib_dir</tt>
+
+  lib/1.8/my_extension.so
+  lib/1.9/my_extension.so
+
+Now is up to you to make your gem load the proper one ;-)
 
 == Future
 

data/features/cross-compile.feature

@@ -11,3 +11,12 @@ Feature: Cross-compile C extensions
     When rake task 'cross compile' is invoked
     Then rake task 'cross compile' succeeded
     And binaries for platform 'i386-mingw32' get generated
+
+  Scenario: compile single extension to multiple versions
+    Given that all my source files are in place
+    And I'm running a POSIX operating system
+    And I've installed cross compile toolchain
+    When rake task 'cross compile RUBY_CC_VERSION=1.8.6:1.9.1' is invoked
+    Then rake task 'cross compile RUBY_CC_VERSION=1.8.6:1.9.1' succeeded
+    And binaries for platform 'i386-mingw32' version '1.8' get copied
+    And binaries for platform 'i386-mingw32' version '1.9' get copied

data/features/step_definitions/cross_compilation.rb

@@ -13,19 +13,20 @@ Given %r{^I've installed cross compile toolchain$} do
       File.exist? File.join(path, comp)
     end
   end
-  raise "Cannot locate '#{compiler}' in the PATH." unless compiler
+  pending "Cannot locate suitable compiler in the PATH." unless compiler
 end
 
 Then /^binaries for platform '(.*)' get generated$/ do |platform|
-  ext = case platform
-    when /darwin/
-      'bundle'
-    when /mingw|mswin|linux/
-      'so'
-    else
-      RbConfig::CONFIG['DLEXT']
-  end
+  ext = binary_extension(platform)
 
   ext_for_platform = Dir.glob("tmp/#{platform}/**/*.#{ext}")
   ext_for_platform.should_not be_empty
 end
+
+Then /^binaries for platform '(.*)' version '(.*)' get copied$/ do |platform, version|
+  lib_path = "lib/#{version}"
+  ext = binary_extension(platform)
+
+  ext_for_platform = Dir.glob("#{lib_path}/*.#{ext}")
+  ext_for_platform.should_not be_empty
+end

data/features/step_definitions/folders.rb

@@ -28,5 +28,5 @@ Then /^'(.*)' folder do not exist$/ do |folder|
 end
 
 Then /^no left over from '(.*)' remains in '(.*)'$/ do |name, folder|
-  Dir.glob("#{folder}/**/#{name}").should be_empty
+  Dir.glob("#{folder}/**/#{name}/#{RUBY_VERSION}").should be_empty
 end

data/features/support/platform_extension_helpers.rb

@@ -0,0 +1,14 @@
+module PlatformExtensionHelpers
+  def binary_extension(platform = RUBY_PLATFORM)
+    case platform
+      when /darwin/
+        'bundle'
+      when /mingw|mswin|linux/
+        'so'
+      else
+        RbConfig::CONFIG['DLEXT']
+    end
+  end
+end
+
+World(PlatformExtensionHelpers)

data/lib/rake/extensiontask.rb

@@ -72,16 +72,19 @@ module Rake
     end
 
     private
-    def define_compile_tasks(for_platform = nil)
+    def define_compile_tasks(for_platform = nil, ruby_ver = RUBY_VERSION)
       # platform usage
       platf = for_platform || platform
 
+      # lib_path
+      lib_path = lib_dir
+
       # tmp_path
-      tmp_path = "#{@tmp_dir}/#{platf}/#{@name}"
+      tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}"
 
       # cleanup and clobbering
       CLEAN.include(tmp_path)
-      CLOBBER.include("#{@lib_dir}/#{binary(platf)}")
+      CLOBBER.include("#{lib_path}/#{binary(platf)}")
       CLOBBER.include("#{@tmp_dir}")
 
       # directories we need
@@ -90,8 +93,8 @@ module Rake
 
       # copy binary from temporary location to final lib
       # tmp/extension_name/extension_name.{so,bundle} => lib/
-      task "copy:#{@name}:#{platf}" => [lib_dir, "#{tmp_path}/#{binary(platf)}"] do
-        cp "#{tmp_path}/#{binary(platf)}", "#{@lib_dir}/#{binary(platf)}"
+      task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_path, "#{tmp_path}/#{binary(platf)}"] do
+        cp "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}"
       end
 
       # binary in temporary folder depends on makefile and source files
@@ -147,25 +150,28 @@ module Rake
       end
 
       # Allow segmented compilation by platform (open door for 'cross compile')
-      task "compile:#{@name}:#{platf}" => ["copy:#{@name}:#{platf}"]
+      task "compile:#{@name}:#{platf}" => ["copy:#{@name}:#{platf}:#{ruby_ver}"]
       task "compile:#{platf}" => ["compile:#{@name}:#{platf}"]
 
       # Only add this extension to the compile chain if current
       # platform matches the indicated one.
       if platf == RUBY_PLATFORM then
         # ensure file is always copied
-        file "#{@lib_dir}/#{binary(platf)}" => ["copy:#{name}:#{platf}"]
+        file "#{lib_path}/#{binary(platf)}" => ["copy:#{name}:#{platf}:#{ruby_ver}"]
 
         task "compile:#{@name}" => ["compile:#{@name}:#{platf}"]
         task "compile" => ["compile:#{platf}"]
       end
     end
 
-    def define_native_tasks(for_platform = nil)
+    def define_native_tasks(for_platform = nil, ruby_ver = RUBY_VERSION)
       platf = for_platform || platform
 
       # tmp_path
-      tmp_path = "#{@tmp_dir}/#{platf}/#{@name}"
+      tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}"
+
+      # lib_path
+      lib_path = lib_dir
 
       # create 'native:gem_name' and chain it to 'native' task
       unless Rake::Task.task_defined?("native:#{@gem_spec.name}:#{platf}")
@@ -181,36 +187,31 @@ module Rake
           spec.extensions.clear
 
           # add the binaries that this task depends on
-          # ensure the files get properly copied to lib_dir
-          ext_files = t.prerequisites.map { |ext| "#{@lib_dir}/#{File.basename(ext)}" }
-          ext_files.each do |ext|
-            unless Rake::Task.task_defined?("#{@lib_dir}/#{File.basename(ext)}") then
-              # strip out path and .so/.bundle
-              file "#{@lib_dir}/#{File.basename(ext)}" => ["copy:#{File.basename(ext).ext('')}:#{platf}"]
-            end
+          ext_files = []
+
+          # go through native prerequisites and grab the real extension files from there
+          t.prerequisites.each do |ext|
+            ext_files << ext
           end
 
           # include the files in the gem specification
           spec.files += ext_files
 
-          # Make sure that the required ruby version matches the ruby version
-          # we've used for cross compiling:
-          target_version = RUBY_VERSION =~ /^1.8/ ? '1.8.6' : '1.9.0'
-          spec.required_ruby_version = "~> #{target_version}"
-
           # Generate a package for this gem
           gem_package = Rake::GemPackageTask.new(spec) do |pkg|
             pkg.need_zip = false
             pkg.need_tar = false
           end
-
-          # ensure the binaries are copied
-          task "#{gem_package.package_dir}/#{gem_package.gem_file}" => ["copy:#{@name}:#{platf}"]
         end
       end
 
       # add binaries to the dependency chain
-      task "native:#{@gem_spec.name}:#{platf}" => ["#{tmp_path}/#{binary(platf)}"]
+      task "native:#{@gem_spec.name}:#{platf}" => ["#{lib_path}/#{binary(platf)}"]
+
+      # ensure the extension get copied
+      unless Rake::Task.task_defined?("#{lib_path}/#{binary(platf)}") then
+        file "#{lib_path}/#{binary(platf)}" => ["copy:#{@name}:#{platf}:#{ruby_ver}"]
+      end
 
       # Allow segmented packaging by platfrom (open door for 'cross compile')
       task "native:#{platf}" => ["native:#{@gem_spec.name}:#{platf}"]
@@ -224,8 +225,33 @@ module Rake
     end
 
     def define_cross_platform_tasks(for_platform)
+      if ruby_vers = ENV['RUBY_CC_VERSION']
+        ruby_vers = ENV['RUBY_CC_VERSION'].split(File::PATH_SEPARATOR)
+      else
+        ruby_vers = [RUBY_VERSION]
+      end
+
+      multi = (ruby_vers.size > 1) ? true : false
+
+      ruby_vers.each do |version|
+        # save original lib_dir
+        orig_lib_dir = @lib_dir
+
+        # tweak lib directory only when targeting multiple versions
+        if multi then
+          version =~ /(\d+.\d+)/
+          @lib_dir = "#{@lib_dir}/#{$1}"
+        end
+
+        define_cross_platform_tasks_with_version(for_platform, version)
+
+        # restore lib_dir
+        @lib_dir = orig_lib_dir
+      end
+    end
+
+    def define_cross_platform_tasks_with_version(for_platform, ruby_ver)
       config_path = File.expand_path("~/.rake-compiler/config.yml")
-      ruby_ver = ENV['RUBY_CC_VERSION'] || RUBY_VERSION
 
       # warn the user about the need of configuration to use cross compilation.
       unless File.exist?(config_path)
@@ -236,24 +262,37 @@ module Rake
       config_file = YAML.load_file(config_path)
 
       # tmp_path
-      tmp_path = "#{@tmp_dir}/#{for_platform}/#{@name}"
+      tmp_path = "#{@tmp_dir}/#{for_platform}/#{@name}/#{ruby_ver}"
+
+      # lib_path
+      lib_path = lib_dir
 
       unless rbconfig_file = config_file["rbconfig-#{ruby_ver}"] then
         warn "no configuration section for specified version of Ruby (rbconfig-#{ruby_ver})"
         return
       end
 
+      # mkmf
+      mkmf_file = File.expand_path(File.join(File.dirname(rbconfig_file), '..', 'mkmf.rb'))
+
       # define compilation tasks for cross platfrom!
-      define_compile_tasks(for_platform)
+      define_compile_tasks(for_platform, ruby_ver)
 
-      # chain fake.rb and rbconfig.rb to Makefile generation
-      file "#{tmp_path}/Makefile" => ["#{tmp_path}/fake.rb", "#{tmp_path}/rbconfig.rb"]
+      # chain fake.rb, rbconfig.rb and mkmf.rb to Makefile generation
+      file "#{tmp_path}/Makefile" => ["#{tmp_path}/fake.rb",
+                                      "#{tmp_path}/rbconfig.rb",
+                                      "#{tmp_path}/mkmf.rb"]
 
       # copy the file from the cross-ruby location
       file "#{tmp_path}/rbconfig.rb" => [rbconfig_file] do |t|
         cp t.prerequisites.first, t.name
       end
 
+      # copy mkmf from cross-ruby location
+      file "#{tmp_path}/mkmf.rb" => [mkmf_file] do |t|
+        cp t.prerequisites.first, t.name
+      end
+
       # genearte fake.rb for different ruby versions
       file "#{tmp_path}/fake.rb" do |t|
         File.open(t.name, 'w') do |f|
@@ -262,7 +301,7 @@ module Rake
       end
 
       # now define native tasks for cross compiled files
-      define_native_tasks(for_platform) if @gem_spec && @gem_spec.platform == 'ruby'
+      define_native_tasks(for_platform, ruby_ver) if @gem_spec && @gem_spec.platform == 'ruby'
 
       # create cross task
       task 'cross' do
@@ -274,12 +313,12 @@ module Rake
 
         # clear lib/binary dependencies and trigger cross platform ones
         # check if lib/binary is defined (damn bundle versus so versus dll)
-        if Rake::Task.task_defined?("#{@lib_dir}/#{binary(for_platform)}") then
-          Rake::Task["#{@lib_dir}/#{binary(for_platform)}"].prerequisites.clear
+        if Rake::Task.task_defined?("#{lib_path}/#{binary(for_platform)}") then
+          Rake::Task["#{lib_path}/#{binary(for_platform)}"].prerequisites.clear
         end
 
         # FIXME: targeting multiple platforms copies the file twice
-        file "#{@lib_dir}/#{binary(for_platform)}" => ["copy:#{@name}:#{for_platform}"]
+        file "#{lib_path}/#{binary(for_platform)}" => ["copy:#{@name}:#{for_platform}:#{ruby_ver}"]
 
         # if everything for native task is in place
         if @gem_spec && @gem_spec.platform == 'ruby' then

data/spec/lib/rake/extensiontask_spec.rb

@@ -110,6 +110,7 @@ describe Rake::ExtensionTask do
         @ext = Rake::ExtensionTask.new('extension_one')
         @ext_bin = ext_bin('extension_one')
         @platform = RUBY_PLATFORM
+        @ruby_ver = RUBY_VERSION
       end
 
       context 'compile' do
@@ -137,46 +138,46 @@ describe Rake::ExtensionTask do
           Rake::Task.task_defined?("lib/#{@ext_bin}").should be_true
         end
 
-        it "should depend on 'copy:extension_one:{platform}'" do
-          Rake::Task["lib/#{@ext_bin}"].prerequisites.should include("copy:extension_one:#{@platform}")
+        it "should depend on 'copy:extension_one:{platform}:{ruby_ver}'" do
+          Rake::Task["lib/#{@ext_bin}"].prerequisites.should include("copy:extension_one:#{@platform}:#{@ruby_ver}")
         end
       end
 
-      context 'tmp/{platform}/extension_one/extension_one.{so,bundle}' do
+      context 'tmp/{platform}/extension_one/{ruby_ver}/extension_one.{so,bundle}' do
         it 'should define as task' do
-          Rake::Task.task_defined?("tmp/#{@platform}/extension_one/#{@ext_bin}").should be_true
+          Rake::Task.task_defined?("tmp/#{@platform}/extension_one/#{@ruby_ver}/#{@ext_bin}").should be_true
         end
 
-        it "should depend on 'tmp/{platform}/extension_one/Makefile'" do
-          Rake::Task["tmp/#{@platform}/extension_one/#{@ext_bin}"].prerequisites.should include("tmp/#{@platform}/extension_one/Makefile")
+        it "should depend on 'tmp/{platform}/extension_one/{ruby_ver}/Makefile'" do
+          Rake::Task["tmp/#{@platform}/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should include("tmp/#{@platform}/extension_one/#{@ruby_ver}/Makefile")
         end
 
         it "should depend on 'ext/extension_one/source.c'" do
-          Rake::Task["tmp/#{@platform}/extension_one/#{@ext_bin}"].prerequisites.should include("ext/extension_one/source.c")
+          Rake::Task["tmp/#{@platform}/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should include("ext/extension_one/source.c")
         end
 
         it "should not depend on 'ext/extension_one/source.h'" do
-          Rake::Task["tmp/#{@platform}/extension_one/#{@ext_bin}"].prerequisites.should_not include("ext/extension_one/source.h")
+          Rake::Task["tmp/#{@platform}/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should_not include("ext/extension_one/source.h")
         end
       end
 
-      context 'tmp/{platform}/extension_one/Makefile' do
+      context 'tmp/{platform}/extension_one/{ruby_ver}/Makefile' do
         it 'should define as task' do
-          Rake::Task.task_defined?("tmp/#{@platform}/extension_one/Makefile").should be_true
+          Rake::Task.task_defined?("tmp/#{@platform}/extension_one/#{@ruby_ver}/Makefile").should be_true
         end
 
-        it "should depend on 'tmp/{platform}/extension_one'" do
-          Rake::Task["tmp/#{@platform}/extension_one/Makefile"].prerequisites.should include("tmp/#{@platform}/extension_one")
+        it "should depend on 'tmp/{platform}/extension_one/{ruby_ver}'" do
+          Rake::Task["tmp/#{@platform}/extension_one/#{@ruby_ver}/Makefile"].prerequisites.should include("tmp/#{@platform}/extension_one/#{@ruby_ver}")
         end
 
         it "should depend on 'ext/extension_one/extconf.rb'" do
-          Rake::Task["tmp/#{@platform}/extension_one/Makefile"].prerequisites.should include("ext/extension_one/extconf.rb")
+          Rake::Task["tmp/#{@platform}/extension_one/#{@ruby_ver}/Makefile"].prerequisites.should include("ext/extension_one/extconf.rb")
         end
       end
 
       context 'clean' do
-        it "should include 'tmp/{platform}/extension_one' in the pattern" do
-          CLEAN.should include("tmp/#{@platform}/extension_one")
+        it "should include 'tmp/{platform}/extension_one/{ruby_ver}' in the pattern" do
+          CLEAN.should include("tmp/#{@platform}/extension_one/#{@ruby_ver}")
         end
       end
 
@@ -199,11 +200,12 @@ describe Rake::ExtensionTask do
         end
         @ext_bin = ext_bin('extension_one')
         @platform = RUBY_PLATFORM
+        @ruby_ver = RUBY_VERSION
       end
 
-      context 'tmp/{platform}/extension_one/Makefile' do
+      context 'tmp/{platform}/extension_one/{ruby_ver}/Makefile' do
         it "should depend on 'custom/ext/foo/extconf.rb'" do
-          Rake::Task["tmp/#{@platform}/extension_one/Makefile"].prerequisites.should include("custom/ext/foo/extconf.rb")
+          Rake::Task["tmp/#{@platform}/extension_one/#{@ruby_ver}/Makefile"].prerequisites.should include("custom/ext/foo/extconf.rb")
         end
       end
     end
@@ -214,6 +216,7 @@ describe Rake::ExtensionTask do
         @spec = mock_gem_spec
         @ext_bin = ext_bin('extension_one')
         @platform = RUBY_PLATFORM
+        @ruby_ver = RUBY_VERSION
       end
 
       context 'native' do
@@ -246,7 +249,7 @@ describe Rake::ExtensionTask do
         context 'native:my_gem:{platform}' do
           it 'should depend on binary extension' do
             Rake::ExtensionTask.new('extension_one', @spec)
-            Rake::Task["native:my_gem:#{@platform}"].prerequisites.should include("tmp/#{@platform}/extension_one/#{@ext_bin}")
+            Rake::Task["native:my_gem:#{@platform}"].prerequisites.should include("lib/#{@ext_bin}")
           end
         end
       end
@@ -307,10 +310,41 @@ describe Rake::ExtensionTask do
         end
       end
 
+      it 'should allow multiple versions be supplied to RUBY_CC_VERSION' do
+        config = mock(Hash)
+        config.should_receive(:[]).once.with("rbconfig-1.8.6").and_return('/path/to/ruby/1.8.6/rbconfig.rb')
+        config.should_receive(:[]).once.with("rbconfig-1.9.1").and_return('/path/to/ruby/1.9.1/rbconfig.rb')
+        YAML.stub!(:load_file).and_return(config)
+
+        ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
+        Rake::ExtensionTask.new('extension_one') do |ext|
+          ext.cross_compile = true
+        end
+      end
+
       after :each do
         ENV.delete('RUBY_CC_VERSION')
       end
 
+      context "(cross compile for multiple versions)" do
+        before :each do
+          config = mock(Hash)
+          config.stub!(:[]).and_return('/path/to/ruby/1.8.6/rbconfig.rb', '/path/to/ruby/1.9.1/rbconfig.rb')
+          YAML.stub!(:load_file).and_return(config)
+
+          ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
+          @ext = Rake::ExtensionTask.new('extension_one') do |ext|
+            ext.cross_compile = true
+            ext.cross_platform = 'universal-unknown'
+          end
+        end
+
+        it 'should create specific copy of binaries for each version' do
+          Rake::Task.should have_defined("copy:extension_one:universal-unknown:1.8.6")
+          Rake::Task.should have_defined("copy:extension_one:universal-unknown:1.9.1")
+        end
+      end
+
       context "(cross for 'universal-unknown' platform)" do
         before :each do
           @ext = Rake::ExtensionTask.new('extension_one', @spec) do |ext|
@@ -321,17 +355,28 @@ describe Rake::ExtensionTask do
 
         context 'fake' do
           it 'should chain fake task to Makefile generation' do
-            Rake::Task['tmp/universal-unknown/extension_one/Makefile'].prerequisites.should include('tmp/universal-unknown/extension_one/fake.rb')
+            Rake::Task["tmp/universal-unknown/extension_one/#{@ruby_ver}/Makefile"].prerequisites.should include("tmp/universal-unknown/extension_one/#{@ruby_ver}/fake.rb")
           end
         end
 
         context 'rbconfig' do
           it 'should chain rbconfig tasks to Makefile generation' do
-            Rake::Task['tmp/universal-unknown/extension_one/Makefile'].prerequisites.should include('tmp/universal-unknown/extension_one/rbconfig.rb')
+            Rake::Task["tmp/universal-unknown/extension_one/#{@ruby_ver}/Makefile"].prerequisites.should include("tmp/universal-unknown/extension_one/#{@ruby_ver}/rbconfig.rb")
           end
 
           it 'should take rbconfig from rake-compiler configuration' do
-            Rake::Task['tmp/universal-unknown/extension_one/rbconfig.rb'].prerequisites.should include(@config_path)
+            Rake::Task["tmp/universal-unknown/extension_one/#{@ruby_ver}/rbconfig.rb"].prerequisites.should include(@config_path)
+          end
+        end
+
+        context 'mkmf' do
+          it 'should chain mkmf tasks to Makefile generation' do
+            Rake::Task["tmp/universal-unknown/extension_one/#{@ruby_ver}/Makefile"].prerequisites.should include("tmp/universal-unknown/extension_one/#{@ruby_ver}/mkmf.rb")
+          end
+
+          it 'should take mkmf from rake-compiler configuration' do
+            mkmf_path = File.expand_path(File.join(File.dirname(@config_path), '..', 'mkmf.rb'))
+            Rake::Task["tmp/universal-unknown/extension_one/#{@ruby_ver}/mkmf.rb"].prerequisites.should include(mkmf_path)
           end
         end
 

data/spec/spec_helper.rb

@@ -9,7 +9,12 @@ require 'spec'
 require File.expand_path(File.join(File.dirname(__FILE__), 'support/capture_output_helper'))
 
 Spec::Runner.configure do |config|
-  config.predicate_matchers[:have_defined] = :task_defined?
-
   include CaptureOutputHelper
 end
+
+# Rake::Task matcher helper
+Spec::Matchers.define :have_defined do |task|
+  match do |tasks|
+    tasks.task_defined?(task)
+  end
+end

data/tasks/bin/cross-ruby.rake

@@ -30,6 +30,7 @@ require 'rake/extensioncompiler'
 
 USER_HOME = File.expand_path("~/.rake-compiler")
 RUBY_CC_VERSION = "ruby-#{ENV['VERSION'] || '1.8.6-p287'}"
+RUBY_SOURCE = ENV['SOURCE']
 
 # grab the major "1.8" or "1.9" part of the version number
 MAJOR = RUBY_CC_VERSION.match(/.*-(\d.\d).\d/)[1]
@@ -55,13 +56,18 @@ CLOBBER.include("#{USER_HOME}/config.yml")
 file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}.tar.gz" => ["#{USER_HOME}/sources"] do |t|
   # download the source file using wget or curl
   chdir File.dirname(t.name) do
-    url = "http://ftp.ruby-lang.org/pub/ruby/#{MAJOR}/#{File.basename(t.name)}"
+    if RUBY_SOURCE
+      url = RUBY_SOURCE
+    else
+      url = "http://ftp.ruby-lang.org/pub/ruby/#{MAJOR}/#{File.basename(t.name)}"
+    end
     sh "wget #{url} || curl -O #{url}"
   end
 end
 
 # Extract the sources
-file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}" => ["#{USER_HOME}/sources/#{RUBY_CC_VERSION}.tar.gz"] do |t|
+source_file = RUBY_SOURCE ? RUBY_SOURCE.split('/').last : "#{RUBY_CC_VERSION}.tar.gz"
+file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}" => ["#{USER_HOME}/sources/#{source_file}"] do |t|
   chdir File.dirname(t.name) do
     t.prerequisites.each { |f| sh "tar xfz #{File.basename(f)}" }
   end

data/tasks/gem.rake

@@ -3,7 +3,7 @@ require 'rubygems/package_task'
 GEM_SPEC = Gem::Specification.new do |s|
   # basic information
   s.name        = "rake-compiler"
-  s.version     = "0.5.0"
+  s.version     = "0.6.0"
   s.platform    = Gem::Platform::RUBY
 
   # description and details

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake-compiler
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Luis Lavena
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -03:00
+date: 2009-07-25 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - features/support/env.rb
 - features/support/file_template_helpers.rb
 - features/support/generator_helpers.rb
+- features/support/platform_extension_helpers.rb
 - bin/rake-compiler
 - lib/rake/extensioncompiler.rb
 - lib/rake/extensiontask.rb
@@ -98,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rake-compiler
-rubygems_version: 1.3.2
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Rake-based Ruby C Extension task generator.