Skip to content

Commit ea88f60

Browse files
committed
(CONT-19) Update config_defaults gems
- Added Rubocop gems missing from original commit - Add lower bounds to all gems - Remove `puppet-lint` as it is brought in by `voxpupuli-puppet-lint-plugins` - Remove `specinfra` as it is brought in by `serverspec` - Move `serverspec` to system_tests - Remove `ed25519` and `bcrypt_pbkf` as they are brought in by `net-ssh` - Remove `rspec-puppet` as it is brought in by `puppetlabs_spec_helper` - Pin `facterdb` to 1.18 and up as this is the version which adds Ub22.04 - Remove code previously used to retrieve ruby version
1 parent 001c90b commit ea88f60

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

config_defaults.yml

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -557,32 +557,39 @@ Gemfile:
557557
required:
558558
':development':
559559
- gem: 'json'
560+
version: '~> 2.0'
560561
- gem: 'voxpupuli-puppet-lint-plugins'
561-
version: '>= 3.0.0'
562+
version: '~> 3.0'
562563
- gem: 'facterdb'
563-
version: '< 2.0.0'
564+
version: '~> 1.18'
564565
- gem: 'metadata-json-lint'
565-
version: '< 4.0.0'
566-
- gem: 'puppet-lint'
567-
version: '< 3.0.0'
566+
version:
567+
- '>= 2.0.2'
568+
- '< 4.0.0'
568569
- gem: 'puppetlabs_spec_helper'
569-
version: '< 4.0.0'
570-
- gem: 'rspec-puppet'
571-
version: '< 3.0.0'
570+
version:
571+
- '>= 3.0.0'
572+
- '< 5.0.0'
572573
- gem: 'rspec-puppet-facts'
573-
version: '< 3.0.0'
574+
version: '~> 2.0'
574575
- gem: 'codecov'
576+
version: '~> 0.2'
575577
- gem: 'dependency_checker'
578+
version: '~> 0.2'
576579
- gem: 'parallel_tests'
580+
version: '~> 3.4'
577581
- gem: 'pry'
578-
- gem: 'serverspec'
582+
version: '~> 0.10'
579583
- gem: 'simplecov-console'
580-
- gem: 'specinfra'
584+
version: '~> 0.5'
581585
- gem: 'puppet-debugger'
582-
- gem: 'ed25519'
583-
platforms: ruby
584-
- gem: 'bcrypt_pbkdf'
585-
platforms: ruby
586+
version: '~> 1.0'
587+
- gem: 'rubocop'
588+
version: '= 1.6.1'
589+
- gem: 'rubocop-performance'
590+
version: '= 1.9.1'
591+
- gem: 'rubocop-rspec'
592+
version: '= 2.0.1'
586593
- gem: 'rb-readline'
587594
version: '= 0.5.5'
588595
platforms:
@@ -593,6 +600,8 @@ Gemfile:
593600
- gem: 'puppet_litmus'
594601
version: '< 1.0.0'
595602
platforms: ruby
603+
- gem: 'serverspec'
604+
version: '~> 2.41'
596605
.gitlab-ci.yml:
597606
defaults:
598607
cache:

moduleroot/Gemfile.erb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ def location_for(place_or_version, fake_version = nil)
7171
end
7272
end
7373

74-
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
75-
minor_version = ruby_version_segments[0..1].join('.')
76-
7774
<%
7875
groups = {}
7976
(@configs['required'].keys + ((@configs['optional'] || {}).keys)).uniq.each do |key|

0 commit comments

Comments
 (0)