Fixed post-merge problems with Travis CI and buld tasks.

Author: jdantonio

.travis.yml

@@ -17,4 +17,4 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: 1.9.3
-script: "bundle exec rspec --color --backtrace --seed 1 --format documentation ./spec"
+script: "bundle exec compile && bundle exec rspec --color --backtrace --seed 1 --format documentation ./spec"

Rakefile

@@ -10,9 +10,17 @@ Bundler::GemHelper.install_tasks
 $:.push File.join(File.dirname(__FILE__), 'lib')
 require 'extension_helper'
 
-$:.unshift 'tasks'
-Dir.glob('tasks/**/*.rake').each do|rakefile|
-  load rakefile
+def safe_load(file)
+  begin
+    load file
+  rescue LoadError => ex
+    puts 'Error loading rake tasks, but will continue...'
+    puts ex.message
+  end
+end
+
+Dir.glob('tasks/**/*.rake').each do |rakefile|
+  safe_load rakefile
 end
 
 desc 'Run benchmarks'
@@ -69,13 +77,11 @@ begin
   require 'rspec'
   require 'rspec/core/rake_task'
 
-  RSpec::Core::RakeTask.new(:spec)
-
-  RSpec::Core::RakeTask.new(:travis_spec) do |t|
-    t.rspec_opts = '--tag ~@not_on_travis'
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.rspec_opts = '--color --backtrace --format documentation'
   end
 
-  task :default => [:clean, :compile, :travis_spec]
+  task :default => [:clean, :compile, :spec]
 rescue LoadError
   puts 'Error loading Rspec rake tasks, probably building the gem...'
 end