Merge pull request #129 from braintrustdata/ci/test_ruby_4

Add Ruby 4.0 to CI and fix stdlib dependency issues

Author: delner

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby-version: ['3.2', '3.3', '3.4']
+        ruby-version: ['3.2', '3.3', '3.4', '4.0']
 
     steps:
     # Security: Pin to commit SHA instead of tag to prevent tag hijacking
@@ -25,10 +25,11 @@ jobs:
 
     - name: Set up Ruby
       # Security: Pin to commit SHA instead of tag
-      # ruby/setup-ruby@v1.270.0
-      uses: ruby/setup-ruby@ac793fdd38cc468a4dd57246fa9d0e868aba9085
+      # ruby/setup-ruby@v1.295.0
+      uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f
       with:
         ruby-version: ${{ matrix.ruby-version }}
+        bundler: 'latest'
         bundler-cache: true
 
     # Security: Provide secrets only to the step that needs them, not all steps

Appraisals

@@ -1,49 +1,41 @@
 # frozen_string_literal: true
 
-# Additional dependencies needed for specific gems.
-# These work around upstream gems that haven't declared dependencies properly.
-# See docs/appraisal-ruby-version-support.md for future Ruby version support.
-GEM_DEPENDENCIES = {
-  "openai" => ["base64"] # openai uses base64 but doesn't declare it (needed for Ruby 3.4+)
-}
-
-def gem_dependencies_for(gem_name)
-  GEM_DEPENDENCIES.fetch(gem_name, [])
-end
-
-# Optional dependencies to test
+# Optional dependencies to test.
+# Each version entry is a hash with:
+#   constraint: version constraint for the gem
+#   deps: hash of additional gem dependencies to install, mapping gem name to
+#         constraint (or nil for no constraint). Works around upstream gems that
+#         haven't declared dependencies properly (e.g. base64/cgi removed from stdlib).
 OPTIONAL_GEMS = {
   "openai" => {
-    "0.33" => "~> 0.33.0",
-    "0.34" => "~> 0.34.0",
-    "latest" => ">= 0.34"
+    "0.33" => {constraint: "~> 0.33.0", deps: {"base64" => nil, "cgi" => nil}},
+    "0.34" => {constraint: "~> 0.34.0", deps: {"base64" => nil, "cgi" => nil}},
+    "latest" => {constraint: ">= 0.34", deps: {"base64" => nil, "cgi" => nil}}
   },
   "anthropic" => {
-    "1.11" => "~> 1.11.0",
-    "1.12" => "~> 1.12.0",
-    "latest" => ">= 1.11"
+    "1.11" => {constraint: "~> 1.11.0", deps: {"base64" => nil, "cgi" => nil}},
+    "1.12" => {constraint: "~> 1.12.0", deps: {"base64" => nil, "cgi" => nil}},
+    "latest" => {constraint: ">= 1.11", deps: {"base64" => nil, "cgi" => nil}}
   },
   "ruby-openai" => {
-    "7.0" => "~> 7.0",
-    "8.0" => "~> 8.0",
-    "latest" => ">= 8.0"
+    "7.0" => {constraint: "~> 7.0", deps: {}},
+    "8.0" => {constraint: "~> 8.0", deps: {}},
+    "latest" => {constraint: ">= 8.0", deps: {}}
   },
   "ruby_llm" => {
-    "1.8" => "~> 1.8.0",
-    "1.9" => "~> 1.9.0",
-    "latest" => ">= 1.9"
+    "1.8" => {constraint: "~> 1.8.0", deps: {}},
+    "1.9" => {constraint: "~> 1.9.0", deps: {}},
+    "latest" => {constraint: ">= 1.9", deps: {}}
   }
 }
 
 # Generate appraisals for each optional gem
 OPTIONAL_GEMS.each do |gem_name, versions|
-  extra_deps = gem_dependencies_for(gem_name)
-
-  versions.each do |name, constraint|
+  versions.each do |name, config|
     suffix = (name == "latest") ? "" : "-#{name.tr(".", "-")}"
     appraise "#{gem_name}#{suffix}" do
-      gem gem_name, constraint
-      extra_deps.each { |dep| gem dep }
+      gem gem_name, config[:constraint]
+      config[:deps].each { |dep, version| gem dep, *[version].compact }
     end
   end
 
@@ -78,6 +70,7 @@ appraise "contrib" do
   gem "anthropic", ">= 1.11"
   gem "ruby_llm", ">= 1.9"
   gem "base64" # needed for openai gem on Ruby 3.4+
+  gem "cgi" # needed for openai/anthropic gems on Ruby 4.0+
 end
 
 # Server testing - all latest LLM SDKs + server deps for eval dev server
@@ -86,6 +79,7 @@ appraise "server" do
   gem "anthropic", ">= 1.11"
   gem "ruby_llm", ">= 1.9"
   gem "base64" # needed for openai gem on Ruby 3.4+
+  gem "cgi" # needed for openai/anthropic gems on Ruby 4.0+
   gem "rack", "~> 3.0"
   gem "rack-test", "~> 2.1"
   gem "rackup", "~> 2.3"

Gemfile

@@ -5,7 +5,16 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in braintrust.gemspec
 gemspec
 
-# Additional development tools not in gemspec (optional/convenience)
+# Development dependencies
+gem "appraisal", "~> 2.5"
+gem "climate_control", "~> 1.2"
+gem "kramdown", "~> 2.0"
 gem "minitest-reporters", "~> 1.6"
 gem "minitest-stub-const", "~> 0.6"
-gem "climate_control", "~> 1.2"
+gem "minitest", "~> 5.0"
+gem "rake", "~> 13.0"
+gem "simplecov", "~> 0.22"
+gem "standard", "~> 1.0"
+gem "vcr", "~> 6.0"
+gem "webmock", "~> 3.0"
+gem "yard", "~> 0.9"

Gemfile.lock

@@ -2,6 +2,7 @@ PATH
   remote: .
   specs:
     braintrust (0.3.0)
+      logger (>= 1.0)
       openssl (~> 3.3.1)
       opentelemetry-exporter-otlp (~> 0.28)
       opentelemetry-sdk (~> 1.3)
@@ -24,23 +25,24 @@ GEM
       bigdecimal
       rexml
     docile (1.4.1)
-    google-protobuf (4.33.2-aarch64-linux-gnu)
+    google-protobuf (4.34.1-aarch64-linux-gnu)
       bigdecimal
-      rake (>= 13)
-    google-protobuf (4.33.2-arm64-darwin)
+      rake (~> 13.3)
+    google-protobuf (4.34.1-arm64-darwin)
       bigdecimal
-      rake (>= 13)
-    google-protobuf (4.33.2-x86_64-linux-gnu)
+      rake (~> 13.3)
+    google-protobuf (4.34.1-x86_64-linux-gnu)
       bigdecimal
-      rake (>= 13)
+      rake (~> 13.3)
     googleapis-common-protos-types (1.22.0)
       google-protobuf (~> 4.26)
     hashdiff (1.2.1)
-    json (2.18.0)
+    json (2.19.2)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
+    logger (1.7.0)
     minitest (5.27.0)
     minitest-reporters (1.7.1)
       ansi
@@ -148,4 +150,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.4.19
+  4.0.8

braintrust.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Runtime dependencies
+  spec.add_runtime_dependency "logger", ">= 1.0"
   spec.add_runtime_dependency "opentelemetry-sdk", "~> 1.3"
   spec.add_runtime_dependency "opentelemetry-exporter-otlp", "~> 0.28"
 
@@ -38,15 +39,4 @@ Gem::Specification.new do |spec|
   # See: https://github.com/ruby/openssl/issues/949
   # This dependency may be removable in future Ruby versions once the fix is widely available.
   spec.add_runtime_dependency "openssl", "~> 3.3.1"
-
-  # Development dependencies
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "standard", "~> 1.0"
-  spec.add_development_dependency "simplecov", "~> 0.22"
-  spec.add_development_dependency "vcr", "~> 6.0"
-  spec.add_development_dependency "webmock", "~> 3.0"
-  spec.add_development_dependency "appraisal", "~> 2.5"
-  spec.add_development_dependency "yard", "~> 0.9"
-  spec.add_development_dependency "kramdown", "~> 2.0"
 end

gemfiles/anthropic.gemfile

@@ -2,9 +2,20 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", "~> 2.5"
+gem "climate_control", "~> 1.2"
+gem "kramdown", "~> 2.0"
 gem "minitest-reporters", "~> 1.6"
 gem "minitest-stub-const", "~> 0.6"
-gem "climate_control", "~> 1.2"
+gem "minitest", "~> 5.0"
+gem "rake", "~> 13.0"
+gem "simplecov", "~> 0.22"
+gem "standard", "~> 1.0"
+gem "vcr", "~> 6.0"
+gem "webmock", "~> 3.0"
+gem "yard", "~> 0.9"
 gem "anthropic", ">= 1.11"
+gem "base64"
+gem "cgi"
 
 gemspec path: "../"

gemfiles/anthropic_1_11.gemfile

@@ -2,9 +2,20 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", "~> 2.5"
+gem "climate_control", "~> 1.2"
+gem "kramdown", "~> 2.0"
 gem "minitest-reporters", "~> 1.6"
 gem "minitest-stub-const", "~> 0.6"
-gem "climate_control", "~> 1.2"
+gem "minitest", "~> 5.0"
+gem "rake", "~> 13.0"
+gem "simplecov", "~> 0.22"
+gem "standard", "~> 1.0"
+gem "vcr", "~> 6.0"
+gem "webmock", "~> 3.0"
+gem "yard", "~> 0.9"
 gem "anthropic", "~> 1.11.0"
+gem "base64"
+gem "cgi"
 
 gemspec path: "../"

gemfiles/anthropic_1_12.gemfile

@@ -2,9 +2,20 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", "~> 2.5"
+gem "climate_control", "~> 1.2"
+gem "kramdown", "~> 2.0"
 gem "minitest-reporters", "~> 1.6"
 gem "minitest-stub-const", "~> 0.6"
-gem "climate_control", "~> 1.2"
+gem "minitest", "~> 5.0"
+gem "rake", "~> 13.0"
+gem "simplecov", "~> 0.22"
+gem "standard", "~> 1.0"
+gem "vcr", "~> 6.0"
+gem "webmock", "~> 3.0"
+gem "yard", "~> 0.9"
 gem "anthropic", "~> 1.12.0"
+gem "base64"
+gem "cgi"
 
 gemspec path: "../"

gemfiles/anthropic_uninstalled.gemfile

@@ -2,8 +2,17 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", "~> 2.5"
+gem "climate_control", "~> 1.2"
+gem "kramdown", "~> 2.0"
 gem "minitest-reporters", "~> 1.6"
 gem "minitest-stub-const", "~> 0.6"
-gem "climate_control", "~> 1.2"
+gem "minitest", "~> 5.0"
+gem "rake", "~> 13.0"
+gem "simplecov", "~> 0.22"
+gem "standard", "~> 1.0"
+gem "vcr", "~> 6.0"
+gem "webmock", "~> 3.0"
+gem "yard", "~> 0.9"
 
 gemspec path: "../"

gemfiles/contrib.gemfile

@@ -2,12 +2,22 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", "~> 2.5"
+gem "climate_control", "~> 1.2"
+gem "kramdown", "~> 2.0"
 gem "minitest-reporters", "~> 1.6"
 gem "minitest-stub-const", "~> 0.6"
-gem "climate_control", "~> 1.2"
+gem "minitest", "~> 5.0"
+gem "rake", "~> 13.0"
+gem "simplecov", "~> 0.22"
+gem "standard", "~> 1.0"
+gem "vcr", "~> 6.0"
+gem "webmock", "~> 3.0"
+gem "yard", "~> 0.9"
 gem "openai", ">= 0.34"
 gem "anthropic", ">= 1.11"
 gem "ruby_llm", ">= 1.9"
 gem "base64"
+gem "cgi"
 
 gemspec path: "../"