Merge pull request #595 from tamird/misc-cleanup

Misc cleanup and update specs to RSpec 3

Author: sodabrew

.rspec

@@ -1,3 +1,4 @@
---format documentation
 --colour
---fail-fast
+--format documentation
+--order rand
+--warnings

.travis.yml

@@ -1,38 +1,10 @@
 language: ruby
-bundler_args: --without benchmarks
-script:
-  - bundle exec rake spec
+bundler_args: --without benchmarks development
 before_install:
   - gem --version
-  - |
-    bash -c " # Install MySQL 5.7 if DB=mysql57
-    if [[ x$DB =~ mysql57 ]]; then
-      sudo bash .travis_mysql57.sh
-    fi
-    "
-  - |
-    bash -c " # Install MariaDB if DB=mariadb
-    if [[ x$DB =~ xmariadb ]]; then
-      sudo bash .travis_mariadb.sh '$DB'
-    fi
-    "
-  - |
-    bash -c " # Install MySQL is OS=darwin
-    if [[ x$OSTYPE =~ ^xdarwin ]]; then
-      brew install mysql
-      mysql.server start
-    fi
-    "
-  - |
-    bash -c " # Configure SSL support
-    if [[ ! x$OSTYPE =~ ^xdarwin ]]; then
-      sudo bash .travis_ssl.sh
-      sudo service mysql restart
-    fi
-    "
+  - bash .travis_setup.sh
   - mysqld --version
-  - mysql -u root -e "CREATE DATABASE IF NOT EXISTS test"
-  - mysql -u root -e "CREATE USER '$USER'@'localhost'" || true
+  - mysql -u $USER -e "CREATE DATABASE IF NOT EXISTS test"
 os:
   - linux
 rvm:
@@ -42,19 +14,14 @@ rvm:
   - 2.1
   - 2.2
   - ree
+  - rbx-2
 matrix:
-  allow_failures:
-    - env: DB=mysql57
-    - rvm: rbx-2
-    - os: osx
   include:
     - rvm: 2.0.0
       env: DB=mariadb55
     - rvm: 2.0.0
       env: DB=mariadb10
     - rvm: 2.0.0
       env: DB=mysql57
-    - rvm: rbx-2
-      env: RBXOPT=-Xgc.honor_start=true
     - rvm: 2.0.0
       os: osx

.travis_mariadb.sh

@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
+set -eu
 
 service mysql stop
 apt-get purge '^mysql*' 'libmysql*'
-apt-get install python-software-properties
 apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
 
 if [[ x$1 = xmariadb55 ]]; then

.travis_mysql57.sh

@@ -1,15 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-service mysql stop
+set -eu
 
+service mysql stop
 apt-get purge '^mysql*' 'libmysql*'
-apt-get autoclean
-
-rm -rf /var/lib/mysql
-rm -rf /var/log/mysql
-
-apt-get install python-software-properties
 apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x8C718D3B5072E1F5
+
 add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.7-dmr'
 
 apt-get update

.travis_setup.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -eu
+
+# Install MySQL 5.7 if DB=mysql57
+if [[ -n ${DB-} && x$DB =~ mysql57 ]]; then
+  sudo bash .travis_mysql57.sh
+fi
+
+# Install MariaDB if DB=mariadb
+if [[ -n ${DB-} && x$DB =~ xmariadb ]]; then
+  sudo bash .travis_mariadb.sh "$DB"
+fi
+
+# Install MySQL if OS=darwin
+if [[ x$OSTYPE =~ ^xdarwin ]]; then
+  brew install mysql
+  mysql.server start
+fi
+
+# TODO: get SSL working on OS X in Travis
+if ! [[ x$OSTYPE =~ ^xdarwin ]]; then
+  sudo bash .travis_ssl.sh
+  sudo service mysql restart
+fi
+
+sudo mysql -e "CREATE USER '$USER'@'localhost'" || true

.travis_ssl.sh

@@ -1,7 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-# Halt the tests on error
-set -e
+set -eu
 
 # Wherever MySQL configs live, go there (this is for cross-platform)
 cd $(my_print_defaults --help | grep my.cnf | xargs find 2>/dev/null | xargs dirname)

Gemfile

@@ -2,22 +2,29 @@ source 'https://rubygems.org'
 
 gemspec
 
-# benchmarks
+gem 'rake', '~> 10.4.2'
+gem 'rake-compiler', '~> 0.9.5'
+
+group :test do
+  gem 'eventmachine' unless RUBY_PLATFORM =~ /mswin|mingw/
+  gem 'rspec', '~> 3.2'
+end
+
 group :benchmarks do
   gem 'activerecord', '>= 3.0'
-  gem 'mysql'
+  gem 'benchmark-ips'
   gem 'do_mysql'
-  gem 'sequel'
   gem 'faker'
+  gem 'mysql'
+  gem 'sequel'
 end
 
 group :development do
   gem 'pry'
-  gem 'eventmachine' unless RUBY_PLATFORM =~ /mswin|mingw/
 end
 
 platforms :rbx do
-  gem 'rubysl-rake'
-  gem 'rubysl-drb'
   gem 'rubysl-bigdecimal'
+  gem 'rubysl-drb'
+  gem 'rubysl-rake'
 end

README.md

@@ -437,13 +437,13 @@ As for field values themselves, I'm workin on it - but expect that soon.
 
 This gem is tested with the following Ruby versions on Linux and Mac OS X:
 
- * Ruby MRI 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.x, 2.2.x (ongoing patch releases)
+ * Ruby MRI 1.8.7, 1.9.3, 2.0.0, 2.1.x, 2.2.x
  * Ruby Enterprise Edition (based on MRI 1.8.7)
  * Rubinius 2.x
 
 This gem is tested with the following MySQL and MariaDB versions:
 
- * MySQL 5.0, 5.1, 5.5, 5.6, 5.7
+ * MySQL 5.5, 5.7
  * MySQL Connector/C 6.0 and 6.1 (primarily on Windows)
  * MariaDB 5.5, 10.0
 

benchmark/active_record.rb

@@ -2,50 +2,32 @@
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
-require 'benchmark'
+require 'benchmark/ips'
 require 'active_record'
 
 ActiveRecord::Base.default_timezone = :local
 ActiveRecord::Base.time_zone_aware_attributes = true
 
-number_of = 10
-mysql2_opts = {
-  :adapter => 'mysql2',
-  :database => 'test'
-}
-mysql_opts = {
-  :adapter => 'mysql',
-  :database => 'test'
-}
-
-class Mysql2Model < ActiveRecord::Base
-  self.table_name = "mysql2_test"
-end
+opts = { :database => 'test' }
 
-class MysqlModel < ActiveRecord::Base
-  self.table_name = "mysql2_test"
+class TestModel < ActiveRecord::Base
+  self.table_name = 'mysql2_test'
 end
 
-Benchmark.bmbm do |x|
-  x.report "Mysql2" do
-    Mysql2Model.establish_connection(mysql2_opts)
-    number_of.times do
-      Mysql2Model.limit(1000).to_a.each{ |r|
-        r.attributes.keys.each{ |k|
-          r.send(k.to_sym)
-        }
-      }
-    end
-  end
+batch_size = 1000
+
+Benchmark.ips do |x|
+  %w(mysql mysql2).each do |adapter|
+    TestModel.establish_connection(opts.merge(:adapter => adapter))
 
-  x.report "Mysql" do
-    MysqlModel.establish_connection(mysql_opts)
-    number_of.times do
-      MysqlModel.limit(1000).to_a.each{ |r|
-        r.attributes.keys.each{ |k|
+    x.report(adapter) do
+      TestModel.limit(batch_size).to_a.each do |r|
+        r.attributes.keys.each do |k|
           r.send(k.to_sym)
-        }
-      }
+        end
+      end
     end
   end
+
+  x.compare!
 end

benchmark/active_record_threaded.rb

@@ -2,41 +2,22 @@
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
-require 'benchmark'
+require 'benchmark/ips'
 require 'active_record'
 
-times = 25
+number_of_threads = 25
+opts = { :database => 'test', :pool => number_of_threads }
 
+Benchmark.ips do |x|
+  %w(mysql mysql2).each do |adapter|
+    ActiveRecord::Base.establish_connection(opts.merge(:adapter => adapter))
 
-# mysql2
-mysql2_opts = {
-  :adapter => 'mysql2',
-  :database => 'test',
-  :pool => times
-}
-ActiveRecord::Base.establish_connection(mysql2_opts)
-x = Benchmark.realtime do
-  threads = []
-  times.times do
-    threads << Thread.new { ActiveRecord::Base.connection.execute("select sleep(1)") }
+    x.report(adapter) do
+      number_of_threads.times.map do
+        Thread.new { ActiveRecord::Base.connection.execute('SELECT SLEEP(1)') }
+      end.each(&:join)
+    end
   end
-  threads.each {|t| t.join }
-end
-puts "mysql2: #{x} seconds"
-
 
-# mysql
-mysql2_opts = {
-  :adapter => 'mysql',
-  :database => 'test',
-  :pool => times
-}
-ActiveRecord::Base.establish_connection(mysql2_opts)
-x = Benchmark.realtime do
-  threads = []
-  times.times do
-    threads << Thread.new { ActiveRecord::Base.connection.execute("select sleep(1)") }
-  end
-  threads.each {|t| t.join }
+  x.compare!
 end
-puts "mysql: #{x} seconds"