Skip to content

Commit cc2918b

Browse files
committed
build: relax Puppet version
Makes this gem easier to use, because you no longer need to override ENV[PUPPET_VERSION] if you don't want Puppet 5.
1 parent 37a5a9b commit cc2918b

File tree

2 files changed

+2
-39
lines changed

2 files changed

+2
-39
lines changed

config/puppet-versions.json

-24
This file was deleted.

octocatalog-diff.gemspec

+2-15
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
require 'json'
22

3-
DEFAULT_PUPPET_VERSION = '5.5.22'.freeze
4-
53
Gem::Specification.new do |s|
64
s.required_ruby_version = '>= 2.6.0'
7-
puppet_version = ENV['PUPPET_VERSION'] || DEFAULT_PUPPET_VERSION
85

96
s.name = 'octocatalog-diff'
107
s.version = ENV['OCTOCATALOG_DIFF_VERSION'] || File.read(File.join(File.dirname(__FILE__), '.version')).strip
@@ -30,23 +27,13 @@ EOF
3027
s.add_runtime_dependency 'hashdiff', '>= 0.3.0'
3128
s.add_runtime_dependency 'parallel', '>= 1.12.0'
3229
s.add_runtime_dependency 'rugged', '>= 0.25.0b2'
33-
s.add_runtime_dependency 'puppet', puppet_version
34-
s.add_development_dependency 'puppet', puppet_version
30+
s.add_runtime_dependency 'puppet', '>= 7'
31+
s.add_development_dependency 'puppet', '>= 7'
3532
s.add_development_dependency 'rspec', '~> 3.4.0'
3633
s.add_development_dependency 'rake', '12.3.3'
3734
s.add_development_dependency 'parallel_tests', '2.7.1'
3835
s.add_development_dependency 'rspec-retry', '0.5.0'
3936
s.add_development_dependency 'rubocop', '= 0.49.0'
4037
s.add_development_dependency 'simplecov', '~> 0.14.1'
4138
s.add_development_dependency 'simplecov-erb', '~> 0.1.1'
42-
43-
puppet_v = Gem::Version.new(puppet_version)
44-
version_config = JSON.parse(File.read(File.join(File.dirname(__FILE__), 'config', 'puppet-versions.json')))
45-
version_config.each do |data|
46-
next unless puppet_v >= Gem::Version.new(data['minimum_version'])
47-
next unless puppet_v <= Gem::Version.new(data['maximum_version'])
48-
data['additional_gems'].each do |additional_gem|
49-
s.add_development_dependency additional_gem['name'], additional_gem['version']
50-
end
51-
end
5239
end

0 commit comments

Comments
 (0)