Skip to content

Commit a566c8a

Browse files
author
Ryan Gard
committed
Merge pull request #135 from ferventcoder/maint/master/modsync-changes
(maint) Guarantee Facter version for old Puppets / (MODULES-2452) Update Beaker Version
2 parents bf9069c + 5418bf0 commit a566c8a

File tree

1 file changed

+24
-20
lines changed

1 file changed

+24
-20
lines changed

Gemfile

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ end
3838

3939
group :system_tests do
4040
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1')
41-
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.19')
41+
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.20')
4242
gem 'beaker-puppet_install_helper', :require => false
4343
end
4444

@@ -74,23 +74,27 @@ if explicitly_require_windows_gems
7474
# This also means Puppet Gem less than 3.5.0 - this has been tested back
7575
# to 3.0.0. Any further back is likely not supported.
7676
if puppet_gem_location == :gem
77-
gem "ffi", "1.9.0", :require => false
78-
gem "win32-eventlog", "0.5.3", :require => false
79-
gem "win32-process", "0.6.5", :require => false
80-
gem "win32-security", "~> 0.1.2", :require => false
81-
gem "win32-service", "0.7.2", :require => false
82-
gem "minitar", "0.5.4", :require => false
77+
gem "ffi", "1.9.0", :require => false
78+
gem "win32-eventlog", "0.5.3", :require => false
79+
gem "win32-process", "0.6.5", :require => false
80+
gem "win32-security", "~> 0.1.2", :require => false
81+
gem "win32-service", "0.7.2", :require => false
82+
gem "minitar", "0.5.4", :require => false
83+
# If facterversion hasn't been specified and we are
84+
# looking for a Puppet Gem version less than 3.5.0, we
85+
# need to ensure we get a good Facter for Windows specs.
86+
gem "facter",">= 1.6.11","<= 1.7.5",:require => false unless facterversion
8387
else
84-
gem "ffi", "~> 1.9.0", :require => false
85-
gem "win32-eventlog", "~> 0.5", :require => false
86-
gem "win32-process", "~> 0.6", :require => false
87-
gem "win32-security", "~> 0.1", :require => false
88-
gem "win32-service", "~> 0.7", :require => false
89-
gem "minitar", "~> 0.5.4", :require => false
88+
gem "ffi", "~> 1.9.0", :require => false
89+
gem "win32-eventlog", "~> 0.5", :require => false
90+
gem "win32-process", "~> 0.6", :require => false
91+
gem "win32-security", "~> 0.1", :require => false
92+
gem "win32-service", "~> 0.7", :require => false
93+
gem "minitar", "~> 0.5.4", :require => false
9094
end
9195

92-
gem "win32-dir", "~> 0.3", :require => false
93-
gem "win32console", "1.3.2", :require => false if RUBY_VERSION =~ /^1\./
96+
gem "win32-dir", "~> 0.3", :require => false
97+
gem "win32console", "1.3.2", :require => false if RUBY_VERSION =~ /^1\./
9498

9599
# Puppet less than 3.7.0 requires these.
96100
# Puppet 3.5.0+ will control the actual requirements.
@@ -99,11 +103,11 @@ if explicitly_require_windows_gems
99103
# We do not want to allow newer versions than what came out after
100104
# 3.6.x to be used as they constitute some risk in breaking older
101105
# functionality. So we set these to exact versions.
102-
gem "sys-admin", "1.5.6", :require => false
103-
gem "win32-api", "1.4.8", :require => false
104-
gem "win32-taskscheduler", "0.2.2", :require => false
105-
gem "windows-api", "0.4.3", :require => false
106-
gem "windows-pr", "1.2.3", :require => false
106+
gem "sys-admin", "1.5.6", :require => false
107+
gem "win32-api", "1.4.8", :require => false
108+
gem "win32-taskscheduler", "0.2.2", :require => false
109+
gem "windows-api", "0.4.3", :require => false
110+
gem "windows-pr", "1.2.3", :require => false
107111
end
108112

109113
if File.exists? "#{__FILE__}.local"

0 commit comments

Comments
 (0)