summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2013-12-12 20:27:35 -0800
committerAndre Arko <andre@arko.net>2013-12-18 21:01:27 -0800
commit77e9c742c8e8b7d48bada2b901c641ae792d6915 (patch)
treebb73afdda344750dd7a79a7736d7163a70d02b42
parentd79c607f2412c617428a5d9d28ba05f4f6420fe5 (diff)
downloadbundler-77e9c742c8e8b7d48bada2b901c641ae792d6915.tar.gz
RSpec version conflicts on 1.8 :cold_sweat:
-rw-r--r--Rakefile2
-rw-r--r--spec/spec_helper.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Rakefile b/Rakefile
index 278a91e808..56aeef1aeb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,5 @@
# -*- encoding: utf-8 -*-
$:.unshift File.expand_path("../lib", __FILE__)
-require 'bundler/gem_tasks'
require 'rubygems'
require 'shellwords'
require 'benchmark'
@@ -221,6 +220,7 @@ rescue LoadError
end
end
+require 'bundler/gem_tasks'
task :build => ["man:clean", "man:build"]
task :release => ["man:clean", "man:build"]
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6c36da4eda..0c5691316c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,10 +1,10 @@
$:.unshift File.expand_path('..', __FILE__)
$:.unshift File.expand_path('../../lib', __FILE__)
+require 'rspec'
require 'bundler/psyched_yaml'
require 'fileutils'
require 'rubygems'
require 'bundler'
-require 'rspec'
require 'uri'
require 'digest/sha1'