selective-ruby-core 0.2.1-x86_64-darwin → 0.2.3-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11ddcb5704709ce00ae4ec05698aa432ed9b852aca35390546d7c466f137f53c
-  data.tar.gz: 8239f857c5f2a8bad1214c7fd8d42fbaed1c92da2802f0644920f71f9206c62c
+  metadata.gz: f3c2ada7869177656debc626f77920f3554ce00fb9c29c3b6d6ca33282190f69
+  data.tar.gz: 78fd7d5ee34a92ac3c85dae98c6278e4600c9735f07250c11a531af0aaaef899
 SHA512:
-  metadata.gz: 4adb3cc62a60fb9338dee1f1b899bdbb59c20f830bbe0280690658f06aad86ddafc79959757b056b8461b599a2cae2112e112b491b4ea5a5e62e50215b23c756
-  data.tar.gz: c22717d5aa0be28acaf4a443ffde4c43fba6da31c2010a111617e7c6e359a62b5bc04bf38273689821458812b6efa4b6b567009adb413323e6da5be9d4347bef
+  metadata.gz: d020bf7e569391e88b9a31e7290c2898b4ae0597da69146e265b9362dcf8f3fa6a226ed023e69c888b64b89d9037512847620603b1993c90a67e7111a1c6a00b
+  data.tar.gz: f81b0d47f266fafd9010090973ccd19c1d0f00b5f7444f23288f0f969ae14584d3b181832a9042bde8d6cd104c822b96e68f70f965d6d37c244a56dec2ec5a69

data/lib/selective/ruby/core/controller.rb

@@ -8,18 +8,20 @@ module Selective
       class Controller
         include Helper
         @@selective_suppress_reporting = false
+        @@report_at_finish = {}
 
         REQUIRED_CONFIGURATION = {
           "host" => "SELECTIVE_HOST",
           "api_key" => "SELECTIVE_API_KEY",
           "platform" => "SELECTIVE_PLATFORM",
           "run_id" => "SELECTIVE_RUN_ID",
+          "run_attempt" => "SELECTIVE_RUN_ATTEMPT",
           "branch" => "SELECTIVE_BRANCH"
         }.freeze
 
-        def initialize(runner, debug: false, log: false)
+        def initialize(runner_class, runner_args, debug: false, log: false)
           @debug = debug
-          @runner = runner
+          @runner = runner_class.new(runner_args, method(:test_case_callback))
           @retries = 0
           @runner_id = safe_filename(get_runner_id)
           @logger = init_logger(log)
@@ -32,7 +34,7 @@ module Selective
           handle_termination_signals(transport_pid)
           wait_for_connectivity
           run_main_loop
-        rescue NamedPipe::PipeClosedError
+        rescue ConnectionLostError
           retry!
         rescue => e
           with_error_handling { raise e }
@@ -56,12 +58,16 @@ module Selective
           @@selective_suppress_reporting
         end
 
+        def self.report_at_finish
+          @@report_at_finish
+        end
+
         private
 
         attr_reader :runner, :pipe, :transport_pid, :retries, :logger, :runner_id, :diff
 
         def get_runner_id
-          runner_id = build_env.delete("runner_id")
+          runner_id = build_env["runner_id"]
           return generate_runner_id if runner_id.nil? || runner_id.empty?
 
           runner_id
@@ -89,10 +95,10 @@ module Selective
         def retry!
           @retries += 1
 
-          with_error_handling { raise "Too many retries" } if retries > 4
+          with_error_handling { raise "Too many retries" } if retries > 10
 
-          puts("Retrying in #{retries} seconds...")
-          sleep(retries)
+          puts("Retrying in #{retries} seconds...") if debug?
+          sleep(retries > 4 ? 4 : retries)
           kill_transport
 
           pipe.reset!
@@ -108,30 +114,30 @@ module Selective
         end
 
         def transport_url(reconnect: false)
-          @transport_url ||= begin
-            api_key = build_env.delete("api_key")
-            host = build_env.delete("host")
-            run_id = build_env.delete("run_id")
-            run_attempt = build_env.delete("run_attempt")
-            run_attempt = SecureRandom.uuid if run_attempt.nil? || run_attempt.empty?
-
-            params = {
+          base_transport_url_params[:reconnect] = true if reconnect
+          query_string = URI.encode_www_form(base_transport_url_params)
+          "#{build_env["host"]}/transport/websocket?#{query_string}"
+        end
+
+        def base_transport_url_params
+          @base_transport_url_params ||= begin
+            api_key = build_env["api_key"]
+            run_id = build_env["run_id"]
+            run_attempt = build_env["run_attempt"]
+
+            metadata = build_env.reject { |k,v| %w(host runner_id api_key run_id run_attempt).include?(k) }
+
+            {
+              "api_key" => api_key,
               "run_id" => run_id,
               "run_attempt" => run_attempt,
-              "api_key" => api_key,
               "runner_id" => runner_id,
               "language" => "ruby",
               "core_version" => Selective::Ruby::Core::VERSION,
               "framework" => runner.framework,
               "framework_version" => runner.framework_version,
               "framework_wrapper_version" => runner.wrapper_version,
-            }.merge(metadata: build_env.to_json)
-
-            prams[:reconnect] = true if reconnect
-
-            query_string = URI.encode_www_form(params)
-
-            "#{host}/transport/websocket?#{query_string}"
+            }.merge(metadata: metadata.to_json)
           end
         end
 
@@ -224,7 +230,7 @@ module Selective
 
               sleep(1)
             end
-          rescue NamedPipe::PipeClosedError, IOError
+          rescue ConnectionLostError, IOError
             # If the pipe is close, move straight to killing
             # it forcefully.
           end
@@ -267,11 +273,14 @@ module Selective
         end
 
         def handle_run_test_cases(data)
-          runner.run_test_cases(data[:test_case_ids], method(:test_case_callback))
+          runner.run_test_cases(data[:test_case_ids])
         end
 
+        # Todo: Rename this command to match the method name
+        # on the runner wrapper. We should do something similar
+        # to normalize handle_print_notice and handle_print_message
         def handle_remove_failed_test_case_result(data)
-          runner.remove_failed_test_case_result(data[:test_case_id])
+          runner.remove_test_case_result(data[:test_case_id])
         end
 
         def handle_print_message(data)
@@ -281,7 +290,13 @@ module Selective
         def handle_close(data)
           exit_status = data[:exit_status]
           self.class.restore_reporting!
-          with_error_handling { runner.finish } unless exit_status.is_a?(Integer)
+
+          with_error_handling do
+            Selective::Ruby::Core::Controller.report_at_finish[:connection_retries] = @retries
+            write({type: "report_at_finish", data: Selective::Ruby::Core::Controller.report_at_finish})
+
+            runner.finish unless exit_status.is_a?(Integer)
+          end
 
           kill_transport
           pipe.delete_pipes

data/lib/selective/ruby/core/file_correlator.rb

@@ -9,7 +9,7 @@ module Selective
         FILE_CORRELATION_COLLECTOR_PATH = File.join(ROOT_GEM_PATH, "lib", "bin", "file_correlation_collector.sh")
 
         def initialize(diff, num_commits, target_branch)
-          @diff = diff
+          @diff = diff.reject {|f| f =~ /^spec\// }
           @num_commits = num_commits
           @target_branch = target_branch
         end

data/lib/selective/ruby/core/named_pipe.rb

@@ -2,8 +2,6 @@ module Selective
   module Ruby
     module Core
       class NamedPipe
-        class PipeClosedError < StandardError; end
-
         attr_reader :read_pipe_path, :write_pipe_path
 
         def initialize(read_pipe_path, write_pipe_path, skip_reset: false)
@@ -44,7 +42,7 @@ module Selective
             write_pipe.write("\n")
             write_pipe.flush
           rescue Errno::EPIPE
-            raise PipeClosedError
+            raise ConnectionLostError
           end
         end
 
@@ -54,7 +52,7 @@ module Selective
             message = read_pipe.gets.chomp
           rescue NoMethodError => e
             if e.name == :chomp
-              raise PipeClosedError
+              raise ConnectionLostError
             else
               raise e
             end

data/lib/selective/ruby/core/version.rb

@@ -3,7 +3,7 @@
 module Selective
   module Ruby
     module Core
-      VERSION = "0.2.1"
+      VERSION = "0.2.3"
     end
   end
 end

data/lib/selective-ruby-core.rb

@@ -14,6 +14,7 @@ module Selective
   module Ruby
     module Core
       class Error < StandardError; end
+      class ConnectionLostError < StandardError; end
 
       ROOT_GEM_PATH = Gem.loaded_specs["selective-ruby-core"].full_gem_path
 
@@ -44,7 +45,7 @@ module Selective
         attr_reader :debug, :log, :runner_name, :args, :command
 
         def run
-          Selective::Ruby::Core::Controller.new(runner, debug: debug, log: log).send(command)
+          Selective::Ruby::Core::Controller.new(runner_class, args, debug: debug, log: log).send(command)
         end
 
         def parse_args(args)
@@ -56,8 +57,8 @@ module Selective
           end
         end
 
-        def runner
-          Selective::Ruby::Core.runner_for(runner_name).new(args)
+        def runner_class
+          Selective::Ruby::Core.runner_for(runner_name)
         end
 
         def require_runner

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selective-ruby-core
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: x86_64-darwin
 authors:
 - Benjamin Wood
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk