Skip to content

Commit 3eec51e

Browse files
committed
Fix gem dependencies
1 parent b27cda0 commit 3eec51e

1 file changed

Lines changed: 17 additions & 31 deletions

File tree

Gemfile

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,15 @@
11
source ENV['GEM_SOURCE'] || "https://rubygems.org"
22

3-
group :development, :test do
4-
gem 'metadata-json-lint', :require => false
5-
gem 'rspec-puppet', :require => false
6-
gem 'puppetlabs_spec_helper', '1.1.1'
7-
gem 'puppet-lint', :require => false
8-
gem 'pry', :require => false
9-
gem 'simplecov', :require => false
10-
end
11-
12-
# pin old versions for ruby 1.8.7
13-
if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
14-
gem 'rspec', '~> 2.0'
15-
gem 'rake', '~> 10.0'
16-
else
17-
gem 'rake', :require => false
3+
group :system_tests do
4+
gem 'serverspec', :require => false
5+
gem 'beaker', :require => false
6+
gem 'beaker-rspec', :require => false
187
end
198

20-
if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0'
21-
# json 2.x requires ruby 2.0. Lock to 1.8
22-
gem 'json', '~> 1.8'
23-
# json_pure 2.0.2 requires ruby 2.0. Lock to 2.0.1
24-
gem 'json_pure', '= 2.0.1'
9+
if puppetversion = ENV['PUPPET_GEM_VERSION']
10+
gem 'puppet', puppetversion, :require => false
2511
else
26-
gem 'json'
12+
gem 'puppet', :require => false
2713
end
2814

2915
if facterversion = ENV['FACTER_GEM_VERSION']
@@ -32,16 +18,16 @@ else
3218
gem 'facter', :require => false
3319
end
3420

35-
if puppetversion = ENV['PUPPET_GEM_VERSION']
36-
gem 'puppet', puppetversion, :require => false
37-
else
38-
gem 'puppet', :require => false
39-
end
21+
gem 'puppetlabs_spec_helper', '>= 1.2.0', :require => false
22+
gem 'rspec-puppet', :require => false
23+
gem 'puppet-lint', '~> 2.0', :require => false
24+
gem 'simplecov', :require => false
4025

41-
group :system_tests do
42-
gem 'serverspec', :require => false
43-
gem 'beaker', :require => false
44-
gem 'beaker-rspec', :require => false
45-
end
26+
gem 'rspec', '~> 2.0', :require => false if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
27+
gem 'rake', '~> 10.0', :require => false if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
28+
gem 'json', '<= 1.8', :require => false if RUBY_VERSION < '2.0.0'
29+
gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0'
30+
gem 'metadata-json-lint', '0.0.11', :require => false if RUBY_VERSION < '1.9'
31+
gem 'metadata-json-lint', :require => false if RUBY_VERSION >= '1.9'
4632

4733
# vim:ft=ruby

0 commit comments

Comments
 (0)