@@ -14,22 +14,20 @@ def location_for(place_or_version, fake_version = nil)
1414end
1515
1616group :development do
17- gem "json" , '= 2.1.0' , require : false if Gem ::Requirement . create ( [ '>= 2.5.0' , '< 2.7.0' ] ) . satisfied_by? ( Gem ::Version . new ( RUBY_VERSION . dup ) )
18- gem "json" , '= 2.3.0' , require : false if Gem ::Requirement . create ( [ '>= 2.7.0' , '< 3.0.0' ] ) . satisfied_by? ( Gem ::Version . new ( RUBY_VERSION . dup ) )
19- gem "json" , '= 2.5.1' , require : false if Gem ::Requirement . create ( [ '>= 3.0.0' , '< 3.0.5' ] ) . satisfied_by? ( Gem ::Version . new ( RUBY_VERSION . dup ) )
2017 gem "json" , '= 2.6.1' , require : false if Gem ::Requirement . create ( [ '>= 3.1.0' , '< 3.1.3' ] ) . satisfied_by? ( Gem ::Version . new ( RUBY_VERSION . dup ) )
2118 gem "json" , '= 2.6.3' , require : false if Gem ::Requirement . create ( [ '>= 3.2.0' , '< 4.0.0' ] ) . satisfied_by? ( Gem ::Version . new ( RUBY_VERSION . dup ) )
2219 gem "racc" , '~> 1.4.0' , require : false if Gem ::Requirement . create ( [ '>= 2.7.0' , '< 3.0.0' ] ) . satisfied_by? ( Gem ::Version . new ( RUBY_VERSION . dup ) )
23- gem "deep_merge" , '~> 1.0' , require : false
20+ gem "deep_merge" , '~> 1.2.2' , require : false
2421 gem "voxpupuli-puppet-lint-plugins" , '~> 5.0' , require : false
2522 gem "facterdb" , '~> 1.18' , require : false
2623 gem "metadata-json-lint" , '~> 4.0' , require : false
2724 gem "rspec-puppet-facts" , '~> 3.0' , require : false
25+ gem "json-schema" , '< 5.1.1' , require : false
2826 gem "dependency_checker" , '~> 1.0.0' , require : false
2927 gem "parallel_tests" , '= 3.12.1' , require : false
3028 gem "pry" , '~> 0.10' , require : false
3129 gem "simplecov-console" , '~> 0.9' , require : false
32- gem "puppet-debugger" , '~> 1.0 ' , require : false
30+ gem "puppet-debugger" , '~> 1.6 ' , require : false
3331 gem "rubocop" , '~> 1.50.0' , require : false
3432 gem "rubocop-performance" , '= 1.16.0' , require : false
3533 gem "rubocop-rspec" , '= 2.19.0' , require : false
@@ -49,26 +47,31 @@ group :development do
4947end
5048group :development , :release_prep do
5149 gem "puppet-strings" , '~> 4.0' , require : false
52- gem "puppetlabs_spec_helper" , '~> 7.0' , require : false
50+ gem "puppetlabs_spec_helper" , '~> 8.0' , require : false
51+ gem "puppet-blacksmith" , '~> 7.0' , require : false
5352end
5453group :system_tests do
54+ gem "puppet_litmus" , '~> 1.0' , require : false , platforms : [ :ruby , :x64_mingw ]
5555 gem "CFPropertyList" , '< 3.0.7' , require : false , platforms : [ :mswin , :mingw , :x64_mingw ]
5656 gem "serverspec" , '~> 2.41' , require : false
5757 gem "voxpupuli-acceptance" , '~> 3' , require : false
5858end
5959
60- puppet_version = ENV [ 'PUPPET_GEM_VERSION' ]
61- facter_version = ENV [ 'FACTER_GEM_VERSION' ]
62- hiera_version = ENV [ 'HIERA_GEM_VERSION' ]
63-
6460gems = { }
61+ puppet_version = ENV . fetch ( 'PUPPET_GEM_VERSION' , nil )
62+ facter_version = ENV . fetch ( 'FACTER_GEM_VERSION' , nil )
63+ hiera_version = ENV . fetch ( 'HIERA_GEM_VERSION' , nil )
6564
66- gems [ 'puppet' ] = location_for ( puppet_version )
67-
68- # If facter or hiera versions have been specified via the environment
69- # variables
65+ # If PUPPET_FORGE_TOKEN is set then use authenticated source for both puppet and facter, since facter is a transitive dependency of puppet
66+ # Otherwise, do as before and use location_for to fetch gems from the default source
67+ if !ENV [ 'PUPPET_FORGE_TOKEN' ] . to_s . empty?
68+ gems [ 'puppet' ] = [ '~> 8.11' , { require : false , source : 'https://rubygems-puppetcore.puppet.com' } ]
69+ gems [ 'facter' ] = [ '~> 4.11' , { require : false , source : 'https://rubygems-puppetcore.puppet.com' } ]
70+ else
71+ gems [ 'puppet' ] = location_for ( puppet_version )
72+ gems [ 'facter' ] = location_for ( facter_version ) if facter_version
73+ end
7074
71- gems [ 'facter' ] = location_for ( facter_version ) if facter_version
7275gems [ 'hiera' ] = location_for ( hiera_version ) if hiera_version
7376
7477gems . each do |gem_name , gem_params |
0 commit comments