knapsack_pro 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23f9763190e37db931c1457e71dccca8ef1f9d6fcd99fe50b28b1571366833cc
-  data.tar.gz: d93d4734cf560ecc77ae06959562c1fcf1ac61489671f374c3fc8a3e2f2e040a
+  metadata.gz: 6c1d109eab55a41f0ad16de94f9675299a8df07eca2c1bca2edf92c588fe2adb
+  data.tar.gz: 05d6fec7a5c6a8d594b78e80eecff4bad0282e4f10bb5e772eae25d659c39bb3
 SHA512:
-  metadata.gz: 254b42538b48ef6483e2479e4db2f5619389df83496443b6924a6953b2d49485563615888864cb0ec3696cb36e2f0338873294ffa559461076ba4033929134bc
-  data.tar.gz: 310f6d28741d8631bba32b205e0f4a86a47b775f0c8f732a272ecf1151c88b2ca46e1975657f5fa5dcaaefefbaa2b2668b9e65e876addf838aa4013e83770723
+  metadata.gz: 01bd206ae95503b54abad29acc5bd29e658b5ee9b8fe0c7d31b1a78e8aee0b364a0d74f619306633e599f004a2e2fdb8c8b188b389e5e26255838c9b17b45c33
+  data.tar.gz: 7067285b1dc323859d8547df7c6d3edcb7c1cfa2f14251be9a857d957212d08666fdd82ae1426c7a614d93692b86131283606e6b57e73f9a1064b47b4af9355a

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+### 3.4.1
+
+* Improve the RSpec Queue Mode runner log output (add seed)
+
+  https://github.com/KnapsackPro/knapsack_pro-ruby/pull/178
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v3.4.0...v3.4.1
+
 ### 3.4.0
 
 * Update documentation and code because the encryption feature does not work with the RSpec split by examples feature

data/lib/knapsack_pro/adapters/rspec_adapter.rb

@@ -12,16 +12,15 @@ module KnapsackPro
       end
 
       def self.has_tag_option?(cli_args)
-        # use start_with? because user can define tag option in a few ways:
-        # -t mytag
-        # -tmytag
-        # --tag mytag
-        # --tag=mytag
-        cli_args.any? { |arg| arg.start_with?('-t') || arg.start_with?('--tag') }
+        !!parsed_options(cli_args)&.[](:inclusion_filter)
       end
 
       def self.has_format_option?(cli_args)
-        cli_args.any? { |arg| arg.start_with?('-f') || arg.start_with?('--format') }
+        !!parsed_options(cli_args)&.[](:formatters)
+      end
+
+      def self.order_option(cli_args)
+        parsed_options(cli_args)&.[](:order)
       end
 
       def self.test_path(example)
@@ -107,6 +106,12 @@ module KnapsackPro
       def self.rspec_configuration
         ::RSpec.configuration
       end
+
+      def self.parsed_options(cli_args)
+        ::RSpec::Core::Parser.parse(cli_args)
+      rescue SystemExit
+        nil
+      end
     end
 
     # This is added to provide backwards compatibility

data/lib/knapsack_pro/runners/queue/rspec_runner.rb

@@ -2,6 +2,8 @@ module KnapsackPro
   module Runners
     module Queue
       class RSpecRunner < BaseRunner
+        @@used_seed = nil
+
         def self.run(args)
           require 'rspec/core'
           require_relative '../../formatters/rspec_queue_summary_formatter'
@@ -11,7 +13,6 @@ module KnapsackPro
           ENV['KNAPSACK_PRO_QUEUE_RECORDING_ENABLED'] = 'true'
           ENV['KNAPSACK_PRO_QUEUE_ID'] = KnapsackPro::Config::EnvGenerator.set_queue_id
 
-          adapter_class = KnapsackPro::Adapters::RSpecAdapter
           KnapsackPro::Config::Env.set_test_runner_adapter(adapter_class)
           runner = new(adapter_class)
 
@@ -61,6 +62,8 @@ module KnapsackPro
               KnapsackPro::Formatters::RSpecQueueSummaryFormatter.print_summary
               KnapsackPro::Formatters::RSpecQueueProfileFormatterExtension.print_summary
 
+              args += ['--seed', @@used_seed] if @@used_seed
+
               log_rspec_command(args, all_test_file_paths, :end_of_queue)
             end
 
@@ -82,12 +85,15 @@ module KnapsackPro
             all_test_file_paths += test_file_paths
             cli_args = args + test_file_paths
 
-            log_rspec_command(args, test_file_paths, :subset_queue)
-
             options = ::RSpec::Core::ConfigurationOptions.new(cli_args)
-            exit_code = ::RSpec::Core::Runner.new(options).run($stderr, $stdout)
+            rspec_runner = ::RSpec::Core::Runner.new(options)
+
+            exit_code = rspec_runner.run($stderr, $stdout)
             exitstatus = exit_code if exit_code != 0
 
+            printable_args = args_with_seed_option_added_when_viable(args, rspec_runner)
+            log_rspec_command(printable_args, test_file_paths, :subset_queue)
+
             rspec_clear_examples
 
             KnapsackPro::Hooks::Queue.call_after_subset_queue
@@ -107,19 +113,22 @@ module KnapsackPro
 
         private
 
+        def self.adapter_class
+          KnapsackPro::Adapters::RSpecAdapter
+        end
+
         def self.log_rspec_command(cli_args, test_file_paths, type)
           case type
           when :subset_queue
-            KnapsackPro.logger.info("To retry the last batch of tests fetched from the API Queue, please run the following command on your machine. (If you use the `-- order random` option, remember to add correct `--seed 123` that you can find at the end of the RSpec output.)")
+            KnapsackPro.logger.info("To retry the last batch of tests fetched from the API Queue, please run the following command on your machine:")
           when :end_of_queue
             KnapsackPro.logger.info("To retry all the tests assigned to this CI node, please run the following command on your machine:")
           end
 
-          stringify_cli_args = cli_args.join(' ')
-          stringify_cli_args.slice!("--format #{KnapsackPro::Formatters::RSpecQueueSummaryFormatter}")
+          stringified_cli_args = cli_args.join(' ').sub(" --format #{KnapsackPro::Formatters::RSpecQueueSummaryFormatter}", '')
 
           KnapsackPro.logger.info(
-            "bundle exec rspec #{stringify_cli_args} " +
+            "bundle exec rspec #{stringified_cli_args} " +
             KnapsackPro::TestFilePresenter.stringify_paths(test_file_paths)
           )
         end
@@ -151,6 +160,24 @@ module KnapsackPro
             ::RSpec.configuration.reset_filters
           end
         end
+
+        def self.args_with_seed_option_added_when_viable(args, rspec_runner)
+          order_option = adapter_class.order_option(args)
+
+          if order_option
+            # Don't add the seed option for order other than random, e.g. `defined`
+            return args unless order_option.include?('rand')
+            # Don't add the seed option if the seed is already set in args, e.g. `rand:12345`
+            return args if order_option.to_s.split(':')[1]
+          end
+
+          # Don't add the seed option if the seed was not used (i.e. a different order is being used, e.g. `defined`)
+          return args unless rspec_runner.configuration.seed_used?
+
+          @@used_seed = rspec_runner.configuration.seed.to_s
+
+          args + ['--seed', @@used_seed]
+        end
       end
     end
   end

data/lib/knapsack_pro/version.rb

@@ -1,3 +1,3 @@
 module KnapsackPro
-  VERSION = '3.4.0'
+  VERSION = '3.4.1'
 end

data/spec/knapsack_pro/adapters/rspec_adapter_spec.rb

@@ -110,6 +110,58 @@ describe KnapsackPro::Adapters::RSpecAdapter do
     end
   end
 
+  describe '.order_option' do
+    subject { described_class.order_option(cli_args) }
+
+    context "when order is 'defined'" do
+      let(:cli_args) { ['--order', 'defined'] }
+
+      it { expect(subject).to eq 'defined' }
+    end
+
+    context "when order is 'recently-modified'" do
+      let(:cli_args) { ['--order', 'recently-modified'] }
+
+      it { expect(subject).to eq 'recently-modified' }
+    end
+
+    context "when order is 'rand'" do
+      let(:cli_args) { ['--order', 'rand'] }
+
+      it { expect(subject).to eq 'rand' }
+
+      context 'with the seed' do
+        let(:cli_args) { ['--order', 'rand:123456'] }
+
+        it { expect(subject).to eq 'rand:123456' }
+      end
+    end
+
+    context "when order is 'random'" do
+      let(:cli_args) { ['--order', 'random'] }
+
+      it { expect(subject).to eq 'random' }
+
+      context 'with the seed' do
+        let(:cli_args) { ['--order', 'random:123456'] }
+
+        it { expect(subject).to eq 'random:123456' }
+      end
+    end
+
+    context 'when some custom order is specified' do
+      let(:cli_args) { ['--order', 'some-custom-order'] }
+
+      it { expect(subject).to eq 'some-custom-order' }
+    end
+
+    context "when the seed is given with the --seed command" do
+      let(:cli_args) { ['--seed', '123456'] }
+
+      it { expect(subject).to eq 'rand:123456' }
+    end
+  end
+
   describe '.test_path' do
     let(:example_group) do
       {

data/spec/knapsack_pro/runners/queue/rspec_runner_spec.rb

@@ -177,7 +177,7 @@ describe KnapsackPro::Runners::Queue::RSpecRunner do
   describe '.run_tests' do
     let(:runner) { instance_double(described_class) }
     let(:can_initialize_queue) { double(:can_initialize_queue) }
-    let(:args) { ['--example-arg', 'example-value', '--default-path', 'fake-test-dir'] }
+    let(:args) { ['--no-color', '--default-path', 'fake-test-dir'] }
     let(:exitstatus) { double }
     let(:all_test_file_paths) { [] }
     let(:accumulator) do
@@ -198,6 +198,8 @@ describe KnapsackPro::Runners::Queue::RSpecRunner do
 
     context 'when test files exist' do
       let(:test_file_paths) { ['a_spec.rb', 'b_spec.rb'] }
+      let(:logger) { double }
+      let(:rspec_seed) { 7771 }
 
       before do
         subset_queue_id = 'fake-subset-queue-id'
@@ -212,7 +214,7 @@ describe KnapsackPro::Runners::Queue::RSpecRunner do
 
         options = double
         expect(RSpec::Core::ConfigurationOptions).to receive(:new).with([
-          '--example-arg', 'example-value',
+          '--no-color',
           '--default-path', 'fake-test-dir',
           'a_spec.rb', 'b_spec.rb',
         ]).and_return(options)
@@ -226,6 +228,16 @@ describe KnapsackPro::Runners::Queue::RSpecRunner do
         expect(KnapsackPro::Hooks::Queue).to receive(:call_after_subset_queue)
 
         expect(KnapsackPro::Report).to receive(:save_subset_queue_to_file)
+
+        configuration = double
+        expect(rspec_core_runner).to receive(:configuration).twice.and_return(configuration)
+        expect(configuration).to receive(:seed_used?).and_return(true)
+        expect(configuration).to receive(:seed).and_return(rspec_seed)
+
+        expect(KnapsackPro).to receive(:logger).twice.and_return(logger)
+        expect(logger).to receive(:info)
+          .with("To retry the last batch of tests fetched from the API Queue, please run the following command on your machine:")
+        expect(logger).to receive(:info).with(/#{args.join(' ')} --seed #{rspec_seed}/)
       end
 
       context 'when exit code is zero' do
@@ -264,8 +276,13 @@ describe KnapsackPro::Runners::Queue::RSpecRunner do
 
       context 'when all_test_file_paths exist' do
         let(:all_test_file_paths) { ['a_spec.rb'] }
+        let(:logger) { double }
+
+        before do
+          described_class.class_variable_set(:@@used_seed, used_seed)
+
+          expect(KnapsackPro).to receive(:logger).twice.and_return(logger)
 
-        it do
           expect(KnapsackPro::Adapters::RSpecAdapter).to receive(:verify_bind_method_called)
 
           expect(KnapsackPro::Formatters::RSpecQueueSummaryFormatter).to receive(:print_summary)
@@ -274,10 +291,33 @@ describe KnapsackPro::Runners::Queue::RSpecRunner do
           expect(KnapsackPro::Hooks::Queue).to receive(:call_after_queue)
           expect(KnapsackPro::Report).to receive(:save_node_queue_to_api)
 
-          expect(subject).to eq({
-            status: :completed,
-            exitstatus: exitstatus,
-          })
+          expect(logger).to receive(:info)
+            .with('To retry all the tests assigned to this CI node, please run the following command on your machine:')
+          expect(logger).to receive(:info).with(logged_rspec_command_matcher)
+        end
+
+        context 'when @@used_seed has been set' do
+          let(:used_seed) { '8333' }
+          let(:logged_rspec_command_matcher) { /#{args.join(' ')} --seed #{used_seed} \"a_spec.rb"/ }
+
+          it do
+            expect(subject).to eq({
+              status: :completed,
+              exitstatus: exitstatus,
+            })
+          end
+        end
+
+        context 'when @@used_seed has not been set' do
+          let(:used_seed) { nil }
+          let(:logged_rspec_command_matcher) { /#{args.join(' ')} \"a_spec.rb"/ }
+
+          it do
+            expect(subject).to eq({
+              status: :completed,
+              exitstatus: exitstatus,
+            })
+          end
         end
       end
 
@@ -287,6 +327,7 @@ describe KnapsackPro::Runners::Queue::RSpecRunner do
         it do
           expect(KnapsackPro::Hooks::Queue).to receive(:call_after_queue)
           expect(KnapsackPro::Report).to receive(:save_node_queue_to_api)
+          expect(KnapsackPro).to_not receive(:logger)
 
           expect(subject).to eq({
             status: :completed,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - ArturT
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -390,7 +390,7 @@ metadata:
   documentation_uri: https://docs.knapsackpro.com/integration/
   homepage_uri: https://knapsackpro.com
   source_code_uri: https://github.com/KnapsackPro/knapsack_pro-ruby
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -405,8 +405,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Knapsack Pro splits tests across parallel CI nodes and ensures each parallel
   job finish work at a similar time.