derailed_benchmarks 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6bbf373c25f791478f3890edeab279da2f13d42a9a7261c6e172f07e3e44713
-  data.tar.gz: fda7f0f615bccaa9409a98dc90f042e794f7fa510c0b64e9e2829843d173f240
+  metadata.gz: cc052693e6702c9fae168ebd5af966409edfd862cb10f493eeeef6f2b56c702a
+  data.tar.gz: e68aa2d95326f0d462b6f531318277180f2f155098c930fec1f7d9d5055a90c1
 SHA512:
-  metadata.gz: 179ff4c0663ecb7960008c81b0e1133cb1b41ed73978c17ca0213612ba39d70312238121c63fc4de669c8f0f4f15a33142dbd778b815b1d6ee2ed184501fc4af
-  data.tar.gz: 8e222be9b6bb2608a360004ad77bcda16b0839145656401bd1b65816a4c8ef6c63358060f852d1f604f5cbb2ea84c5e1435b445267a81414cca64e9678e1a4b6
+  metadata.gz: da2a2ddb042b1d7d50e2d6ef70dc281fbe09bac107b763e64fe26bb47b30a3a0b46580e618f7c97c29c689b3b0981333a902dbb32f3c8df340a6cc2c54db4cf9
+  data.tar.gz: 113502784b03d89cafc13ed4856db140352a83ab5e68393e5a09bd9f7942505aa0aec33d8b35858e97d873c2e6435fe1cdb140ae1915dbd60a4d7d2c82129310

data/.travis.yml

@@ -1,36 +1,17 @@
 language: ruby
 rvm:
-  - 2.2
-  - 2.3
-  - 2.4.0
+  - 2.5.5
+  - 2.6.3
   - ruby-head
+
 gemfile:
-  - gemfiles/rails_3_2.gemfile
-  - gemfiles/rails_4_0.gemfile
-  - gemfiles/rails_4_1.gemfile
-  - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6_0.gemfile
 
 before_install:
   - gem install bundler
 
 matrix:
-  # Ruby 2.4 doesn't work with devise + rails 3/4, so just skip the builds to
-  # avoid travis runs we expect to fail.  This is due to the Integer/Fixnum
-  # change if I am not mistaken.
-  exclude:
-  - rvm: 2.4.0
-    gemfile: gemfiles/rails_3_2.gemfile
-  - rvm: 2.4.0
-    gemfile: gemfiles/rails_4_0.gemfile
-  - rvm: 2.4.0
-    gemfile: gemfiles/rails_4_1.gemfile
-  - rvm: ruby-head
-    gemfile: gemfiles/rails_3_2.gemfile
-  - rvm: ruby-head
-    gemfile: gemfiles/rails_4_0.gemfile
-  - rvm: ruby-head
-    gemfile: gemfiles/rails_4_1.gemfile
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,11 +1,16 @@
 # A Log of Changes!
 
+## 1.3.6
+
+- `require_relative` is now measured [commit](https://github.com/schneems/derailed_benchmarks/commit/af11bcc46a4fa24f79e4897a51034927a56e077e)
+- Fix bug preventing a specific Rails 6 file from being loaded (https://github.com/schneems/derailed_benchmarks/pull/134)
+- `exit(1)` is called instead of raise (https://github.com/schneems/derailed_benchmarks/pull/127)
+
 ## [1.3.5]
 
 - Output of `test` now emits the word "derailed" for easier grepping.
 - Fix "already initialized constant" warning
 
-
 ## [1.3.4]
 
 - Allow for "warming up tasks" via WARM_COUNT env var #119

data/README.md

@@ -579,7 +579,7 @@ If you're trying to authenticate a non-user model, you'll need to write your own
 
 ### Custom Authentication Strategy
 
-To implement your own authentication strategy You will need to create a class that [inherits from auth_helper.rb](lib/derailed_benchmarks/auth_helper.rb). You will need to implement a `setup` and a `call` method. You can see an example of [how the devise auth helper was written](lib/derailed_benchmarks/auth_helpers/devise.rb). You can put this code in your `perf.rake` file.
+To implement your own authentication strategy You will need to create a class that [inherits from auth_helper.rb](lib/derailed_benchmarks/auth_helper.rb). You will need to implement a `setup` and a `call` method. You can see an example of [how the devise auth helper was written](lib/derailed_benchmarks/auth_helpers/devise.rb) and [how it can be done for Clearance](https://gist.github.com/zavan/f4d34dd86bf825db549a0ac28c7e10d5). You can put this code in your `perf.rake` file.
 
 ```ruby
 class MyCustomAuth < DerailedBenchmarks::AuthHelper

data/derailed_benchmarks.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency "thor",            "~> 0.19"
 
   gem.add_development_dependency "capybara",  "~> 2"
-  gem.add_development_dependency "rails",     "> 3", "< 6"
+  gem.add_development_dependency "m"
+  gem.add_development_dependency "rails",     "> 3", "<= 6"
   gem.add_development_dependency "devise",    "> 3", "< 5"
   gem.add_development_dependency "appraisal", "2.2.0"
 end

data/gemfiles/{rails_3_2.gemfile → rails_5_2.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 3.2.0"
+gem "rails", "~> 5.2.0"
 
 group :development, :test do
   gem "sqlite3", platform: [:ruby, :mswin, :mingw]

data/gemfiles/{rails_4_0.gemfile → rails_6_0.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
+gem "rails", "6.0.0.rc1"
 
 group :development, :test do
   gem "sqlite3", platform: [:ruby, :mswin, :mingw]

data/lib/derailed_benchmarks/core_ext/kernel_require.rb

@@ -9,6 +9,9 @@ ENV['CUT_OFF'] ||= "0.3"
 # Monkey patch kernel to ensure that all `require` calls call the same
 # method
 module Kernel
+
+  private
+
   alias :original_require :require
   REQUIRE_STACK = []
 
@@ -16,13 +19,14 @@ module Kernel
     Kernel.require(file)
   end
 
-  # This breaks things, not sure how to fix
-  # def require_relative(file)
-  #   Kernel.require_relative(file)
-  # end
+  def require_relative(file)
+    # Kernel.require_relative(file)
+    require File.expand_path("../#{file}", caller_locations(1, 1)[0].absolute_path)
+  end
+
   class << self
     alias :original_require          :require
-    # alias :original_require_relative :require_relative
+    alias :original_require_relative :require_relative
   end
 
   # The core extension we use to measure require time of all requires
@@ -60,7 +64,12 @@ TOP_REQUIRE = DerailedBenchmarks::RequireTree.new("TOP")
 REQUIRE_STACK.push(TOP_REQUIRE)
 
 Kernel.define_singleton_method(:require) do |file|
-  measure_memory_impact(file) { |file| original_require(file) }
+  measure_memory_impact(file) do |file|
+    # "source_annotation_extractor" is deprecated in Rails 6
+    # # if we don't skip the library it leads to a crash
+    # next if file == "rails/source_annotation_extractor" && Rails.version >= '6.0'
+    original_require(file)
+  end
 end
 
 # Don't forget to assign a cost to the top level
@@ -69,4 +78,4 @@ TOP_REQUIRE.cost = cost_before_requiring_anything
 def TOP_REQUIRE.print_sorted_children(*args)
   self.cost = GetProcessMem.new.mb - self.cost
   super
-end
+end

data/lib/derailed_benchmarks/require_tree.rb

@@ -5,7 +5,7 @@ module DerailedBenchmarks
     REQUIRED_BY = {}
 
     attr_reader   :name
-    attr_accessor :cost
+    attr_writer   :cost
     attr_accessor :parent
 
     def initialize(name)

data/lib/derailed_benchmarks/tasks.rb

@@ -96,14 +96,35 @@ namespace :perf do
       def call_app(path = File.join("/", PATH_TO_HIT))
         cmd = "curl #{CURL_HTTP_HEADER_ARGS} 'http://localhost:#{@port}#{path}' -s --fail 2>&1"
         response = `#{cmd}`
-        raise "Bad request to #{cmd.inspect} Response:\n#{ response.inspect }" unless $?.success?
+        unless $?.success?
+          STDERR.puts "Couldn't call app."
+          STDERR.puts "Bad request to #{cmd.inspect} \n\n***RESPONSE***:\n\n#{ response.inspect }"
+
+          FileUtils.mkdir_p("tmp")
+          File.open("tmp/fail.html", "w+") {|f| f.write response.body }
+
+          `open #{File.expand_path("tmp/fail.html")}` if ENV["DERAILED_DEBUG"]
+
+          exit(1)
+        end
       end
     else
       @app = Rack::MockRequest.new(DERAILED_APP)
 
       def call_app
         response = @app.get(PATH_TO_HIT, RACK_HTTP_HEADERS)
-        raise "Bad request: #{ response.body }" unless response.status == 200
+        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"
+          STDERR.puts response.body
+
+          FileUtils.mkdir_p("tmp")
+          File.open("tmp/fail.html", "w+") {|f| f.write response.body }
+
+          `open #{File.expand_path("tmp/fail.html")}` if ENV["DERAILED_DEBUG"]
+
+          exit(1)
+        end
         response
       end
     end
@@ -199,8 +220,7 @@ namespace :perf do
   end
 
   task :ram_over_time do
-    Kernel.warn("The ram_over_time task is deprecated. Use mem_over_time")
-    Rake::Task["perf:ram_over_time"].invoke
+    raise "Use mem_over_time"
   end
 
   desc "iterations per second"

data/lib/derailed_benchmarks/version.rb

@@ -1,3 +1,3 @@
 module DerailedBenchmarks
-  VERSION = "1.3.5"
+  VERSION = "1.3.6"
 end

data/test/derailed_benchmarks/core_ext/kernel_require_test.rb

@@ -22,8 +22,9 @@ class KernelRequireTest < ActiveSupport::TestCase
   test "core extension profiles useage" do
     require fixtures_dir("require/parent_one.rb")
     parent    = assert_node_in_parent("parent_one.rb", TOP_REQUIRE)
-    child_one = assert_node_in_parent("child_one.rb", parent)
+    assert_node_in_parent("child_one.rb", parent)
     child_two = assert_node_in_parent("child_two.rb", parent)
-    rse_child = assert_node_in_parent("raise_child.rb", child_two)
+    assert_node_in_parent("relative_child", parent)
+    assert_node_in_parent("raise_child.rb", child_two)
   end
 end

data/test/fixtures/require/parent_one.rb

@@ -4,3 +4,4 @@ class ParentOne
 end
 require File.expand_path('../child_one.rb', __FILE__)
 require File.expand_path('../child_two.rb', __FILE__)
+require_relative 'relative_child'

data/test/integration/tasks_test.rb

@@ -12,7 +12,7 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   def rake(cmd, options = {})
-    assert_success = options[:assert_success] || true
+    assert_success = options.key?(:assert_success) ? options[:assert_success] : true
     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"
@@ -48,7 +48,7 @@ class TasksTest < ActiveSupport::TestCase
 
   test 'TEST_COUNT' do
     result = rake "perf:test", env: { "TEST_COUNT" => 1 }
-    assert_match "1 requests", result
+    assert_match "1 derailed requests", result
   end
 
   test 'WARM_COUNT' do

data/test/rails_app/config/initializers/secret_token.rb

@@ -4,4 +4,8 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'bedc31c5fff702ea808045bbbc5123455f1c00ecd005a1f667a5f04332100a6abf22cfcee2b3d39b8f677c03bb6503cf1c3b65c1287b9e13bd0d20c6431ec6ab'
+if Dummy::Application.config.respond_to?(:secret_key_base)
+  Dummy::Application.config.secret_key_base = 'bedc31c5fff702ea808045bbbc5123455f1c00ecd005a1f667a5f04332100a6abf22cfcee2b3d39b8f677c03bb6503cf1c3b65c1287b9e13bd0d20c6431ec6ab'
+else
+  Dummy::Application.config.secret_token = 'bedc31c5fff702ea808045bbbc5123455f1c00ecd005a1f667a5f04332100a6abf22cfcee2b3d39b8f677c03bb6503cf1c3b65c1287b9e13bd0d20c6431ec6ab'
+end

data/test/test_helper.rb

@@ -27,12 +27,17 @@ Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
 
 # Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../rails_app/db/migrate/", __FILE__)
+if Rails.gem_version >= Gem::Version.new('5.2.0')
+  ActiveRecord::MigrationContext
+    .new(File.expand_path("../rails_app/db/migrate/", __FILE__))
+    .migrate
+else
+  ActiveRecord::Migrator.migrate(File.expand_path("../rails_app/db/migrate/", __FILE__))
+end
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-
 class ActiveSupport::IntegrationCase
   def assert_has_content?(content)
     assert has_content?(content), "Expected #{page.body} to include #{content.inspect}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: derailed_benchmarks
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heapy
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: m
+  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: rails
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +149,7 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '6'
   type: :development
@@ -145,7 +159,7 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
@@ -200,12 +214,9 @@ files:
 - bin/derailed
 - derailed_benchmarks.gemspec
 - gemfiles/.bundle/config
-- gemfiles/rails_3_2.gemfile
-- gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_1.gemfile
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
 - lib/derailed_benchmarks.rb
 - lib/derailed_benchmarks/auth_helper.rb
 - lib/derailed_benchmarks/auth_helpers/devise.rb
@@ -288,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Benchmarks designed to performance test your ENTIRE site

data/gemfiles/rails_4_1.gemfile

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

data/gemfiles/rails_4_2.gemfile

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

data/gemfiles/rails_5_0.gemfile

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