Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CAT-1530 - Updating Gemfile to fix bolt vulnerability #94

Merged
merged 1 commit into from
Oct 23, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 33 additions & 36 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# frozen_string_literal: true

source ENV['GEM_SOURCE'] || 'https://rubygems.org'

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

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

group :development do
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))
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))
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))
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))
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))
gem 'codecov', '~> 0.2', require: false
gem 'dependency_checker', '~> 1.0.0', require: false
gem 'facterdb', '~> 1.18', require: false
gem 'metadata-json-lint', '~> 3.0', require: false
gem 'parallel_tests', '= 3.12.1', require: false
gem 'pry', '~> 0.10', require: false
gem 'puppet-debugger', '~> 1.0', require: false
gem 'puppetlabs_spec_helper', '~> 6.0', require: false
gem 'rb-readline', '= 0.5.5', require: false, platforms: %i[mswin mingw x64_mingw]
gem 'rspec-puppet-facts', '~> 2.0', require: false
gem 'rubocop', '= 1.48.1', require: false
gem 'rubocop-performance', '= 1.16.0', require: false
gem 'rubocop-rspec', '= 2.19.0', require: false
gem 'simplecov-console', '~> 0.5', require: false
gem 'voxpupuli-puppet-lint-plugins', '~> 5.0', require: false
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))
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))
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))
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))
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))
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))
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
gem "facterdb", '~> 1.18', require: false
gem "metadata-json-lint", '~> 3.0', require: false
gem "puppetlabs_spec_helper", '~> 6.0', require: false
gem "rspec-puppet-facts", '~> 2.0', require: false
gem "codecov", '~> 0.2', require: false
gem "dependency_checker", '~> 1.0.0', require: false
gem "parallel_tests", '= 3.12.1', require: false
gem "pry", '~> 0.10', require: false
gem "simplecov-console", '~> 0.5', require: false
gem "puppet-debugger", '~> 1.0', require: false
gem "rubocop", '= 1.48.1', require: false
gem "rubocop-performance", '= 1.16.0', require: false
gem "rubocop-rspec", '= 2.19.0', require: false
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "github_changelog_generator", '= 1.15.2', require: false
end
group :system_tests do
gem 'puppet_litmus', '~> 1.0', require: false, platforms: %i[ruby x64_mingw]
gem 'serverspec', '~> 2.41', require: false
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
gem "serverspec", '~> 2.41', require: false
end

puppet_version = ENV.fetch('PUPPET_GEM_VERSION', nil)
facter_version = ENV.fetch('FACTER_GEM_VERSION', nil)
hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil)
puppet_version = ENV['PUPPET_GEM_VERSION']
facter_version = ENV['FACTER_GEM_VERSION']
hiera_version = ENV['HIERA_GEM_VERSION']

gems = {}

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

extra_gemfiles.each do |gemfile|
eval(File.read(gemfile), binding) if File.file?(gemfile) && File.readable?(gemfile)
if File.file?(gemfile) && File.readable?(gemfile)
eval(File.read(gemfile), binding)
end
end
# vim: syntax=ruby