Skip to content

Commit 44c289b

Browse files
authored
Merge pull request #219 from bastelfreak/openfact
Switch from facter to openfact
2 parents 51d0fe9 + 13796f0 commit 44c289b

File tree

4 files changed

+9
-18
lines changed

4 files changed

+9
-18
lines changed

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ Style/IfUnlessModifier:
1414
Naming/FileName:
1515
Exclude:
1616
- 'lib/rspec-puppet-facts.rb'
17+
18+
AllCops:
19+
TargetRubyVersion: 3.2

.rubocop_todo.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
3-
# using RuboCop version 1.75.8.
3+
# using RuboCop version 1.79.2.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
@@ -34,10 +34,6 @@ RSpec/LeakyConstantDeclaration:
3434
RSpec/MessageSpies:
3535
EnforcedStyle: receive
3636

37-
# Offense count: 4
38-
RSpec/MultipleExpectations:
39-
Max: 2
40-
4137
# Offense count: 48
4238
# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
4339
# SupportedStyles: always, named_only

Gemfile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,10 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
44

55
gemspec
66

7-
gem 'facter', ENV.fetch('FACTER_GEM_VERSION', nil), require: false
8-
97
group :release, optional: true do
108
gem 'faraday-retry', '~> 2.1', require: false
119
gem 'github_changelog_generator', '~> 1.16.4', require: false
1210
end
1311

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
12+
gem 'openvox'
2213
gem 'syslog', '~> 0.3' if RUBY_VERSION >= '3.4'

rspec-puppet-facts.gemspec

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
1313
s.description = 'Contains facts from many Facter version on many Operating Systems'
1414
s.licenses = 'Apache-2.0'
1515

16-
s.required_ruby_version = '>= 2.7.0'
16+
s.required_ruby_version = '>= 3.2.0'
1717

1818
s.files = `git ls-files`.split("\n")
1919
s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
@@ -23,9 +23,10 @@ Gem::Specification.new do |s|
2323
s.add_development_dependency 'rspec', '~> 3.12'
2424
s.add_development_dependency 'yard', '~> 0.9.34'
2525

26-
s.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
26+
s.add_development_dependency 'voxpupuli-rubocop', '~> 4.2.0'
2727

2828
s.add_dependency 'deep_merge', '~> 1.2'
29-
s.add_dependency 'facter', '< 5'
29+
3030
s.add_dependency 'facterdb', '>= 3.1', '< 5.0'
31+
s.add_dependency 'openfact', '~> 5.0'
3132
end

0 commit comments

Comments
 (0)