Merge pull request #452 from sodabrew/task_prereqs

Define rake tasks first that will have dependencies added later

Author: sodabrew

.travis.yml

@@ -13,5 +13,4 @@ matrix:
 env: RBXOPT=-Xgc.honor_start=true
 bundler_args: --without benchmarks
 script:
-  - bundle exec rake
-  - bundle exec rspec
+  - bundle exec rake spec

Gemfile

@@ -16,5 +16,7 @@ group :development do
 end
 
 platforms :rbx do
-  gem 'rubysl'
+  gem 'rubysl-rake'
+  gem 'rubysl-drb'
+  gem 'rubysl-bigdecimal'
 end

Rakefile

@@ -1,5 +1,11 @@
 # encoding: UTF-8
 require 'rake'
 
-# Load custom tasks
-Dir['tasks/*.rake'].sort.each { |f| load f }
+# Load custom tasks (careful attention to define tasks before prerequisites)
+load 'tasks/rspec.rake'
+load 'tasks/compile.rake'
+load 'tasks/generate.rake'
+load 'tasks/benchmarks.rake'
+load 'tasks/vendor_mysql.rake'
+
+task :default => :spec

spec/mysql2/client_spec.rb

@@ -106,6 +106,7 @@ def connect *args
 
   it "should not leave dangling connections after garbage collection" do
     GC.start
+    sleep 1 if defined? Rubinius # Let the rbx GC thread do its work
     client = Mysql2::Client.new(DatabaseCredentials['root'])
     before_count = client.query("SHOW STATUS LIKE 'Threads_connected'").first['Value'].to_i
 
@@ -116,9 +117,9 @@ def connect *args
     after_count.should == before_count + 10
 
     GC.start
+    sleep 1 if defined? Rubinius # Let the rbx GC thread do its work
     final_count = client.query("SHOW STATUS LIKE 'Threads_connected'").first['Value'].to_i
-    final_count.should == before_count if !defined? Rubinius
-    final_count.should < before_count + 5 if defined? Rubinius # Cut GC some slack
+    final_count.should == before_count
   end
 
   it "should be able to connect to database with numeric-only name" do

tasks/rspec.rake

@@ -26,8 +26,6 @@ begin
   RSpec::Core::RakeTask.new('spec') do |t|
     t.verbose = true
   end
-
-  task :default => :spec
 rescue LoadError
   puts "rspec, or one of its dependencies, is not available. Install it with: sudo gem install rspec"
 end
@@ -37,9 +35,8 @@ file 'spec/configuration.yml' => 'spec/configuration.yml.example' do |task|
   src_path = File.expand_path("../../#{task.prerequisites.first}", __FILE__)
   dst_path = File.expand_path("../../#{task.name}", __FILE__)
 
-  dst_file = File.open(dst_path, 'w')
-  File.open(src_path) do |f|
-    f.each_line do |line|
+  File.open(dst_path, 'w') do |dst_file|
+    File.open(src_path).each_line do |line|
       dst_file.write line.gsub(/LOCALUSERNAME/, ENV['USER'])
     end
   end
@@ -50,9 +47,8 @@ file 'spec/my.cnf' => 'spec/my.cnf.example' do |task|
   src_path = File.expand_path("../../#{task.prerequisites.first}", __FILE__)
   dst_path = File.expand_path("../../#{task.name}", __FILE__)
 
-  dst_file = File.open(dst_path, 'w')
-  File.open(src_path) do |f|
-    f.each_line do |line|
+  File.open(dst_path, 'w') do |dst_file|
+    File.open(src_path).each_line do |line|
       dst_file.write line.gsub(/LOCALUSERNAME/, ENV['USER'])
     end
   end