summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel E. Giddins <segiddins@segiddins.me>2015-07-15 23:05:10 -0700
committerSamuel E. Giddins <segiddins@segiddins.me>2015-07-15 23:05:10 -0700
commit2e12a0f35fc821fe723212299d00dd400b45a423 (patch)
tree19597bc3905becb44491d670dd7436c73530687f
parent2fc5cf0fc0b543156c94be9b92f03c2cad802726 (diff)
downloadbundler-2e12a0f35fc821fe723212299d00dd400b45a423.tar.gz
[Rakefile] Properly install RuboCop
-rw-r--r--Rakefile5
-rw-r--r--spec/support/rubygems_ext.rb1
2 files changed, 5 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index 0e07f90f5a..d0380dfc54 100644
--- a/Rakefile
+++ b/Rakefile
@@ -90,6 +90,7 @@ namespace :spec do
deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
[d.name, d.requirement.to_s]
end]
+ deps["rubocop"] ||= ">= 0.32.1" if RUBY_VERSION >= "1.9.3" # can't go in the gemspec because of the ruby version requirement
# JRuby can't build ronn or rdiscount, so we skip that
if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
@@ -273,6 +274,10 @@ rescue LoadError
task :spec do
abort "Run `rake spec:deps` to be able to run the specs"
end
+
+ task :rubocop do
+ abort "Run `rake spec:deps` to be able to run rubocop"
+ end
end
begin
diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb
index f9ea9f2513..5456ad2e90 100644
--- a/spec/support/rubygems_ext.rb
+++ b/spec/support/rubygems_ext.rb
@@ -22,7 +22,6 @@ module Spec
`gem install rack --no-rdoc --no-ri`
# ruby-graphviz is used by the viz tests
`gem install ruby-graphviz --no-rdoc --no-ri` if RUBY_VERSION >= "1.9.3"
- `gem install rubocop --version ">= 0.32.1" --no-rdoc --no-ri` if RUBY_VERSION >= "1.9.3"
end
ENV["HOME"] = Path.home.to_s