knapsack_pro 10.0.1 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df1bd6fed96717579eafe72fc0587d8be51fc0542eecce91b663e37c8a239235
-  data.tar.gz: ac1c8349e0285f2f45d25690a3a5f4a237f8a61d221ba66946fead53e3a2b3bb
+  metadata.gz: 228fc40233719e372291f82fe1c6d5c25ed0396ae12fb3e0f28edac71e69754d
+  data.tar.gz: ce7cb564e98830745734efd59850e50c43c0abd49ed6131ecd4392801dd4758e
 SHA512:
-  metadata.gz: a7bd6ebbfd0760f8423207d2927d7f170fa1b81279ea0b4517d5727bf09195364b5aa4f8963cd6126120e18331385bab62c0bfd3d774bd36de7a9c8c32fccb54
-  data.tar.gz: 52b6553e650532ea35db97663d7619a7e34f9b8040ce9d50d000a0ef18fcf632e1a2e0c75e33e3c9227ae5dd51fce7bcaeac9d8a7c36a0a9cec0c23e97b1b377
+  metadata.gz: ff6be1076a78549e3f4a8f57362ec560cd482ddd332513280bf67155248e7066478291014cd6f166c904344be81d520f374fdb565884d4540f2344b8577739d1
+  data.tar.gz: 8131b135fa3f86574b77ae3576ed538c88c871073c1d9756f283ad88245a84ed50dd55ab203ab330a39e578e5aeedf3e700051f8bab3f622611db9380926e42a

data/lib/knapsack_pro/adapters/base_adapter.rb

@@ -41,15 +41,15 @@ module KnapsackPro
         KnapsackPro::Config::TempFiles.ensure_temp_directory_exists!
         File.write(self.class.adapter_bind_method_called_file, nil)
 
-        if KnapsackPro::Config::Env.regular_mode?
-          KnapsackPro.logger.debug('Regular Mode enabled.')
+        if KnapsackPro::Config::Env.single_batch_mode?
+          KnapsackPro.logger.debug('Single-Batch enabled.')
           bind_time_tracker
           bind_save_report
         end
 
-        if KnapsackPro::Config::Env.queue_mode?
-          KnapsackPro.logger.debug('Queue Mode enabled.')
-          bind_queue_mode
+        if KnapsackPro::Config::Env.normal_mode?
+          KnapsackPro.logger.debug('Enabled.')
+          bind_normal_mode
         end
       end
 
@@ -69,7 +69,7 @@ module KnapsackPro
         raise NotImplementedError
       end
 
-      def bind_queue_mode
+      def bind_normal_mode
         bind_before_queue_hook
         bind_after_queue_hook
         bind_time_tracker

data/lib/knapsack_pro/adapters/minitest_adapter.rb

@@ -54,7 +54,7 @@ module KnapsackPro
         @@parent_of_test_dir = File.expand_path('../', test_dir_path)
       end
 
-      module BindQueueModeMinitestPlugin
+      module BindNormalModeMinitestPlugin
         def before_setup
           super
 
@@ -74,8 +74,8 @@ module KnapsackPro
         end
       end
 
-      def bind_queue_mode
-        ::Minitest::Test.send(:include, BindQueueModeMinitestPlugin)
+      def bind_normal_mode
+        ::Minitest::Test.send(:include, BindNormalModeMinitestPlugin)
 
         add_post_run_callback do
           KnapsackPro.logger.debug(KnapsackPro::Presenter.global_time)

data/lib/knapsack_pro/adapters/rspec_adapter.rb

@@ -107,7 +107,7 @@ module KnapsackPro
 
       def bind_time_tracker
         ensure_no_focus!
-        bind_regular_mode_time_tracker
+        bind_single_batch_mode_time_tracker
         log_tests_duration
       end
 
@@ -136,8 +136,8 @@ module KnapsackPro
         end
       end
 
-      def bind_regular_mode_time_tracker
-        return unless KnapsackPro::Config::Env.regular_mode?
+      def bind_single_batch_mode_time_tracker
+        return unless KnapsackPro::Config::Env.single_batch_mode?
 
         ::RSpec.configure do |config|
           config.append_before(:suite) do

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

@@ -5,36 +5,7 @@ module KnapsackPro
     module API
       module V1
         class BuildDistributions < Base
-          TEST_SUITE_SPLIT_CACHE_MISS_CODE = 'TEST_SUITE_SPLIT_CACHE_MISS'
-
           class << self
-            def subset(args)
-              request_hash = {
-                :fixed_test_suite_split => KnapsackPro::Config::Env.fixed_test_suite_split,
-                :cache_read_attempt => args.fetch(:cache_read_attempt),
-                :commit_hash => args.fetch(:commit_hash),
-                :branch => args.fetch(:branch),
-                :node_total => args.fetch(:node_total),
-                :node_index => args.fetch(:node_index),
-                :ci_build_id => KnapsackPro::Config::Env.ci_node_build_id,
-                :user_seat => KnapsackPro::Config::Env.masked_user_seat,
-                :build_author => KnapsackPro::RepositoryAdapters::GitAdapter.new.build_author,
-                :commit_authors => KnapsackPro::RepositoryAdapters::GitAdapter.new.commit_authors,
-              }
-
-              unless request_hash[:cache_read_attempt]
-                request_hash.merge!({
-                  :test_files => args.fetch(:test_files)
-                })
-              end
-
-              action_class.new(
-                endpoint_path: '/v1/build_distributions/subset',
-                http_method: :post,
-                request_hash: request_hash
-              )
-            end
-
             def last(request_hash)
               action_class.new(
                 endpoint_path: '/v1/build_distributions/last',

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

@@ -15,10 +15,10 @@ module KnapsackPro
                 branch: args.fetch(:branch),
                 can_initialize_queue: args.fetch(:can_initialize_queue),
                 commit_hash: args.fetch(:commit_hash),
-                fixed_queue_split: KnapsackPro::Config::Env.fixed_queue_split_?,
                 node_index: args.fetch(:node_index),
                 node_total: args.fetch(:node_total),
                 node_uuid: args.fetch(:node_uuid),
+                single_batch: KnapsackPro::Config::Env.single_batch? || args.fetch(:single_batch, false),
                 test_queue_id: KnapsackPro::Config::Env.test_queue_id,
                 user_seat: KnapsackPro::Config::Env.masked_user_seat
               }
@@ -59,7 +59,6 @@ module KnapsackPro
                 can_initialize_queue: true,
                 commit_authors: git_adapter.commit_authors,
                 commit_hash: repository_adapter.commit_hash,
-                fixed_queue_split: KnapsackPro::Config::Env.fixed_queue_split_?,
                 node_index: KnapsackPro::Config::Env.ci_node_index,
                 node_total: KnapsackPro::Config::Env.ci_node_total,
                 node_uuid: SecureRandom.uuid,
@@ -87,7 +86,6 @@ module KnapsackPro
                 can_initialize_queue: true,
                 commit_authors: git_adapter.commit_authors,
                 commit_hash: repository_adapter.commit_hash,
-                fixed_queue_split: KnapsackPro::Config::Env.fixed_queue_split_?,
                 node_index: KnapsackPro::Config::Env.ci_node_index,
                 node_total: KnapsackPro::Config::Env.ci_node_total,
                 node_uuid: SecureRandom.uuid,

data/lib/knapsack_pro/client/connection.rb

@@ -136,24 +136,37 @@ module KnapsackPro
         @http_debug_output.string.each_line { |line| logger.warn(line.chomp) }
 
         require 'open3'
+        require 'shellwords'
+
+        host = endpoint_uri.host
+        port = endpoint_uri.port.to_s
+
         [
-          "dig #{endpoint_uri.host}",
-          "nslookup #{endpoint_uri.host}",
-          "curl -v #{endpoint_uri.host}:#{endpoint_uri.port}",
-          "nc -vz #{endpoint_uri.host} #{endpoint_uri.port}",
-          "openssl s_client -connect #{endpoint_uri.host}:#{endpoint_uri.port} < /dev/null",
-          'env | grep KNAPSACK_PRO | grep -v TOKEN'
-        ].each do |cmd|
-          logger.warn(cmd)
-          logger.warn('=' * cmd.size)
+          [['dig', host], {}],
+          [['nslookup', host], {}],
+          [['curl', '-v', "#{host}:#{port}"], {}],
+          [['nc', '-vz', host, port], {}],
+          [['openssl', 's_client', '-connect', "#{host}:#{port}"], { stdin_data: '' }]
+        ].each do |argv, options|
+          command = Shellwords.join(argv)
+          logger.warn(command)
+          logger.warn('=' * command.size)
           begin
-            outerr, status = Open3.capture2e(cmd)
+            outerr, status = Open3.capture2e(*argv, **options)
             logger.warn("Exit status: #{status.exitstatus}")
             outerr.each_line { |line| logger.warn(line.chomp) }
           rescue Errno::ENOENT => e
             logger.warn("Error: #{e}")
           end
         end
+
+        logger.warn('KNAPSACK_PRO_*')
+        logger.warn('==============')
+        ENV.each do |key, value|
+          next unless key.start_with?('KNAPSACK_PRO')
+          next if key.include?('TOKEN')
+          logger.warn("#{key}=#{value}")
+        end
       end
 
       def backoff(attempt_count)
@@ -225,10 +238,10 @@ module KnapsackPro
         # when Fallback Mode is disabled then try more attempts to connect to the API
         return 6 unless KnapsackPro::Config::Env.fallback_mode_enabled?
 
-        # when Regular Mode then try more attempts to connect to the API
+        # when Single-Batch Mode then try more attempts to connect to the API
         # if only one CI node starts Fallback Mode instead of all then we can't guarantee all test files will be run
         # https://github.com/KnapsackPro/knapsack_pro-ruby/pull/124
-        return 6 if KnapsackPro::Config::Env.regular_mode?
+        return 6 if KnapsackPro::Config::Env.single_batch_mode?
 
         # default number of attempts
         4

data/lib/knapsack_pro/commands.rb

@@ -12,49 +12,49 @@ module KnapsackPro
       true
     end
 
-    desc "rspec ['arguments']", "Parallelize RSpec with Knapsack Pro in Regular Mode"
+    desc "rspec ['arguments']", "Parallelize RSpec with Knapsack Pro (single batch)"
     def rspec(arguments = "")
       require "knapsack_pro"
       KnapsackPro::Runners::RSpecRunner.run(arguments)
     end
 
-    desc "queue:rspec ['arguments']", "Parallelize RSpec with Knapsack Pro in Queue Mode"
+    desc "queue:rspec ['arguments']", "Parallelize RSpec with Knapsack Pro"
     def queue_rspec(arguments = "")
       require "knapsack_pro"
       KnapsackPro::Runners::Queue::RSpecRunner.run(arguments)
     end
 
-    desc "cucumber ['arguments']", "Parallelize Cucumber with Knapsack Pro in Regular Mode"
+    desc "cucumber ['arguments']", "Parallelize Cucumber with Knapsack Pro (single batch)"
     def cucumber(arguments = "")
       require "knapsack_pro"
       KnapsackPro::Runners::CucumberRunner.run(arguments)
     end
 
-    desc "queue:cucumber ['arguments']", "Parallelize Cucumber with Knapsack Pro in Queue Mode"
+    desc "queue:cucumber ['arguments']", "Parallelize Cucumber with Knapsack Pro"
     def queue_cucumber(arguments = "")
       require "knapsack_pro"
       KnapsackPro::Runners::Queue::CucumberRunner.run(arguments)
     end
 
-    desc "minitest ['arguments']", "Parallelize Minitest with Knapsack Pro in Regular Mode"
+    desc "minitest ['arguments']", "Parallelize Minitest with Knapsack Pro (single batch)"
     def minitest(arguments = "")
       require "knapsack_pro"
       KnapsackPro::Runners::MinitestRunner.run(arguments)
     end
 
-    desc "queue:minitest ['arguments']", "Parallelize Minitest with Knapsack Pro in Queue Mode"
+    desc "queue:minitest ['arguments']", "Parallelize Minitest with Knapsack Pro"
     def queue_minitest(arguments = "")
       require "knapsack_pro"
       KnapsackPro::Runners::Queue::MinitestRunner.run(arguments)
     end
 
-    desc "test_unit ['arguments']", "Parallelize TestUnit with Knapsack Pro in Regular Mode"
+    desc "test_unit ['arguments']", "Parallelize TestUnit with Knapsack Pro (single batch)"
     def test_unit(arguments = "")
       require "knapsack_pro"
       KnapsackPro::Runners::TestUnitRunner.run(arguments)
     end
 
-    desc "spinach ['arguments']", "Parallelize Spinach with Knapsack Pro in Regular Mode"
+    desc "spinach ['arguments']", "Parallelize Spinach with Knapsack Pro (single batch)"
     def spinach(arguments = "")
       require "knapsack_pro"
       KnapsackPro::Runners::SpinachRunner.run(arguments)

data/lib/knapsack_pro/config/ci/app_veyor.rb

@@ -13,10 +13,6 @@ module KnapsackPro
           # not provided
         end
 
-        def node_build_id
-          ENV['APPVEYOR_BUILD_ID']
-        end
-
         def commit_hash
           ENV['APPVEYOR_REPO_COMMIT']
         end
@@ -37,10 +33,6 @@ module KnapsackPro
           ENV.key?('APPVEYOR') ? self.class : nil
         end
 
-        def fixed_queue_split
-          false
-        end
-
         def ci_provider
           "AppVeyor"
         end

data/lib/knapsack_pro/config/ci/base.rb

@@ -10,9 +10,6 @@ module KnapsackPro
         def node_index
         end
 
-        def node_build_id
-        end
-
         def node_retry_count
         end
 
@@ -31,10 +28,6 @@ module KnapsackPro
         def detected
         end
 
-        def fixed_queue_split
-          true
-        end
-
         def ci_provider
           return 'AWS CodeBuild' if ENV.key?('CODEBUILD_BUILD_ARN')
           return 'Azure Pipelines' if ENV.key?('SYSTEM_TEAMFOUNDATIONCOLLECTIONURI')

data/lib/knapsack_pro/config/ci/buildkite.rb

@@ -12,10 +12,6 @@ module KnapsackPro
           ENV['BUILDKITE_PARALLEL_JOB']
         end
 
-        def node_build_id
-          ENV['BUILDKITE_BUILD_NUMBER']
-        end
-
         def node_retry_count
           ENV['BUILDKITE_RETRY_COUNT']
         end
@@ -40,16 +36,12 @@ module KnapsackPro
           ENV.key?('BUILDKITE') ? self.class : nil
         end
 
-        def fixed_queue_split
-          true
-        end
-
         def ci_provider
           "Buildkite"
         end
 
         def test_queue_id
-          node_build_id
+          ENV['BUILDKITE_BUILD_NUMBER']
         end
       end
     end

data/lib/knapsack_pro/config/ci/circle.rb

@@ -12,10 +12,6 @@ module KnapsackPro
           ENV['CIRCLE_NODE_INDEX']
         end
 
-        def node_build_id
-          ENV['CIRCLE_BUILD_NUM']
-        end
-
         def commit_hash
           ENV['CIRCLE_SHA1']
         end
@@ -36,10 +32,6 @@ module KnapsackPro
           ENV.key?('CIRCLECI') ? self.class : nil
         end
 
-        def fixed_queue_split
-          false
-        end
-
         def ci_provider
           "CircleCI"
         end

data/lib/knapsack_pro/config/ci/cirrus_ci.rb

@@ -12,10 +12,6 @@ module KnapsackPro
           ENV['CI_NODE_INDEX']
         end
 
-        def node_build_id
-          ENV['CIRRUS_BUILD_ID']
-        end
-
         def commit_hash
           ENV['CIRRUS_CHANGE_IN_REPO']
         end
@@ -36,10 +32,6 @@ module KnapsackPro
           ENV.key?('CIRRUS_CI') ? self.class : nil
         end
 
-        def fixed_queue_split
-          false
-        end
-
         def ci_provider
           "Cirrus CI"
         end

data/lib/knapsack_pro/config/ci/codefresh.rb

@@ -13,10 +13,6 @@ module KnapsackPro
           # not provided
         end
 
-        def node_build_id
-          ENV['CF_BUILD_ID']
-        end
-
         def commit_hash
           ENV['CF_REVISION']
         end
@@ -37,10 +33,6 @@ module KnapsackPro
           ENV.key?('CF_BUILD_ID') ? self.class : nil
         end
 
-        def fixed_queue_split
-          false
-        end
-
         def ci_provider
           "Codefresh"
         end

data/lib/knapsack_pro/config/ci/codeship.rb

@@ -12,10 +12,6 @@ module KnapsackPro
           # not provided
         end
 
-        def node_build_id
-          ENV['CI_BUILD_NUMBER']
-        end
-
         def commit_hash
           ENV['CI_COMMIT_ID']
         end
@@ -36,10 +32,6 @@ module KnapsackPro
           ENV['CI_NAME'] == 'codeship' ? self.class : nil
         end
 
-        def fixed_queue_split
-          true
-        end
-
         def ci_provider
           "Codeship"
         end

data/lib/knapsack_pro/config/ci/github_actions.rb

@@ -13,11 +13,6 @@ module KnapsackPro
           # not provided
         end
 
-        def node_build_id
-          # A unique number for each run within a repository. This number does not change if you re-run the workflow run.
-          ENV['GITHUB_RUN_ID']
-        end
-
         def node_retry_count
           # A unique number for each attempt of a particular workflow run in a repository.
           # This number begins at 1 for the workflow run's first attempt, and increments with each re-run.
@@ -50,16 +45,13 @@ module KnapsackPro
           ENV.key?('GITHUB_ACTIONS') ? self.class : nil
         end
 
-        def fixed_queue_split
-          true
-        end
-
         def ci_provider
           "GitHub Actions"
         end
 
+        # A unique number for each run within a repository. This number does not change if you re-run the workflow run.
         def test_queue_id
-          node_build_id
+          ENV['GITHUB_RUN_ID']
         end
       end
     end

data/lib/knapsack_pro/config/ci/gitlab_ci.rb

@@ -16,11 +16,6 @@ module KnapsackPro
           index.to_i - 1 if index
         end
 
-        def node_build_id
-          ENV['CI_PIPELINE_ID'] || # Gitlab Release 9.0+
-          ENV['CI_BUILD_ID'] # Gitlab Release 8.x
-        end
-
         def commit_hash
           ENV['CI_COMMIT_SHA'] || # Gitlab Release 9.0+
           ENV['CI_BUILD_REF'] # Gitlab Release 8.x
@@ -44,10 +39,6 @@ module KnapsackPro
           ENV.key?('GITLAB_CI') ? self.class : nil
         end
 
-        def fixed_queue_split
-          true
-        end
-
         def ci_provider
           "Gitlab CI"
         end

data/lib/knapsack_pro/config/ci/heroku.rb

@@ -12,10 +12,6 @@ module KnapsackPro
           ENV['CI_NODE_INDEX']
         end
 
-        def node_build_id
-          ENV['HEROKU_TEST_RUN_ID']
-        end
-
         def commit_hash
           ENV['HEROKU_TEST_RUN_COMMIT_VERSION']
         end
@@ -25,7 +21,7 @@ module KnapsackPro
         end
 
         def project_dir
-          '/app' if node_build_id
+          '/app' if ENV['HEROKU_TEST_RUN_ID']
         end
 
         def user_seat
@@ -36,10 +32,6 @@ module KnapsackPro
           ENV.key?('HEROKU_TEST_RUN_ID') ? self.class : nil
         end
 
-        def fixed_queue_split
-          false
-        end
-
         def ci_provider
           "Heroku CI"
         end

data/lib/knapsack_pro/config/ci/semaphore.rb

@@ -15,10 +15,6 @@ module KnapsackPro
           index.to_i - 1 if index
         end
 
-        def node_build_id
-          ENV['SEMAPHORE_BUILD_NUMBER']
-        end
-
         def commit_hash
           ENV['REVISION']
         end
@@ -35,10 +31,6 @@ module KnapsackPro
           ENV.key?('SEMAPHORE_BUILD_NUMBER') ? self.class : nil
         end
 
-        def fixed_queue_split
-          false
-        end
-
         def ci_provider
           "Semaphore CI 1.0"
         end

data/lib/knapsack_pro/config/ci/semaphore2.rb

@@ -14,10 +14,6 @@ module KnapsackPro
           index.to_i - 1 if index
         end
 
-        def node_build_id
-          ENV['SEMAPHORE_WORKFLOW_ID']
-        end
-
         def commit_hash
           ENV['SEMAPHORE_GIT_SHA']
         end
@@ -42,10 +38,6 @@ module KnapsackPro
           ENV.key?('SEMAPHORE') && ENV.key?('SEMAPHORE_WORKFLOW_ID') ? self.class : nil
         end
 
-        def fixed_queue_split
-          false
-        end
-
         def ci_provider
           "Semaphore CI 2.0"
         end

data/lib/knapsack_pro/config/ci/travis.rb

@@ -4,10 +4,6 @@ module KnapsackPro
   module Config
     module CI
       class Travis < Base
-        def node_build_id
-          ENV['TRAVIS_BUILD_NUMBER']
-        end
-
         def commit_hash
           ENV['TRAVIS_COMMIT']
         end
@@ -28,10 +24,6 @@ module KnapsackPro
           ENV.key?('TRAVIS') ? self.class : nil
         end
 
-        def fixed_queue_split
-          true
-        end
-
         def ci_provider
           "Travis CI"
         end