ci-queue 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c56cc78cb306fb67c398a2cdf41b5a9d7d594d87
-  data.tar.gz: d63fb0d78ec9fe9eeb04bc2bc60a1ab6aeeab77d
+  metadata.gz: 652339a43dd06f487b03a5ffb074d5f1fb5291e7
+  data.tar.gz: 8ae7eae228a8b630934793402cf9398ee7c7310a
 SHA512:
-  metadata.gz: 4ef344549d3bb3e75bb01f0e9bae693b2ed635eedcc31f5043383de2c8775e662c1822ba740435b174e0f9ebce3346b97ccc203a44ce433ab922ab9796d2a91f
-  data.tar.gz: 0b6ec24e92bf4ec95d6bd68a20e64efab06dcf5109bb9c7b3ab1ad2f8632cc8907865dbaacebff891606f817d0101376281ba5549d152b8acfc3ebfe537eeea9
+  metadata.gz: 3d432b69e34fd503a6cc6a334637b28382e5e8617c747f992b1399a8cba56e688d829d424627f2c40c8a847d0853ad9fde0812ff0643a94969f72f94bf3fc591
+  data.tar.gz: f55f4e1134e40542535c32dc30c16b80af59d053b09682b69cba149e6b2161d31f3c6613dced48cbdb476f51fdd51daf590cd81b4d270aab98555626758acb48

data/ci-queue.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', "~> 10.0"
-  spec.add_development_dependency 'minitest', '~> 5.9.1'
+  spec.add_development_dependency 'minitest', ENV.fetch('MINITEST_VERSION', '~> 5.11')
   spec.add_development_dependency 'rspec', '~> 3.7.0'
   spec.add_development_dependency 'redis', '~> 3.3'
   spec.add_development_dependency 'simplecov', '~> 0.12'

data/lib/ci/queue/version.rb

@@ -1,6 +1,6 @@
 module CI
   module Queue
-    VERSION = '0.9.2'
+    VERSION = '0.10.0'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue.rb

@@ -116,4 +116,9 @@ module Minitest
 end
 
 MiniTest.singleton_class.prepend(MiniTest::Queue)
-MiniTest::Test.prepend(MiniTest::Requeueing)
+if defined? MiniTest::Result
+  MiniTest::Result.prepend(MiniTest::Requeueing)
+else
+  MiniTest::Test.prepend(MiniTest::Requeueing)
+  MiniTest::Test.send(:alias_method, :klass, :class)
+end

data/lib/minitest/queue/runner.rb

@@ -2,6 +2,7 @@ require 'optparse'
 require 'minitest/queue'
 require 'ci/queue'
 require 'digest/md5'
+require 'minitest/reporters/bisect_reporter'
 
 module Minitest
   module Queue
@@ -61,7 +62,7 @@ module Minitest
         step("Testing the failing test in isolation")
         unless run_tests_in_fork(queue.failing_test)
           puts reopen_previous_step
-          puts red("The test fail when run alone, no need to bisect.")
+          puts red("The test fail when ran alone, no need to bisect.")
           exit! 0
         end
 
@@ -130,7 +131,7 @@ module Minitest
       def run_tests_in_fork(queue)
         child_pid = fork do
           Minitest.queue = queue
-          Minitest::Reporters.use!([Minitest::Reporters::SpecReporter.new])
+          Minitest::Reporters.use!([Minitest::Reporters::BisectReporter.new])
           exit # let minitest excute its at_exit
         end
 

data/lib/minitest/reporters/bisect_reporter.rb

@@ -0,0 +1,16 @@
+require 'minitest/reporters'
+
+module Minitest
+  module Reporters
+    class BisectReporter < BaseReporter
+      include RelativePosition
+
+      def record(test)
+        super
+        test_name = "#{test.klass}##{test.name}"
+        print pad_test(test_name)
+        puts pad_mark(result(test).to_s.upcase)
+      end
+    end
+  end
+end

data/lib/minitest/reporters/failure_formatter.rb

@@ -20,7 +20,7 @@ module Minitest
 
       def to_h
         {
-          test_and_module_name: "#{test.class}##{test.name}",
+          test_and_module_name: "#{test.klass}##{test.name}",
           test_name: test.name,
           output: to_s,
         }
@@ -31,7 +31,7 @@ module Minitest
       attr_reader :test
 
       def header
-        "#{red(status)} #{test.class}##{test.name}"
+        "#{red(status)} #{test.klass}##{test.name}"
       end
 
       def status

data/lib/minitest/reporters/order_reporter.rb

@@ -13,7 +13,7 @@ class Minitest::Reporters::OrderReporter < Minitest::Reporters::BaseReporter
 
   def before_test(test)
     super
-    @file.puts("#{test.class}##{test.name}")
+    @file.puts("#{test.klass}##{test.name}")
   end
 
   def report

data/lib/minitest/reporters/queue_reporter.rb

@@ -36,7 +36,7 @@ module Minitest
         e = test.failure
 
         if test.requeued?
-          "Requeued:\n#{test.class}##{test.name} [#{location(e)}]:\n#{e.message}"
+          "Requeued:\n#{test.klass}##{test.name} [#{location(e)}]:\n#{e.message}"
         else
           super
         end

data/lib/minitest/reporters/redis_reporter.rb

@@ -217,9 +217,9 @@ module Minitest
 
           redis.multi do
             if (test.failure || test.error?) && !test.skipped?
-              redis.hset(key('error-reports'), "#{test.class}##{test.name}", dump(test))
+              redis.hset(key('error-reports'), "#{test.klass}##{test.name}", dump(test))
             else
-              redis.hdel(key('error-reports'), "#{test.class}##{test.name}")
+              redis.hdel(key('error-reports'), "#{test.klass}##{test.name}")
             end
             COUNTERS.each do |counter|
               redis.hset(key(counter), worker_id, send(counter))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.9.1
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.9.1
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,7 @@ files:
 - lib/ci/queue/version.rb
 - lib/minitest/queue.rb
 - lib/minitest/queue/runner.rb
+- lib/minitest/reporters/bisect_reporter.rb
 - lib/minitest/reporters/failure_formatter.rb
 - lib/minitest/reporters/order_reporter.rb
 - lib/minitest/reporters/queue_reporter.rb