derailed_benchmarks 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581626c86185aaf6f5155ff71279a5bddc26beac617d894523b97ea534960f08
-  data.tar.gz: 93b3a57bcde0653c6682e0757137e4f5612e6e4f3444dd4fe94d556ec5ef77a8
+  metadata.gz: 2ed7fac91722a804da9125b03501653c1e1d78993b9c7d874e5e597656cb3c12
+  data.tar.gz: 5c36d946b6e0533d195f9b285d1d6541e4890a2f2eb37f2ca5d26b4c9434b655
 SHA512:
-  metadata.gz: 0e9eb3bd1494b2cca18f2b61adc0bc62794cff238afb6c7713826aaea44f4987648520d735ffd93f2e81b2bd69dc7ac7adc5d0966fda75d3ebdc728ed6c5c476
-  data.tar.gz: 442a77045473b79c8a4bdeb82e3002f63c3eb1195cc321754ae8ebc905c02d0300c58eb5c95f8488e58b27fb33a7c7ca5a536b99da305a30470b32e2e788a6ef
+  metadata.gz: be591fafddeff784a41a817c51f1f0f4c6a7f0b14b80f16b4792c61564af97f22a38f8cc999d5e7431cae3393cbfe427eebb291e2bc2efac7c578a802a870ec7
+  data.tar.gz: 4e0fceb32c0acbc09f74c91959121a9033b5ac188700eb225c7d51a4cee796665640302e5e7eed5508c870c63fc26a4370ed1ed6e88b15757fc8c291a70a3c88

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-# A Log of Changes!
+## master (unreleased)
+
+## 1.4.2
+
+- Fixed syntax error that resulted in ensure end error inside tasks.rb for older rubies (https://github.com/schneems/derailed_benchmarks/pull/155)
+- Fix case in perf:library where the same SHA could be tested against itself (https://github.com/schneems/derailed_benchmarks/pull/153)
 
 ## 1.4.1
 

data/lib/derailed_benchmarks/tasks.rb

@@ -3,80 +3,100 @@ require_relative 'load_tasks'
 namespace :perf do
   desc "runs the same test against two different branches for statistical comparison"
   task :library do
-    DERAILED_SCRIPT_COUNT = (ENV["DERAILED_SCRIPT_COUNT"] ||= "200").to_i
-    ENV["TEST_COUNT"] ||= "200"
+    begin
+      DERAILED_SCRIPT_COUNT = (ENV["DERAILED_SCRIPT_COUNT"] ||= "200").to_i
+      ENV["TEST_COUNT"] ||= "200"
 
-    raise "test count must be at least 2, is set to #{DERAILED_SCRIPT_COUNT}" if DERAILED_SCRIPT_COUNT < 2
-    script = ENV["DERAILED_SCRIPT"] || "bundle exec derailed exec perf:test"
+      raise "test count must be at least 2, is set to #{DERAILED_SCRIPT_COUNT}" if DERAILED_SCRIPT_COUNT < 2
+      script = ENV["DERAILED_SCRIPT"] || "bundle exec derailed exec perf:test"
 
-    if ENV["DERAILED_PATH_TO_LIBRARY"]
-      library_dir = ENV["DERAILED_PATH_TO_LIBRARY"]
-    else
-      library_dir = DerailedBenchmarks.rails_path_on_disk
-    end
+      if ENV["DERAILED_PATH_TO_LIBRARY"]
+        library_dir = ENV["DERAILED_PATH_TO_LIBRARY"]
+      else
+        library_dir = DerailedBenchmarks.rails_path_on_disk
+      end
 
-    raise "Must be a path with a .git directory '#{library_dir}'" unless File.exist?(File.join(library_dir, ".git"))
-
-    # Use either the explicit SHAs when present or grab last two SHAs from commit history
-    # if only one SHA is given, then use it and the last SHA from commit history
-    branch_names = []
-    branch_names = ENV.fetch("SHAS_TO_TEST").split(",") if ENV["SHAS_TO_TEST"]
-    if branch_names.length < 2
-      Dir.chdir(library_dir) do
-        branches = run!('git log --format="%H" -n 2').chomp.split($INPUT_RECORD_SEPARATOR)
-        if branch_names.empty?
-          branch_names = branches
-        else
-          branch_names << branches.shift
+      raise "Must be a path with a .git directory '#{library_dir}'" unless File.exist?(File.join(library_dir, ".git"))
+
+      # Use either the explicit SHAs when present or grab last two SHAs from commit history
+      # if only one SHA is given, then use it and the last SHA from commit history
+      branch_names = []
+      branch_names = ENV.fetch("SHAS_TO_TEST").split(",") if ENV["SHAS_TO_TEST"]
+      if branch_names.length < 2
+        Dir.chdir(library_dir) do
+          run!("git checkout '#{branch_names.first}'") unless branch_names.empty?
+
+          branches = run!('git log --format="%H" -n 2').chomp.split($/)
+          if branch_names.empty?
+            branch_names = branches
+          else
+            branches.shift
+            branch_names << branches.shift
+          end
         end
       end
-    end
 
-    current_library_branch = ""
-    Dir.chdir(library_dir) { current_library_branch = run!('git describe --contains --all HEAD').chomp }
+      current_library_branch = ""
+      Dir.chdir(library_dir) { current_library_branch = run!('git describe --contains --all HEAD').chomp }
 
-    out_dir = Pathname.new("tmp/library_branches/#{Time.now.strftime('%Y-%m-%d-%H-%M-%s-%N')}")
-    out_dir.mkpath
+      out_dir = Pathname.new("tmp/library_branches/#{Time.now.strftime('%Y-%m-%d-%H-%M-%s-%N')}")
+      out_dir.mkpath
 
-    branches_to_test = branch_names.each_with_object({}) {|elem, hash| hash[elem] = out_dir + "#{elem.gsub('/', ':')}.bench.txt" }
-    branch_info = {}
+      branches_to_test = branch_names.each_with_object({}) {|elem, hash| hash[elem] = out_dir + "#{elem.gsub('/', ':')}.bench.txt" }
+      branch_info = {}
+      branch_to_sha = {}
 
-    branches_to_test.each do |branch, file|
-      Dir.chdir(library_dir) do
-        run!("git checkout '#{branch}'")
-        description = run!("git log --oneline --format=%B -n 1 HEAD | head -n 1").strip
-        time_stamp  = run!("git log -n 1 --pretty=format:%ci").strip # https://stackoverflow.com/a/25921837/147390
-        name        = run!("git rev-parse --short HEAD").strip
-        branch_info[name] = { desc: description, time: DateTime.parse(time_stamp), file: file }
+      branches_to_test.each do |branch, file|
+        Dir.chdir(library_dir) do
+          run!("git checkout '#{branch}'")
+          description = run!("git log --oneline --format=%B -n 1 HEAD | head -n 1").strip
+          time_stamp  = run!("git log -n 1 --pretty=format:%ci").strip # https://stackoverflow.com/a/25921837/147390
+          short_sha   = run!("git rev-parse --short HEAD").strip
+          branch_to_sha[branch] = short_sha
+
+          branch_info[short_sha] = { desc: description, time: DateTime.parse(time_stamp), file: file }
+        end
+        run!("#{script}")
       end
-      run!("#{script}")
-    end
 
-    stats = DerailedBenchmarks::StatsFromDir.new(branch_info)
-    ENV["DERAILED_STOP_VALID_COUNT"] ||= "50"
-    stop_valid_count = Integer(ENV["DERAILED_STOP_VALID_COUNT"])
-
-    times_significant = 0
-    DERAILED_SCRIPT_COUNT.times do |i|
-      puts "Sample: #{i.next}/#{DERAILED_SCRIPT_COUNT} iterations per sample: #{ENV['TEST_COUNT']}"
-      branches_to_test.each do |branch, file|
-        Dir.chdir(library_dir) { run!("git checkout '#{branch}'") }
-        run!(" #{script} 2>&1 | tail -n 1 >> '#{file}'")
+      puts
+      puts
+      branches_to_test.each.with_index do |(branch, _), i|
+        short_sha = branch_to_sha[branch]
+        desc      = branch_info[short_sha][:desc]
+        puts "Testing #{i + 1}: #{short_sha}: #{desc}"
+      end
+      puts
+      puts
+
+      raise "SHAs to test must be different" if branch_info.length == 1
+      stats = DerailedBenchmarks::StatsFromDir.new(branch_info)
+      ENV["DERAILED_STOP_VALID_COUNT"] ||= "50"
+      stop_valid_count = Integer(ENV["DERAILED_STOP_VALID_COUNT"])
+
+      times_significant = 0
+      DERAILED_SCRIPT_COUNT.times do |i|
+        puts "Sample: #{i.next}/#{DERAILED_SCRIPT_COUNT} iterations per sample: #{ENV['TEST_COUNT']}"
+        branches_to_test.each do |branch, file|
+          Dir.chdir(library_dir) { run!("git checkout '#{branch}'") }
+          run!(" #{script} 2>&1 | tail -n 1 >> '#{file}'")
+        end
+        times_significant += 1 if i >= 2 && stats.call.significant?
+        break if stop_valid_count != 0 && times_significant == stop_valid_count
       end
-      times_significant += 1 if i >= 2 && stats.call.significant?
-      break if stop_valid_count != 0 && times_significant == stop_valid_count
-    end
 
-  ensure
-    if library_dir && current_library_branch
-      puts "Resetting git dir of #{library_dir.inspect} to #{current_library_branch.inspect}"
-      Dir.chdir(library_dir) do
-        run!("git checkout '#{current_library_branch}'")
+    ensure
+      if library_dir && current_library_branch
+        puts "Resetting git dir of '#{library_dir.to_s}' to #{current_library_branch.inspect}"
+        Dir.chdir(library_dir) do
+          run!("git checkout '#{current_library_branch}'")
+        end
       end
-    end
 
-    stats.call.banner if stats
-  end
+      stats.call.banner if stats
+    end
+   end
+  
 
   desc "hits the url TEST_COUNT times"
   task :test => [:setup] do

data/lib/derailed_benchmarks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: derailed_benchmarks
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heapy