Skip to content

Commit 3dd6d7c

Browse files
authored
Merge pull request #217 from bastelfreak/openvox2
Support OpenVox
2 parents 575b635 + e327bac commit 3dd6d7c

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

Gemfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ group :release do
1111
gem 'github_changelog_generator', '~> 1.16.4', require: false
1212
end
1313

14-
# openvox on Ruby 3.3 / 3.4 has some missing dependencies
15-
# Will be fixed in a future openvox release
16-
gem 'base64', '~> 0.2' if RUBY_VERSION >= '3.4'
17-
gem 'puppet', '>= 7', '< 9'
18-
gem 'racc', '~> 1.8' if RUBY_VERSION >= '3.3'
14+
if ENV.fetch('IMPLEMENTATION', nil) == 'puppet'
15+
# puppet on Ruby 3.3 / 3.4 has some missing dependencies
16+
gem 'base64', '~> 0.2' if RUBY_VERSION >= '3.4'
17+
gem 'puppet', '>= 7', '< 9'
18+
gem 'racc', '~> 1.8' if RUBY_VERSION >= '3.3'
19+
else
20+
gem 'openvox'
21+
end
1922
gem 'syslog', '~> 0.3' if RUBY_VERSION >= '3.4'

lib/rspec-puppet-facts.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ def self.common_facts
266266
else
267267
# from Puppet.initialize_facts
268268
@common_facts[:puppetversion] = Puppet.version.to_s
269+
# from Puppet::Node::Facts#add_local_facts
270+
@common_facts[:implementation] = Puppet.implementation if Puppet.respond_to?(:implementation)
269271
end
270272

271273
@common_facts[:mco_version] = MCollective::VERSION if mcollective?

0 commit comments

Comments
 (0)