Skip to content

Commit 4feee98

Browse files
Ramesh7Ramesh7
authored
Merge pull request #124 from puppetlabs/CAT-1530
CAT-1530 - Updating Gemfile to fix bolt vulnerability
2 parents 6647604 + 06439fd commit 4feee98

File tree

1 file changed

+33
-36
lines changed

1 file changed

+33
-36
lines changed

‎Gemfile‎

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
# frozen_string_literal: true
2-
31
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
42

53
def location_for(place_or_version, fake_version = nil)
6-
git_url_regex = /\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?/
7-
file_url_regex = %r{\Afile://(?<path>.*)}
4+
git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
5+
file_url_regex = %r{\Afile:\/\/(?<path>.*)}
86

97
if place_or_version && (git_url = place_or_version.match(git_url_regex))
108
[fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
@@ -16,40 +14,37 @@ def location_for(place_or_version, fake_version = nil)
1614
end
1715

1816
group :development do
19-
gem 'json', '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0',
20-
'< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21-
gem 'json', '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0',
22-
'< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23-
gem 'json', '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0',
24-
'< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
25-
gem 'json', '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0',
26-
'< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
27-
gem 'json', '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0',
28-
'< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
29-
gem 'codecov', '~> 0.2', require: false
30-
gem 'dependency_checker', '~> 1.0.0', require: false
31-
gem 'facterdb', '~> 1.18', require: false
32-
gem 'metadata-json-lint', '~> 3.0', require: false
33-
gem 'parallel_tests', '= 3.12.1', require: false
34-
gem 'pry', '~> 0.10', require: false
35-
gem 'puppet-debugger', '~> 1.0', require: false
36-
gem 'puppetlabs_spec_helper', '~> 6.0', require: false
37-
gem 'rb-readline', '= 0.5.5', require: false, platforms: %i[mswin mingw x64_mingw]
38-
gem 'rspec-puppet-facts', '~> 2.0', require: false
39-
gem 'rubocop', '= 1.48.1', require: false
40-
gem 'rubocop-performance', '= 1.16.0', require: false
41-
gem 'rubocop-rspec', '= 2.19.0', require: false
42-
gem 'simplecov-console', '~> 0.5', require: false
43-
gem 'voxpupuli-puppet-lint-plugins', '~> 5.0', require: false
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))
20+
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))
21+
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))
22+
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 "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
24+
gem "facterdb", '~> 1.18', require: false
25+
gem "metadata-json-lint", '~> 3.0', require: false
26+
gem "puppetlabs_spec_helper", '~> 6.0', require: false
27+
gem "rspec-puppet-facts", '~> 2.0', require: false
28+
gem "codecov", '~> 0.2', require: false
29+
gem "dependency_checker", '~> 1.0.0', require: false
30+
gem "parallel_tests", '= 3.12.1', require: false
31+
gem "pry", '~> 0.10', require: false
32+
gem "simplecov-console", '~> 0.5', require: false
33+
gem "puppet-debugger", '~> 1.0', require: false
34+
gem "rubocop", '= 1.48.1', require: false
35+
gem "rubocop-performance", '= 1.16.0', require: false
36+
gem "rubocop-rspec", '= 2.19.0', require: false
37+
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
38+
gem "github_changelog_generator", '= 1.15.2', require: false
4439
end
4540
group :system_tests do
46-
gem 'puppet_litmus', '~> 1.0', require: false, platforms: %i[ruby x64_mingw]
47-
gem 'serverspec', '~> 2.41', require: false
41+
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
42+
gem "serverspec", '~> 2.41', require: false
4843
end
4944

50-
puppet_version = ENV.fetch('PUPPET_GEM_VERSION', nil)
51-
facter_version = ENV.fetch('FACTER_GEM_VERSION', nil)
52-
hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil)
45+
puppet_version = ENV['PUPPET_GEM_VERSION']
46+
facter_version = ENV['FACTER_GEM_VERSION']
47+
hiera_version = ENV['HIERA_GEM_VERSION']
5348

5449
gems = {}
5550

@@ -68,10 +63,12 @@ end
6863
# Evaluate Gemfile.local and ~/.gemfile if they exist
6964
extra_gemfiles = [
7065
"#{__FILE__}.local",
71-
File.join(Dir.home, '.gemfile')
66+
File.join(Dir.home, '.gemfile'),
7267
]
7368

7469
extra_gemfiles.each do |gemfile|
75-
eval(File.read(gemfile), binding) if File.file?(gemfile) && File.readable?(gemfile)
70+
if File.file?(gemfile) && File.readable?(gemfile)
71+
eval(File.read(gemfile), binding)
72+
end
7673
end
7774
# vim: syntax=ruby

0 commit comments

Comments
 (0)