rake-compiler 0.6.0 → 0.7.0

data/spec/lib/rake/extensiontask_spec.rb

@@ -299,6 +299,16 @@ describe Rake::ExtensionTask do
         err.should match(/no configuration section for specified version of Ruby/)
       end
 
+      it 'should capture an action block to be executed when cross compiling' do
+        lambda {
+          Rake::ExtensionTask.new('extension_one') do |ext|
+            ext.cross_compiling do |gem_spec|
+              gem_spec.post_install_message = "Cross compiled gem"
+            end
+          end
+        }.should_not raise_error
+      end
+
       it 'should allow usage of RUBY_CC_VERSION to indicate a different version of ruby' do
         config = mock(Hash)
         config.should_receive(:[]).with("rbconfig-1.9.1").and_return('/path/to/ruby/1.9.1/rbconfig.rb')
@@ -421,7 +431,7 @@ describe Rake::ExtensionTask do
   end
 
   def mock_gem_spec(stubs = {})
-    mock(Gem::Specification, 
+    mock(Gem::Specification,
       { :name => 'my_gem', :platform => 'ruby' }.merge(stubs)
     )
   end

data/spec/lib/rake/javaextensiontask_spec.rb

@@ -0,0 +1,182 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'rake/javaextensiontask'
+require 'rbconfig'
+
+describe Rake::JavaExtensionTask do
+  context '#new' do
+    context '(basic)' do
+      it 'should raise an error if no name is provided' do
+        lambda {
+          Rake::JavaExtensionTask.new
+        }.should raise_error(RuntimeError, /Extension name must be provided/)
+      end
+
+      it 'should allow string as extension name assignation' do
+        ext = Rake::JavaExtensionTask.new('extension_one')
+        ext.name.should == 'extension_one'
+      end
+
+      it 'should allow string as extension name using block assignation' do
+        ext = Rake::JavaExtensionTask.new do |ext|
+          ext.name = 'extension_two'
+        end
+        ext.name.should == 'extension_two'
+      end
+
+      it 'should return itself for the block' do
+        from_block = nil
+        from_lasgn = Rake::JavaExtensionTask.new('extension_three') do |ext|
+          from_block = ext
+        end
+        from_block.should == from_lasgn
+      end
+
+      it 'should accept a gem specification as parameter' do
+        spec = mock_gem_spec
+        ext = Rake::JavaExtensionTask.new('extension_three', spec)
+        ext.gem_spec.should == spec
+      end
+
+      it 'should allow gem specification be defined using block assignation' do
+        spec = mock_gem_spec
+        ext = Rake::JavaExtensionTask.new('extension_four') do |ext|
+          ext.gem_spec = spec
+        end
+        ext.gem_spec.should == spec
+      end
+
+      it 'should allow forcing of platform' do
+        ext = Rake::JavaExtensionTask.new('weird_extension') do |ext|
+          ext.platform = 'java-128bit'
+        end
+        ext.platform.should == 'java-128bit'
+      end
+    end
+  end
+
+  context '(defaults)' do
+    before :each do
+      @ext = Rake::JavaExtensionTask.new('extension_one')
+    end
+
+    it 'should dump intermediate files to tmp/' do
+      @ext.tmp_dir.should == 'tmp'
+    end
+
+    it 'should copy build extension into lib/' do
+      @ext.lib_dir.should == 'lib'
+    end
+
+    it 'should look for Java files pattern (.java)' do
+      @ext.source_pattern.should == "**/*.java"
+    end
+
+    it 'should have no configuration options preset to delegate' do
+      @ext.config_options.should be_empty
+    end
+
+    it 'should default to Java platform' do
+      @ext.platform.should == 'java'
+    end
+
+  context '(tasks)' do
+    before :each do
+      Rake.application.clear
+      CLEAN.clear
+      CLOBBER.clear
+    end
+
+    context '(one extension)' do
+      before :each do
+        Rake::FileList.stub!(:[]).and_return(["ext/extension_one/source.java"])
+        @ext = Rake::JavaExtensionTask.new('extension_one')
+        @ext_bin = ext_bin('extension_one')
+        @platform = 'java'
+      end
+
+      context 'compile' do
+        it 'should define as task' do
+          Rake::Task.task_defined?('compile').should be_true
+        end
+
+        it "should depend on 'compile:{platform}'" do
+          pending 'needs fixing'
+          Rake::Task['compile'].prerequisites.should include("compile:#{@platform}")
+        end
+      end
+
+      context 'compile:extension_one' do
+        it 'should define as task' do
+          Rake::Task.task_defined?('compile:extension_one').should be_true
+        end
+
+        it "should depend on 'compile:extension_one:{platform}'" do
+          pending 'needs fixing'
+          Rake::Task['compile:extension_one'].prerequisites.should include("compile:extension_one:#{@platform}")
+        end
+      end
+
+      context 'lib/extension_one.jar' do
+        it 'should define as task' do
+          pending 'needs fixing'
+          Rake::Task.task_defined?("lib/#{@ext_bin}").should be_true
+        end
+
+        it "should depend on 'copy:extension_one:{platform}'" do
+          pending 'needs fixing'
+          Rake::Task["lib/#{@ext_bin}"].prerequisites.should include("copy:extension_one:#{@platform}")
+        end
+      end
+
+      context 'tmp/{platform}/extension_one/extension_one.jar' do
+        it 'should define as task' do
+          Rake::Task.task_defined?("tmp/#{@platform}/extension_one/#{@ext_bin}").should be_true
+        end
+
+        it "should depend on checkpoint file" do
+          Rake::Task["tmp/#{@platform}/extension_one/#{@ext_bin}"].prerequisites.should include("tmp/#{@platform}/extension_one/.build")
+        end
+      end
+
+      context 'tmp/{platform}/extension_one/.build' do
+        it 'should define as task' do
+          Rake::Task.task_defined?("tmp/#{@platform}/extension_one/.build").should be_true
+        end
+
+        it 'should depend on source files' do
+          Rake::Task["tmp/#{@platform}/extension_one/.build"].prerequisites.should include("ext/extension_one/source.java")
+        end
+      end
+
+      context 'clean' do
+        it "should include 'tmp/{platform}/extension_one' in the pattern" do
+          CLEAN.should include("tmp/#{@platform}/extension_one")
+        end
+      end
+
+      context 'clobber' do
+        it "should include 'lib/extension_one.jar'" do
+          CLOBBER.should include("lib/#{@ext_bin}")
+        end
+
+        it "should include 'tmp'" do
+          CLOBBER.should include('tmp')
+        end
+      end
+    end
+    end
+  end
+  private
+
+  def ext_bin(extension_name)
+    "#{extension_name}.jar"
+  end
+
+  def mock_gem_spec(stubs = {})
+    mock(Gem::Specification,
+      { :name => 'my_gem', :platform => 'ruby' }.merge(stubs)
+    )
+  end
+
+end

data/tasks/bin/cross-ruby.rake

@@ -28,6 +28,7 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'rake/extensioncompiler'
 
+MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') }
 USER_HOME = File.expand_path("~/.rake-compiler")
 RUBY_CC_VERSION = "ruby-#{ENV['VERSION'] || '1.8.6-p287'}"
 RUBY_SOURCE = ENV['SOURCE']
@@ -137,14 +138,14 @@ end
 # make
 file "#{USER_HOME}/builds/#{RUBY_CC_VERSION}/ruby.exe" => ["#{USER_HOME}/builds/#{RUBY_CC_VERSION}/Makefile"] do |t|
   chdir File.dirname(t.prerequisites.first) do
-    sh "make"
+    sh MAKE
   end
 end
 
 # make install
 file "#{USER_HOME}/ruby/#{RUBY_CC_VERSION}/bin/ruby.exe" => ["#{USER_HOME}/builds/#{RUBY_CC_VERSION}/ruby.exe"] do |t|
   chdir File.dirname(t.prerequisites.first) do
-    sh "make install"
+    sh "#{MAKE} install"
   end
 end
 task :install => ["#{USER_HOME}/ruby/#{RUBY_CC_VERSION}/bin/ruby.exe"]

data/tasks/common.rake

@@ -9,8 +9,5 @@ task :default => [:spec, :features]
 # make packing depend on success of running specs and features
 task :package => [:spec, :features]
 
-# make the release re-generate the gemspec if required
-task :release => [:gemspec]
-
 # publish documentation when doing a release
 task :release => [:publish]

data/tasks/cucumber.rake

@@ -1,15 +1,23 @@
 begin
-  gem 'cucumber'
   require 'cucumber/rake/task'
-rescue Exception
-  nil
+rescue LoadError
+  warn "Cucumber gem is required, please install it. (gem install cucumber)"
 end
 
 if defined?(Cucumber)
-  Cucumber::Rake::Task.new do |t|
-    t.cucumber_opts = "--format pretty --no-source"
+  namespace :cucumber do
+    Cucumber::Rake::Task.new('default', 'Run features testing C extension support') do |t|
+      t.profile       = 'default'
+      t.cucumber_opts = '--format pretty --no-source'
+    end
+    Cucumber::Rake::Task.new('java', 'Run features testing Java extension support') do |t|
+      t.profile       = 'java'
+      t.cucumber_opts = '--format pretty --no-source'
+    end
+
+    desc 'Run all features'
+    task :all => [:default, :java]
   end
-else
-  warn "Cucumber gem is required, please install it. (gem install cucumber)"
+  desc 'Alias for cucumber:default'
+  task :cucumber => 'cucumber:default'
 end
-

data/tasks/gem.rake

@@ -3,26 +3,31 @@ require 'rubygems/package_task'
 GEM_SPEC = Gem::Specification.new do |s|
   # basic information
   s.name        = "rake-compiler"
-  s.version     = "0.6.0"
+  s.version     = "0.7.0"
   s.platform    = Gem::Platform::RUBY
 
   # description and details
-  s.summary     = 'Rake-based Ruby C Extension task generator.'
-  s.description = "Provide a standard and simplified way to build and package\nRuby C extensions using Rake as glue."
+  s.summary     = 'Rake-based Ruby Extension (C, Java) task generator.'
+  s.description = "Provide a standard and simplified way to build and package\nRuby extensions (C, Java) using Rake as glue."
+
+  # requirements
+  s.required_ruby_version = ">= 1.8.6"
+  s.required_rubygems_version = ">= 1.3.5"
 
   # dependencies
   s.add_dependency  'rake', '>= 0.8.3', '< 0.9'
 
   # development dependencies
-  #s.add_development_dependency 'rspec', '~> 1.1.9'
-  #s.add_development_dependency 'rcov', '~> 0.8.1'
-  #s.add_development_dependency 'cucumber', '~> 0.1.8'
+  s.add_development_dependency 'rspec', '~> 1.2.9'
+  s.add_development_dependency 'cucumber', '~> 0.4.4'
+  #s.add_development_dependency 'rcov', '~> 0.9.6'
 
   # components, files and paths
   s.files = FileList["features/**/*.{feature,rb}", "bin/rake-compiler",
                       "lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake",
                       "Rakefile", "*.{rdoc,txt,yml}"]
 
+  s.bindir      = 'bin'
   s.executables = ['rake-compiler']
 
   s.require_path = 'lib'
@@ -47,11 +52,3 @@ gem_package = Gem::PackageTask.new(GEM_SPEC) do |pkg|
   pkg.need_tar = false
   pkg.need_zip = false
 end
-
-file "#{GEM_SPEC.name}.gemspec" => ['Rakefile', 'tasks/gem.rake'] do |t|
-  puts "Generating #{t.name}"
-  File.open(t.name, 'w') { |f| f.puts GEM_SPEC.to_yaml }
-end
-
-desc "Generate or update the standalone gemspec file for the project"
-task :gemspec => ["#{GEM_SPEC.name}.gemspec"]

data/tasks/news.rake

@@ -1,8 +1,7 @@
 begin
-  gem 'rubyforge', '~> 1.0.1'
   require 'rubyforge'
-rescue Exception
-  nil
+rescue LoadError
+  warn "rubyforge gem is required to generate announces, please install it (gem install rubyforge)."
 end
 
 CLEAN.include('email.txt')
@@ -77,6 +76,4 @@ if defined?(RubyForge) then
   else
     warn "no GEM_SPEC is found or defined. 'announce' task cannot work without it."
   end
-else
-  warn "rubyforge gem is required to generate announces, please install it (gem install rubyforge)."
 end

data/tasks/rdoc_publish.rake

@@ -1,8 +1,7 @@
 begin
-  gem 'rubyforge', '~> 1.0.1'
   require 'rubyforge'
-rescue Exception
-  nil
+rescue LoadError
+  warn "rubyforge gem is required to generate releases, please install it (gem install rubyforge)."
 end
 
 if defined?(RubyForge) then
@@ -39,6 +38,4 @@ if defined?(RubyForge) then
   else
     warn "You need a GEM_SPEC and DOC rdoc definitions present. task publish not defined."
   end
-else
-  warn "rubyforge gem is required to generate releases, please install it (gem install rubyforge)."
 end

data/tasks/release.rake

@@ -1,8 +1,7 @@
 begin
-  gem 'rubyforge', '~> 1.0.1'
   require 'rubyforge'
-rescue Exception
-  nil
+rescue LoadError
+  warn "rubyforge gem is required to generate releases, please install it (gem install rubyforge)."
 end
 
 if defined?(RubyForge) then
@@ -69,6 +68,4 @@ if defined?(RubyForge) then
   else
     warn "no GEM_SPEC is found or defined. 'release' task cannot work without it."
   end
-else
-  warn "rubyforge gem is required to generate releases, please install it (gem install rubyforge)."
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake-compiler
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Luis Lavena
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-25 00:00:00 -03:00
+date: 2009-12-08 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,9 +25,29 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.9"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.4
+    version: 
 description: |-
   Provide a standard and simplified way to build and package
-  Ruby C extensions using Rake as glue.
+  Ruby extensions (C, Java) using Rake as glue.
 email: luislavena@gmail.com
 executables: 
 - rake-compiler
@@ -42,20 +62,27 @@ files:
 - features/cross-compile.feature
 - features/cross-package-multi.feature
 - features/cross-package.feature
+- features/java-compile.feature
+- features/java-no-native-compile.feature
+- features/java-package.feature
 - features/package.feature
 - features/step_definitions/compilation.rb
 - features/step_definitions/cross_compilation.rb
 - features/step_definitions/execution.rb
 - features/step_definitions/folders.rb
 - features/step_definitions/gem.rb
+- features/step_definitions/java_compilation.rb
 - 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/baseextensiontask.rb
 - lib/rake/extensioncompiler.rb
 - lib/rake/extensiontask.rb
+- lib/rake/javaextensiontask.rb
 - spec/lib/rake/extensiontask_spec.rb
+- spec/lib/rake/javaextensiontask_spec.rb
 - spec/spec_helper.rb
 - spec/support/capture_output_helper.rb
 - tasks/bin/cross-ruby.rake
@@ -88,20 +115,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.8.6
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.5
   version: 
 requirements: []
 
 rubyforge_project: rake-compiler
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Rake-based Ruby C Extension task generator.
+summary: Rake-based Ruby Extension (C, Java) task generator.
 test_files: []