moved back to 2.1.1, some gemfile modifications

Added a Bundler.require so that bundler will manage the dependencies.
Uses ruby-debug for ruby 1.8.*, and uses debugger for anything else.
Also, seems as if the debugger gem has yet to support ruby 2.1.2, so
moved back to ruby 2.1.1 for now.

.travis.yml

@@ -2,5 +2,5 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
-  - 2.1.2
+  - 2.1.1
   - ree

Gemfile

@@ -3,11 +3,14 @@ source 'http://rubygems.org'
 gemspec
 
 group :test do
-  gem "ruby-debug", "~> 0.10.4", :require => nil, :platforms => :ruby_18
-  gem "debugger",   "~> 1.1",    :require => nil, :platforms => :ruby_19
+  if RUBY_VERSION < "1.9"
+    gem "ruby-debug", "~> 0.10.4"
+  else
+    gem "debugger",   "~> 1.1"
+  end
   gem "shoulda",    "~> 2.11"
   gem "rake",       "~> 10"
-  gem "mocha",      "~> 0.14"
+  gem "mocha",      "~> 0.14",  :require => false
   gem "nokogiri",   "~> 1.5.0"
   gem "timecop",    "<= 0.6.0"
   gem "systemu",    "~> 2"

test/test_helper.rb

@@ -1,8 +1,9 @@
 require 'rubygems'
+require 'bundler'
 require 'test/unit'
-require 'shoulda'
 require 'mocha/setup'
-require 'timecop'
+
+Bundler.require :default, :test
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))