Skip to content
Open
Show file tree
Hide file tree
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
24 changes: 0 additions & 24 deletions config/puppet-versions.json

This file was deleted.

13 changes: 1 addition & 12 deletions octocatalog-diff.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,12 @@ EOF
s.add_runtime_dependency 'hashdiff', '>= 0.3.0'
s.add_runtime_dependency 'parallel', '>= 1.12.0'
s.add_runtime_dependency 'rugged', '>= 0.25.0b2'
s.add_runtime_dependency 'puppet', '>= 5.5.0'
s.add_development_dependency 'puppet', '>= 5.5.0'
s.add_runtime_dependency 'openvox', '< 9'
Copy link

Copilot AI Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing the puppet gem dependency breaks the current bootstrap/CI tooling: script/bootstrap runs bundle binstubs puppet ... and extracts .puppet_version by grepping for puppet in Gemfile.lock, and script/puppet then executes bin/puppet. This PR needs corresponding updates so a bin/puppet binstub is still generated (or scripts are updated to use OpenVox) and the version file is derived from the correct gem/executable.

Suggested change
s.add_runtime_dependency 'openvox', '< 9'
s.add_runtime_dependency 'openvox', '< 9'
s.add_development_dependency 'puppet', puppet_version

Copilot uses AI. Check for mistakes.
Copy link

Copilot AI Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the removal of the Puppet version matrix block from this gemspec, require 'json', DEFAULT_PUPPET_VERSION, and puppet_version = ... are now unused. Please remove them (or repurpose puppet_version to constrain the openvox dependency) to avoid dead/misleading configuration.

Copilot uses AI. Check for mistakes.
s.add_development_dependency 'rspec', '~> 3.4.0'
Comment on lines 31 to 34
Copy link

Copilot AI Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

script/bootstrap runs bundle install --local (offline) and the repository’s vendor/cache currently does not include an openvox-*.gem. With this new runtime dependency, bootstrap/CI will fail unless the OpenVox gem is vendored (or --local is removed/changed).

Copilot uses AI. Check for mistakes.
s.add_development_dependency 'rake', '12.3.3'
s.add_development_dependency 'parallel_tests', '2.7.1'
s.add_development_dependency 'rspec-retry', '0.5.0'
s.add_development_dependency 'rubocop', '= 0.49.0'
s.add_development_dependency 'simplecov', '~> 0.14.1'
s.add_development_dependency 'simplecov-erb', '~> 0.1.1'

puppet_v = Gem::Version.new(puppet_version)
version_config = JSON.parse(File.read(File.join(File.dirname(__FILE__), 'config', 'puppet-versions.json')))
version_config.each do |data|
next unless puppet_v >= Gem::Version.new(data['minimum_version'])
next unless puppet_v <= Gem::Version.new(data['maximum_version'])
data['additional_gems'].each do |additional_gem|
s.add_development_dependency additional_gem['name'], additional_gem['version']
end
end
end
Binary file removed vendor/cache/CFPropertyList-2.2.8.gem
Binary file not shown.
Binary file removed vendor/cache/ast-2.4.2.gem
Binary file not shown.
Binary file removed vendor/cache/concurrent-ruby-1.1.7.gem
Binary file not shown.
Binary file removed vendor/cache/deep_merge-1.2.1.gem
Binary file not shown.
Binary file removed vendor/cache/diff-lcs-1.5.1.gem
Binary file not shown.
Binary file removed vendor/cache/diffy-3.4.2.gem
Binary file not shown.
Binary file removed vendor/cache/facter-2.5.7.gem
Binary file not shown.
Binary file removed vendor/cache/fast_gettext-1.1.2.gem
Binary file not shown.
Binary file removed vendor/cache/gettext-3.2.6.gem
Binary file not shown.
Binary file removed vendor/cache/gettext-setup-0.30.gem
Binary file not shown.
Binary file removed vendor/cache/hashdiff-1.1.1.gem
Binary file not shown.
Binary file removed vendor/cache/hiera-3.12.0.gem
Binary file not shown.
Binary file removed vendor/cache/hocon-1.3.1.gem
Binary file not shown.
Binary file removed vendor/cache/httparty-0.21.0.gem
Binary file not shown.
Binary file removed vendor/cache/httpclient-2.8.3.gem
Binary file not shown.
Binary file removed vendor/cache/json-2.7.2.gem
Binary file not shown.
Binary file removed vendor/cache/json_pure-1.8.6.gem
Binary file not shown.
Binary file removed vendor/cache/json_pure-2.0.2.gem
Binary file not shown.
Binary file removed vendor/cache/locale-2.1.4.gem
Binary file not shown.
Binary file removed vendor/cache/mime-types-3.5.2.gem
Binary file not shown.
Binary file removed vendor/cache/mime-types-data-3.2023.1205.gem
Binary file not shown.
Binary file removed vendor/cache/multi_json-1.15.0.gem
Binary file not shown.
Binary file removed vendor/cache/multi_xml-0.6.0.gem
Binary file not shown.
Binary file removed vendor/cache/parallel-1.24.0.gem
Binary file not shown.
Binary file removed vendor/cache/puppet-4.10.10.gem
Binary file not shown.
Binary file removed vendor/cache/puppet-5.5.22.gem
Binary file not shown.
Binary file removed vendor/cache/puppet-5.5.8.gem
Binary file not shown.
Binary file removed vendor/cache/puppet-6.18.0.gem
Binary file not shown.
Binary file removed vendor/cache/puppet-7.3.0.gem
Binary file not shown.
Binary file removed vendor/cache/puppet-7.32.1.gem
Binary file not shown.
Binary file removed vendor/cache/puppet-resource_api-1.8.13.gem
Binary file not shown.
Binary file removed vendor/cache/puppetdb-terminus-3.2.4.gem
Binary file not shown.
Binary file removed vendor/cache/rugged-0.27.5.gem
Binary file not shown.
Binary file removed vendor/cache/rugged-1.7.2.gem
Binary file not shown.
Binary file removed vendor/cache/safe_yaml-1.0.4.gem
Binary file not shown.
Binary file removed vendor/cache/semantic_puppet-1.0.2.gem
Binary file not shown.
Binary file removed vendor/cache/text-1.3.1.gem
Binary file not shown.
Loading