diff options
author | Andre Arko <andre@arko.net> | 2013-12-12 20:27:35 -0800 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2013-12-12 20:29:15 -0800 |
commit | 67fb448f465addd48f8a9bb667ddbd9815203b34 (patch) | |
tree | ea62c01f0f12803e4c210cf0cfcfe83ffeab8c63 | |
parent | 7892dc86babbb0031567603874fe00c6891eff73 (diff) | |
download | bundler-67fb448f465addd48f8a9bb667ddbd9815203b34.tar.gz |
RSpec version conflicts on 1.8 :cold_sweat:
-rw-r--r-- | Rakefile | 2 | ||||
-rw-r--r-- | spec/spec_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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' |