summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-02-09 17:29:07 -0800
committerelijah <elijah@riseup.net>2014-02-09 17:29:07 -0800
commit5e0fbedd18833379021c116d8700cf328f045a07 (patch)
treead0ca6c101f1667f8708967340f63127f0e605f7
parent2c1419345ae24f8ecfa2d8275631ce03c9a1ab3f (diff)
add bundler/setup to Rakefile, so we don't get minitest version conflicts.
-rw-r--r--Rakefile3
-rw-r--r--leap_cli.gemspec2
2 files changed, 3 insertions, 2 deletions
diff --git a/Rakefile b/Rakefile
index f450ed6..56b9d23 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,5 @@
require "rubygems"
+require 'bundler/setup'
require "pty"
require "fileutils"
require "rake/testtask"
@@ -134,4 +135,4 @@ task :doc do
puts "error"
end
end
-end \ No newline at end of file
+end
diff --git a/leap_cli.gemspec b/leap_cli.gemspec
index 73316c2..85bc7da 100644
--- a/leap_cli.gemspec
+++ b/leap_cli.gemspec
@@ -43,7 +43,7 @@ spec = Gem::Specification.new do |s|
##
# test
- s.add_development_dependency('rake', '>= 10.0.3')
+ s.add_development_dependency('rake', '~> 10.1')
s.add_development_dependency('minitest')
#s.add_development_dependency('rdoc')