From 48d29043c8062fae49862a370cbf9a0d0a23e5a2 Mon Sep 17 00:00:00 2001
From: Charles Lowell <cowboyd@thefrontside.net>
Date: Mon, 28 Nov 2011 15:21:09 -0600
Subject: [PATCH] clean up the Rakefile, fix rspec task

---
 Rakefile             |  8 ++++----
 tasks/jruby.rake     |  7 -------
 tasks/rspec.rake     | 13 -------------
 therubyrhino.gemspec |  1 +
 4 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 tasks/jruby.rake
 delete mode 100644 tasks/rspec.rake

diff --git a/Rakefile b/Rakefile
index cdf18da..ff3cb5e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,11 +1,11 @@
+require 'java'
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
-for file in Dir['tasks/*.rake']
-  load file
-end
-
 desc "remove all build artifacts"
 task :clean do
   sh "rm -rf pkg/"
 end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
diff --git a/tasks/jruby.rake b/tasks/jruby.rake
deleted file mode 100644
index 60a9556..0000000
--- a/tasks/jruby.rake
+++ /dev/null
@@ -1,7 +0,0 @@
-if RUBY_PLATFORM =~ /java/
-  require 'java'
-else
-  puts "Java RubyGem only! You are not running within jruby."
-  puts "Try: jruby -S rake #{ARGV.join(' ')}"
-  exit(1)
-end
diff --git a/tasks/rspec.rake b/tasks/rspec.rake
deleted file mode 100644
index 2ed38de..0000000
--- a/tasks/rspec.rake
+++ /dev/null
@@ -1,13 +0,0 @@
-begin
-  require 'spec'
-  require 'spec/rake/spectask'
-  desc "Run the specs under spec/models"
-  Spec::Rake::SpecTask.new do |t|
-    t.spec_opts = ['--options', "spec/spec.opts"]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-  end
-rescue LoadError
-  desc "bundle install to run rspecs"
-  task :spec
-end
-
diff --git a/therubyrhino.gemspec b/therubyrhino.gemspec
index 2f72671..68adc1f 100644
--- a/therubyrhino.gemspec
+++ b/therubyrhino.gemspec
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{therubyrhino}
   s.summary = %q{Embed the Rhino JavaScript interpreter into JRuby}
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "jruby-openssl"
 end