flakey_spec_catcher 0.9.8 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fce0bbfeef6c7ba89586f7d59b64084329d685108396037f77dec4276cf7a402
-  data.tar.gz: 015d979e822fb914c0eaecbe1a518eb2971fba7d1a1d41c13e5ffb83e184b0f3
+  metadata.gz: 9894969be42fdb7dfafa961942ce16b1313ca3cffdc746d9613ebe1398d39069
+  data.tar.gz: 75238a79f25ddb8cec6fd60064e9f06d5f5651b8bb3c27e423f317f653f65774
 SHA512:
-  metadata.gz: fa94174f28662dc5d1e10be69879852c9b7f1947dfa7acfcafc462916a9fa405a1fd8807a79a81f9cbf83fd91bc930370bae54491f892da7f90e9b3c1b2440c5
-  data.tar.gz: 2ce6f81244240c34a64a1c8319d95e56a50d24f270642f77ad5edf1f33464e8b2df601c2e6d20ca6705eca94f683e30caa81138b8909f57e0b301b5a897a09c4
+  metadata.gz: d3698a10fd2c5d4ae75f3fe0250d7578a82906eb6ad478c759756911501b8f53125a63f1ced325e51c6115a9f76c7ac2264ae28a42c8b65273376186e8e7aa34
+  data.tar.gz: 440e5ef180775556f3292548330cf9572db13d82394921fbbca6053b37ed4c088aa5c37b9dcb06ab2fb4049879c7fe2a093a60cf05da649abb950bf01d0af6cf

data/.gitignore

@@ -1,3 +1,4 @@
+/.byebug_history
 /coverage
 /Gemfile.lock
 /flakey_spec_catcher-*.gem

data/flakey_spec_catcher.gemspec

@@ -28,11 +28,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.metadata['allowed_push_host'] = 'https://rubygems.org'
-  gem.required_ruby_version         = '>= 2.3'
+  gem.required_ruby_version         = '>= 2.6'
 
-  gem.add_dependency 'rspec', '~> 3.8'
+  gem.add_dependency 'rspec', '~> 3.10'
+  gem.add_development_dependency 'byebug', '~> 11.1'
   gem.add_development_dependency 'climate_control', '~> 0.2'
-  gem.add_development_dependency 'rake', '~> 12.3'
-  gem.add_development_dependency 'simplecov', '~> 0.17'
+  gem.add_development_dependency 'rake', '~> 13.0'
+  gem.add_development_dependency 'rubocop', '~> 0.93.1'
+  gem.add_development_dependency 'simplecov', '~> 0.19'
 end
 # rubocop:enable Layout/ExtraSpacing, Layout/SpaceAroundOperators

data/lib/flakey_spec_catcher/cli_override.rb

@@ -8,7 +8,7 @@ module FlakeySpecCatcher
   # Captures command line arguments for manual re-runs
   class CliOverride
     attr_reader :rerun_patterns, :rerun_usage, :repeat_factor, :enable_runs, :excluded_tags, :use_parent, :dry_run
-    attr_reader :output_file, :split_nodes, :split_index, :verbose, :test_options
+    attr_reader :output_file, :split_nodes, :split_index, :verbose, :test_options, :break_on_first_failure
 
     def initialize
       @dry_run = false
@@ -56,6 +56,10 @@ module FlakeySpecCatcher
           @repeat_factor = remove_formatter_quotes(repeat).to_i
         end
 
+        opts.on('--break-on-first-failure', 'Break on first failure') do |break_on_first_failure|
+          @break_on_first_failure = break_on_first_failure
+        end
+
         opts.on('-e', '--excluded-tags=EXCLUDED_TAGS',
                 'Specify tags to exclude in a comma separated list') do |tags|
           @excluded_tags = parse_tags(tags)

data/lib/flakey_spec_catcher/git_controller.rb

@@ -56,45 +56,12 @@ module FlakeySpecCatcher
       return nil if @remote.nil?
 
       working_branch = `git branch | grep '*'`.delete('*').gsub(/\s+/, '')
-      # `git remote show origin` will show us if our branch is configured to push
-      #  to a non-master branch. Note that our push destination is what we're interested in
-      #  Assume master if no matches
-
-      # Example output
-      # * remote origin
-      # Fetch URL: gerrit:repo
-      # Push  URL: gerrit:repo
-      # HEAD branch: master
-      # Remote branches:
-      #   dev/reports           tracked
-      #   edge                  tracked
-      #   master                tracked
-      # Local branch configured for 'git pull':
-      #   master merges with remote master
-      # Local refs configured for 'git push':
-      #   dev/reports pushes to dev/reports                 (up to date)
-      #   master              pushes to master              (up to date)
-
-      remote_branches = `git remote show #{@remote}`.split("\n")
-
-      # Separate 'dev/reports pushes to dev/reports                 (up to date)' into
-      #  ['dev/reports', 'dev/reports'] or [<LOCAL BRANCH>, <REMOTE BRANCH>]
-      remote_pairs = remote_branches.map { |r| r.scan(/(\S*)\s+pushes to\s+(\S*)\s+/).flatten }
-
-      # check if the working branch (currently checked out branch) corresponds to a remote_pair
-      #  if so, use that remote pair for comparison, else use master
-      match = remote_pairs.find do |pair|
-        # working branch (pair[0]) pushes to remote (pair[1])
-        pair[0] == working_branch
-      end
+      branch_remote = `git config branch.#{working_branch}.remote`.strip
+      return 'master' unless @remote == branch_remote
 
-      remote_branch = if match.nil?
-        'master'
-      else
-        # match is formatted as [working_branch, remote]
-        match[1]
-      end
-      remote_branch
+      remote_branch = `git config branch.#{branch}.merge`.strip.sub(%r{^refs/heads/}, '')
+      remote_branch = nil if remote_branch.empty?
+      remote_branch || 'master'
     end
 
     def initialize_git_comparison(test_mode)
@@ -108,7 +75,7 @@ module FlakeySpecCatcher
       @git_comparison = "#{@base_commit_sha}..#{@working_commit_sha}"
     end
 
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
     def parse_changes
       # For each file, get the change block
       diff_files.each do |filename|
@@ -128,7 +95,7 @@ module FlakeySpecCatcher
         end
       end
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def identify_change_contexts
       @capsule_manager.change_capsules.each(&:fill_contexts)

data/lib/flakey_spec_catcher/runner.rb

@@ -36,6 +36,7 @@ module FlakeySpecCatcher
       puts "  Current Sha: #{@git_controller.working_commit_sha}"
       puts "  Base Sha: #{@git_controller.base_commit_sha}"
       puts "  Repeat factor: #{@user_config.repeat_factor}"
+      puts "  Break on first failure: #{@user_config.break_on_first_failure}" if @user_config.break_on_first_failure
       puts "  Node Total: #{@user_config.split_nodes}" if @user_config.split_nodes
       puts "  Node Index: #{@user_config.split_index}" if @user_config.split_index
       puts "  Changed Specs Detected: #{@git_controller.changed_examples}"
@@ -75,6 +76,7 @@ module FlakeySpecCatcher
         @user_config.repeat_factor.times do
           iteration_status = handle_capsule_rerun(capsule)
           status = [status, iteration_status].max
+          break if @user_config.break_on_first_failure && !status.zero?
         end
       end
 

data/lib/flakey_spec_catcher/user_config.rb

@@ -12,6 +12,7 @@ module FlakeySpecCatcher
     attr_reader :manual_rerun_patterns, :manual_rerun_usage
     attr_reader :enable_runs, :output_file, :use_parent, :dry_run
     attr_reader :split_nodes, :split_index, :verbose, :test_options
+    attr_reader :break_on_first_failure
 
     USER_CONFIG_ENV_VARS = %w[FSC_REPEAT_FACTOR FSC_IGNORE_FILES FSC_IGNORE_BRANCHES
                               FSC_SILENT_MODE FSC_RERUN_FILE_ONLY FSC_USAGE_PATTERNS
@@ -44,6 +45,7 @@ module FlakeySpecCatcher
       @manual_rerun_usage = @cli_override.rerun_usage
       @use_parent = @cli_override.use_parent
       @repeat_factor = @cli_override.repeat_factor if @cli_override.repeat_factor.to_i.positive?
+      @break_on_first_failure = @cli_override.break_on_first_failure
       @enable_runs = @cli_override.enable_runs
       @dry_run = @cli_override.dry_run
       @split_nodes = @cli_override.split_nodes unless @cli_override.split_nodes.nil?

data/lib/flakey_spec_catcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flakey_spec_catcher
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.0
 platform: ruby
 authors:
 - Brian Watson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -18,14 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
@@ -46,28 +60,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.93.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 0.93.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.19'
 description:
 email:
 - bwatson@instructure.com
@@ -115,14 +143,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key:
 specification_version: 4
 summary: Run new or changed specs many times to prevent unreliable specs