ci-queue 0.20.1 → 0.20.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5d3525c5eac10718326a27026a9760509bca1a0d23b15f6ad2b8f5521321c29
-  data.tar.gz: 05a459ded4b16d60c5dd5e58ed3e175b97467193894d6f64acbdb3d071e971a9
+  metadata.gz: fdf8ce628f8d7b21a66f614c867dbd2f568b011f22a467a6d274c51e81294a63
+  data.tar.gz: c591e50cf510e91d6aa6d6bbf39573b38581002c2dcf2e07f1b57e9edb2abef6
 SHA512:
-  metadata.gz: e1589714a963162803a93e134b671026c90910d7a645057d58dafa785f97408f94562d43d4545c7123b63feb93a0966710b43acf63cc1d7aa727684db7a952e7
-  data.tar.gz: da902c68164c997ebbda25d6305742059c101d08a23d084b3b0bedeb3e2f4bace623e1241c4298dff24b0061a846be201b9ae4edda4d3df3537ae40642bab276
+  metadata.gz: 9b5b2c9fe39aa132bda26cc98387349eaddcfb2074e37ed225f675a3e8fb3c50f42dab761f0620b54d1df48ae285b10d75f1b66f07456e05d4bccbfb01116414
+  data.tar.gz: f92b07076fc21b13efe3a9587f4e57cf7d1d12b1838c37d10fcbeb8b2e4e684a101fd5d9588fa482e06cf45c0e12f1bce212b5d7e9bcf695e4ba8f5fcfdd7864

data/README.md

@@ -51,7 +51,9 @@ The runner also comes with a tool to investigate leaky tests:
 minitest-queue --queue path/to/test_order.log --failing-test 'SomeTest#test_something' bisect -Itest test/**/*_test.rb
 ```
 
-### RSpec
+### RSpec [DEPRECATED]
+
+The rspec-queue runner is deprecated. The minitest-queue runner continues to be supported and is actively being improved. At Shopify, we strongly recommend that new projects set up their test suite using Minitest rather than RSpec.
 
 Assuming you use one of the supported CI providers, the command can be as simple as:
 
@@ -67,4 +69,4 @@ rspec-queue --queue redis://example.com --timeout 600 --report
 
 #### Limitations
 
-Because of how `ci-queue` execute the examples, `before(:all)` and `after(:all)` hooks are not supported. `rspec-queue` will explicitly reject them.
+Because of how `ci-queue` executes the examples, `before(:all)` and `after(:all)` hooks are not supported. `rspec-queue` will explicitly reject them.

data/ci-queue.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   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 'redis'
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
 

data/lib/ci/queue/redis/worker.rb

@@ -56,10 +56,18 @@ module CI
         rescue *CONNECTION_ERRORS
         end
 
-        def retrying?
-          redis.exists(key('worker', worker_id, 'queue'))
-        rescue *CONNECTION_ERRORS
-          false
+        if ::Redis.method_defined?(:exists?)
+          def retrying?
+            redis.exists?(key('worker', worker_id, 'queue'))
+          rescue *CONNECTION_ERRORS
+            false
+          end
+        else
+          def retrying?
+            redis.exists(key('worker', worker_id, 'queue'))
+          rescue *CONNECTION_ERRORS
+            false
+          end
         end
 
         def retry_queue

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue.rb

@@ -106,7 +106,7 @@ module Minitest
     attr_writer :run_command_formatter, :project_root
 
     def run_command_formatter
-      @run_command_formatter ||= if defined?(Railties)
+      @run_command_formatter ||= if defined?(Rails) && defined?(Rails::TestUnitRailtie)
         RAILS_RUN_COMMAND_FORMATTER
       else
         DEFAULT_RUN_COMMAND_FORMATTER

data/lib/minitest/queue/error_report.rb

@@ -58,6 +58,10 @@ module Minitest
         @data[:test_and_module_name]
       end
 
+      def test_suite
+        @data[:test_suite]
+      end
+
       def test_file
         @data[:test_file]
       end

data/lib/minitest/queue/failure_formatter.rb

@@ -27,6 +27,7 @@ module Minitest
           test_line: test_line,
           test_and_module_name: "#{test.klass}##{test.name}",
           test_name: test.name,
+          test_suite: test.klass,
           error_class: test.failure.exception.class.name,
           output: to_s,
         }

data/lib/minitest/queue/junit_reporter.rb

@@ -96,13 +96,16 @@ module Minitest
         message.lines.first.chomp.gsub(/\e\[[^m]+m/, '')
       end
 
+      def project_root_path_matcher
+        @project_root_path_matcher ||= %r{(?<=\s)#{Regexp.escape(Minitest::Queue.project_root)}/}
+      end
+
       def message_for(test)
         suite = test.klass
         name = test.name
         error = test.failure
 
-        message_with_relative_paths = error.message.gsub("#{Minitest::Queue.project_root}/", '')
-
+        message_with_relative_paths = error.message.gsub(project_root_path_matcher, '')
         if test.passed?
           nil
         elsif test.skipped?

data/lib/minitest/queue/test_data.rb

@@ -54,7 +54,11 @@ module Minitest
 
       def test_file_path
         path = @test.source_location.first
-        relative_path_for(path)
+        begin
+          relative_path_for(path)
+        rescue ArgumentError
+          path # e.g. "(eval)" etc.
+        end
       end
 
       def test_file_line_number

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.6
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement