From dac0f4df2ab8346682867217a07d775a1b755fa2 Mon Sep 17 00:00:00 2001 From: Peter Cai <222655+pcai@users.noreply.github.com> Date: Sat, 28 Sep 2024 16:28:01 +0000 Subject: [PATCH] get tests working again --- .devcontainer/devcontainer.json | 22 ++++++++++++++++++++++ Gemfile | 2 +- derailed_benchmarks.gemspec | 8 ++++++-- lib/derailed_benchmarks/stats_from_dir.rb | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..6c6df7e --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,22 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/ruby +{ + "name": "Ruby", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "image": "mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye" + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "ruby --version", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/Gemfile b/Gemfile index 4aa1cf6..b0799e1 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gemspec group :development, :test do - gem "sqlite3", :platform => [:ruby, :mswin, :mingw] + gem "sqlite3", '~> 1.4', :platform => [:ruby, :mswin, :mingw] gem "activerecord-jdbcsqlite3-adapter", '~> 1.3.13', :platform => :jruby gem "test-unit", "~> 3.0" end diff --git a/derailed_benchmarks.gemspec b/derailed_benchmarks.gemspec index ba3ebb6..edaf812 100644 --- a/derailed_benchmarks.gemspec +++ b/derailed_benchmarks.gemspec @@ -29,15 +29,19 @@ Gem::Specification.new do |gem| gem.add_dependency "rack", ">= 1" gem.add_dependency "rake", "> 10", "< 14" gem.add_dependency "thor", ">= 0.19", "< 2" - gem.add_dependency "ruby-statistics", ">= 2.1" + gem.add_dependency "ruby-statistics", ">= 4.0" gem.add_dependency "mini_histogram", ">= 0.3.0" gem.add_dependency "dead_end", ">= 0" gem.add_dependency "rack-test", ">= 0" + gem.add_dependency "base64", ">= 0" + gem.add_dependency "mutex_m", ">= 0" + gem.add_dependency "bigdecimal", ">= 0" + gem.add_dependency "drb", ">= 0" gem.add_development_dependency "appraisal" gem.add_development_dependency "webrick", ">= 0" gem.add_development_dependency "capybara", "~> 2" gem.add_development_dependency "m" - gem.add_development_dependency "rails", "> 3", "<= 7" + gem.add_development_dependency "rails", "> 3", "< 7.1" gem.add_development_dependency "devise", "> 3", "< 6" end diff --git a/lib/derailed_benchmarks/stats_from_dir.rb b/lib/derailed_benchmarks/stats_from_dir.rb index 5c107e3..5900535 100644 --- a/lib/derailed_benchmarks/stats_from_dir.rb +++ b/lib/derailed_benchmarks/stats_from_dir.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'bigdecimal' -require 'statistics' +require 'ruby-statistics' require 'stringio' require 'mini_histogram' require 'mini_histogram/plot'