Skip to content

Commit

Permalink
Unpin rubocop gem to be compatible with latest rake version when ruby…
Browse files Browse the repository at this point in the history
… >= 2
  • Loading branch information
aerostitch committed Jan 25, 2017
1 parent 733fa78 commit b24714d
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 3 deletions.
42 changes: 40 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,41 @@
source 'https://rubygems.org'
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0'
group :test do
gem 'rake'
gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0'
gem 'rspec-core', '< 3.2.0' if RUBY_VERSION < '1.9'
gem 'rspec-puppet'
gem 'puppetlabs_spec_helper'
gem 'metadata-json-lint'
gem 'rspec-puppet-facts'
if RUBY_VERSION < '1.9'
gem 'rubocop', '< 0.42.0'
else
gem 'rubocop'
end
gem 'simplecov', '>= 0.11.0'
gem 'simplecov-console'

gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-leading_zero-check'
gem 'puppet-lint-trailing_comma-check'
gem 'puppet-lint-version_comparison-check'
gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
gem 'puppet-lint-unquoted_string-check'
gem 'puppet-lint-resource_reference_syntax'

gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
end

group :development do
gem 'travis' if RUBY_VERSION >= '2.1.0'
gem 'travis-lint' if RUBY_VERSION >= '2.1.0'
gem 'puppet-blacksmith'
gem 'guard-rake' if RUBY_VERSION >= '2.2.5' # per dependency https://rubygems.org/gems/ruby_dep
end

group :system_tests do
gem 'beaker'
gem 'beaker-rspec'
gem 'beaker-puppet_install_helper'
end
2 changes: 1 addition & 1 deletion skeleton/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ group :test do
gem 'puppetlabs_spec_helper'
gem 'metadata-json-lint'
gem 'rspec-puppet-facts'
gem 'rubocop', '0.33.0'
gem 'rubocop'
gem 'simplecov', '>= 0.11.0'
gem 'simplecov-console'

Expand Down

0 comments on commit b24714d

Please sign in to comment.