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-12 20:29:15 -0800
commit67fb448f465addd48f8a9bb667ddbd9815203b34 (patch)
treeea62c01f0f12803e4c210cf0cfcfe83ffeab8c63
parent7892dc86babbb0031567603874fe00c6891eff73 (diff)
downloadbundler-67fb448f465addd48f8a9bb667ddbd9815203b34.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 1c97b863d1..5bc8e6de80 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'
@@ -219,6 +218,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 ec678f2d4c..44f68c673a 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'