spec.rake in sequel-rails-0.4.1

- old
+ new

@@ -5,12 +5,12 @@
   RSpec::Core::RakeTask.new('spec')
 
   namespace :spec do
     def clean_env
       [
-        "TEST_ADAPTER", 
-        "TEST_DATABASE", 
+        "TEST_ADAPTER",
+        "TEST_DATABASE",
         "TEST_OWNER",
         "TEST_USERNAME",
         "TEST_PASSWORD",
         "TEST_ENCODING",
       ].each do |name|
@@ -36,15 +36,19 @@
       Rake::Task["spec"].invoke
     end
 
     desc "Run specs for mysql2 adapter"
     task :mysql2 do
-      clean_env
-      Rake::Task["spec"].reenable
-      ENV["TEST_ADAPTER"] = "mysql2"
-      ENV["TEST_ENCODING"] = "utf8"
-      Rake::Task["spec"].invoke
+      if SequelRails.jruby?
+        warn "No mysql2 adapter for jdbc"
+      else
+        clean_env
+        Rake::Task["spec"].reenable
+        ENV["TEST_ADAPTER"] = "mysql2"
+        ENV["TEST_ENCODING"] = "utf8"
+        Rake::Task["spec"].invoke
+      end
     end
 
     desc "Run specs for sqlite3 adapter"
     task :sqlite3 do
       clean_env
@@ -54,13 +58,18 @@
       Rake::Task["spec"].invoke
     end
 
     desc "Run specs for all adapters"
     task :all do
-      Rake::Task["spec:postgresql"].invoke
-      Rake::Task["spec:mysql"].invoke
-      Rake::Task["spec:mysql2"].invoke
-      Rake::Task["spec:sqlite3"].invoke
+      res = [
+        "spec:postgresql",
+        "spec:mysql",
+        "spec:mysql2",
+        "spec:sqlite3"
+      ].map do |task_name|
+        Rake::Task[task_name].invoke
+      end
+      res.all?
     end
   end
 
   task :default => "spec:all"
 