File tree Expand file tree Collapse file tree 3 files changed +19
-4
lines changed Expand file tree Collapse file tree 3 files changed +19
-4
lines changed Original file line number Diff line number Diff line change 1414# openvox on Ruby 3.3 / 3.4 has some missing dependencies
1515# Will be fixed in a future openvox release
1616gem 'base64' , '~> 0.2' if RUBY_VERSION >= '3.4'
17+ gem 'puppet' , '>= 7' , '< 9'
1718gem 'racc' , '~> 1.8' if RUBY_VERSION >= '3.3'
1819gem 'syslog' , '~> 0.3' if RUBY_VERSION >= '3.4'
Original file line number Diff line number Diff line change 11# frozen_string_literal: true
22
3- require 'puppet'
43require 'facter'
54require 'facterdb'
65require 'json'
@@ -254,12 +253,21 @@ def self.spec_facts_strict?
254253 def self . common_facts
255254 return @common_facts if @common_facts
256255
256+ # from Facter itself
257257 @common_facts = {
258- puppetversion : Puppet . version ,
259258 rubysitedir : RbConfig ::CONFIG [ 'sitelibdir' ] ,
260259 rubyversion : RUBY_VERSION ,
261260 }
262261
262+ begin
263+ require 'puppet'
264+ rescue LoadError
265+ warning 'Could not load Puppet'
266+ else
267+ # from Puppet.initialize_facts
268+ @common_facts [ :puppetversion ] = Puppet . version . to_s
269+ end
270+
263271 @common_facts [ :mco_version ] = MCollective ::VERSION if mcollective?
264272
265273 if augeas?
@@ -418,6 +426,13 @@ def self.facter_version_for_puppet_version(puppet_version)
418426end
419427
420428RSpec . configure do |c |
421- c . add_setting :default_facter_version , default : RspecPuppetFacts . facter_version_for_puppet_version ( Puppet . version )
429+ begin
430+ require 'puppet'
431+ rescue LoadError
432+ puppet_version = nil
433+ else
434+ puppet_version = Puppet . version
435+ end
436+ c . add_setting :default_facter_version , default : RspecPuppetFacts . facter_version_for_puppet_version ( puppet_version )
422437 c . add_setting :facterdb_string_keys , default : false
423438end
Original file line number Diff line number Diff line change @@ -28,5 +28,4 @@ Gem::Specification.new do |s|
2828 s . add_dependency 'deep_merge' , '~> 1.2'
2929 s . add_dependency 'facter' , '< 5'
3030 s . add_dependency 'facterdb' , '~> 3.1'
31- s . add_dependency 'puppet' , '>= 7' , '< 9'
3231end
You can’t perform that action at this time.
0 commit comments