Skip to content

Commit e430aae

Browse files
committed
implement ruby240 properly
1 parent 0fa4650 commit e430aae

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

Gemfile

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,31 @@ group :test do
2828
gem 'puppet-strings', '~> 1.0.0', :require => false
2929
gem 'rubocop-rspec', '~> 1.9.0', :require => false if RUBY_VERSION >= '2.3.0'
3030
gem 'mocha', '>= 1.2.1', :require => false
31-
gem 'coveralls', :require => false if RUBY_VERSION >= '2.0.0'
32-
gem 'simplecov-console', :require => false if RUBY_VERSION >= '2.0.0'
33-
gem 'json', '>= 2.0.0', :require => false
31+
gem 'coveralls', :require => false
32+
gem 'simplecov-console', :require => false
33+
gem 'json', '>= 2.0.0', :require => false if RUBY_VERSION >= '2.4.0'
3434
end
3535

36-
#group :development do
37-
# gem 'travis', :require => false
38-
# gem 'travis-lint', :require => false
39-
# gem 'guard-rake', :require => false
40-
#end
41-
42-
#group :system_tests do
43-
# if beaker_version = ENV['BEAKER_VERSION']
44-
# gem 'beaker', *location_for(beaker_version)
45-
# end
46-
# if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
47-
# gem 'beaker-rspec', *location_for(beaker_rspec_version)
48-
# else
49-
# gem 'beaker-rspec', :require => false
50-
# end
51-
# gem 'serverspec', :require => false
52-
# gem 'beaker-puppet_install_helper', :require => false
53-
#end
36+
if RUBY_VERSION < '2.4.0'
37+
group :development do
38+
gem 'travis', :require => false
39+
gem 'travis-lint', :require => false
40+
gem 'guard-rake', :require => false
41+
end
5442

43+
group :system_tests do
44+
if beaker_version = ENV['BEAKER_VERSION']
45+
gem 'beaker', *location_for(beaker_version)
46+
end
47+
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
48+
gem 'beaker-rspec', *location_for(beaker_rspec_version)
49+
else
50+
gem 'beaker-rspec', :require => false
51+
end
52+
gem 'serverspec', :require => false
53+
gem 'beaker-puppet_install_helper', :require => false
54+
end
55+
end
5556

5657

5758
if facterversion = ENV['FACTER_GEM_VERSION']

0 commit comments

Comments
 (0)