.travis.yml

@@ -5,10 +5,18 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.2
+  - ruby-head
 env:
-  - RUBYGEMS_VERSION=1.8.25
-  - RUBYGEMS_VERSION=2.0.3
+  - RUBYGEMS_VERSION=1.8.29
+  - RUBYGEMS_VERSION=2.0.14
+  - RUBYGEMS_VERSION=2.2.2
+  - RUBYGEMS_VERSION=2.4.1
 matrix:
   exclude:
     - rvm: 2.0.0
-      env: RUBYGEMS_VERSION=1.8.25
+      env: RUBYGEMS_VERSION=1.8.29
+    - rvm: 2.1.2
+      env: RUBYGEMS_VERSION=1.8.29
+    - rvm: ruby-head
+      env: RUBYGEMS_VERSION=1.8.29

History.txt

@@ -1,3 +1,9 @@
+=== 0.9.3 / 2014-08-03
+
+* Bugfixes:
+  * Fix specs to run (and pass) on Ruby 2.1 and beyond.
+    Pull #94 [hggh]
+
 === 0.9.2 / 2013-11-14
 
 * Bugfixes:

README.rdoc

@@ -71,7 +71,8 @@ to tell it to use rake-compiler to build your extension:
 
     # File: extconf.rb
 
-    # this line should already exist
+    # these lines must exist already
+    require 'mkmf'
     create_makefile('hello_world')
 
 

spec/lib/rake/extensiontask_spec.rb

@@ -340,7 +340,7 @@
 
       it 'should allow usage of RUBY_CC_VERSION to indicate a different version of ruby' do
         config = mock(Hash)
-        config.should_receive(:[]).with("rbconfig-i386-mingw32-1.9.1").and_return('/path/to/ruby/1.9.1/rbconfig.rb')
+        config.should_receive(:[]).with("rbconfig-i386-mingw32-1.9.1").and_return('/rubies/1.9.1/rbconfig.rb')
         YAML.stub!(:load_file).and_return(config)
 
         ENV['RUBY_CC_VERSION'] = '1.9.1'
@@ -351,8 +351,8 @@
 
       it 'should allow multiple versions be supplied to RUBY_CC_VERSION' do
         config = mock(Hash)
-        config.should_receive(:[]).once.with("rbconfig-i386-mingw32-1.8.6").and_return('/path/to/ruby/1.8.6/rbconfig.rb')
-        config.should_receive(:[]).once.with("rbconfig-i386-mingw32-1.9.1").and_return('/path/to/ruby/1.9.1/rbconfig.rb')
+        config.should_receive(:[]).once.with("rbconfig-i386-mingw32-1.8.6").and_return('/rubies/1.8.6/rbconfig.rb')
+        config.should_receive(:[]).once.with("rbconfig-i386-mingw32-1.9.1").and_return('/rubies/1.9.1/rbconfig.rb')
         YAML.stub!(:load_file).and_return(config)
 
         ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
@@ -368,7 +368,7 @@
       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')
+          config.stub!(:[]).and_return('/rubies/1.8.6/rbconfig.rb', '/rubies/1.9.1/rbconfig.rb')
           YAML.stub!(:load_file).and_return(config)
 
           ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
@@ -475,24 +475,34 @@ def mock_gem_spec(stubs = {})
   end
 
   def mock_config_yml
-    {
-      'rbconfig-i386-mingw32-1.8.6' => '/some/path/version/1.8/to/rbconfig.rb',
-      'rbconfig-universal-unknown-1.8.6' => '/some/path/version/1.8/to/rbconfig.rb',
-      'rbconfig-i386-mingw32-1.8.7' => '/some/path/version/1.8/to/rbconfig.rb',
-      'rbconfig-universal-known-1.8.7' => '/some/path/version/1.8/to/rbconfig.rb',
-      'rbconfig-universal-unknown-1.8.7' => '/some/path/version/1.8/to/rbconfig.rb',
-      'rbconfig-universal-unknown-1.9.1' => '/some/path/version/1.9.1/to/rbconfig.rb',
-      'rbconfig-universal-unknown-1.9.2' => '/some/path/version/1.9.1/to/rbconfig.rb',
-      'rbconfig-universal-unknown-1.9.3' => '/some/path/version/1.9.1/to/rbconfig.rb',
-      'rbconfig-i386-mingw32-1.9.3' => '/some/path/version/1.9.1/to/rbconfig.rb',
-      'rbconfig-universal-known-1.9.3' => '/some/path/version/1.9.1/to/rbconfig.rb',
-      'rbconfig-universal-known-2.0.0' => '/some/path/version/2.0.0/to/rbconfig.rb',
-      'rbconfig-universal-unknown-1.9.3' => '/some/path/version/1.9.1/to/rbconfig.rb',
-      'rbconfig-universal-unknown-2.0.0' => '/some/path/version/2.0.0/to/rbconfig.rb',
-      'rbconfig-i386-mingw32-2.0.0' => '/some/path/version/2.0.0/to/rbconfig.rb',
-      'rbconfig-x64-mingw32-2.0.0' => '/some/path/version/2.0.0/to/rbconfig.rb',
-      'rbconfig-x64-mingw32-3.0.0' => '/some/fake/version/3.0.0/to/rbconfig.rb'
+    return @mock_config_yml if @mock_config_yml
+
+    versions = {
+      "1.8.6"      => "1.8",
+      "1.8.7"      => "1.8",
+      "1.9.3"      => "1.9.1",
+      "2.0.0"      => "2.0.0",
+      "2.1.2"      => "2.1.0",
+      RUBY_VERSION => RbConfig::CONFIG["ruby_version"]
     }
+
+    platforms = [
+      "i386-mingw32",
+      "universal-known",
+      "universal-unknown",
+      "x64-mingw32",
+      RUBY_PLATFORM
+    ]
+
+    @mock_config_yml = {}
+
+    platforms.collect do |platform|
+      versions.each do |version, api_version|
+        @mock_config_yml["rbconfig-#{platform}-#{version}"] = "/rubies/#{api_version}/rbconfig.rb"
+      end
+    end
+
+    @mock_config_yml
   end
 
   def mock_fake_rb

tasks/bin/cross-ruby.rake

@@ -13,7 +13,7 @@
 # http://eigenclass.org/hiki/cross+compiling+rcovrt
 #
 # This recipe only cleanup the dependency chain and automate it.
-# Also opens the door to usage different ruby versions 
+# Also opens the door to usage different ruby versions
 # for cross-compilation.
 #
 
@@ -79,7 +79,7 @@ file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}.tar.bz2" => ["#{USER_HOME}/sources
     if RUBY_SOURCE
       url = RUBY_SOURCE
     else
-      url = "http://ftp.ruby-lang.org/pub/ruby/#{MAJOR}/#{File.basename(t.name)}"
+      url = "http://cache.ruby-lang.org/pub/ruby/#{MAJOR}/#{File.basename(t.name)}"
     end
     sh "wget #{url} || curl -O #{url}"
   end

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.9.2"
+  s.version     = "0.9.3"
   s.platform    = Gem::Platform::RUBY
 
   # description and details