Skip to content

Commit b24714d

Browse files
committed
Unpin rubocop gem to be compatible with latest rake version when ruby >= 2
1 parent 733fa78 commit b24714d

File tree

2 files changed

+41
-3
lines changed

2 files changed

+41
-3
lines changed

Gemfile

+40-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1-
source 'https://rubygems.org'
1+
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
22

3-
gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0'
3+
group :test do
4+
gem 'rake'
5+
gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0'
6+
gem 'rspec-core', '< 3.2.0' if RUBY_VERSION < '1.9'
7+
gem 'rspec-puppet'
8+
gem 'puppetlabs_spec_helper'
9+
gem 'metadata-json-lint'
10+
gem 'rspec-puppet-facts'
11+
if RUBY_VERSION < '1.9'
12+
gem 'rubocop', '< 0.42.0'
13+
else
14+
gem 'rubocop'
15+
end
16+
gem 'simplecov', '>= 0.11.0'
17+
gem 'simplecov-console'
18+
19+
gem 'puppet-lint-absolute_classname-check'
20+
gem 'puppet-lint-leading_zero-check'
21+
gem 'puppet-lint-trailing_comma-check'
22+
gem 'puppet-lint-version_comparison-check'
23+
gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
24+
gem 'puppet-lint-unquoted_string-check'
25+
gem 'puppet-lint-resource_reference_syntax'
26+
27+
gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
28+
end
29+
30+
group :development do
31+
gem 'travis' if RUBY_VERSION >= '2.1.0'
32+
gem 'travis-lint' if RUBY_VERSION >= '2.1.0'
33+
gem 'puppet-blacksmith'
34+
gem 'guard-rake' if RUBY_VERSION >= '2.2.5' # per dependency https://rubygems.org/gems/ruby_dep
35+
end
36+
37+
group :system_tests do
38+
gem 'beaker'
39+
gem 'beaker-rspec'
40+
gem 'beaker-puppet_install_helper'
41+
end

skeleton/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ group :test do
88
gem 'puppetlabs_spec_helper'
99
gem 'metadata-json-lint'
1010
gem 'rspec-puppet-facts'
11-
gem 'rubocop', '0.33.0'
11+
gem 'rubocop'
1212
gem 'simplecov', '>= 0.11.0'
1313
gem 'simplecov-console'
1414

0 commit comments

Comments
 (0)