flakey_spec_catcher 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc06031fb90bd9c4c2c6fa24adba0ae0cf1258a59a1e0da987c8c1d8ab55fb40
-  data.tar.gz: 0f57f9915d914fd6beef160a48a15fa1506f6eb227c02c9494e289d2b1777f98
+  metadata.gz: 924bcd5b7fe71399bc43663478b9b238731e9920e4fcc8c54ba8977a345ee065
+  data.tar.gz: '080682849736c9d46acd6eeeb8ccc8e98115fb9558004e821f4beed33dfd455e'
 SHA512:
-  metadata.gz: c8b176b42027dd46fd4babcf98920558d42fa21a59e396cf1874758552def055d7a02fce1a4fecf02f4f312e8be79401d978816f83b58f7b59ec82b2cde1875e
-  data.tar.gz: 6883e6f623ef3d94d9eca75d78eae51086111358a1e0951a4c44ebb989e8661650f0203f408f3b22cbe99758eea4b7fb8a0927b872abedc179f88d8a35d4b799
+  metadata.gz: 68cf5c4b41ae6b158a501bab2a6134a40dd1d0ca3d7ce26452948b986ddf713d443458643d2a27a8ff565b9856c647867630015c78dc2f9e7784bf31b0d772e4
+  data.tar.gz: cee42fcbf243eaa03e56745491515ae7580e2e7974d751faef5f2387c40f07cb20b9f225d188e04009950b7cfd339720e406b789f4e7fa2ec537c2c109b81c18

data/lib/flakey_spec_catcher/cli_override.rb

@@ -7,12 +7,13 @@ module FlakeySpecCatcher
   #
   # Captures command line arguments for manual re-runs
   class CliOverride
-    attr_reader :rerun_patterns, :rerun_usage, :repeat_factor, :enable_runs, :excluded_tags
+    attr_reader :rerun_patterns, :rerun_usage, :repeat_factor, :enable_runs, :excluded_tags, :use_parent
     attr_reader :output_file
 
     def initialize
       @enable_runs = true
       @excluded_tags = []
+      @use_parent = false
       parse_command_line_args
     end
 
@@ -23,6 +24,11 @@ module FlakeySpecCatcher
       OptionParser.new do |opts|
         opts.banner = 'Usage: flakey_spec_catcher [OPTIONS]'
 
+        opts.on('--use-parent',
+                'Use the parent of commit for git diff instead of the Head of SCM') do
+          @use_parent = true
+        end
+
         opts.on('-t', '--test=TEST_NAME',
                 'Specify one or more specs in comma separated list ' \
                 'as `<path/to/file:line_number>, <path/to/file:line_number>...`') do |test|

data/lib/flakey_spec_catcher/git_controller.rb

@@ -19,7 +19,10 @@ module FlakeySpecCatcher
     attr_reader :branch, :remote, :working_commit_sha, :base_commit_sha, :git_comparison
     attr_reader :capsule_manager
 
-    def initialize(test_mode: false, capsule_manager: FlakeySpecCatcher::CapsuleManager.new)
+    def initialize(test_mode: false, capsule_manager: FlakeySpecCatcher::CapsuleManager.new,
+      user_config: FlakeySpecCatcher::UserConfig.new)
+
+      @user_config = user_config
       @remote = find_git_remote
       @branch = find_remote_branch
       @capsule_manager = capsule_manager
@@ -36,7 +39,9 @@ module FlakeySpecCatcher
 
     # Use 'origin' unless otherwise specified
     def find_git_remote
-      if ENV['FSC_GIT_REMOTE'].nil? || ENV['FSC_GIT_REMOTE'].strip.empty?
+      if @user_config.use_parent
+        nil
+      elsif ENV.fetch('FSC_GIT_REMOTE', '').empty?
         remotes = `git remote show`.split
         remotes.empty? ? nil : remotes[0]
       else

data/lib/flakey_spec_catcher/runner.rb

@@ -13,8 +13,8 @@ module FlakeySpecCatcher
     attr_reader :user_config, :rerun_manager, :git_controller
 
     def initialize(test_mode: false,
-      git_controller: FlakeySpecCatcher::GitController.new(test_mode: test_mode),
       user_config: FlakeySpecCatcher::UserConfig.new,
+      git_controller: FlakeySpecCatcher::GitController.new(test_mode: test_mode, user_config: user_config),
       result_manager: FlakeySpecCatcher::RspecResultManager.new(FlakeySpecCatcher::RspecResult),
       rerun_manager: FlakeySpecCatcher::RerunManager.new(git_controller: git_controller,
                                                          user_config: user_config))
@@ -29,8 +29,8 @@ module FlakeySpecCatcher
     # rubocop:disable Metrics/AbcSize
     def show_settings
       puts 'Flakey Spec Catcher Settings:'
-      puts "  Current Branch: #{@git_controller.branch}"
-      puts "  Remote: #{@git_controller.remote}"
+      puts "  Current Branch: #{@git_controller.branch}" unless @user_config.use_parent
+      puts "  Remote: #{@git_controller.remote}" unless @user_config.use_parent
       puts "  Current Sha: #{@git_controller.working_commit_sha}"
       puts "  Base Sha: #{@git_controller.base_commit_sha}"
       puts "  Repeat factor: #{@user_config.repeat_factor}"

data/lib/flakey_spec_catcher/user_config.rb

@@ -10,7 +10,7 @@ module FlakeySpecCatcher
     attr_reader :repeat_factor, :ignore_files, :ignore_branches, :silent_mode
     attr_reader :rerun_file_only, :rspec_usage_patterns, :excluded_tags
     attr_reader :manual_rerun_patterns, :manual_rerun_usage
-    attr_reader :enable_runs, :output_file
+    attr_reader :enable_runs, :output_file, :use_parent
 
     USER_CONFIG_ENV_VARS = %w[FSC_REPEAT_FACTOR FSC_IGNORE_FILES FSC_IGNORE_BRANCHES
                               FSC_SILENT_MODE FSC_RERUN_FILE_ONLY FSC_USAGE_PATTERNS
@@ -47,6 +47,7 @@ module FlakeySpecCatcher
     def apply_cli_override
       @manual_rerun_patterns = @cli_override.rerun_patterns
       @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?
       @enable_runs = @cli_override.enable_runs
       @excluded_tags = if @cli_override.excluded_tags.empty?

data/lib/flakey_spec_catcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flakey_spec_catcher
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Brian Watson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Run new or changed specs many times to prevent unreliable specs