Skip to content

Commit 59a6053

Browse files
hunnerhunner
committed
(MODULES-3704) Update gemfile template to be identical
1 parent 06a8ed9 commit 59a6053

File tree

4 files changed

+45
-34
lines changed

4 files changed

+45
-34
lines changed

‎.sync.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
CONTRIBUTING.md:
1010
unmanaged: true
1111
Gemfile:
12-
supports_windows: true
1312
optional:
1413
':development':
1514
- gem: yard
@@ -29,4 +28,4 @@ NOTICE:
2928
unmanaged: true
3029
MAINTAINERS.md:
3130
maintainers:
32-
- "Puppet Windows Team `windows |at| puppet |dot| com`"
31+
- "Puppet Windows Team `windows |at| puppet |dot| com`"

‎Gemfile

+42-30
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#This file is generated by ModuleSync, do not edit.
2+
13
source ENV['GEM_SOURCE'] || "https://rubygems.org"
24

35
# Determines what type of gem is requested based on place_or_version.
@@ -25,6 +27,9 @@ def location_for(place_or_version, fake_version = nil)
2527
end
2628
end
2729

30+
# Used for gem conditionals
31+
supports_windows = true
32+
2833
# The following gems are not included by default as they require DevKit on Windows.
2934
# You should probably include them in a Gemfile.local or a ~/.gemfile
3035
#gem 'pry' #this may already be included in the gemfile
@@ -36,62 +41,66 @@ end
3641
#end
3742

3843
group :development do
39-
gem 'rake', :require => false
40-
gem 'rspec', '~>3.0', :require => false
41-
gem 'puppet-lint', :require => false
42-
gem 'puppetlabs_spec_helper', '~>0.10.3', :require => false
43-
gem 'puppet_facts', :require => false
44-
gem 'mocha', '~>0.10.5', :require => false
45-
gem 'pry', :require => false
46-
gem 'yard', :require => false
44+
gem 'puppet-lint', :require => false
45+
gem 'metadata-json-lint', :require => false
46+
gem 'puppet_facts', :require => false
47+
gem 'puppet-blacksmith', '>= 3.4.0', :require => false, :platforms => 'ruby'
48+
gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false
49+
gem 'rspec-puppet', '>= 2.3.2', :require => false
50+
gem 'rspec-puppet-facts', :require => false
51+
gem 'mocha', '< 1.2.0', :require => false
52+
gem 'simplecov', :require => false
53+
gem 'parallel_tests', '< 2.10.0', :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
54+
gem 'parallel_tests', :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0.0')
55+
gem 'rubocop', '0.41.2', :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
56+
gem 'rubocop', :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0.0')
57+
gem 'rubocop-rspec', '~> 1.6', :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
58+
gem 'pry', :require => false
59+
gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
60+
gem 'yard', :require => false
4761
end
4862

4963
group :system_tests do
50-
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1')
51-
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.20')
52-
gem 'beaker-puppet_install_helper', :require => false
64+
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.20') if supports_windows
65+
gem 'beaker', *location_for(ENV['BEAKER_VERSION']) if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0') and ! supports_windows
66+
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '< 3') if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') and ! supports_windows
67+
gem 'beaker-pe', :require => false if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
68+
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4') if ! supports_windows
69+
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1') if supports_windows
70+
gem 'beaker-puppet_install_helper', :require => false
71+
gem 'master_manipulator', :require => false
72+
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
5373
end
5474

55-
# The recommendation is for PROJECT_GEM_VERSION, although there are older ways
56-
# of referencing these. Add them all for compatibility reasons. We'll remove
57-
# later when no issues are known. We'll prefer them in the right order.
58-
puppetversion = ENV['PUPPET_GEM_VERSION'] || ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_LOCATION'] || '>= 0'
59-
gem 'puppet', *location_for(puppetversion)
60-
61-
# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
62-
# if using ruby 1.x
63-
gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
75+
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
6476

6577
# Only explicitly specify Facter/Hiera if a version has been specified.
6678
# Otherwise it can lead to strange bundler behavior. If you are seeing weird
6779
# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable
6880
# to `1` and then run bundle install.
69-
facterversion = ENV['FACTER_GEM_VERSION'] || ENV['GEM_FACTER_VERSION'] || ENV['FACTER_LOCATION']
70-
gem "facter", *location_for(facterversion) if facterversion
71-
hieraversion = ENV['HIERA_GEM_VERSION'] || ENV['GEM_HIERA_VERSION'] || ENV['HIERA_LOCATION']
72-
gem "hiera", *location_for(hieraversion) if hieraversion
81+
gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
82+
gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
7383

7484
# For Windows dependencies, these could be required based on the version of
7585
# Puppet you are requiring. Anything greater than v3.5.0 is going to have
7686
# Windows-specific dependencies dictated by the gem itself. The other scenario
7787
# is when you are faking out Puppet to use a local file path / git path.
7888
explicitly_require_windows_gems = false
79-
puppet_gem_location = gem_type(puppetversion)
89+
puppet_gem_location = gem_type(ENV['PUPPET_GEM_VERSION'])
8090
# This is not a perfect answer to the version check
81-
if puppet_gem_location != :gem || puppetversion < '3.5.0'
91+
if puppet_gem_location != :gem || (Gem::Version.correct?(ENV['PUPPET_GEM_VERSION']) && Gem::Requirement.new('< 3.5.0').satisfied_by?(Gem::Version.new(ENV['PUPPET_GEM_VERSION'])))
8292
if Gem::Platform.local.os == 'mingw32'
8393
explicitly_require_windows_gems = true
8494
end
85-
8695
if puppet_gem_location == :gem
8796
# If facterversion hasn't been specified and we are
8897
# looking for a Puppet Gem version less than 3.5.0, we
8998
# need to ensure we get a good Facter for specs.
90-
gem "facter",">= 1.6.11","<= 1.7.5",:require => false unless facterversion
99+
gem "facter",">= 1.6.11","<= 1.7.5",:require => false unless ENV['FACTER_GEM_VERSION']
91100
# If hieraversion hasn't been specified and we are
92101
# looking for a Puppet Gem version less than 3.5.0, we
93102
# need to ensure we get a good Hiera for specs.
94-
gem "hiera",">= 1.0.0","<= 1.3.0",:require => false unless hieraversion
103+
gem "hiera",">= 1.0.0","<= 1.3.0",:require => false unless ENV['HIERA_GEM_VERSION']
95104
end
96105
end
97106

@@ -117,14 +126,17 @@ if explicitly_require_windows_gems
117126
gem "win32-dir", "~> 0.3","<= 0.4.9", :require => false
118127
gem "win32console", "1.3.2", :require => false if RUBY_VERSION =~ /^1\./
119128

129+
# sys-admin was removed in Puppet 3.7.0+, and doesn't compile
130+
# under Ruby 2.3 - so restrict it to Ruby 1.x
131+
gem "sys-admin", "1.5.6", :require => false if RUBY_VERSION =~ /^1\./
132+
120133
# Puppet less than 3.7.0 requires these.
121134
# Puppet 3.5.0+ will control the actual requirements.
122135
# These are listed in formats that work with all versions of
123136
# Puppet from 3.0.0 to 3.6.x. After that, these were no longer used.
124137
# We do not want to allow newer versions than what came out after
125138
# 3.6.x to be used as they constitute some risk in breaking older
126139
# functionality. So we set these to exact versions.
127-
gem "sys-admin", "1.5.6", :require => false
128140
gem "win32-api", "1.4.8", :require => false
129141
gem "win32-taskscheduler", "0.2.2", :require => false
130142
gem "windows-api", "0.4.3", :require => false

‎metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.1.3",
44
"author": "Puppet Inc",
55
"summary": "The `sqlserver` module installs and manages MS SQL Server 2012 and 2014 on Windows systems.",
6-
"license": "PuppetLabs-Enterprise",
6+
"license": "proprietary",
77
"source": "https://tickets.puppet.com/browse/MODULES/component/12400",
88
"project_page": "https://tickets.puppet.com/browse/MODULES/component/12400",
99
"issues_url": "https://tickets.puppet.com/browse/MODULES/component/12400",

‎spec/defines/database_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
it_behaves_like 'validation error' do
2929
let(:additional_params) { {
3030
:filespec_filename => 'c:/test/test.mdf'} }
31-
let(:raise_error_check) { 'filespec_name must not be null if specifying filespec_filename' }
31+
let(:raise_error_check) { /(input needs to be a String|filespec_name must not be null if specifying filespec_filename)/ }
3232
end
3333
describe 'filespec_name can not be more than 128 characters' do
3434
it_behaves_like 'validation error' do

0 commit comments

Comments
 (0)