rubyfarm-bisect 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc79c5531a352ef5394ba8028b135ce65ee55bea26ad2777dde522bead7ebdce
-  data.tar.gz: 3284b3ddc7d5dbb4e509e5d3d090d14baaefe52ab7d5b9eca3a3b07118ec4956
+  metadata.gz: 579c655b1499377ecf225a7f9c30eff0aece7a85954bf15510d2f6f4ba9e2f55
+  data.tar.gz: 0c73556465406ce122586ae14be3dea1dba9f3e4c29d569315238e69eafb8a78
 SHA512:
-  metadata.gz: a91015f9b57e449b0148f32dcddaa0b80b3c6e65734f955953e7a9be78f1713bc04af1b108622613ed52491106a0a908cc7b7f2d0cbc0c90aa686ff43deabfb6
-  data.tar.gz: f54e2fd3b027dd370729a73c76f253469553ee133e427d3438ac00afc11242941362618c1875fd4e22e3dbbe6886f0d4f69804dc76c59f21ff9e346c3f8a1552
+  metadata.gz: 2a6b28203ee2b3b4c49c2cea9734a90648b10831e57f37de7c92183fe23b91c50343d33c858abbf54d802db92b03e11be26f0bfe15ada945c4baff365ae499fe
+  data.tar.gz: 0cb2739a1bee909dc0101395852029093d2cb7d9ab274271d5aa2519aaa06eac28ecac46115611dad6d74195127233a32e37966cafec8480cec996cc90c6dc81

data/README.md

@@ -1,8 +1,13 @@
 # rubyfarm-bisect
 
 This tool allows you to do "git bisect" MRI revisions easily.
-Instead of compiling each revision locally, it uses ["mametter/rubyfarm" repository](https://hub.docker.com/r/mametter/rubyfarm/tags/) in DockerHub, which contains all MRI revisions since r57410 that were successfully built.
-In short, you don't need to worry about "exit 125" (compilation failure).
+Instead of compiling each revision locally, it uses ["rubylang/rubyfarm" repository](https://hub.docker.com/r/rubylang/rubyfarm/tags/) in DockerHub, which contains all MRI revisions since r57410 that were successfully built.
+
+By using rubyfarm-bisect, you don't have to worry about:
+
+* Compilation failure ("exit 125").  rubyfarm-bisect handles it.
+* The range of bisect.  rubyfarm-bisect has a good default.
+* The order of good and bad commits.  rubyfarm-bisect automatically detects the order.
 
 ## How to setup
 
@@ -15,13 +20,13 @@ $ gem install rubyfarm-biesct
 You also need to be able to use "docker" command without "sudo".
 
 ```
-$ docker run --rm -t mametter/rubyfarm:r60001 ruby -v
-Unable to find image 'mametter/rubyfarm:r60001' locally
-r60001: Pulling from mametter/rubyfarm
+$ docker run --rm -t rubylang/rubyfarm:r60001 ruby -v
+Unable to find image 'rubylang/rubyfarm:r60001' locally
+r60001: Pulling from rubylang/rubyfarm
 
   *snip*
 
-Status: Downloaded newer image for mametter/rubyfarm:r60001
+Status: Downloaded newer image for rubylang/rubyfarm:r60001
 ruby 2.5.0dev (2017-09-23 trunk 60001) [x86_64-linux]
 ```
 
@@ -33,19 +38,24 @@ The simplest way:
 $ rubyfarm-bisect ruby -e '<your test code>'
 ```
 
-which assumes that `<your test code>` runs successfully at r57410, and fails at HEAD.
+which assumes that `<your test code>` runs successfully at r57410, and fails at "trunk".
 
 ### `-g`/`-b`: specify a good/bad commit range
 
 You can specify good and bad commits for git bisect:
 
 ```
-$ rubyfarm-bisect -g 7c1b30a6 -b HEAD ruby -e '<your test code>'
+$ rubyfarm-bisect -g 7c1b30a6 -b trunk ruby -e '<your test code>'
 ```
 
 `-g` is a good commit, and `-b` is a bad commit.
 The arguments must be a SVN revision (e.g., "r60000"), or a commit hash of [git.ruby-lang.org/ruby.git](https://git.ruby-lang.org/ruby.git) (e.g., 7c1b30a6).
 
+You don't have to worry about which is good and bad:
+
+* rubyfarm-bisect first checks if the good commit is an ancestor of the bad one.  If not, it swaps the good and bad ones.
+* rubyfarm-bisect then checks if the test passes at the good (older) commit.  If it does not pass the test, it works as a "reversed" mode; it tries to find the first "good" commit.
+
 ### `-u`: specify a git url
 
 This tool clones [the git repository of ruby](https://git.ruby-lang.org/ruby.git) into temporary directory, which takes some minutes.

data/exe/rubyfarm-bisect

@@ -9,19 +9,21 @@ ORIGINAL_GIT_PATH = "https://git.ruby-lang.org/ruby.git"
 CORE = File.join(__dir__, "rubyfarm-bisect-core")
 
 good_commit = FIRST_COMMIT
-bad_commit = "HEAD"
+bad_commit = "trunk"
 git_url = ORIGINAL_GIT_PATH
 mounts = []
+auto = true
 
 opt = OptionParser.new
 opt.on("-u URL", "--git-url URL", "URL of git repository (defalut: #{ ORIGINAL_GIT_PATH })") {|v| git_url = v }
 opt.on("-g COMMIT", "--good-commit COMMIT", "good commit (defalut: 7c1b30a)") {|v| good_commit = v }
-opt.on("-b COMMIT", "--bad-commit COMMIT", "bad commit (defalut: HEAD)") {|v| bad_commit = v }
+opt.on("-b COMMIT", "--bad-commit COMMIT", "bad commit (defalut: trunk)") {|v| bad_commit = v }
 opt.on("-m PATH", "--mount-volume PATH", "mount PATH to /root (default: none)") {|v| mounts << v }
 opt.on("-t", "--test-rb", "run test.rb") do
   mounts = ["test.rb"]
   ARGV.concat(["ruby", "/root/test.rb"])
 end
+opt.on("--no-auto", "disable automatic detection of the order (good->bad or bad->good)") { auto = false }
 opt.order!(ARGV)
 
 mounts = mounts.flat_map do |path|
@@ -54,8 +56,30 @@ Dir.mktmpdir do |dir|
     system("git", "clone", git_url)
     puts "\e[0m"
     Dir.chdir("ruby") do
+      good_commit = solve_rev[good_commit]
+      bad_commit = solve_rev[bad_commit]
+
+      if !system("git", "merge-base", "--is-ancestor", solve_rev[good_commit], solve_rev[bad_commit])
+        puts "\e[1m\e[32m#{ good_commit } is not an ancestor of #{ bad_commit }.  Try to reverse.\e[0m"
+        good_commit, bad_commit = bad_commit, good_commit
+        if !system("git", "merge-base", "--is-ancestor", solve_rev[good_commit], solve_rev[bad_commit])
+          puts "\e[1m\e[32m#{ good_commit } is not an ancestor of #{ bad_commit }.  Aborting.\e[0m"
+          exit 1
+        end
+      end
+
+      order = "normal"
+      if auto
+        system("git", "checkout", solve_rev[good_commit])
+        if !system(CORE, "--", *ARGV)
+          puts "\e[1m\e[32mThe beginning commit #{ good_commit } doesn't pass the test.  Find the first good commit. \e[0m"
+          order = "reversed"
+        end
+      end
+
       system("git", "bisect", "start", solve_rev[bad_commit], solve_rev[good_commit])
-      system("git", "bisect", "run", CORE, *mounts, "--", *ARGV)
+      env = { "RUBYFARM_BISECT_ORDER" => order }
+      system(env, "git", "bisect", "run", CORE, *mounts, "--", *ARGV)
     end
   end
 end

data/exe/rubyfarm-bisect-core

@@ -2,10 +2,10 @@
 
 require "shellwords"
 
-REPOSITORY = "mametter/rubyfarm"
+REPOSITORY = "rubylang/rubyfarm"
 
 puts
-rev = "r" + `git show HEAD`[%r(git-svn-id: svn\+ssh://ci.ruby-lang.org/ruby/trunk@(\d+)), 1]
+rev = `git rev-parse HEAD`.chomp
 log = -> msg do
   puts "\e[1m\e[32mrubyfarm-bisect[#{ rev }]: #{ msg }\e[0m"
 end
@@ -15,7 +15,7 @@ run = -> color, *cmd do
   system(*cmd)
   print "\e[0m"
 end
-tag = "mametter/rubyfarm:#{ rev }"
+tag = REPOSITORY + ":#{ rev }"
 
 run["\e[34m", "docker", "image", "inspect", "-f", "ok", tag]
 unless $?.success?
@@ -36,4 +36,6 @@ status = $?.exitstatus
 msg = { 0 => "good", 125 => "skip" }[status] || "bad"
 log["status = #{ status } (#{ rev } is #{ msg })"]
 puts
+exit 125 if status == 125
+exit(status == 0 ? 1 : 0) if ENV["RUBYFARM_BISECT_ORDER"] == "reversed"
 exit status

data/rubyfarm-bisect.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "rubyfarm-bisect"
-  spec.version       = "1.0.2"
+  spec.version       = "1.1.0"
   spec.authors       = ["Yusuke Endoh"]
   spec.email         = ["mame@ruby-lang.org"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyfarm-bisect
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Yusuke Endoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,8 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: '"git bisect" ruby without compilation trouble'