minor: a few small deployment and test fixes

Author: Brandon Black

.travis.yml

@@ -9,7 +9,7 @@ rvm:
 
 bundler_args: --without deploy
 
-script: bundle exec rake test:ruby
+script: bundle exec rake test
 
 notifications:
   email: false
@@ -25,5 +25,6 @@ branches:
 
 matrix:
   allow_failures:
+    - rvm: jruby
     - rvm: ruby-head
     - rvm: jruby-head

Gemfile

@@ -29,7 +29,7 @@ end
 
 platforms :jruby do
   gem 'bouncy-castle-java'
-  gem 'jruby-launcher'
   gem 'jruby-openssl'
+  gem 'jruby-launcher'
   gem 'jruby-jars'
 end

tasks/deploy.rake

@@ -44,14 +44,14 @@ namespace :deploy do
     g.push('origin', 'release', true)
   end
 
-  desc "Package all gems for release"
+  desc "Package all gems for release (Run from MRI)"
   task :package do
-    # TODO: Make this work for rbenv too
     version = bumper_version.to_s
     RVM.use 'jruby'
-    system "gem build bson.gemspec; mv bson-#{version}.gem bson-java-#{version}.gem"
-    RVM.reset_current!
+    system "gem build bson.gemspec"
+    system "mv bson-#{version}.gem bson-java-#{version}.gem"
 
+    RVM.reset_current!
     Dir.glob('*.gemspec').each { |file| system "gem build #{file}" }
   end
 

tasks/testing.rake

@@ -13,7 +13,7 @@ namespace :test do
   desc "Run default test suites with BSON extensions enabled."
   task :ext do
     ENV.delete('BSON_EXT_DISABLED')
-    Rake::Task['compile'].invoke
+    Rake::Task['compile'].invoke unless RUBY_PLATFORM =~ /java/
     Rake::Task['test:default'].invoke
   end