From ceaa9a582019c32872b2496a35fbe2f38065e7e5 Mon Sep 17 00:00:00 2001 From: pnevins Date: Tue, 23 May 2023 11:29:18 -0500 Subject: [PATCH 1/3] (RUBY-11) Updated to support Ruby 3.x. --- Gemfile | 4 +-- Gemfile.lock | 58 +++++++++++++++++++++++++----------- lib/stackify/logger_proxy.rb | 4 +-- lib/stackify/version.rb | 2 +- stackify-api-ruby.gemspec | 8 ++--- 5 files changed, 49 insertions(+), 27 deletions(-) diff --git a/Gemfile b/Gemfile index 46b49ae..d8a1d44 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ group :test do if ENV['STACKIFY_RUBY_TEST'] - gem 'stackify-ruby-apm', '~> 1.15', source: ENV['STACKIFY_RUBY_TEST_REPO'] + gem 'stackify-ruby-apm', '~> 1.16.0.beta1', source: ENV['STACKIFY_RUBY_TEST_REPO'] else - gem 'stackify-ruby-apm', '~> 1.15' + gem 'stackify-ruby-apm', '~> 1.16.0.beta1' end end diff --git a/Gemfile.lock b/Gemfile.lock index d4c9119..c796b6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,26 +1,32 @@ PATH remote: . specs: - stackify-api-ruby (1.3.0.beta1) + stackify-api-ruby (1.4.0.beta1) faraday (~> 0.8) net_http_unix (~> 0.2) GEM remote: https://rubygems.org/ specs: - concurrent-ruby (1.1.9) + concurrent-ruby (1.2.2) + delegate_matcher (0.4.3) + proc_extensions (~> 0.2) diff-lcs (1.4.4) - et-orbi (1.2.4) + et-orbi (1.2.7) tzinfo faraday (0.17.4) multipart-post (>= 1.2, < 3) - fugit (1.5.0) - et-orbi (~> 1.1, >= 1.1.8) + file-tail (1.2.0) + tins (~> 1.0) + fugit (1.8.1) + et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) multipart-post (2.1.1) net_http_unix (0.2.2) + proc_extensions (0.2) + sourcify (~> 0.5) raabro (1.4.0) - rake (0.9.6) + rake (10.5.0) rspec (3.10.0) rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) @@ -34,29 +40,45 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) - rufus-scheduler (3.8.0) + ruby2ruby (2.5.0) + ruby_parser (~> 3.1) + sexp_processor (~> 4.6) + ruby_parser (3.20.1) + sexp_processor (~> 4.16) + rufus-scheduler (3.8.2) fugit (~> 1.1, >= 1.1.6) - stackify-ruby-apm (1.15.1) + sexp_processor (4.17.0) + sourcify (0.5.0) + file-tail (>= 1.0.5) + ruby2ruby (>= 1.2.5) + ruby_parser (>= 2.0.5) + sexp_processor (>= 3.0.5) + stackify-ruby-apm (1.16.0.beta1) + concurrent-ruby + delegate_matcher + faraday + net_http_unix + rufus-scheduler + sync (0.5.0) + tins (1.32.1) + sync + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - faraday (~> 0.8) - net_http_unix (~> 0.2) - rufus-scheduler (~> 3.0) - tzinfo (2.0.4) - concurrent-ruby (~> 1.0) - tzinfo-data (1.2021.1) + tzinfo-data (1.2023.3) tzinfo (>= 1.0.0) PLATFORMS ruby + x64-mingw-ucrt x86-mingw32 DEPENDENCIES - bundler (~> 1.6) - rake (~> 0) + bundler (~> 2.0) + rake (~> 10.0) rspec (~> 3.0) stackify-api-ruby! - stackify-ruby-apm (~> 1.15) + stackify-ruby-apm (~> 1.16.0.beta1) tzinfo-data BUNDLED WITH - 1.17.13 + 2.4.10 diff --git a/lib/stackify/logger_proxy.rb b/lib/stackify/logger_proxy.rb index 0172e3c..0ec9280 100644 --- a/lib/stackify/logger_proxy.rb +++ b/lib/stackify/logger_proxy.rb @@ -24,8 +24,8 @@ def initialize logger protected - def method_missing(name, *args, &block) - @logger.send(name, *args, &block) + def method_missing(name, *args, **kwargs, &block) + @logger.send(name, *args, **kwargs, &block) end private diff --git a/lib/stackify/version.rb b/lib/stackify/version.rb index 0548f93..33911ba 100644 --- a/lib/stackify/version.rb +++ b/lib/stackify/version.rb @@ -1,3 +1,3 @@ module Stackify - VERSION = '1.3.0.beta1' + VERSION = '1.4.0.beta1' end diff --git a/stackify-api-ruby.gemspec b/stackify-api-ruby.gemspec index 31220a1..af48a3f 100644 --- a/stackify-api-ruby.gemspec +++ b/stackify-api-ruby.gemspec @@ -12,18 +12,18 @@ Gem::Specification.new do |spec| spec.description = 'Stackify Logs and Metrics API for Ruby' spec.homepage = 'http://www.stackify.com/' spec.license = 'Apache-2.0' - spec.required_ruby_version = '>= 1.9' + spec.required_ruby_version = '>= 3.0' spec.files = `git ls-files -z`.split("\x0") spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ['lib'] - spec.add_development_dependency 'bundler', '~> 1.6' - spec.add_development_dependency 'rake', '~> 0' + spec.add_development_dependency 'bundler', '~> 2.0' + spec.add_development_dependency 'rake', '~> 10.0' spec.add_development_dependency 'rspec', '~> 3.0' - if RUBY_PLATFORM == 'i386-mingw32' + if RUBY_PLATFORM =~ /mingw32|win32|x64/ spec.add_development_dependency 'tzinfo-data' end From 7e0ac2ff42274ece104b5adb4cde30b23d8562c7 Mon Sep 17 00:00:00 2001 From: pnevins Date: Tue, 23 May 2023 15:15:21 -0500 Subject: [PATCH 2/3] (RUBY-11) Update the version to 2.0.0.beta1 to note a possible breaking change for Ruby 2.x applications. --- lib/stackify/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/stackify/version.rb b/lib/stackify/version.rb index 33911ba..3752846 100644 --- a/lib/stackify/version.rb +++ b/lib/stackify/version.rb @@ -1,3 +1,3 @@ module Stackify - VERSION = '1.4.0.beta1' + VERSION = '2.0.0.beta1' end From d6425ba6f910a7f06d79b72b543d58d5e8d63e1e Mon Sep 17 00:00:00 2001 From: pnevins Date: Tue, 23 May 2023 15:18:10 -0500 Subject: [PATCH 3/3] (RUBY-11) Updated version to 2.0.0.beta1 in the gem lock file. --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c796b6f..64f8c7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - stackify-api-ruby (1.4.0.beta1) + stackify-api-ruby (2.0.0.beta1) faraday (~> 0.8) net_http_unix (~> 0.2)