Merge branch '16470-activesupport52-dependency' into production-master

[arvados.git] / Rakefile

diff --git a/Rakefile b/Rakefile
index 77bc6f426fabedd558732bf7544e05022ed4782d..dca3b0903898e62d6dbe901c0d31282bc02a03cd 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,9 @@
+# -*- ruby -*-
 lib_dir = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib_dir)
 $LOAD_PATH.uniq!
 
+require 'bundler/gem_tasks'
 require 'rubygems'
 require 'rake'
 
@@ -33,14 +35,7 @@ list = FileList[
 end
 PKG_FILES = list
 
-RCOV_ENABLED = !!(RUBY_PLATFORM != 'java' && RUBY_VERSION =~ /^1\.8/)
-if RCOV_ENABLED
-  task :default => 'spec:rcov'
-else
-  task :default => 'spec'
-end
+task :default => 'spec'
 
 WINDOWS = (RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/) rescue false
 SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }