Fix rubocop for ruby >= 2

metrixware-echoes-tech · Aug 5, 2016 · 26f1b99 · 26f1b99
1 parent bd4b0b0
commit 26f1b99
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -35,6 +35,9 @@ if RUBY_VERSION < '2.0'
   gem 'json', '~> 1.0', :require => false
   # json_pure 2.0.2 requires ruby 2.0. Lock to 2.0.1
   gem 'json_pure', '= 2.0.1', :require => false
+else
+  # rubocop requires ruby >= 2.0
+  gem 'rubocop'
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
@@ -48,8 +51,6 @@ if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
   gem 'rspec', '~> 2.0'
   gem 'rake', '~> 10.0'
 else
-  # rubocop requires ruby >= 1.9
-  gem 'rubocop'
   gem 'rake', :require => false
 end
 

diff --git a/Rakefile b/Rakefile
@@ -2,7 +2,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 require 'metadata-json-lint/rake_task'
 
-if RUBY_VERSION >= '1.9'
+if RUBY_VERSION >= '2.0'
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new
 end