github · jhongturney · Sep 16, 2024 · Sep 16, 2024 · Sep 17, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.6"]
+        ruby-version: ["2.7"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.6"]
+        ruby-version: ["2.7"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.6"]
+        ruby-version: ["2.7"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -76,7 +76,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.6"]
+        ruby-version: ["2.7"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@52753b7da854d5c07df37391a986c76ab4615999 # v1.191.0
         with:
-          ruby-version: '2.6'
+          ruby-version: '2.7'
       - run: bundle install
 
       - name: Publish to GPR

diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.7.8
diff --git a/.version b/.version
@@ -1 +1 @@
-2.1.0
+2.3.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUBY_VERSION="2.6"
+ARG RUBY_VERSION="2.7"
 FROM ruby:${RUBY_VERSION} as ruby
 ARG RUBY_VERSION
 ENV RUBY_VERSION="${RUBY_VERSION}"

diff --git a/octocatalog-diff.gemspec b/octocatalog-diff.gemspec
@@ -3,7 +3,7 @@ require 'json'
 DEFAULT_PUPPET_VERSION = '5.5.22'.freeze
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
   puppet_version = ENV['PUPPET_VERSION'] || DEFAULT_PUPPET_VERSION
 
   s.name        = 'octocatalog-diff'
@@ -25,20 +25,20 @@ Gem::Specification.new do |s|
   from a local development environment or in CI.
 EOF
 
-  s.add_runtime_dependency 'diffy', '>= 3.1.0'
-  s.add_runtime_dependency 'httparty', '>= 0.21.0'
-  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 'diffy', '~> 3.4.0'
+  s.add_runtime_dependency 'httparty'
+  s.add_runtime_dependency 'hashdiff'
+  s.add_runtime_dependency 'parallel'
+  s.add_runtime_dependency 'rugged'
   s.add_runtime_dependency 'puppet', puppet_version
   s.add_development_dependency 'puppet', puppet_version
-  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'
-  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'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'parallel_tests', '= 4.7.1' # 4.7.1 is the last version that supports Ruby 2.7
+  s.add_development_dependency 'rspec-retry'
+  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'simplecov-erb'
 
   puppet_v = Gem::Version.new(puppet_version)
   version_config = JSON.parse(File.read(File.join(File.dirname(__FILE__), 'config', 'puppet-versions.json')))

diff --git a/vendor/cache/CFPropertyList-2.2.8.gem b/vendor/cache/CFPropertyList-2.2.8.gem
diff --git a/vendor/cache/CFPropertyList-2.3.6.gem b/vendor/cache/CFPropertyList-2.3.6.gem
diff --git a/vendor/cache/ast-2.4.0.gem b/vendor/cache/ast-2.4.0.gem
diff --git a/vendor/cache/csv-3.3.0.gem b/vendor/cache/csv-3.3.0.gem
diff --git a/vendor/cache/diff-lcs-1.3.gem b/vendor/cache/diff-lcs-1.3.gem
diff --git a/vendor/cache/diff-lcs-1.5.0.gem b/vendor/cache/diff-lcs-1.5.0.gem
diff --git a/vendor/cache/diff-lcs-1.5.1.gem b/vendor/cache/diff-lcs-1.5.1.gem
diff --git a/vendor/cache/diffy-3.2.1.gem b/vendor/cache/diffy-3.2.1.gem
diff --git a/vendor/cache/docile-1.1.5.gem b/vendor/cache/docile-1.1.5.gem
diff --git a/vendor/cache/docile-1.4.1.gem b/vendor/cache/docile-1.4.1.gem
diff --git a/vendor/cache/facter-2.5.1-universal-darwin.gem b/vendor/cache/facter-2.5.1-universal-darwin.gem
diff --git a/vendor/cache/facter-2.5.1.gem b/vendor/cache/facter-2.5.1.gem
diff --git a/vendor/cache/facter-2.5.7-universal-darwin.gem b/vendor/cache/facter-2.5.7-universal-darwin.gem
diff --git a/vendor/cache/hashdiff-0.3.7.gem b/vendor/cache/hashdiff-0.3.7.gem
diff --git a/vendor/cache/hashdiff-1.1.0.gem b/vendor/cache/hashdiff-1.1.0.gem
diff --git a/vendor/cache/hashdiff-1.1.1.gem b/vendor/cache/hashdiff-1.1.1.gem
diff --git a/vendor/cache/hiera-1.3.4.gem b/vendor/cache/hiera-1.3.4.gem
diff --git a/vendor/cache/hiera-3.4.5.gem b/vendor/cache/hiera-3.4.5.gem
diff --git a/vendor/cache/httparty-0.16.2.gem b/vendor/cache/httparty-0.16.2.gem
diff --git a/vendor/cache/httparty-0.16.3.gem b/vendor/cache/httparty-0.16.3.gem
diff --git a/vendor/cache/httparty-0.21.0.gem b/vendor/cache/httparty-0.21.0.gem
diff --git a/vendor/cache/httparty-0.22.0.gem b/vendor/cache/httparty-0.22.0.gem
diff --git a/vendor/cache/json-2.1.0.gem b/vendor/cache/json-2.1.0.gem
diff --git a/vendor/cache/json-2.7.1.gem b/vendor/cache/json-2.7.1.gem
diff --git a/vendor/cache/json-2.7.2.gem b/vendor/cache/json-2.7.2.gem
diff --git a/vendor/cache/json_pure-1.8.6.gem b/vendor/cache/json_pure-1.8.6.gem
diff --git a/vendor/cache/language_server-protocol-3.17.0.3.gem b/vendor/cache/language_server-protocol-3.17.0.3.gem
diff --git a/vendor/cache/locale-2.1.2.gem b/vendor/cache/locale-2.1.2.gem
diff --git a/vendor/cache/locale-2.1.3.gem b/vendor/cache/locale-2.1.3.gem
diff --git a/vendor/cache/locale-2.1.4.gem b/vendor/cache/locale-2.1.4.gem
diff --git a/vendor/cache/mime-types-3.2.2.gem b/vendor/cache/mime-types-3.2.2.gem
diff --git a/vendor/cache/mime-types-data-3.2018.0812.gem b/vendor/cache/mime-types-data-3.2018.0812.gem
diff --git a/vendor/cache/parallel-1.12.1.gem b/vendor/cache/parallel-1.12.1.gem
diff --git a/vendor/cache/parallel-1.24.0.gem b/vendor/cache/parallel-1.24.0.gem
diff --git a/vendor/cache/parallel-1.26.3.gem b/vendor/cache/parallel-1.26.3.gem
diff --git a/vendor/cache/parallel_tests-2.7.1.gem b/vendor/cache/parallel_tests-2.7.1.gem
diff --git a/vendor/cache/parallel_tests-4.7.1.gem b/vendor/cache/parallel_tests-4.7.1.gem
diff --git a/vendor/cache/parser-2.5.3.0.gem b/vendor/cache/parser-2.5.3.0.gem
diff --git a/vendor/cache/parser-2.7.2.0.gem b/vendor/cache/parser-2.7.2.0.gem
diff --git a/vendor/cache/parser-3.3.5.0.gem b/vendor/cache/parser-3.3.5.0.gem
diff --git a/vendor/cache/powerpack-0.1.2.gem b/vendor/cache/powerpack-0.1.2.gem
diff --git a/vendor/cache/puppet-3.8.7.gem b/vendor/cache/puppet-3.8.7.gem
diff --git a/vendor/cache/puppet-4.10.10-universal-darwin.gem b/vendor/cache/puppet-4.10.10-universal-darwin.gem
diff --git a/vendor/cache/puppet-5.5.22-universal-darwin.gem b/vendor/cache/puppet-5.5.22-universal-darwin.gem
diff --git a/vendor/cache/puppet-5.5.8-universal-darwin.gem b/vendor/cache/puppet-5.5.8-universal-darwin.gem
diff --git a/vendor/cache/racc-1.8.1.gem b/vendor/cache/racc-1.8.1.gem
diff --git a/vendor/cache/rainbow-2.2.2.gem b/vendor/cache/rainbow-2.2.2.gem
diff --git a/vendor/cache/rainbow-3.1.1.gem b/vendor/cache/rainbow-3.1.1.gem
diff --git a/vendor/cache/rake-12.3.1.gem b/vendor/cache/rake-12.3.1.gem
diff --git a/vendor/cache/rake-12.3.3.gem b/vendor/cache/rake-12.3.3.gem
diff --git a/vendor/cache/rake-13.2.1.gem b/vendor/cache/rake-13.2.1.gem
diff --git a/vendor/cache/regexp_parser-2.9.2.gem b/vendor/cache/regexp_parser-2.9.2.gem
diff --git a/vendor/cache/rspec-3.13.0.gem b/vendor/cache/rspec-3.13.0.gem
diff --git a/vendor/cache/rspec-3.4.0.gem b/vendor/cache/rspec-3.4.0.gem
diff --git a/vendor/cache/rspec-core-3.13.1.gem b/vendor/cache/rspec-core-3.13.1.gem
diff --git a/vendor/cache/rspec-core-3.4.4.gem b/vendor/cache/rspec-core-3.4.4.gem
diff --git a/vendor/cache/rspec-expectations-3.13.3.gem b/vendor/cache/rspec-expectations-3.13.3.gem
diff --git a/vendor/cache/rspec-expectations-3.4.0.gem b/vendor/cache/rspec-expectations-3.4.0.gem
diff --git a/vendor/cache/rspec-mocks-3.13.1.gem b/vendor/cache/rspec-mocks-3.13.1.gem
diff --git a/vendor/cache/rspec-mocks-3.4.1.gem b/vendor/cache/rspec-mocks-3.4.1.gem
diff --git a/vendor/cache/rspec-retry-0.5.0.gem b/vendor/cache/rspec-retry-0.5.0.gem
diff --git a/vendor/cache/rspec-retry-0.6.2.gem b/vendor/cache/rspec-retry-0.6.2.gem
diff --git a/vendor/cache/rspec-support-3.13.1.gem b/vendor/cache/rspec-support-3.13.1.gem
diff --git a/vendor/cache/rspec-support-3.4.1.gem b/vendor/cache/rspec-support-3.4.1.gem
diff --git a/vendor/cache/rubocop-0.48.1.gem b/vendor/cache/rubocop-0.48.1.gem
diff --git a/vendor/cache/rubocop-0.49.0.gem b/vendor/cache/rubocop-0.49.0.gem
diff --git a/vendor/cache/rubocop-1.66.1.gem b/vendor/cache/rubocop-1.66.1.gem
diff --git a/vendor/cache/rubocop-ast-1.32.3.gem b/vendor/cache/rubocop-ast-1.32.3.gem
diff --git a/vendor/cache/ruby-progressbar-1.10.0.gem b/vendor/cache/ruby-progressbar-1.10.0.gem
diff --git a/vendor/cache/rugged-0.27.5.gem b/vendor/cache/rugged-0.27.5.gem
diff --git a/vendor/cache/rugged-1.7.1.gem b/vendor/cache/rugged-1.7.1.gem
diff --git a/vendor/cache/rugged-1.7.2.gem b/vendor/cache/rugged-1.7.2.gem
diff --git a/vendor/cache/simplecov-0.14.1.gem b/vendor/cache/simplecov-0.14.1.gem
diff --git a/vendor/cache/simplecov-0.22.0.gem b/vendor/cache/simplecov-0.22.0.gem
diff --git a/vendor/cache/simplecov-erb-0.1.1.gem b/vendor/cache/simplecov-erb-0.1.1.gem
diff --git a/vendor/cache/simplecov-erb-1.0.1.gem b/vendor/cache/simplecov-erb-1.0.1.gem
diff --git a/vendor/cache/simplecov-html-0.10.2.gem b/vendor/cache/simplecov-html-0.10.2.gem
diff --git a/vendor/cache/simplecov-html-0.13.1.gem b/vendor/cache/simplecov-html-0.13.1.gem
diff --git a/vendor/cache/simplecov_json_formatter-0.1.4.gem b/vendor/cache/simplecov_json_formatter-0.1.4.gem
diff --git a/vendor/cache/unicode-display_width-1.4.0.gem b/vendor/cache/unicode-display_width-1.4.0.gem
diff --git a/vendor/cache/unicode-display_width-1.8.0.gem b/vendor/cache/unicode-display_width-1.8.0.gem
diff --git a/vendor/cache/unicode-display_width-2.6.0.gem b/vendor/cache/unicode-display_width-2.6.0.gem