Merge pull request #337 from sodabrew/travis_ruby_2.0.0

Travis Ruby 2.0.0

Author: brianmario

.travis.yml

@@ -6,6 +6,8 @@ rvm:
   - ree
   - rbx-18mode
   - rbx-19mode
+  - ruby-head
+bundler_args: --without benchmarks
 script:
   - bundle exec rake
   - bundle exec rspec

Gemfile

@@ -1,3 +1,12 @@
 source :rubygems
 
-gemspec
+gemspec
+
+# benchmarks
+group :benchmarks do
+  gem 'activerecord'
+  gem 'mysql'
+  gem 'do_mysql'
+  gem 'sequel'
+  gem 'faker'
+end

Gemfile.lock

@@ -31,8 +31,8 @@ GEM
     i18n (0.6.0)
     multi_json (1.0.4)
     mysql (2.8.1)
-    rake (0.8.7)
-    rake-compiler (0.7.9)
+    rake (0.9.4)
+    rake-compiler (0.8.1)
       rake
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -55,7 +55,7 @@ DEPENDENCIES
   faker
   mysql
   mysql2!
-  rake (= 0.8.7)
-  rake-compiler (~> 0.7.7)
-  rspec
+  rake (~> 0.9.3)
+  rake-compiler (~> 0.8.1)
+  rspec (~> 2.8.0)
   sequel

mysql2.gemspec

@@ -17,13 +17,7 @@ Gem::Specification.new do |s|
 
   # tests
   s.add_development_dependency 'eventmachine'
-  s.add_development_dependency 'rake-compiler', "~> 0.7.7"
-  s.add_development_dependency 'rake', '0.8.7' # NB: 0.8.7 required by rake-compiler 0.7.9
-  s.add_development_dependency 'rspec'
-  # benchmarks
-  s.add_development_dependency 'activerecord'
-  s.add_development_dependency 'mysql'
-  s.add_development_dependency 'do_mysql'
-  s.add_development_dependency 'sequel'
-  s.add_development_dependency 'faker'
+  s.add_development_dependency 'rake-compiler', "~> 0.8.1"
+  s.add_development_dependency 'rake', '~> 0.9.3'
+  s.add_development_dependency 'rspec', '~> 2.8.0'
 end

spec/mysql2/client_spec.rb

@@ -421,7 +421,7 @@ def connect *args
       }.should_not raise_error(SystemStackError)
     end
 
-    if RUBY_VERSION =~ /1.9/
+    unless RUBY_VERSION =~ /1.8/
       it "should carry over the original string's encoding" do
         str = "abc'def\"ghi\0jkl%mno"
         escaped = Mysql2::Client.escape(str)
@@ -638,7 +638,7 @@ def connect *args
     @client.ping.should eql(false)
   end
 
-  if RUBY_VERSION =~ /1.9/
+  unless RUBY_VERSION =~ /1.8/
     it "should respond to #encoding" do
       @client.should respond_to(:encoding)
     end

spec/mysql2/error_spec.rb

@@ -35,7 +35,7 @@
     @error.should respond_to(:error)
   end
 
-  if RUBY_VERSION =~ /1.9/
+  unless RUBY_VERSION =~ /1.8/
     it "#message encoding should match the connection's encoding, or Encoding.default_internal if set" do
       if Encoding.default_internal.nil?
         @error.message.encoding.should eql(@client.encoding)

spec/mysql2/result_spec.rb

@@ -234,7 +234,7 @@
     end
 
     if 1.size == 4 # 32bit
-      if RUBY_VERSION =~ /1.9/
+      unless RUBY_VERSION =~ /1.8/
         klass = Time
       else
         klass = DateTime
@@ -252,7 +252,7 @@
         r.first['test'].class.should eql(klass)
       end
     elsif 1.size == 8 # 64bit
-      if RUBY_VERSION =~ /1.9/
+      unless RUBY_VERSION =~ /1.8/
         it "should return Time when timestamp is < 1901-12-13 20:45:52" do
           r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
           r.first['test'].class.should eql(Time)