rake-compiler 0.7.9 → 0.8.0

data/History.txt

@@ -1,3 +1,18 @@
+=== 0.8.0 / 2012-01-08
+
+* Enhancements:
+  * Invocation from command line now support extra options similar to RubyGems.
+    Closes #4 from Pull #47 [jonforums]
+
+      $ rake compile -- --with-opt-dir=/opt/local
+
+* Bugfixes:
+  * Only emit cross-compilation warnings for C when `cross` is invoked.
+    Closes #16 from Pull #48 [mvz]
+  * Only emit warnings when invoking cross-compilation tasks for JRuby.
+    Pull #45 [jfirebaugh]
+  * Use x86 MinGW cross-compiler. Pull #49 [larskanis]
+
 === 0.7.9 / 2011-06-08
 
 * Enhancements:

data/Isolate

@@ -1,7 +1,6 @@
-gem 'rake'
-gem 'rspec', '~> 2.6.0'
-gem 'cucumber', '~> 0.10.6'
+gem "rake"
 
-unless RUBY_PLATFORM =~ /java/
-  gem 'rcov', '~> 0.9.9'
+env :development do
+  gem "rspec",    "~> 2.8.0"
+  gem "cucumber", "~> 1.1.4"
 end

data/Rakefile

@@ -12,9 +12,9 @@
 #
 
 begin
-  require 'isolate/now'
+  require "isolate/now"
 rescue LoadError => e
-  fail "This project uses Isolate to manage development dependencies. Please `gem install isolate` first and try again."
+  abort "This project requires Isolate to work. Please `gem install isolate` and try again."
 end
 
 # load rakefile extensions (tasks)

data/features/compile.feature

@@ -13,6 +13,14 @@ Feature: Compile C code into Ruby extensions.
     And binary extension 'extension_one' do exist in 'lib'
     And 'tmp' folder is created
 
+  Scenario: compile an extension with extra options
+    Given a safe project directory
+    And a extension named 'extension_one'
+    And 'tmp' folder is deleted
+    When rake task 'compile -- --with-opt-dir=/opt/local' is invoked
+    Then rake task 'compile -- --with-opt-dir=/opt/local' succeeded
+    And output of rake task 'compile -- --with-opt-dir=/opt/local' contains /with-opt-dir/
+
   Scenario: not recompile unmodified extension
     Given a safe project directory
     And a extension named 'extension_one'

data/features/cross-compile.feature

@@ -16,7 +16,7 @@ Feature: Cross-compile C extensions
     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
+    When rake task 'cross compile RUBY_CC_VERSION=1.8.7:1.9.2' is invoked
+    Then rake task 'cross compile RUBY_CC_VERSION=1.8.7:1.9.2' 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/compilation.rb

@@ -24,31 +24,31 @@ Given /^a extension '(.*)' with forced platform '(.*)'$/ do |extension_name, for
 end
 
 Given /^that all my source files are in place$/ do
-  Given "a safe project directory"
-  Given "a extension cross-compilable 'extension_one'"
+  step "a safe project directory"
+  step "a extension cross-compilable 'extension_one'"
 end
 
 Given /^that all my Java source files are in place$/ do
-  Given "a safe project directory"
-  Given "a extension Java-compilable 'extension_one'"
+  step "a safe project directory"
+  step "a extension Java-compilable 'extension_one'"
 end
 
 Given /^that my gem source is all in place$/ do
-  Given "a safe project directory"
-  Given "a gem named 'gem_abc'"
-  Given "a extension cross-compilable 'extension_one'"
+  step "a safe project directory"
+  step "a gem named 'gem_abc'"
+  step "a extension cross-compilable 'extension_one'"
 end
 
 Given /^that my JRuby gem source is all in place$/ do
-  Given "a safe project directory"
-  Given "a gem named 'gem_abc'"
-  Given "a extension Java-compilable 'extension_one'"
+  step "a safe project directory"
+  step "a gem named 'gem_abc'"
+  step "a extension Java-compilable 'extension_one'"
 end
 
 Given /^that my gem source is all in place to target two platforms$/ do
-  Given "a safe project directory"
-  Given "a gem named 'gem_abc'"
-  Given "a extension 'extension_one' multi cross-compilable"
+  step "a safe project directory"
+  step "a gem named 'gem_abc'"
+  step "a extension 'extension_one' multi cross-compilable"
 end
 
 Given /^not changed any file since$/ do

data/lib/rake/baseextensiontask.rb

@@ -24,6 +24,7 @@ module Rake
     attr_accessor :platform
     attr_accessor :config_options
     attr_accessor :source_pattern
+    attr_accessor :extra_options
 
     def platform
       @platform ||= RUBY_PLATFORM
@@ -42,6 +43,7 @@ module Rake
       @ext_dir = "ext/#{@name}"
       @lib_dir = 'lib'
       @config_options = []
+      @extra_options = ARGV.select { |i| i =~ /\A--?/ }
     end
 
     def define

data/lib/rake/extensioncompiler.rb

@@ -39,7 +39,7 @@ module Rake
       paths = ENV['PATH'].split(File::PATH_SEPARATOR)
 
       # the pattern to look into (captures *nix and windows executables)
-      pattern = "*mingw*gcc{,.*}"
+      pattern = "i?86*mingw*gcc{,.*}"
 
       @mingw_gcc_executable = paths.find do |path|
         # cleanup paths before globbing

data/lib/rake/extensiontask.rb

@@ -38,10 +38,6 @@ module Rake
 
     def binary(platform = nil)
       if platform == "java"
-	warn_once <<-EOF
-Compiling a native C extension on JRuby. This is discouraged and a 
-Java extension should be preferred.
-        EOF
         "#{name}.#{RbConfig::MAKEFILE_CONFIG['DLEXT']}"
       else
         super
@@ -106,6 +102,12 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       # binary in temporary folder depends on makefile and source files
       # tmp/extension_name/extension_name.{so,bundle}
       file "#{tmp_path}/#{binary(platf)}" => ["#{tmp_path}/Makefile"] + source_files do
+        jruby_compile_msg = <<-EOF
+Compiling a native C extension on JRuby. This is discouraged and a 
+Java extension should be preferred.
+        EOF
+        warn_once(jruby_compile_msg) if defined?(JRUBY_VERSION)
+
         chdir tmp_path do
           sh make
         end
@@ -140,10 +142,14 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
         # add options to command
         cmd.push(*options)
 
+        # add any extra command line options
+        unless extra_options.empty?
+          cmd.push(*extra_options)
+        end
+
         chdir tmp_path do
           # FIXME: Rake is broken for multiple arguments system() calls.
           # Add current directory to the search path of Ruby
-          # Also, include additional parameters supplied.
           sh cmd.join(' ')
         end
       end
@@ -272,7 +278,7 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
 
       # warn the user about the need of configuration to use cross compilation.
       unless File.exist?(config_path)
-        warn "rake-compiler must be configured first to enable cross-compilation"
+        define_dummy_cross_platform_tasks
         return
       end
 
@@ -349,6 +355,15 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       end
     end
 
+    def define_dummy_cross_platform_tasks
+      task 'cross' do
+        Rake::Task['compile'].clear
+        task 'compile' do
+          raise "rake-compiler must be configured first to enable cross-compilation"
+        end
+      end
+    end
+
     def extconf
       "#{@ext_dir}/#{@config_script}"
     end

data/lib/rake/javaextensiontask.rb

@@ -67,15 +67,6 @@ module Rake
         install "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}"
       end
 
-      not_jruby_compile_msg = <<-EOF
-WARNING: You're cross-compiling a binary extension for JRuby, but are using
-another interpreter. If your Java classpath or extension dir settings are not
-correctly detected, then either check the appropriate environment variables or
-execute the Rake compilation task using the JRuby interpreter.
-(e.g. `jruby -S rake compile:java`)
-      EOF
-      warn_once(not_jruby_compile_msg) unless defined?(JRUBY_VERSION)
-
       file "#{tmp_path}/#{binary(platf)}" => "#{tmp_path}/.build" do
 
         class_files = FileList["#{tmp_path}/**/*.class"].
@@ -92,6 +83,15 @@ execute the Rake compilation task using the JRuby interpreter.
       end
 
       file "#{tmp_path}/.build" => [tmp_path] + source_files do
+        not_jruby_compile_msg = <<-EOF
+WARNING: You're cross-compiling a binary extension for JRuby, but are using
+another interpreter. If your Java classpath or extension dir settings are not
+correctly detected, then either check the appropriate environment variables or
+execute the Rake compilation task using the JRuby interpreter.
+(e.g. `jruby -S rake compile:java`)
+        EOF
+        warn_once(not_jruby_compile_msg) unless defined?(JRUBY_VERSION)
+
         classpath_arg = java_classpath_arg(@classpath)
         debug_arg     = @debug ? '-g' : ''
 

data/spec/lib/rake/extensiontask_spec.rb

@@ -283,16 +283,29 @@ describe Rake::ExtensionTask do
         File.stub!(:open).and_yield(mock_fake_rb)
       end
 
-      it 'should warn if no rake-compiler configuration exist' do
-        File.should_receive(:exist?).with(@config_file).and_return(false)
+      context 'if no rake-compiler configuration exists' do
+        before :each do
+          File.should_receive(:exist?).with(@config_file).and_return(false)
 
-        out, err = capture_output do
-          Rake::ExtensionTask.new('extension_one') do |ext|
-            ext.cross_compile = true
+          _, @err = capture_output do
+            Rake::ExtensionTask.new('extension_one') do |ext|
+              ext.cross_compile = true
+            end
           end
         end
 
-        err.should match(/rake-compiler must be configured first to enable cross-compilation/)
+        it 'should not generate a warning' do
+          @err.should eq("")
+        end
+
+        it 'should create a dummy nested cross-compile target that raises an error' do
+          Rake::Task.should have_defined("cross")
+          Rake::Task["cross"].invoke
+          lambda {
+            Rake::Task["compile"].invoke
+          }.should raise_error(RuntimeError,
+                               /rake-compiler must be configured first to enable cross-compilation/)
+        end
       end
 
       it 'should parse the config file using YAML' do

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.7.9"
+  s.version     = "0.8.0"
   s.platform    = Gem::Platform::RUBY
 
   # description and details
@@ -18,9 +18,8 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.add_dependency  'rake'
 
   # development dependencies
-  s.add_development_dependency 'rspec', '~> 2.6.0'
-  s.add_development_dependency 'cucumber', '~> 0.10.6'
-  #s.add_development_dependency 'rcov', '~> 0.9.9'
+  s.add_development_dependency 'rspec', '~> 2.8.0'
+  s.add_development_dependency 'cucumber', '~> 1.1.4'
 
   # components, files and paths
   s.files = FileList["features/**/*.{feature,rb}", "bin/rake-compiler",

data/tasks/rspec.rake

@@ -1,29 +1,9 @@
 begin
   require "rspec/core/rake_task"
-
-  begin
-    require 'rcov'
-  rescue LoadError
-    warn "RCov gem is required, please install it (gem install rcov)."
-  end
-
-rescue LoadError
+rescue LoadError => e
   warn "RSpec gem is required, please install it (gem install rspec)."
 end
 
 if defined?(RSpec::Core::RakeTask)
   RSpec::Core::RakeTask.new(:spec)
-
-  if defined?(Rcov)
-    CLOBBER.include('coverage')
-
-    namespace :spec do
-      desc "Run all specs in spec directory with RCov"
-      RSpec::Core::RakeTask.new(:rcov) do |t|
-        t.rcov = true
-        t.rcov_opts   = ["--exclude", "spec/*,features/*,gems/*"]
-      end
-    end
-  end
 end
-

metadata

@@ -1,81 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rake-compiler
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.8.0
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 9
-  version: 0.7.9
 platform: ruby
-authors: 
+authors:
 - Luis Lavena
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &23233764 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *23233764
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &23233056 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *23233056
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &23248788 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 10
-        - 6
-        version: 0.10.6
+      - !ruby/object:Gem::Version
+        version: 1.1.4
   type: :development
-  version_requirements: *id003
-description: |-
-  Provide a standard and simplified way to build and package
-  Ruby extensions (C, Java) using Rake as glue.
+  prerelease: false
+  version_requirements: *23248788
+description: ! 'Provide a standard and simplified way to build and package
+
+  Ruby extensions (C, Java) using Rake as glue.'
 email: luislavena@gmail.com
-executables: 
+executables:
 - rake-compiler
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE.txt
 - History.txt
-files: 
+files:
 - features/compile.feature
 - features/cross-compile.feature
 - features/cross-package-multi.feature
@@ -119,44 +99,32 @@ files:
 - LICENSE.txt
 - cucumber.yml
 homepage: http://github.com/luislavena/rake-compiler
-licenses: 
+licenses:
 - MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --title
 - rake-compiler -- Documentation
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: rake-compiler
-rubygems_version: 1.8.5
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Rake-based Ruby Extension (C, Java) task generator.
 test_files: []
-