ci-queue 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9c3ef16af71af28cb4ba0a1b1cc6333549b29c59be0b4a5d81d04820c2b9b09
-  data.tar.gz: 3b7f66435ec75625bb68af73917bea553815ac76f526efb0bb954252fac35bc3
+  metadata.gz: 436b1f0bca2725e6f532cbd4a4df9a880e6b1dd2e11a80b9587178d213fe6137
+  data.tar.gz: 93fe3b4055e7c99e6c61af1f106e63157e79dd2fe3717d5b1cfc74e096195e9a
 SHA512:
-  metadata.gz: 110d276a4d4a44cf98cba68be7e895991d510e14236fdad601fc9887ea13f6b1f67b3ec3df48b5210cac8b2185be2528cd39c1c9da67a0649660300594801878
-  data.tar.gz: 103c204787a1f3b29e9ebb676f5847eac789acd806f5eaabbce84a5e2f47e6af27ea48d7a6f6d725c25dbf78061d38e5cb10feb62586a0b8d0ea1d32f5230af5
+  metadata.gz: 2bc328cd567173a875bc8273a812d2ad48ea32bad0eb0f7b0a586b279a80c4eaf08eede41a15e98d71929776dc1a5d59e7fee94b844b55a1924b3f1aa0be4272
+  data.tar.gz: fab60979f729dd77fbf8661d8e1b644deb7e9c126a5ea27a97537e0fb960416b71c69b2b01b4123e6f19216b6a764a136079412875686c93f949a6323ebf0a63

data/ci-queue.gemspec

@@ -29,8 +29,6 @@ Gem::Specification.new do |spec|
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.add_dependency 'ansi'
-
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest', ENV.fetch('MINITEST_VERSION', '~> 5.11')

data/lib/ci/queue.rb

@@ -18,12 +18,16 @@ module CI
   module Queue
     extend self
 
-    attr_accessor :shuffler
+    attr_accessor :shuffler, :requeueable
 
     module Warnings
       RESERVED_LOST_TEST = :RESERVED_LOST_TEST
     end
 
+    def requeueable?(test_result)
+      requeueable.nil? || requeueable.call(test_result)
+    end
+
     def shuffle(tests, random)
       if shuffler
         shuffler.call(tests, random)

data/lib/ci/queue/output_helpers.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
-require 'ansi'
-
 module CI
   module Queue
     module OutputHelpers
-      include ANSI::Code
-
       private
 
       def step(*args, **kwargs)
@@ -28,6 +24,22 @@ module CI
         end
       end
 
+      def red(text)
+        colorize(text, 31)
+      end
+
+      def green(text)
+        colorize(text, 32)
+      end
+
+      def yellow(text)
+        colorize(text, 33)
+      end
+
+      def colorize(text, color_code)
+        "\e[#{color_code}m#{text}\e[0m"
+      end
+
       module DefaultOutput
         extend self
 

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.18.0'
+    VERSION = '0.19.0'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue.rb

@@ -180,7 +180,7 @@ module Minitest
         end
 
         requeued = false
-        if failed && queue.requeue(example)
+        if failed && CI::Queue.requeueable?(result) && queue.requeue(example)
           requeued = true
           result.requeue!
           reporter.record(result)

data/lib/minitest/queue/failure_formatter.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 require 'delegate'
-require 'ansi'
+require 'ci/queue/output_helpers'
 
 module Minitest
   module Queue
     class FailureFormatter < SimpleDelegator
-      include ANSI::Code
+      include ::CI::Queue::OutputHelpers
 
       def initialize(test)
         @test = test

data/lib/rspec/queue.rb

@@ -211,7 +211,7 @@ module RSpec
             reporter.report_success!
           end
 
-          if @exception && reporter.requeue
+          if @exception && CI::Queue.requeueable?(@exception) && reporter.requeue
             reporter.cancel_run!
             dup.mark_as_requeued!(reporter)
             return true

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ansi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement