wip

Author: bf4

bin/bench

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'benchmark'
 require 'pathname'
 require 'shellwords'
+require 'English'
 
 class Benchmarking
   ROOT = Pathname File.expand_path(['..', '..'].join(File::Separator), __FILE__)
@@ -13,6 +14,7 @@ class Benchmarking
   def initialize(prepend: '', append: '')
     @prepend = prepend
     @append = append
+    refresh_temp_dir if temp_dir_empty?
   end
 
   def temp_dir_empty?
@@ -39,7 +41,6 @@ class Benchmarking
   end
 
   def benchmark_tests
-    refresh_temp_dir if temp_dir_empty?
     tmp_dir = Shellwords.shellescape(TMP_DIR)
     system("#{prepend} bundle exec ruby -Ilib:test #{tmp_dir}/*_benchmark.rb #{append}")
   end
@@ -50,11 +51,10 @@ class Benchmarking
 
   def checkout_ref(ref)
     puts `git checkout #{ref}`.chomp
-    abort "Checkout failed: #{ref}, #{$?.exitstatus}" unless $?.success?
+    abort "Checkout failed: #{ref}, #{$CHILD_STATUS.exitstatus}" unless $CHILD_STATUS.success?
   end
 
   def benchmark_refs(ref1: nil, ref2: nil)
-    refresh_temp_dir
     ref0 = current_branch
     ref1 ||= current_branch
     ref2 ||= 'master'
@@ -64,22 +64,29 @@ class Benchmarking
 
     checkout_ref(ref0)
 
-    puts "\n\nResults ============================\n"
-    puts "------------------------------------~> (Branch) #{ref1.upcase}"
-    puts master
-    puts "------------------------------------\n\n"
+    <<-REPORT
+
+
+Results ============================
+------------------------------------~> (Branch) #{ref2.upcase}
+    #{master} (seconds)
+------------------------------------
 
-    puts "------------------------------------~> (Actual Branch) #{ref2.upcase}"
-    puts actual
-    puts "------------------------------------"
-  rescue Exception
+
+
+------------------------------------~> (Actual Branch) #{ref1.upcase}
+    #{actual} (seconds)
+------------------------------------
+    REPORT
+  rescue Exception # rubocop:disable Lint/RescueException
     checkout_ref(ref0)
     raise
   end
 
   def run_benchmark
+    bundle
     benchmark_tests # warmup
-    Benchmark.realtime {
+    parse_measurement Benchmark.measure {
       benchmark_tests
     }
   end
@@ -88,14 +95,35 @@ class Benchmarking
     checkout_ref(ref)
     run_benchmark
   end
+
+  def bundle
+    system('rm -f Gemfile.lock; bundle check || bundle --local --quiet || bundle --quiet')
+  end
+
+  def parse_measurement(measurement)
+    user = measurement.utime
+    system = measurement.stime
+    total = measurement.total
+    real = measurement.real
+    {
+      :real => real,
+      :total => total,
+      :user => user,
+      :system => system
+    }
+  end
 end
 
-if $0 == __FILE__
+if $PROGRAM_NAME == __FILE__
   benchmarking = Benchmarking.new(append: '> /dev/null')
-  # Current only
-  # puts "Ran in #{benchmarking.run_benchmark} seconds."
-
-  # Compare ref to master
-  # Optionally pass in two refs as args to `bin/bench`
-  benchmarking.benchmark_refs(ref1: ARGV[0], ref2: ARGV[1])
+  test_type = ARGV[0]
+  case test_type
+  when 'current'
+    puts "Ran in #{benchmarking.run_benchmark} seconds."
+  else
+    # Default: Compare current_branch to master
+    # Optionally: pass in two refs as args to `bin/bench`
+    # TODO: Consider checking across more revisions, to automatically find problems.
+    puts benchmarking.benchmark_refs(ref1: ARGV[0], ref2: ARGV[1])
+  end
 end

test/benchmark/benchmark_helper.rb

@@ -48,5 +48,11 @@ def setup
   end
 end
 
+# Needs to initialize app before any serializes are defined, for sanity's sake.
+# Otherwise, you have to manually set perform caching.
+Rails.application.initialize!
+
 require_relative 'fixtures'
-BenchmarkApp.initialize!
+
+# Uncomment the below to test that cache is in use.
+# ActiveSupport::Cache::Store.logger = Logger.new(STDERR)