Rakefile in bcrypt-ruby-2.0.5 vs Rakefile in bcrypt-ruby-2.1.0

@@ -5,48 +5,51 @@
 require 'rake/clean'
 require 'rake/rdoctask'
 require "benchmark"
 
 PKG_NAME = "bcrypt-ruby"
-PKG_VERSION   = "2.0.5"
+PKG_VERSION   = "2.1.0"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
   'lib/**/*.rb', 
   'spec/**/*.rb', 
-  'ext/*.c',
-  'ext/*.h',
-  'ext/*.rb'
+  'ext/mri/*.c',
+  'ext/mri/*.h',
+  'ext/mri/*.rb',
+  'ext/jruby/bcrypt_jruby/BCrypt.java',
+  'ext/jruby/bcrypt_jruby/BCrypt.class'
 ]
 CLEAN.include(
-  "ext/*.o",
-  "ext/*.bundle",
-  "ext/*.so"  
+  "ext/mri/*.o",
+  "ext/mri/*.bundle",
+  "ext/mri/*.so",
+  "ext/jruby/bcrypt_jruby/*.class"
 )
 CLOBBER.include(
-  "doc/coverage"
+  "ext/mri/Makefile",
+  "doc/coverage",
+  "pkg"
 )
 
 task :default => [:compile, :spec]
 
 desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.spec_opts = ['--color','--backtrace','--diff']
+end
+
+desc "Run all specs, with coverage testing"
+Spec::Rake::SpecTask.new(:rcov) do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = ['--color','--backtrace','--diff']
   t.rcov = true
   t.rcov_dir = 'doc/coverage'
-  t.rcov_opts = ['--exclude', 'spec\/spec,spec\/.*_spec.rb']
+  t.rcov_opts = ['--exclude', 'rspec,diff-lcs,rcov,_spec,_helper']
 end
 
-namespace :spec do
-  desc "Run all specs and store html output in doc/specs.html"
-  Spec::Rake::SpecTask.new('html') do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--diff','--format html','--backtrace','--out doc/specs.html']
-  end
-end
-
 desc 'Generate RDoc'
 rd = Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.options << '--title' << 'bcrypt-ruby' << '--line-numbers' << '--inline-source' << '--main' << 'README'
   rdoc.template = ENV['TEMPLATE'] if ENV['TEMPLATE']
@@ -68,35 +71,58 @@
 
   s.has_rdoc = true
   s.rdoc_options = rd.options
   s.extra_rdoc_files = rd.rdoc_files.to_a
   
-  s.extensions = FileList["ext/extconf.rb"].to_a
+  s.extensions = FileList["ext/mri/extconf.rb"].to_a
   
   s.authors = ["Coda Hale"]
   s.email = "[e-mail]"
   s.homepage = "http://bcrypt-ruby.rubyforge.org"
   s.rubyforge_project = "bcrypt-ruby"
 end
 
+file 'ext/jruby/bcrypt_jruby/BCrypt.class' => ["ext/jruby/bcrypt_jruby/BCrypt.java"] do
+  Rake::Task['compile:jruby'].invoke
+end
+
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
 end
 
-desc "Clean, then compile the extension."
-task :compile => [:clean] do
-  Dir.chdir('./ext')
-  system "ruby extconf.rb"
-  system "make"
-  Dir.chdir('..')
+desc "Clean, then compile the extension that's native to the current Ruby compiler."
+if RUBY_PLATFORM == "java"
+  task :compile => 'compile:jruby'
+else
+  task :compile => 'compile:mri'
 end
 
+namespace :compile do
+  desc "CLean, then compile all extensions"
+  task :all => [:mri, :jruby]
+  
+  desc "Clean, then compile the MRI extension"
+  task :mri => :clean do
+    Dir.chdir('ext/mri') do
+      ruby "extconf.rb"
+      sh "make"
+    end
+  end
+  
+  desc "Clean, then compile the JRuby extension"
+  task :jruby => :clean do
+    Dir.chdir('ext/jruby/bcrypt_jruby') do
+      sh "javac BCrypt.java"
+    end
+  end
+end
+
 desc "Run a set of benchmarks on the compiled extension."
 task :benchmark do
   TESTS = 100
   TEST_PWD = "this is a test"
-  require "lib/bcrypt"
+  require File.expand_path(File.join(File.dirname(__FILE__), "lib", "bcrypt"))
   Benchmark.bmbm do |results|
     4.upto(10) do |n|
       results.report("cost #{n}:") { TESTS.times { BCrypt::Password.create(TEST_PWD, :cost => n) } }
     end
   end