knapsack_pro 10.0.0 → 11.0.0

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

@@ -13,7 +13,6 @@ module KnapsackPro
           KnapsackPro::Extensions::RSpecExtension.setup!
 
           ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = KnapsackPro::Config::Env.test_suite_token_rspec
-          ENV['KNAPSACK_PRO_NODE_UUID'] = SecureRandom.uuid
 
           rspec_pure = KnapsackPro::Pure::Queue::RSpecPure.new
 
@@ -119,10 +118,10 @@ module KnapsackPro
 
         private
 
-        def post_trap_signals
+        def post_trap_signals(debug: false)
           RSpec.world.wants_to_quit = true
 
-          log_current_batch_rspec_command
+          log_current_batch_rspec_command if debug
         end
 
         def log_current_tests(threads)
@@ -145,7 +144,7 @@ module KnapsackPro
         end
 
         def pre_run_setup
-          ENV['KNAPSACK_PRO_QUEUE_MODE_ENABLED'] = 'true'
+          ENV['KNAPSACK_PRO_NORMAL_MODE_ENABLED'] = 'true'
           ENV['KNAPSACK_PRO_QUEUE_ID'] = KnapsackPro::Config::EnvGenerator.set_queue_id
 
           KnapsackPro::Config::Env.set_test_runner_adapter(@adapter_class)

data/lib/knapsack_pro/runners/rspec_runner.rb

@@ -7,8 +7,9 @@ module KnapsackPro
         require 'rspec/core'
 
         ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = KnapsackPro::Config::Env.test_suite_token_rspec
-        ENV['KNAPSACK_PRO_REGULAR_MODE_ENABLED'] = 'true'
+        ENV['KNAPSACK_PRO_SINGLE_BATCH_MODE_ENABLED'] = 'true'
         ENV['KNAPSACK_PRO_RSPEC_OPTIONS'] = args.to_s
+        ENV['KNAPSACK_PRO_NODE_UUID'] = SecureRandom.uuid
 
         adapter_class = KnapsackPro::Adapters::RSpecAdapter
         KnapsackPro::Config::Env.set_test_runner_adapter(adapter_class)

data/lib/knapsack_pro/runners/spinach_runner.rb

@@ -5,6 +5,7 @@ module KnapsackPro
     class SpinachRunner < BaseRunner
       def self.run(args)
         ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = KnapsackPro::Config::Env.test_suite_token_spinach
+        ENV['KNAPSACK_PRO_NODE_UUID'] = SecureRandom.uuid
 
         adapter_class = KnapsackPro::Adapters::SpinachAdapter
         KnapsackPro::Config::Env.set_test_runner_adapter(adapter_class)
@@ -15,7 +16,7 @@ module KnapsackPro
 
           KnapsackPro.tracker.set_prerun_tests(runner.test_file_paths)
 
-          cmd = %Q[KNAPSACK_PRO_REGULAR_MODE_ENABLED=true KNAPSACK_PRO_TEST_SUITE_TOKEN=#{ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN']} bundle exec spinach #{args} --features_path #{runner.test_dir} -- #{runner.stringify_test_file_paths}]
+          cmd = %Q[KNAPSACK_PRO_SINGLE_BATCH_MODE_ENABLED=true KNAPSACK_PRO_TEST_SUITE_TOKEN=#{ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN']} bundle exec spinach #{args} --features_path #{runner.test_dir} -- #{runner.stringify_test_file_paths}]
 
           Kernel.exec(cmd)
         end

data/lib/knapsack_pro/runners/test_unit_runner.rb

@@ -5,7 +5,8 @@ module KnapsackPro
     class TestUnitRunner < BaseRunner
       def self.run(args)
         ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = KnapsackPro::Config::Env.test_suite_token_test_unit
-        ENV['KNAPSACK_PRO_REGULAR_MODE_ENABLED'] = 'true'
+        ENV['KNAPSACK_PRO_SINGLE_BATCH_MODE_ENABLED'] = 'true'
+        ENV['KNAPSACK_PRO_NODE_UUID'] = SecureRandom.uuid
 
         adapter_class = KnapsackPro::Adapters::TestUnitAdapter
         KnapsackPro::Config::Env.set_test_runner_adapter(adapter_class)

data/lib/knapsack_pro/tracker.rb

@@ -4,8 +4,6 @@ module KnapsackPro
   class Tracker
     include Singleton
 
-    # when test file is pending, empty with no tests or has syntax error then assume time execution
-    # to better allocate it in Queue Mode for future CI build runs
     DEFAULT_TEST_FILE_TIME = 0.0 # seconds
 
     attr_reader :global_time, :test_files_with_time, :prerun_tests_loaded
@@ -22,7 +20,7 @@ module KnapsackPro
 
       # Remove report only when the reset! method is called explicitly.
       # The report should be persisted on the disk so that multiple tracker instances can share the report state.
-      # Tracker instance can be created by knapsack_pro process and a separate tracker is created by rake task (e.g., RSpec) in Regular Mode.
+      # Tracker instance can be created by knapsack_pro process and a separate tracker is created by rake task (e.g., RSpec) in Single-Batch Mode.
       File.delete(prerun_tests_report_path) if File.exist?(prerun_tests_report_path)
     end
 
@@ -71,7 +69,7 @@ module KnapsackPro
 
     def to_a
       # When the test files are not loaded in the memory then load them from the disk.
-      # Useful for the Regular Mode when the memory is not shared between tracker instances.
+      # Useful for the Single-Batch Mode when the memory is not shared between tracker instances.
       # Tracker instance can be created by knapsack_pro process and a separate tracker is created by rake task (e.g., RSpec)
       load_prerun_tests unless prerun_tests_loaded
 

data/lib/knapsack_pro/urls.rb

@@ -12,21 +12,15 @@ module KnapsackPro
 
     FALLBACK_MODE = "#{HOST}/perma/ruby/fallback-mode"
 
-    FIXED_QUEUE_SPLIT = "#{HOST}/perma/ruby/fixed-queue-split"
-
-    FIXED_TEST_SUITE_SPLIT = "#{HOST}/perma/ruby/fixed-test-suite-split"
-
     INSTALLATION_GUIDE = "#{HOST}/perma/ruby/installation-guide"
 
-    KNAPSACK_PRO_CI_NODE_BUILD_ID = "#{HOST}/perma/ruby/knapsack-pro-ci-node-build-id"
-
-    QUEUE_MODE__CONNECTION_ERROR_WITH_FALLBACK_ENABLED_FALSE = "#{HOST}/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false"
+    NORMAL_MODE__CONNECTION_ERROR_WITH_FALLBACK_ENABLED_FALSE = "#{HOST}/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false"
 
-    QUEUE_MODE__CONNECTION_ERROR_WITH_FALLBACK_ENABLED_TRUE_AND_POSITIVE_RETRY_COUNT = "#{HOST}/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count"
+    NORMAL_MODE__CONNECTION_ERROR_WITH_FALLBACK_ENABLED_TRUE_AND_POSITIVE_RETRY_COUNT = "#{HOST}/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count"
 
-    REGULAR_MODE__CONNECTION_ERROR_WITH_FALLBACK_ENABLED_FALSE = "#{HOST}/perma/ruby/regular-mode-connection-error-with-fallback-enabled-false"
+    SINGLE_BATCH_MODE__CONNECTION_ERROR_WITH_FALLBACK_ENABLED_FALSE = "#{HOST}/perma/ruby/regular-mode-connection-error-with-fallback-enabled-false"
 
-    REGULAR_MODE__CONNECTION_ERROR_WITH_FALLBACK_ENABLED_TRUE_AND_POSITIVE_RETRY_COUNT = "#{HOST}/perma/ruby/regular-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count"
+    SINGLE_BATCH_MODE__CONNECTION_ERROR_WITH_FALLBACK_ENABLED_TRUE_AND_POSITIVE_RETRY_COUNT = "#{HOST}/perma/ruby/regular-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count"
 
     RSPEC__DEPRECATED_RUN_ALL_WHEN_EVERYTHING_FILTERED = "#{HOST}/perma/ruby/rspec-deprecated-run-all-when-everything-filtered"
 

data/lib/knapsack_pro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KnapsackPro
-  VERSION = '10.0.0'
+  VERSION = '11.0.0'
 end

data/lib/tasks/queue/rspec.rake

@@ -5,7 +5,11 @@ require 'knapsack_pro'
 namespace :knapsack_pro do
   namespace :queue do
     task :rspec, [:rspec_args] do |_, args|
-      Kernel.exec("RAILS_ENV=test RACK_ENV=test #{$PROGRAM_NAME} 'knapsack_pro:queue:rspec_go[#{args[:rspec_args]}]'")
+      if ENV.fetch('KNAPSACK_PRO_SINGLE_BATCH', 'false') == 'true'
+        KnapsackPro::Runners::RSpecRunner.run(args[:rspec_args])
+      else
+        Kernel.exec("RAILS_ENV=test RACK_ENV=test #{$PROGRAM_NAME} 'knapsack_pro:queue:rspec_go[#{args[:rspec_args]}]'")
+      end
     end
 
     task :rspec_go, [:rspec_args] do |_, args|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 11.0.0
 platform: ruby
 authors:
 - ArturT
@@ -217,7 +217,6 @@ files:
 - lib/knapsack_pro/client/api/v1/base.rb
 - lib/knapsack_pro/client/api/v1/build_distributions.rb
 - lib/knapsack_pro/client/api/v1/build_subsets.rb
-- lib/knapsack_pro/client/api/v1/queues.rb
 - lib/knapsack_pro/client/api/v2/queues.rb
 - lib/knapsack_pro/client/connection.rb
 - lib/knapsack_pro/commands.rb
@@ -321,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Knapsack Pro splits tests across parallel CI nodes and ensures each parallel
   job finish work at a similar time.

data/lib/knapsack_pro/client/api/v1/queues.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module KnapsackPro
-  module Client
-    module API
-      module V1
-        class Queues < Base
-          CODE_ATTEMPT_CONNECT_TO_QUEUE_FAILED = 'ATTEMPT_CONNECT_TO_QUEUE_FAILED'
-
-          class << self
-            def queue(args)
-              request_hash = {
-                :fixed_queue_split => KnapsackPro::Config::Env.fixed_queue_split,
-                :can_initialize_queue => args.fetch(:can_initialize_queue),
-                :attempt_connect_to_queue => args.fetch(:attempt_connect_to_queue),
-                :commit_hash => args.fetch(:commit_hash),
-                :branch => args.fetch(:branch),
-                :node_total => args.fetch(:node_total),
-                :node_index => args.fetch(:node_index),
-                :node_build_id => KnapsackPro::Config::Env.ci_node_build_id,
-                :user_seat => KnapsackPro::Config::Env.masked_user_seat,
-                batch_uuid: args.fetch(:batch_uuid)
-              }
-
-              if request_hash[:can_initialize_queue] && !request_hash[:attempt_connect_to_queue]
-                request_hash.merge!({
-                  :test_files => args.fetch(:test_files),
-                  :build_author => KnapsackPro::RepositoryAdapters::GitAdapter.new.build_author,
-                  :commit_authors => KnapsackPro::RepositoryAdapters::GitAdapter.new.commit_authors,
-                })
-              end
-
-              action_class.new(
-                endpoint_path: '/v1/queues/queue',
-                http_method: :post,
-                request_hash: request_hash
-              )
-            end
-          end
-        end
-      end
-    end
-  end
-end