flakey_spec_catcher 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 993c31c2baefd8e58b525db89b1ff79ea1d6220c2d515151fda4ce2c2bcd6df7
-  data.tar.gz: 4760b425917fc1284e46eaaa73e8cf48f4f1f6224fc423beb18f749df6756d0f
+  metadata.gz: bbde8c00cdc9c8c24d9d81572fe3217d73114d7d360a87ff4f08adea746aae55
+  data.tar.gz: 8142ae2b56440f6a53db1b03c3e736a5556aed9c31945e0ccfbfc3a5d9df5b3b
 SHA512:
-  metadata.gz: 59be5545a0be53ffc435a299458d665893c35b7df44d9d3c8a8522792cd3ad68069b777d0ac9bd4bc8f10850ad38f679bcaac5fa198023836fe472b633daf401
-  data.tar.gz: aff2fe42b718049783361bf81d554182928963cc0e9bb0a4a27d9d0ceef7cc72dfbc155e24ad6a1a0c5effb5621ac35b3ae2c69f7c3ed8b16d87107eafecacc4
+  metadata.gz: 69f5f46b6dc7a8cf31c030b16a3a129dc5768b60214abc9cf603facc4ad3c94d2ee2df7a08838c9b033d91941dc7af4b388861f94b0f539466a107b2dfd10a7c
+  data.tar.gz: 72325c48ca9c58ab7f65f569905b3a4782b9678cf608f86c9b8982f4b6cc70c797e5a6ee6ab04c7d35c1c9275c35d48d9b1f38b1e9d60e08bf8caf357db08db2

data/lib/flakey_spec_catcher/cli_override.rb

@@ -7,7 +7,7 @@ module FlakeySpecCatcher
   #
   # Captures command line arguments for manual re-runs
   class CliOverride
-    attr_reader :rerun_pattern, :rerun_usage, :repeat_factor, :enable_runs, :excluded_tags
+    attr_reader :rerun_patterns, :rerun_usage, :repeat_factor, :enable_runs, :excluded_tags
 
     def initialize
       @enable_runs = true
@@ -23,19 +23,20 @@ module FlakeySpecCatcher
         opts.banner = 'Usage: flakey_spec_catcher [OPTIONS]'
 
         opts.on('-t', '--test=TEST_NAME',
-                'Specify a spec as `path/to/file:line_number` or `file/path` to run') do |test|
-          @rerun_pattern = remove_formatter_quotes(test)
+                'Specify one or more specs in comma separated list ' \
+                'as `<path/to/file:line_number>, <path/to/file:line_number>...`') do |test|
+          @rerun_patterns = remove_formatter_quotes(test)
         end
 
         opts.on('-u', '--usage=USAGE', 'Specify a re-run usage for the manual re-run') do |usage|
-          raise ArgumentError if @rerun_pattern.nil?
+          raise ArgumentError if @rerun_patterns.nil?
 
           @rerun_usage = remove_formatter_quotes(usage)
         end
 
         opts.on('-r', '--repeat=REPEAT_FACTOR',
                 'Specify a repeat factor for the manual re-run(s)') do |repeat|
-          raise ArgumentError if @rerun_pattern.nil?
+          raise ArgumentError if @rerun_patterns.nil?
 
           parsed_repeat_factor = remove_formatter_quotes(repeat).to_i
           @repeat_factor = parsed_repeat_factor if parsed_repeat_factor.positive?

data/lib/flakey_spec_catcher/rerun_manager.rb

@@ -20,11 +20,11 @@ module FlakeySpecCatcher
     end
 
     def determine_rerun_usage
-      if @user_config.manual_rerun_pattern.nil?
+      if @user_config.manual_rerun_patterns.nil?
         pair_reruns_with_usages
       else
         @rerun_capsules.clear
-        inject_manual_reruns(@user_config.manual_rerun_pattern,
+        inject_manual_reruns(@user_config.manual_rerun_patterns,
                              @user_config.manual_rerun_usage)
       end
     end
@@ -81,31 +81,33 @@ module FlakeySpecCatcher
     end
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    def inject_manual_reruns(pattern, usage)
-      # Check if file exists first and handle if user supplies testcase:line_number
-      file_name = pattern.split(':')[0]
-      line_number_present = pattern.split(':').count > 1
-      matching_files = Dir.glob(file_name)
-
-      # If no file matches are run, don't queue up re-runs
-      if matching_files.count.zero?
-        puts "Specified pattern #{pattern} did not match an existing file"
-        raise ArgumentError
-      end
-
-      # It won't make sense to have multiple files to run with one specific line number
-      if line_number_present
-        if matching_files.count > 1
-          puts "Specified pattern #{pattern} matched multiple files but a line number was specified"
+    def inject_manual_reruns(patterns, usage)
+      patterns.tr(' ', '').split(',').each do |pattern|
+        # Check if file exists first and handle if user supplies testcase:line_number
+        file_name = pattern.split(':')[0]
+        line_number_present = pattern.split(':').count > 1
+        matching_files = Dir.glob(file_name)
+
+        # If no file matches are run, don't queue up re-runs
+        if matching_files.count.zero?
+          puts "Specified pattern #{pattern} did not match an existing file"
           raise ArgumentError
-        else
-          add_rerun_capsule(testcase: pattern, usage: usage)
         end
 
-      # No line numbers, queue up all matching files
-      else
-        matching_files.each do |file|
-          add_rerun_capsule(testcase: file, usage: usage)
+        # It won't make sense to have multiple files to run with one specific line number
+        if line_number_present
+          if matching_files.count > 1
+            puts "Specified pattern #{pattern} matched multiple files but a line number was given"
+            raise ArgumentError
+          else
+            add_rerun_capsule(testcase: pattern, usage: usage)
+          end
+
+        # No line numbers, queue up all matching files
+        else
+          matching_files.each do |file|
+            add_rerun_capsule(testcase: file, usage: usage)
+          end
         end
       end
     end

data/lib/flakey_spec_catcher/user_config.rb

@@ -10,7 +10,7 @@ module FlakeySpecCatcher
   class UserConfig
     attr_reader :repeat_factor, :ignore_files, :ignore_branches, :silent_mode
     attr_reader :rerun_file_only, :rspec_usage_patterns, :excluded_tags
-    attr_reader :manual_rerun_pattern, :manual_rerun_usage
+    attr_reader :manual_rerun_patterns, :manual_rerun_usage
     attr_reader :enable_runs
 
     USER_CONFIG_ENV_VARS = %w[FSC_REPEAT_FACTOR FSC_IGNORE_FILES FSC_IGNORE_BRANCHES
@@ -38,13 +38,13 @@ module FlakeySpecCatcher
 
     def override_settings
       apply_cli_override
-      return unless @manual_rerun_pattern.nil?
+      return unless @manual_rerun_patterns.nil?
 
       parse_commit_message
     end
 
     def apply_cli_override
-      @manual_rerun_pattern = @cli_override.rerun_pattern
+      @manual_rerun_patterns = @cli_override.rerun_patterns
       @manual_rerun_usage = @cli_override.rerun_usage
       @repeat_factor = @cli_override.repeat_factor if @cli_override.repeat_factor.to_i.positive?
       @enable_runs = @cli_override.enable_runs

data/lib/flakey_spec_catcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlakeySpecCatcher
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flakey_spec_catcher
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Brian Watson