diff --git a/config/puppet-versions.json b/config/puppet-versions.json deleted file mode 100644 index 4ed39b4b..00000000 --- a/config/puppet-versions.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "minimum_version": "4.0.0", - "maximum_version": "4.99.99", - "additional_gems": [ - { "name": "puppetdb-terminus", "version": "3.2.4" } - ] - }, - { - "minimum_version": "5.0.0", - "maximum_version": "5.99.99", - "additional_gems": [] - }, - { - "minimum_version": "6.0.0", - "maximum_version": "6.99.99", - "additional_gems": [] - }, - { - "minimum_version": "7.0.0", - "maximum_version": "7.99.99", - "additional_gems": [] - } -] diff --git a/octocatalog-diff.gemspec b/octocatalog-diff.gemspec index 92245a50..4c99f720 100644 --- a/octocatalog-diff.gemspec +++ b/octocatalog-diff.gemspec @@ -30,8 +30,7 @@ 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' s.add_development_dependency 'rspec', '~> 3.4.0' s.add_development_dependency 'rake', '12.3.3' s.add_development_dependency 'parallel_tests', '2.7.1' @@ -39,14 +38,4 @@ EOF 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 diff --git a/vendor/cache/CFPropertyList-2.2.8.gem b/vendor/cache/CFPropertyList-2.2.8.gem deleted file mode 100644 index adf1cf0c..00000000 Binary files a/vendor/cache/CFPropertyList-2.2.8.gem and /dev/null differ diff --git a/vendor/cache/ast-2.4.2.gem b/vendor/cache/ast-2.4.2.gem deleted file mode 100644 index abe16436..00000000 Binary files a/vendor/cache/ast-2.4.2.gem and /dev/null differ diff --git a/vendor/cache/concurrent-ruby-1.1.7.gem b/vendor/cache/concurrent-ruby-1.1.7.gem deleted file mode 100644 index ae9b3702..00000000 Binary files a/vendor/cache/concurrent-ruby-1.1.7.gem and /dev/null differ diff --git a/vendor/cache/deep_merge-1.2.1.gem b/vendor/cache/deep_merge-1.2.1.gem deleted file mode 100644 index ee9d198f..00000000 Binary files a/vendor/cache/deep_merge-1.2.1.gem and /dev/null differ diff --git a/vendor/cache/diff-lcs-1.5.1.gem b/vendor/cache/diff-lcs-1.5.1.gem deleted file mode 100644 index c070cb0d..00000000 Binary files a/vendor/cache/diff-lcs-1.5.1.gem and /dev/null differ diff --git a/vendor/cache/diffy-3.4.2.gem b/vendor/cache/diffy-3.4.2.gem deleted file mode 100644 index f6c83e44..00000000 Binary files a/vendor/cache/diffy-3.4.2.gem and /dev/null differ diff --git a/vendor/cache/facter-2.5.7.gem b/vendor/cache/facter-2.5.7.gem deleted file mode 100644 index 0c49e7c5..00000000 Binary files a/vendor/cache/facter-2.5.7.gem and /dev/null differ diff --git a/vendor/cache/fast_gettext-1.1.2.gem b/vendor/cache/fast_gettext-1.1.2.gem deleted file mode 100644 index 9dac89ed..00000000 Binary files a/vendor/cache/fast_gettext-1.1.2.gem and /dev/null differ diff --git a/vendor/cache/gettext-3.2.6.gem b/vendor/cache/gettext-3.2.6.gem deleted file mode 100644 index c36484ce..00000000 Binary files a/vendor/cache/gettext-3.2.6.gem and /dev/null differ diff --git a/vendor/cache/gettext-setup-0.30.gem b/vendor/cache/gettext-setup-0.30.gem deleted file mode 100644 index 44e32ad4..00000000 Binary files a/vendor/cache/gettext-setup-0.30.gem and /dev/null differ diff --git a/vendor/cache/hashdiff-1.1.1.gem b/vendor/cache/hashdiff-1.1.1.gem deleted file mode 100644 index f0a3f1b8..00000000 Binary files a/vendor/cache/hashdiff-1.1.1.gem and /dev/null differ diff --git a/vendor/cache/hiera-3.12.0.gem b/vendor/cache/hiera-3.12.0.gem deleted file mode 100644 index 2a01d965..00000000 Binary files a/vendor/cache/hiera-3.12.0.gem and /dev/null differ diff --git a/vendor/cache/hocon-1.3.1.gem b/vendor/cache/hocon-1.3.1.gem deleted file mode 100644 index e474ff66..00000000 Binary files a/vendor/cache/hocon-1.3.1.gem and /dev/null differ diff --git a/vendor/cache/httparty-0.21.0.gem b/vendor/cache/httparty-0.21.0.gem deleted file mode 100644 index 7c216b03..00000000 Binary files a/vendor/cache/httparty-0.21.0.gem and /dev/null differ diff --git a/vendor/cache/httpclient-2.8.3.gem b/vendor/cache/httpclient-2.8.3.gem deleted file mode 100644 index 9c19ad46..00000000 Binary files a/vendor/cache/httpclient-2.8.3.gem and /dev/null differ diff --git a/vendor/cache/json-2.7.2.gem b/vendor/cache/json-2.7.2.gem deleted file mode 100644 index 1c3c4680..00000000 Binary files a/vendor/cache/json-2.7.2.gem and /dev/null differ diff --git a/vendor/cache/json_pure-1.8.6.gem b/vendor/cache/json_pure-1.8.6.gem deleted file mode 100644 index 7380e49d..00000000 Binary files a/vendor/cache/json_pure-1.8.6.gem and /dev/null differ diff --git a/vendor/cache/json_pure-2.0.2.gem b/vendor/cache/json_pure-2.0.2.gem deleted file mode 100644 index 6716fb4b..00000000 Binary files a/vendor/cache/json_pure-2.0.2.gem and /dev/null differ diff --git a/vendor/cache/locale-2.1.4.gem b/vendor/cache/locale-2.1.4.gem deleted file mode 100644 index 60fd62df..00000000 Binary files a/vendor/cache/locale-2.1.4.gem and /dev/null differ diff --git a/vendor/cache/mime-types-3.5.2.gem b/vendor/cache/mime-types-3.5.2.gem deleted file mode 100644 index 57a6ae2f..00000000 Binary files a/vendor/cache/mime-types-3.5.2.gem and /dev/null differ diff --git a/vendor/cache/mime-types-data-3.2023.1205.gem b/vendor/cache/mime-types-data-3.2023.1205.gem deleted file mode 100644 index dbe83e66..00000000 Binary files a/vendor/cache/mime-types-data-3.2023.1205.gem and /dev/null differ diff --git a/vendor/cache/multi_json-1.15.0.gem b/vendor/cache/multi_json-1.15.0.gem deleted file mode 100644 index 8348d7b7..00000000 Binary files a/vendor/cache/multi_json-1.15.0.gem and /dev/null differ diff --git a/vendor/cache/multi_xml-0.6.0.gem b/vendor/cache/multi_xml-0.6.0.gem deleted file mode 100644 index 77c5d002..00000000 Binary files a/vendor/cache/multi_xml-0.6.0.gem and /dev/null differ diff --git a/vendor/cache/parallel-1.24.0.gem b/vendor/cache/parallel-1.24.0.gem deleted file mode 100644 index f2b99ea2..00000000 Binary files a/vendor/cache/parallel-1.24.0.gem and /dev/null differ diff --git a/vendor/cache/puppet-4.10.10.gem b/vendor/cache/puppet-4.10.10.gem deleted file mode 100644 index a98710dc..00000000 Binary files a/vendor/cache/puppet-4.10.10.gem and /dev/null differ diff --git a/vendor/cache/puppet-5.5.22.gem b/vendor/cache/puppet-5.5.22.gem deleted file mode 100644 index 66fc27d9..00000000 Binary files a/vendor/cache/puppet-5.5.22.gem and /dev/null differ diff --git a/vendor/cache/puppet-5.5.8.gem b/vendor/cache/puppet-5.5.8.gem deleted file mode 100644 index 38cd7dc7..00000000 Binary files a/vendor/cache/puppet-5.5.8.gem and /dev/null differ diff --git a/vendor/cache/puppet-6.18.0.gem b/vendor/cache/puppet-6.18.0.gem deleted file mode 100644 index c3bcc148..00000000 Binary files a/vendor/cache/puppet-6.18.0.gem and /dev/null differ diff --git a/vendor/cache/puppet-7.3.0.gem b/vendor/cache/puppet-7.3.0.gem deleted file mode 100644 index 7c2705be..00000000 Binary files a/vendor/cache/puppet-7.3.0.gem and /dev/null differ diff --git a/vendor/cache/puppet-7.32.1.gem b/vendor/cache/puppet-7.32.1.gem deleted file mode 100644 index 2cc2ff23..00000000 Binary files a/vendor/cache/puppet-7.32.1.gem and /dev/null differ diff --git a/vendor/cache/puppet-resource_api-1.8.13.gem b/vendor/cache/puppet-resource_api-1.8.13.gem deleted file mode 100644 index 13f8c5ab..00000000 Binary files a/vendor/cache/puppet-resource_api-1.8.13.gem and /dev/null differ diff --git a/vendor/cache/puppetdb-terminus-3.2.4.gem b/vendor/cache/puppetdb-terminus-3.2.4.gem deleted file mode 100644 index 0da55b98..00000000 Binary files a/vendor/cache/puppetdb-terminus-3.2.4.gem and /dev/null differ diff --git a/vendor/cache/rugged-0.27.5.gem b/vendor/cache/rugged-0.27.5.gem deleted file mode 100644 index 79bb2eff..00000000 Binary files a/vendor/cache/rugged-0.27.5.gem and /dev/null differ diff --git a/vendor/cache/rugged-1.7.2.gem b/vendor/cache/rugged-1.7.2.gem deleted file mode 100644 index 5e4af1b1..00000000 Binary files a/vendor/cache/rugged-1.7.2.gem and /dev/null differ diff --git a/vendor/cache/safe_yaml-1.0.4.gem b/vendor/cache/safe_yaml-1.0.4.gem deleted file mode 100644 index 7da49f5e..00000000 Binary files a/vendor/cache/safe_yaml-1.0.4.gem and /dev/null differ diff --git a/vendor/cache/semantic_puppet-1.0.2.gem b/vendor/cache/semantic_puppet-1.0.2.gem deleted file mode 100644 index 305b4e61..00000000 Binary files a/vendor/cache/semantic_puppet-1.0.2.gem and /dev/null differ diff --git a/vendor/cache/text-1.3.1.gem b/vendor/cache/text-1.3.1.gem deleted file mode 100644 index 341f3455..00000000 Binary files a/vendor/cache/text-1.3.1.gem and /dev/null differ