minitest-bisect 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a2f0e5308b623a3bd5ba94ef584fec183e7dd51
-  data.tar.gz: 62eb672d93534aee515afcbf939b01d01fff7ba3
+  metadata.gz: 0a69c4cd04993faef276a75c10d66a9661380664
+  data.tar.gz: 1b98b09d3cbca5bdb4001824ea63482d9b64f688
 SHA512:
-  metadata.gz: ded844dfc9c7dffd7a598b6a2a5fc7a3dd2de11d7091856b508e303a3f1f366797df0dcbe9e1aaa1fa8eec0002f6d460a682878463624ca9b80656671bc0fdac
-  data.tar.gz: bffd131f915c60ed1e2185f957ffb6ac523008690b49c2a03786f9ba29c0c20a2720aad6c5090f2a8dd3d99a17ee8acd4b663f79718486dff902360d2f82d22a
+  metadata.gz: 1f5723f2eacf4adb6ed59f802210119793c8ac36f6cbb3dc1396bc6e0530b2a29883be75a37ba3fd8899d56473b558be5a80ff20308703ef9885ac53234505ca
+  data.tar.gz: ce36d7e6111c168c852d1f070c855c541bf74b0b26af21a661649645d904c78baa534d2967ab1b99afc6eed4726eeaae5dec4c508212973608ed4e4a3e4593c2

data.tar.gz.sig

@@ -1,2 +1,4 @@
-���
-�ۗgEc�m1��x���wN���H��$��*Y���j����	W����N.���S`{J��\��:���X7���r�u���Z�vѵ��'���`~�ESu铱�j9顅6�2�S������=ȸ��[k�j�vd�u+�n����
-��n��9;`�	n���'=x�e�7<\�K���
���]��6����4y�cP�]�(?>��|Qq����&jo�;7���L��WU��8\i��@3UMuM
+g�&z楛Ěq�=#�A�����f3w�=ը)��2)>S��B����BÏB����.�?o�U�
+@N��;����9v{I�G�үp�Y@d��k�\��ͭ��g:b���R�Z����qC�o7{X��N��G��e��9gn_Q��:�bH
+f2'�I���0�1C�
+��qW&���2n��a�E���Wy]d콈�ǽD̷d���Rm?�n~�<Q�_���

data/History.rdoc

@@ -1,3 +1,18 @@
+=== 1.1.0 / 2014-09-08
+
+* 4 minor enhancements:
+
+  * Added MTB_DEBUG env var to add debugging output to bisect trials.
+  * Added MTB_VERBOSE env var to show test output.
+  * Remove `--server ###` from final repro to make it easer to copy/paste/debug.
+  * Removed `-s` option. Now only `--server` remains to be unambiguous.
+
+* 3 bug fixes:
+
+  * Accidentally left in -v while I was debugging something.
+  * Reject skips in culprit accounting.
+  * Switched to manual escaping of regexp. Shellwords was horribly overzealous.
+
 === 1.0.0 / 2014-07-16
 
 * 1 major enhancement

data/lib/minitest/bisect.rb

@@ -3,8 +3,9 @@ require "minitest/server"
 require "shellwords"
 
 class Minitest::Bisect
-  VERSION = "1.0.0"
-  SHH = " &> /dev/null"
+  VERSION = "1.1.0"
+
+  SHH = ENV["MTB_VERBOSE"].to_i >= 2 ? nil : " &> /dev/null"
 
   attr_accessor :tainted, :failures, :culprits, :mode, :seen_bad
   alias :tainted? :tainted
@@ -33,7 +34,7 @@ class Minitest::Bisect
     if :until_I_have_negative_filtering_in_minitest then
       files, flags = files.partition { |arg| File.file? arg }
       rb_flags, mt_flags = flags.partition { |arg| arg =~ /^-I/ }
-      mt_flags += ["-s", $$]
+      mt_flags += ["--server", $$]
 
       cmd = bisect_methods build_files_cmd(files, rb_flags, mt_flags)
     else
@@ -43,7 +44,7 @@ class Minitest::Bisect
     puts "Final reproduction:"
     puts
 
-    system cmd
+    system cmd.sub(/--server \d+/, "")
   ensure
     Minitest::Server.stop
   end
@@ -53,7 +54,7 @@ class Minitest::Bisect
 
     files, flags = files.partition { |arg| File.file? arg }
     rb_flags, mt_flags = flags.partition { |arg| arg =~ /^-I/ }
-    mt_flags += ["-s", $$]
+    mt_flags += ["--server", $$]
 
     puts "reproducing..."
     system "#{build_files_cmd files, rb_flags, mt_flags} #{SHH}"
@@ -87,6 +88,7 @@ class Minitest::Bisect
     # from: {"file.rb"=>{"Class"=>["test_method"]}} to: "Class#test_method"
     bad = failures.values.first.to_a.join "#"
 
+    # culprits populated by initial reproduction via minitest/server
     found, count = culprits.find_minimal_combination_and_count do |test|
       puts "# of culprit methods: #{test.size}"
 
@@ -118,22 +120,34 @@ class Minitest::Bisect
     if bad then
       re = []
 
-      bbc = (culprits + [bad]).map { |s| s.split(/#/) }.group_by(&:first)
+      # bad by class, you perv
+      bbc = (culprits + [bad]).map { |s| s.split(/#/, 2) }.group_by(&:first)
+
       bbc.each do |klass, methods|
-        methods = methods.map(&:last).flatten
+        methods = methods.map(&:last).flatten.uniq.map { |method|
+          method.gsub(/([`'"!?&\[\]\(\)\|\+])/, '\\\\\1')
+        }
 
-        re << /#{klass}##{Regexp.union(methods)}/
+        re << /#{klass}#(?:#{methods.join "|"})/.to_s[7..-2] # (?-mix:...)
       end
 
-      re = Regexp.union(re).to_s.gsub(/-mix/, "")
+      re = re.join("|").to_s.gsub(/-mix/, "")
 
-      cmd += " -n '/^#{re}$/'" if bad
+      cmd += " -n \"/^(?:#{re})$/\"" if bad
+    end
+
+    if ENV["MTB_VERBOSE"].to_i >= 1 then
+      puts
+      puts cmd
+      puts
     end
 
     cmd
   end
 
   def result file, klass, method, fails, assertions, time
+    fails.reject! { |fail| Minitest::Skip === fail }
+
     if mode == :methods then
       if fails.empty? then
         culprits << "#{klass}##{method}" unless seen_bad # UGH

data/lib/minitest/find_minimal_combination.rb

@@ -28,6 +28,8 @@ class ComboFinder
     level, n_combos = 1, 1
     seen = {}
 
+    d "Total number of culprits: #{ary.size}"
+
     loop do
       size = 2 ** (Math.log(ary.size) / Math.log(2)).round
       divs = 2 ** level
@@ -36,11 +38,17 @@ class ComboFinder
 
       subsections = ary.each_slice(size/divs).to_a.combination(n_combos)
 
+      d
+      d "# new round!"
+      d "#   of subsections in this round: #{subsections.size}"
+      d
+
       found = subsections.find { |a|
         b = a.flatten
 
         next if seen[b]
 
+        d "#   trying #{b.size} at level #{level} / combo #{n_combos}"
         cache_result yield(b), b, seen
       }
 
@@ -50,14 +58,20 @@ class ComboFinder
 
         seen.delete ary
 
+        d "#   FOUND!"
+        d "#     search space size = #{ary.size}"
+        d "#     resetting level and n_combos to 1"
+
         level = n_combos = 1
       else
         if done then
           n_combos += 1
+          d "#   increasing n_combos to #{n_combos}"
           break if n_combos > size
         else
           level += 1
           n_combos = level
+          d "#   setting level to #{level} and n_combos to #{n_combos}"
         end
       end
     end
@@ -65,6 +79,10 @@ class ComboFinder
     ary
   end
 
+  def d s=""
+    warn s if ENV["MTB_DEBUG"]
+  end
+
   def cache_result result, data, cache
     cache[data] = true
 

data/lib/minitest/server_plugin.rb

@@ -4,7 +4,7 @@ module Minitest
   @server = false
 
   def self.plugin_server_options opts, options # :nodoc:
-    opts.on "-s", "--server=pid", Integer, "Connect to minitest server w/ pid." do |s|
+    opts.on "--server=pid", Integer, "Connect to minitest server w/ pid." do |s|
       @server = s
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-bisect
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest

metadata.gz.sig

@@ -1,2 +1,2 @@
-�O��
-�����26I����>W3�����a1\�kI@�{4�:�,"M�����{�]ò��W9dgG�pKM��`��J���$�4����C��8`��S���i���!�0�Df�uܨ��.�����ً[������26���4'rXV��qL#ݟ��:�]�ӈ���\=g<�*�7�l�@�Zg�#�\oR�Qs�e+KG�w�~0%��<�i��ˬ0{*C��(��1�I�<��OֶF���b@���u���
+��#K1�9?���9��5�Wvs��[�3�C�&J���^%!C���<�2�џ/���I:��z
+�����'�D17��'�z-�V�3