Merge pull request #14 from TeamIguana/master

Ruby 2.0.0 build on Travis

Author: kennyj

.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 1.9.3
   - 1.9.2
   - 1.8.7
+  - 2.0.0

java_bin.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<json>, [">= 1.7.5"])
   s.add_development_dependency(%q<rsolr>, [">= 1.0.8"])
   s.add_development_dependency(%q<mocha>, [">= 0.12.6"])
+  s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
 end
 

test/helper.rb

@@ -10,7 +10,7 @@ class Test::Unit::TestCase
 end
 
 require 'rsolr'
-require 'mocha'
+require 'mocha/setup'
 
 require 'bundler'
 Bundler.require