derailed_benchmarks 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 812e6f5e721e4baf5dd1911b6d4a21d00e3502d5a9c2c882c825026f174f0df7
-  data.tar.gz: ba3f9978aebf3652f767835edbbb0805d75c127e1a1df247057a04f7f0dde228
+  metadata.gz: 2fa2f30d83c6eadc1ede327c7b69b69a85ff91e242b8cd8d71f3405c58a9f0c0
+  data.tar.gz: f3734272aaa4f3cc8d12f5b5bae04abd1cff4280eb855365a557e14afc9ec02e
 SHA512:
-  metadata.gz: f422494ba5fd286bf36531b1c8bf1a8dc28cd6366f1d3ff9f2e81215307969eb1c8f60a6e3f6e27588f95cd7e5ad3c10ba963dfd820769a6f76656ae35d11ae9
-  data.tar.gz: ecbd77956660e6d0f5ca957fe718d564b2f7463f2197eaf84bad1b0c3ae1e3a42bf7bb58ed46bffc9153c819dd32f13335728556704da9bf9191f82bf95ce467
+  metadata.gz: de086034ef9a992032e983d2e3fcb947c9c193f9bb1030650f9d3f19be010fefa9e5035dd07649c80a249375f480345821cf78a65aeac1c943425b53920bc262
+  data.tar.gz: d692c75c307a8aae9b7af80069bb9385ad8f75d3a937d43020cc3421f47a2ceab3ed156e214a39d9393426f3af5ce512ca1635ed55d00e7ca33db42bc12b9d4b

data/.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"
+}

data/.github/workflows/ci.yml

@@ -0,0 +1,95 @@
+name: CI
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - ruby: "2.5"
+          gemfile: gemfiles/rails_5_1.gemfile
+        - ruby: "2.5"
+          gemfile: gemfiles/rails_5_2.gemfile
+        - ruby: "2.5"
+          gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: "2.5"
+          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: "2.6"
+          gemfile: gemfiles/rails_5_2.gemfile
+        - ruby: "2.6"
+          gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: "2.6"
+          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: "2.7"
+          gemfile: gemfiles/rails_5_1.gemfile
+        - ruby: "2.7"
+          gemfile: gemfiles/rails_5_2.gemfile
+        - ruby: "2.7"
+          gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: "2.7"
+          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: "2.7"
+          gemfile: gemfiles/rails_7_0.gemfile
+        - ruby: "2.7"
+          gemfile: gemfiles/rails_7_1.gemfile
+        - ruby: "3.0"
+          gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: "3.0"
+          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: "3.0"
+          gemfile: gemfiles/rails_7_0.gemfile
+        - ruby: "3.0"
+          gemfile: gemfiles/rails_7_1.gemfile
+        - ruby: "3.1"
+          gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: "3.1"
+          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: "3.1"
+          gemfile: gemfiles/rails_7_0.gemfile
+        - ruby: "3.1"
+          gemfile: gemfiles/rails_7_1.gemfile
+        - ruby: "3.1"
+          gemfile: gemfiles/rails_7_2.gemfile
+        - ruby: "3.2"
+          gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: "3.2"
+          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: "3.2"
+          gemfile: gemfiles/rails_7_0.gemfile
+        - ruby: "3.2"
+          gemfile: gemfiles/rails_7_1.gemfile
+        - ruby: "3.2"
+          gemfile: gemfiles/rails_7_2.gemfile
+        - ruby: "3.3"
+          gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: "3.3"
+          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: "3.3"
+          gemfile: gemfiles/rails_7_0.gemfile
+        - ruby: "3.3"
+          gemfile: gemfiles/rails_7_1.gemfile
+        - ruby: "3.3"
+          gemfile: gemfiles/rails_7_2.gemfile
+        - ruby: "head"
+          gemfile: gemfiles/rails_head.gemfile
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Set Git config
+        run: |
+          git config --global user.email "user@example.com"
+          git config --global user.name "Github Action Bot"
+      - name: Run test
+        run: bundle exec rake test

data/.gitignore

@@ -6,3 +6,4 @@
 
 Gemfile.lock
 gemfiles/*.lock
+.idea

data/Appraisals

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+appraise 'rails_5_1' do
+  gem 'rails', '~> 5.1.0'
+end
+
+appraise 'rails_5_2' do
+  gem 'rails', '~> 5.2.0'
+end
+
+appraise 'rails_6_0' do
+  gem 'rails', '~> 6.0.0'
+end
+
+appraise 'rails_6_1' do
+  gem 'rails', '~> 6.1.0'
+
+  # https://stackoverflow.com/questions/70500220/rails-7-ruby-3-1-loaderror-cannot-load-such-file-net-smtp
+  gem 'net-smtp', require: false
+  gem 'net-imap', require: false
+  gem 'net-pop', require: false
+end
+
+appraise 'rails_7_0' do
+  gem 'rails', '~> 7.0'
+end

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 ## HEAD
 
+## 2.2.0
+
+- Support REQUEST_METHOD, REQUEST_BODY, CONTENT_TYPE, and CONTENT_LENGTH env vars (https://github.com/zombocom/derailed_benchmarks/pull/234, https://github.com/zombocom/derailed_benchmarks/pull/122)
+- Support ruby-statistics 4.x (https://github.com/zombocom/derailed_benchmarks/pull/238, 
+    https://github.com/zombocom/derailed_benchmarks/pull/239, https://github.com/zombocom/derailed_benchmarks/pull/247)
+- Repair tests, support ruby-statistics in ruby < 3.0 (https://github.com/zombocom/derailed_benchmarks/pull/241)
+- Test Rails 7.1 and 7.2 (https://github.com/zombocom/derailed_benchmarks/pull/242)
+- Switch from dead_end to syntax_suggest (https://github.com/zombocom/derailed_benchmarks/pull/243)
+- require `ruby2_keywords` so drb doesn't break in ruby < 2.7 (https://github.com/zombocom/derailed_benchmarks/pull/244)
+- support relative BUNDLE_GEMFILE in tests (https://github.com/zombocom/derailed_benchmarks/pull/245)
+
 ## 2.1.2
 
+- Support DERAILED_SKIP_RAILS_REQUIRES (https://github.com/zombocom/derailed_benchmarks/pull/199)
 - Support rails 7 for bundle exec derailed exec mem (https://github.com/zombocom/derailed_benchmarks/pull/212)
 - Update the gemspec's homepage to the current repo URL (https://github.com/zombocom/derailed_benchmarks/pull/212)
 

data/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

data/README.md

@@ -4,7 +4,7 @@ A series of things you can use to benchmark a Rails or Ruby app.
 
 ![](http://media.giphy.com/media/lfbxexWy71b6U/giphy.gif)
 
-[![CircleCI](https://circleci.com/gh/zombocom/derailed_benchmarks/tree/main.svg?style=svg)](https://circleci.com/gh/zombocom/derailed_benchmarks/tree/main)
+[![Build Status](https://github.com/zombocom/derailed_benchmarks/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/zombocom/derailed_benchmarks)
 [![Help Contribute to Open Source](https://www.codetriage.com/schneems/derailed_benchmarks/badges/users.svg)](https://www.codetriage.com/schneems/derailed_benchmarks)
 
 ## Compatibility/Requirements
@@ -575,6 +575,22 @@ $ HTTP_AUTHORIZATION="Basic YWRtaW46c2VjcmV0\n" \
   PATH_TO_HIT=/foo_secret bundle exec derailed exec perf:ips
 ```
 
+The `Content-Type` and `Content-Length` headers are a bit different. To set those, ignore the HTTP_ prefix, use the `CONTENT_TYPE` and `CONTENT_LENGTH` variables.
+
+### Performing non-GET requests
+
+If the endpoint being tested is not a GET request, you can set the `REQUEST_METHOD` variable with the HTTP method you want (e.g. POST, PUT, PATCH, DELETE).
+
+To set the request body, you can use the `REQUEST_BODY`.
+
+```
+$ REQUEST_METHOD=POST \
+  REQUEST_BODY="{\"user\":{\"email\":\"foo@bar.com\",\"password\":\"123456\",\"password_confirmation\":\"123456\"}}" \
+  CONTENT_TYPE="application/json" \
+  PATH_TO_HIT=/users \
+  bundle exec derailed exec perf:test
+```
+
 ### Using a real web server with `USE_SERVER`
 
 All tests are run without a webserver (directly using `Rack::Mock` by default), if you want to use a webserver set `USE_SERVER` to a Rack::Server compliant server, such as `webrick`.

data/derailed_benchmarks.gemspec

@@ -29,14 +29,28 @@ 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"
+  if RUBY_VERSION >= '3.0'
+    gem.add_dependency "ruby-statistics", ">= 4.0.1"
+  else
+    gem.add_dependency "ruby-statistics", ">= 2.1"
+  end
+  if RUBY_VERSION < "3.2"
+    gem.add_dependency "syntax_suggest", "~> 1.1.0"
+  end
   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_dependency "logger",          ">= 0"
+  gem.add_dependency "ostruct",         ">= 0"
+  gem.add_dependency "ruby2_keywords",  ">= 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

data/gemfiles/rails_5_1.gemfile

@@ -1,12 +1,8 @@
-# frozen_string_literal: true
-
-#  BUNDLE_GEMFILE="gemfiles/rails_5_1.gemfile" bundle exec m test/integration/tasks_test.rb:30
-#
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.7"
+gem "rails", "~> 5.1.0"
 
 group :development, :test do
   gem "sqlite3", platform: [:ruby, :mswin, :mingw]

data/gemfiles/rails_5_2.gemfile

@@ -1,10 +1,8 @@
 # This file was generated by Appraisal
-#
-# BUNDLE_GEMFILE="gemfiles/rails_5_2.gemfile" bundle exec m test/integration/tasks_test.rb:30
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.4.4"
+gem "rails", "~> 5.2.0"
 
 group :development, :test do
   gem "sqlite3", platform: [:ruby, :mswin, :mingw]

data/gemfiles/rails_6_0.gemfile

@@ -1,15 +1,14 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "rails", "6.0.0"
+gem "rails", "~> 6.0.0"
 
 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"
+  gem "psych", "~> 3.0"
 end
 
 gemspec path: "../"

data/gemfiles/rails_6_1.gemfile

@@ -2,10 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.1.1"
+gem "rails", "~> 6.1.0"
+gem "net-smtp", require: false
+gem "net-imap", require: false
+gem "net-pop", require: false
 
 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

data/gemfiles/rails_7_0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.0"
+
+group :development, :test do
+  gem "sqlite3", '~> 1.4', platform: [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby
+  gem "test-unit", "~> 3.0"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7_1.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1.0"
+
+group :development, :test do
+  gem "sqlite3", '~> 1.4', platform: [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby
+  gem "test-unit", "~> 3.0"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7_2.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.2.0"
+
+group :development, :test do
+  gem "sqlite3", '~> 1.4', platform: [:ruby, :mswin, :mingw]
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby
+  gem "test-unit", "~> 3.0"
+end
+
+gemspec path: "../"

data/gemfiles/{rails_git.gemfile → rails_head.gemfile}

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
-# $ BUNDLE_GEMFILE="$(pwd)/gemfiles/rails_git.gemfile" bundle exec m test/integration/tasks_test.rb:50
+# $ BUNDLE_GEMFILE="gemfiles/rails_git.gemfile" bundle exec m test/integration/tasks_test.rb:50
 
 source "https://rubygems.org"
 
-gem "rails", github: "rails/rails", ref: "12bb9d32f56883914abcd98fd72e3c68c444808d"
+gem "rails", github: "rails/rails", branch: "main"
 
-gem 'devise', github: "plataformatec/devise", ref: "6d32d2447cc0f3739d9732246b5a5bde98d9e032"
+gem 'devise', github: "plataformatec/devise", branch: "main"
 
 group :development, :test do
   gem "sqlite3", platform: [:ruby, :mswin, :mingw]
   gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby
   gem "test-unit", "~> 3.0"
+  gem "rackup"
 end
 
 gemspec path: "../"

data/lib/derailed_benchmarks/load_tasks.rb

@@ -24,6 +24,9 @@ namespace :perf do
 
     DERAILED_APP = Rails.application
 
+    # Disables CSRF protection because of non-GET requests
+    DERAILED_APP.config.action_controller.allow_forgery_protection = false
+
     if DERAILED_APP.respond_to?(:initialized?)
       DERAILED_APP.initialize! unless DERAILED_APP.initialized?
     else
@@ -40,7 +43,10 @@ namespace :perf do
       ActiveRecord::Migrator.migrations_paths = DERAILED_APP.paths['db/migrate'].to_a
       ActiveRecord::Migration.verbose         = true
 
-      if Rails.version >= "6.0"
+      # https://github.com/plataformatec/devise/blob/master/test/orm/active_record.rb
+      if Rails.version >= "7.1"
+        ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrate
+      elsif Rails.version >= "6.0"
         ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration).migrate
       elsif Rails.version.start_with?("5.2")
         ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrate
@@ -74,23 +80,44 @@ namespace :perf do
     WARM_COUNT  = (ENV['WARM_COUNT'] || 0).to_i
     TEST_COUNT  = (ENV['TEST_COUNT'] || ENV['CNT'] || 1_000).to_i
     PATH_TO_HIT = ENV["PATH_TO_HIT"] || ENV['ENDPOINT'] || "/"
+    REQUEST_METHOD = ENV["REQUEST_METHOD"] || "GET"
+    REQUEST_BODY = ENV["REQUEST_BODY"]
+    puts "Method: #{REQUEST_METHOD}"
     puts "Endpoint: #{ PATH_TO_HIT.inspect }"
 
+    # See https://www.rubydoc.info/github/rack/rack/file/SPEC#The_Environment
+    # All HTTP_ variables are accepted in the Rack environment hash, except HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH.
+    # For those, the HTTP_ prefix has to be removed.
     HTTP_HEADER_PREFIX = "HTTP_".freeze
-    RACK_HTTP_HEADERS = ENV.select { |key| key.start_with?(HTTP_HEADER_PREFIX) }
+    HTTP_HEADER_REGEXP = /^#{HTTP_HEADER_PREFIX}.+|CONTENT_(TYPE|LENGTH)$/
+    RACK_ENV_HASH = ENV.select { |key| key =~ HTTP_HEADER_REGEXP }
 
-    HTTP_HEADERS = RACK_HTTP_HEADERS.keys.inject({}) do |hash, rack_header_name|
+    HTTP_HEADERS = RACK_ENV_HASH.keys.inject({}) do |hash, rack_header_name|
       # e.g. "HTTP_ACCEPT_CHARSET" -> "Accept-Charset"
-      header_name = rack_header_name[HTTP_HEADER_PREFIX.size..-1].split("_").map(&:downcase).map(&:capitalize).join("-")
-      hash[header_name] = RACK_HTTP_HEADERS[rack_header_name]
+      upper_case_header_name =
+        if rack_header_name.start_with?(HTTP_HEADER_PREFIX)
+          rack_header_name[HTTP_HEADER_PREFIX.size..-1]
+        else
+          rack_header_name
+        end
+
+      header_name = upper_case_header_name.split("_").map(&:downcase).map(&:capitalize).join("-")
+
+      hash[header_name] = RACK_ENV_HASH[rack_header_name]
       hash
     end
     puts "HTTP headers: #{HTTP_HEADERS}" unless HTTP_HEADERS.empty?
 
     CURL_HTTP_HEADER_ARGS = HTTP_HEADERS.map { |http_header_name, value| "-H \"#{http_header_name}: #{value}\"" }.join(" ")
+    CURL_BODY_ARG = REQUEST_BODY ? "-d '#{REQUEST_BODY}'" : nil
+
+    if REQUEST_METHOD != "GET" && REQUEST_BODY
+      RACK_ENV_HASH["GATEWAY_INTERFACE"] = "CGI/1.1"
+      RACK_ENV_HASH[:input] = REQUEST_BODY.dup
+      puts "Body: #{REQUEST_BODY}"
+    end
 
     require 'rack/test'
-    require 'rack/file'
 
     DERAILED_APP = DerailedBenchmarks.add_auth(Object.class_eval { remove_const(:DERAILED_APP) })
     if server = ENV["USE_SERVER"]
@@ -98,12 +125,15 @@ namespace :perf do
       puts "Port: #{ @port.inspect }"
       puts "Server: #{ server.inspect }"
       thread = Thread.new do
-        Rack::Server.start(app: DERAILED_APP, :Port => @port, environment: "none", server: server)
+        # rack 3 doesn't have Rack::Server
+        require 'rackup' unless defined?(Rack::Server)
+        server_class = defined?(Rack::Server) ? Rack::Server : Rackup::Server
+        server_class.start(app: DERAILED_APP, :Port => @port, environment: "none", server: server)
       end
       sleep 1
 
       def call_app(path = File.join("/", PATH_TO_HIT))
-        cmd = "curl #{CURL_HTTP_HEADER_ARGS} 'http://localhost:#{@port}#{path}' -s --fail 2>&1"
+        cmd = "curl -X #{REQUEST_METHOD} #{CURL_HTTP_HEADER_ARGS} #{CURL_BODY_ARG} -s --fail 'http://localhost:#{@port}#{path}' 2>&1"
         response = `#{cmd}`
         unless $?.success?
           STDERR.puts "Couldn't call app."
@@ -121,7 +151,7 @@ namespace :perf do
       @app = Rack::MockRequest.new(DERAILED_APP)
 
       def call_app
-        response = @app.get(PATH_TO_HIT, RACK_HTTP_HEADERS)
+        response = @app.request(REQUEST_METHOD, PATH_TO_HIT, RACK_ENV_HASH)
         if response.status != 200
           STDERR.puts "Couldn't call app. Bad request to #{PATH_TO_HIT}! Resulted in #{response.status} status."
           STDERR.puts "\n\n***RESPONSE BODY***\n\n"

data/lib/derailed_benchmarks/stats_from_dir.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 require 'bigdecimal'
-require 'statistics'
+# keep this in sync with gemspec
+if RUBY_VERSION >= '3.0'
+  require 'ruby-statistics'
+else
+  require 'statistics'
+end
 require 'stringio'
 require 'mini_histogram'
 require 'mini_histogram/plot'

data/lib/derailed_benchmarks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DerailedBenchmarks
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/lib/derailed_benchmarks.rb

@@ -4,7 +4,7 @@ require 'time'
 require 'bundler'
 require 'get_process_mem'
 
-require 'dead_end'
+require 'syntax_suggest'
 
 module DerailedBenchmarks
   def self.gem_is_bundled?(name)

data/test/integration/tasks_test.rb

@@ -14,7 +14,6 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   def run!(cmd)
-    puts "Running: #{cmd}"
     out = `#{cmd}`
     raise "Could not run #{cmd}, output: #{out}" unless $?.success?
     out
@@ -25,8 +24,11 @@ class TasksTest < ActiveSupport::TestCase
     env             = options[:env]           || {}
     env_string = env.map {|key, value| "#{key.shellescape}=#{value.to_s.shellescape}" }.join(" ")
     cmd        = "env #{env_string} bundle exec rake -f perf.rake #{cmd} --trace"
-    puts "Running: #{cmd}"
-    result = Bundler.with_original_env { `cd '#{rails_app_path}' && #{cmd} 2>&1` }
+    result = Bundler.with_original_env do
+      # Ensure relative BUNDLE_GEMFILE is expanded so path is still correct after cd
+      ENV['BUNDLE_GEMFILE'] = File.expand_path(ENV['BUNDLE_GEMFILE']) if ENV['BUNDLE_GEMFILE']
+      `cd '#{rails_app_path}' && #{cmd} 2>&1` 
+    end
     if assert_success && !$?.success?
       puts result
       raise "Expected '#{cmd}' to return a success status.\nOutput: #{result}"
@@ -44,23 +46,23 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   test 'rails perf:library from git' do
-    # BUNDLE_GEMFILE="$(pwd)/gemfiles/rails_git.gemfile" bundle exec m test/integration/tasks_test.rb:<linenumber>
+    # BUNDLE_GEMFILE="gemfiles/rails_git.gemfile" bundle exec m test/integration/tasks_test.rb:<linenumber>
 
-    skip unless ENV['USING_RAILS_GIT']
+    skip # unless ENV['USING_RAILS_GIT']
 
     env = { "TEST_COUNT" => 2, "DERAILED_SCRIPT_COUNT" => 2,
-            "SHAS_TO_TEST" => "acb6631cd99cdfe7db356773ef74cad7cbb570ed,12bb9d32f56883914abcd98fd72e3c68c444808d"}
+            "SHAS_TO_TEST" => "fd9308a2925e862435859e1803e720e6eebe4bb6,aa85e897312396b5c6993d8092b9aff7faa93011"}
     puts rake "perf:library", { env: env }
   end
 
   test "rails perf:library with bad script" do
-    # BUNDLE_GEMFILE="$(pwd)/gemfiles/rails_git.gemfile" bundle exec m test/integration/tasks_test.rb:<linenumber>
+    # BUNDLE_GEMFILE="gemfiles/rails_git.gemfile" bundle exec m test/integration/tasks_test.rb:<linenumber>
 
-    skip unless ENV['USING_RAILS_GIT']
+    skip # unless ENV['USING_RAILS_GIT']
 
     error = assert_raises {
       env = { "DERAILED_SCRIPT" => "nopenopenop", "TEST_COUNT" => 2, "DERAILED_SCRIPT_COUNT" => 2,
-              "SHAS_TO_TEST" => "acb6631cd99cdfe7db356773ef74cad7cbb570ed,12bb9d32f56883914abcd98fd72e3c68c444808d"}
+              "SHAS_TO_TEST" => "fd9308a2925e862435859e1803e720e6eebe4bb6,aa85e897312396b5c6993d8092b9aff7faa93011"}
       puts rake "perf:library", { env: env }
     }
 
@@ -120,16 +122,56 @@ class TasksTest < ActiveSupport::TestCase
     env = {
       "PATH_TO_HIT" => 'foo_secret',
       "TEST_COUNT" => "2",
-      "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("admin:secret")}",
+      "HTTP_AUTHORIZATION" => "Basic #{Base64.strict_encode64("admin:secret")}",
       "HTTP_CACHE_CONTROL" => "no-cache"
     }
     result = rake "perf:test", env: env
     assert_match 'Endpoint: "foo_secret"', result
-    assert_match 'HTTP headers: {"Authorization"=>"Basic YWRtaW46c2VjcmV0\n", "Cache-Control"=>"no-cache"}', result
+    assert_match (/"Authorization"=>"Basic YWRtaW46c2VjcmV0"/), result
+    assert_match (/"Cache-Control"=>"no-cache"/), result
+
+    env["USE_SERVER"] = "webrick"
+    result = rake "perf:test", env: env
+    assert_match (/"Authorization"=>"Basic YWRtaW46c2VjcmV0"/), result
+    assert_match (/"Cache-Control"=>"no-cache"/), result
+  end
+
+  test 'CONTENT_TYPE' do
+    env = {
+      "REQUEST_METHOD" => "POST",
+      "PATH_TO_HIT" => "users",
+      "CONTENT_TYPE" => "application/json",
+      "REQUEST_BODY" => '{"user":{"email":"foo@bar.com","password":"123456","password_confirmation":"123456"}}',
+      "TEST_COUNT" => "2"
+    }
+
+    result = rake "perf:test", env: env
+    assert_match 'Body: {"user":{"email":"foo@bar.com","password":"123456","password_confirmation":"123456"}}', result
+    assert_match 'HTTP headers: {"Content-Type"=>"application/json"}', result
+
+    env["USE_SERVER"] = "webrick"
+    result = rake "perf:test", env: env
+    assert_match 'Body: {"user":{"email":"foo@bar.com","password":"123456","password_confirmation":"123456"}}', result
+    assert_match 'HTTP headers: {"Content-Type"=>"application/json"}', result
+  end
+
+  test 'REQUEST_METHOD and REQUEST_BODY' do
+    env = {
+      "REQUEST_METHOD" => "POST",
+      "PATH_TO_HIT" => "users",
+      "REQUEST_BODY" => "user%5Bemail%5D=foo%40bar.com&user%5Bpassword%5D=123456&user%5Bpassword_confirmation%5D=123456",
+      "TEST_COUNT" => "2"
+    }
+
+    result = rake "perf:test", env: env
+    assert_match 'Endpoint: "users"', result
+    assert_match 'Method: POST', result
+    assert_match 'Body: user%5Bemail%5D=foo%40bar.com&user%5Bpassword%5D=123456&user%5Bpassword_confirmation%5D=123456', result
 
     env["USE_SERVER"] = "webrick"
     result = rake "perf:test", env: env
-    assert_match 'HTTP headers: {"Authorization"=>"Basic YWRtaW46c2VjcmV0\n", "Cache-Control"=>"no-cache"}', result
+    assert_match 'Method: POST', result
+    assert_match 'Body: user%5Bemail%5D=foo%40bar.com&user%5Bpassword%5D=123456&user%5Bpassword_confirmation%5D=123456', result
   end
 
   test 'USE_SERVER' do

data/test/rails_app/app/controllers/users_controller.rb

@@ -0,0 +1,13 @@
+class UsersController < ApplicationController
+  def create
+    User.create!(user_params)
+
+    head :created
+  end
+
+  private
+
+  def user_params
+    params.require(:user).permit(:email, :password, :password_confirmation)
+  end
+end

data/test/rails_app/config/environments/development.rb

@@ -11,6 +11,8 @@ Dummy::Application.configure do
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
 
+  config.eager_load = false
+
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/test/rails_app/config/environments/production.rb

@@ -11,6 +11,8 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
+  config.eager_load = true
+
   # Specifies the header that your server uses for sending files
   config.action_dispatch.x_sendfile_header = "X-Sendfile"
 

data/test/rails_app/config/environments/test.rb

@@ -12,6 +12,8 @@ Dummy::Application.configure do
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
 
+  config.eager_load = false
+
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/test/rails_app/config/routes.rb

@@ -56,6 +56,7 @@ Dummy::Application.routes.draw do
 
   get "foo", to: "pages#index"
   get "foo_secret", to: "pages#secret"
+  post "users", to: "users#create"
 
   get "authenticated", to: "authenticated#index"
 

data/test/test_helper.rb

@@ -6,6 +6,8 @@ require 'bundler/setup'
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
+require "ruby2_keywords" if RUBY_VERSION < "2.7"
+
 require 'rails'
 require 'rails/test_help'
 
@@ -15,7 +17,6 @@ require 'pathname'
 require 'derailed_benchmarks'
 
 require File.expand_path("../rails_app/config/environment.rb",  __FILE__)
-require "rails/test_help"
 
 ActionMailer::Base.delivery_method    = :test
 ActionMailer::Base.perform_deliveries = true
@@ -32,7 +33,9 @@ require_relative "rails_app/config/environment"
 
 # https://github.com/plataformatec/devise/blob/master/test/orm/active_record.rb
 migrate_path = File.expand_path("../rails_app/db/migrate", __FILE__)
-if Rails.version >= "6.0"
+if Rails.version >= "7.1"
+  ActiveRecord::MigrationContext.new(migrate_path).migrate
+elsif Rails.version >= "6.0"
   ActiveRecord::MigrationContext.new(migrate_path, ActiveRecord::SchemaMigration).migrate
 elsif Rails.version.start_with? "5.2"
   ActiveRecord::MigrationContext.new(migrate_path).migrate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: derailed_benchmarks
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heapy
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: mini_histogram
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: dead_end
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -169,7 +169,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: drb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -182,6 +224,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -231,9 +329,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -241,9 +339,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -272,9 +370,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".devcontainer/devcontainer.json"
 - ".github/workflows/check_changelog.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -286,7 +386,10 @@ files:
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
 - gemfiles/rails_6_1.gemfile
-- gemfiles/rails_git.gemfile
+- gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_2.gemfile
+- gemfiles/rails_head.gemfile
 - lib/derailed_benchmarks.rb
 - lib/derailed_benchmarks/auth_helper.rb
 - lib/derailed_benchmarks/auth_helpers/devise.rb
@@ -326,6 +429,7 @@ files:
 - test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/authenticated_controller.rb
 - test/rails_app/app/controllers/pages_controller.rb
+- test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
 - test/rails_app/app/helpers/authenticated_helper.rb
 - test/rails_app/app/models/user.rb
@@ -387,7 +491,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Benchmarks designed to performance test your ENTIRE site
@@ -417,6 +521,7 @@ test_files:
 - test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/authenticated_controller.rb
 - test/rails_app/app/controllers/pages_controller.rb
+- test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
 - test/rails_app/app/helpers/authenticated_helper.rb
 - test/rails_app/app/models/user.rb

data/.circleci/config.yml

@@ -1,77 +0,0 @@
-version: 2.1
-orbs:
-  ruby: circleci/ruby@1.1.2
-references:
-  run_tests: &run_tests
-    run:
-      name: Run test suite
-      command: bundle exec rake test
-  # Needed because tests execute raw git commands
-  set_git_config: &set_git_config
-    run:
-      name: Set Git config
-      command: git config --global user.email "you@example.com"; git config --global user.name "Your Name"
-  restore: &restore
-    restore_cache:
-      keys:
-        - v1_bundler_deps-{{ .Environment.CIRCLE_JOB }}
-  save: &save
-    save_cache:
-      paths:
-        - ./vendor/bundle
-      key: v1_bundler_deps-{{ .Environment.CIRCLE_JOB }} # CIRCLE_JOB e.g. "ruby-2.5"
-  bundle: &bundle
-    run:
-      name: install dependencies
-      command: |
-        echo "export BUNDLE_JOBS=4" >> $BASH_ENV
-        echo "export BUNDLE_RETRY=3" >> $BASH_ENV
-        echo "export BUNDLE_PATH=$(pwd)/vendor/bundle" >> $BASH_ENV
-        echo "export BUNDLE_GEMFILE=$(pwd)/gemfiles/$GEMFILE_NAME" >> $BASH_ENV
-        source $BASH_ENV
-
-        bundle install
-        bundle update
-        bundle clean
-  mysteps: &mysteps
-    steps:
-      - checkout
-      - <<: *set_git_config
-      - <<: *restore
-      - <<: *bundle
-      - <<: *run_tests
-      - <<: *save
-
-jobs:
-  test:
-    parameters:
-      ruby_version:
-        type: string
-      gemfile:
-        type: string
-    docker:
-      - image: "ruby:<< parameters.ruby_version >>"
-    environment:
-      GEMFILE_NAME: <<parameters.gemfile>>
-    steps:
-      - checkout
-      - <<: *set_git_config
-      - <<: *restore
-      - <<: *bundle
-      - <<: *run_tests
-      - <<: *save
-
-workflows:
-  all-tests:
-    jobs:
-      - test:
-          matrix:
-            parameters:
-              ruby_version: ["2.5.8", "2.7.2", "3.0.0"]
-              gemfile: ["rails_5_2.gemfile", "rails_6_1.gemfile", "rails_git.gemfile"]
-            exclude:
-              - ruby_version: "3.0.0"
-                gemfile: rails_5_2.gemfile
-              - ruby_version: "2.5.8"
-                gemfile: rails_git.gemfile
-          name: test-ruby-<<matrix.ruby_version>>-<<matrix.gemfile>>