rake-compiler 0.4.0 → 0.4.1

data/History.txt

@@ -1,70 +1,73 @@
-== 0.4.0  2009-04-03
+=== 0.4.1 / 2009-04-09
 
-=== Enhancements
+* Enhancements
+  * Target specific versions of Ruby when generating binaries.
+    This avoids installing a 1.8.x binary gem in 1.9.x and viceversa.
+    (Thanks to Aaron Patterson for the patches)
 
+* Bugfixes
+  * No longer raises error if rake-compiler configuration is missing.
+    Not all users of a project would have it installed.
+    (Thanks to Aaron Patterson for the patch)
+
+=== 0.4.0 / 2009-04-03
+
+* Enhancements
   * Bended the convention for extension folder.
     Defining <tt>ext_dir</tt> for custom extension location.
 
-    Rake::ExtensionTask.new('my_extension') do |ext|
-      ext.ext_dir = 'custom/location'         # look into custom/location
-    end                                       # instead of ext/my_extension
+      Rake::ExtensionTask.new('my_extension') do |ext|
+        ext.ext_dir = 'custom/location'         # look into custom/location
+      end                                       # instead of ext/my_extension
 
   * Better detection of mingw target across Linux/OSX.
     Exposed it as Rake::ExtensionCompiler
-
   * Display list of available tasks when calling rake-compiler script
-
   * Track Ruby full versioning (x.y.z).
     This will help the compilation of extensions targetting 1.8.6/7 and 1.9.1
 
-=== Bugfixes
-
+* Bugfixes
   * Better output of Rake development tasks (Thanks to Luis Parravicini).
   * Proper usage of Gem::Platform for native gems (Thanks to Dirkjan Bussink).
   * Don't use autoload for YAML (present problems with Ruby 1.9.1).
 
-== 0.3.1 / 2009-01-09
-
-=== Enhancements
+=== 0.3.1 / 2009-01-09
 
+* Enhancements
   * Download cross-ruby source code using HTTP instead of FTP.
   * Disabled Tcl/Tk extension building on cross-ruby (helps with 1.9).
 
-=== Bugfixes
-
+* Bugfixes
   * Workaround bug introduced by lack of Gem::Specification cloning. Fixes DM LH #757.
   * Use proper binary extension on OSX (reported by Dirkjan Bussink).
   * Ensure lib/binary task is defined prior clear of requisites.
 
-== 0.3.0 / 2008-12-07
-
-=== New features
+=== 0.3.0 / 2008-12-07
 
+* New features
   * Let you specify the Ruby version used for cross compilation instead 
     of default one.
 
       rake cross compile RUBY_CC_VERSION=1.8
 
-=== Enhancements
-
+* Enhancements
   * Properly update rake-compiler configuration when new version is installed.
   * Automated release process to RubyForge, yay!
 
-=== Bugfixes
-
+* Bugfixes
   * Corrected documentation to reflect the available options
 
-== 0.2.1 / 2008-11-30
+=== 0.2.1 / 2008-11-30
 
-=== New features
+* New features
 
   * Allow cross compilation (cross compile) using mingw32 on Linux or OSX.
   * Allow packaging of gems for Windows on Linux or OSX.
 
-=== Enhancements
+* Enhancements
 
   * Made generation of extensions safe and target folders per-platform
 
-=== Bugfixes
+* Bugfixes
 
   * Ensure binaries for the specific platform are copied before packaging.

data/lib/rake/extensioncompiler.rb

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 
-#
-# HACK: Lousy API design, sue me. At least works ;-)
-#
-# Define a series of helpers to aid in search and usage of MinGW (GCC) Compiler
-# by gem developer/creators.
-#
-
 module Rake
+
+  #
+  # HACK: Lousy API design, sue me. At least works ;-)
+  #
+  # Define a series of helpers to aid in search and usage of MinGW (GCC) Compiler
+  # by gem developer/creators.
+  #
   module ExtensionCompiler
     # return the host portion from the installed MinGW
     def self.mingw_host

data/lib/rake/extensiontask.rb

@@ -188,6 +188,11 @@ module Rake
           # 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
@@ -229,7 +234,8 @@ module Rake
       tmp_path = "#{@tmp_dir}/#{cross_platform}/#{@name}"
 
       unless rbconfig_file = config_file["rbconfig-#{ruby_ver}"] then
-        fail "no configuration section for specified version of Ruby (rbconfig-#{ruby_ver})"
+        warn "no configuration section for specified version of Ruby (rbconfig-#{ruby_ver})"
+        return
       end
 
       # define compilation tasks for cross platfrom!

data/spec/lib/rake/extensiontask_spec.rb

@@ -265,13 +265,16 @@ describe Rake::ExtensionTask do
         File.stub!(:open).and_yield(mock_fake_rb)
       end
 
-      it 'should not generate an error if no rake-compiler configuration exist' do
+      it 'should warn if no rake-compiler configuration exist' do
         File.should_receive(:exist?).with(@config_file).and_return(false)
-        lambda {
+
+        out, err = capture_output do
           Rake::ExtensionTask.new('extension_one') do |ext|
             ext.cross_compile = true
           end
-        }.should_not raise_error(RuntimeError)
+        end
+
+        err.should match(/rake-compiler must be configured first to enable cross-compilation/)
       end
 
       it 'should parse the config file using YAML' do
@@ -281,15 +284,16 @@ describe Rake::ExtensionTask do
         end
       end
 
-      it 'should fail if no section of config file defines running version of ruby' do
+      it 'should warn if no section of config file defines running version of ruby' do
         config = mock(Hash)
         config.should_receive(:[]).with("rbconfig-#{@ruby_ver}").and_return(nil)
         YAML.stub!(:load_file).and_return(config)
-        lambda {
+        out, err = capture_output do
           Rake::ExtensionTask.new('extension_one') do |ext|
             ext.cross_compile = true
           end
-        }.should raise_error(RuntimeError, /no configuration section for specified version of Ruby/)
+        end
+        err.should match(/no configuration section for specified version of Ruby/)
       end
 
       it 'should allow usage of RUBY_CC_VERSION to indicate a different version of ruby' do

data/spec/spec_helper.rb

@@ -5,5 +5,9 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 require 'rubygems'
 require 'spec'
 
+# Console redirection helper
+require File.expand_path(File.join(File.dirname(__FILE__), 'support/capture_output_helper'))
+
 Spec::Runner.configure do |config|
+  include CaptureOutputHelper
 end

data/spec/support/capture_output_helper.rb

@@ -0,0 +1,22 @@
+module CaptureOutputHelper
+  def capture_output(&block)
+    old_stdout = $stdout
+    old_stderr = $stderr
+
+    stream_out = StringIO.new
+    stream_err = StringIO.new
+
+    begin
+      $stdout = stream_out
+      $stderr = stream_err
+      yield
+    ensure
+      $stdout = old_stdout
+      $stderr = old_stderr
+    end
+    stream_out.rewind
+    stream_err.rewind
+
+    [stream_out.read, stream_err.read]
+  end
+end

data/tasks/gem.rake

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

data/tasks/news.rake

@@ -41,7 +41,7 @@ if defined?(RubyForge) then
       # read changes
       changes = begin
                   h = File.read("History.txt")
-                  h.split(/^(==.*)/)[1..2].join.strip
+                  h.split(/^(===+ .*)/)[1..2].join.strip
                 rescue
                   warn "Missing History.txt"
                   ''

data/tasks/rdoc.rake

@@ -1,9 +1,15 @@
-require 'rake/rdoctask'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  warn "RDoc 2.4.3+ gem is required, please install it (gem install rdoc)."
+end
 
-DOC = Rake::RDocTask.new(:rdoc) do |rd|
-  rd.title    = 'rake-compiler -- Documentation'
-  rd.main     = 'README.rdoc'
-  rd.rdoc_dir = 'doc/api'
-  rd.options << '--main'  << 'README.rdoc' << '--title' << 'rake-compiler -- Documentation'
-  rd.rdoc_files.include %w(README.rdoc LICENSE.txt History.txt lib/**/*.rb)
+if defined?(RDoc) then
+  DOC = RDoc::Task.new(:rdoc) do |rd|
+    rd.title    = 'rake-compiler -- Documentation'
+    rd.main     = 'README.rdoc'
+    rd.rdoc_dir = 'doc/api'
+    rd.options << '--line-numbers' << '--main'  << 'README.rdoc' << '--title' << 'rake-compiler -- Documentation'
+    rd.rdoc_files.include %w(README.rdoc LICENSE.txt History.txt lib/**/*.rb)
+  end
 end

data/tasks/release.rake

@@ -36,7 +36,7 @@ if defined?(RubyForge) then
       # read changes
       changes = begin
                   h = File.read("History.txt")
-                  h.split(/^(==.*)/)[1..2].join.strip
+                  h.split(/^(===+ .*)/)[1..2].join.strip
                 rescue
                   warn "Missing History.txt"
                   ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake-compiler
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Luis Lavena
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-04 00:00:00 -03:00
+date: 2009-04-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
 - lib/rake/extensiontask.rb
 - spec/lib/rake/extensiontask_spec.rb
 - spec/spec_helper.rb
+- spec/support/capture_output_helper.rb
 - tasks/bin/cross-ruby.rake
 - tasks/common.rake
 - tasks/cucumber.rake