selective-ruby-core 0.2.2-x86_64-linux → 0.2.4-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b4696012125323f44de397fe520cd5f37770a7182ad3df3a69f0cf10d4cbbf0
-  data.tar.gz: 2c1ea6d1eb4d118ec556b1989f298a350c583789c6d5cf85e901605e7487e622
+  metadata.gz: 74f08ebaa7da3c1328489896257aa1b9e7d0b5a6c996a57d0ca40177614133ad
+  data.tar.gz: 2efd8ad84aa62bfef058963d7efadcfc02f131f15036436ee837573c1ecd0a71
 SHA512:
-  metadata.gz: e3382682940c2c4293c88e5b3cfaad302245bcb8f6505686d199a742d5bf12bfda3c983e8d8a8922ad0662c209050f8024dc09ce92cc3a8a6a2c3ad6f031e87a
-  data.tar.gz: 674a0719f90878cffdfad02c630369991a53bc84c4794754af5edbaad3a2f30f42210e1946b5b6e0b108563b5a5cd91b735e76664db4c667272c48e950775aab
+  metadata.gz: 9e43158abef313a224bf9095c054bae85380eef4107f06b39b7d58e1746c8057b15b29cf1c766bde0c78da6fb437d5d72c0595047e8110dc1a2b830ebc95240c
+  data.tar.gz: 8552dd1fb2439624597431526b759c7fa2c0baef9ffebea2888049a07aef2b4f3e859af2cff83077b29a657297bd5645c2da6c904adb966a84898e37cfdc4bdd

data/lib/bin/build_env.sh

@@ -31,22 +31,26 @@ elif [ -n "$SEMAPHORE" ]; then
   pr_title=$SEMAPHORE_GIT_PR_NAME
 fi
 
+function escape() {
+  echo -n "$1" | sed 's/"/\\"/g'
+}
+
 # Output the JSON
 cat <<EOF
   {
-    "api_key": "$SELECTIVE_API_KEY",
-    "host": "${SELECTIVE_HOST:-wss://app.selective.ci}",
-    "platform": "${SELECTIVE_PLATFORM:-$platform}",
-    "branch": "${SELECTIVE_BRANCH:-$branch}",
-    "pr_title": "${SELECTIVE_PR_TITLE:-$pr_title}",
-    "target_branch": "${SELECTIVE_TARGET_BRANCH:-$target_branch}",
-    "actor": "${SELECTIVE_ACTOR:-$actor}",
-    "sha": "${SELECTIVE_SHA:-$sha}",
-    "run_id": "${SELECTIVE_RUN_ID:-$run_id}",
-    "run_attempt": "${SELECTIVE_RUN_ATTEMPT:-$run_attempt}",
-    "runner_id": "${SELECTIVE_RUNNER_ID:-$runner_id}",
-    "commit_message": "$(git log --format=%s -n 1 $sha)",
-    "committer_name": "$(git show -s --format='%an' -n 1 $sha)",
-    "committer_email": "$(git show -s --format='%ae' -n 1 $sha)"
+    "api_key": "$(escape "${SELECTIVE_API_KEY}")",
+    "host": "$(escape "${SELECTIVE_HOST:-wss://app.selective.ci}")",
+    "platform": "$(escape "${SELECTIVE_PLATFORM:-$platform}")",
+    "branch": "$(escape "${SELECTIVE_BRANCH:-$branch}")",
+    "pr_title": "$(escape "${SELECTIVE_PR_TITLE:-$pr_title}")",
+    "target_branch": "$(escape "${SELECTIVE_TARGET_BRANCH:-$target_branch}")",
+    "actor": "$(escape "${SELECTIVE_ACTOR:-$actor}")",
+    "sha": "$(escape "${SELECTIVE_SHA:-$sha}")",
+    "run_id": "$(escape "${SELECTIVE_RUN_ID:-$run_id}")",
+    "run_attempt": "$(escape "${SELECTIVE_RUN_ATTEMPT:-$run_attempt}")",
+    "runner_id": "$(escape "${SELECTIVE_RUNNER_ID:-$runner_id}")",
+    "commit_message": "$(escape "$(git log --format=%s -n 1 $sha)")",
+    "committer_name": "$(escape "$(git show -s --format='%an' -n 1 $sha)")",
+    "committer_email": "$(escape "$(git show -s --format='%ae' -n 1 $sha)")"
   }
 EOF

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

@@ -8,6 +8,7 @@ module Selective
       class Controller
         include Helper
         @@selective_suppress_reporting = false
+        @@report_at_finish = {}
 
         REQUIRED_CONFIGURATION = {
           "host" => "SELECTIVE_HOST",
@@ -33,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 }
@@ -57,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
@@ -90,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!
@@ -109,29 +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")
+          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"]
 
-            params = {
+            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
@@ -270,8 +276,11 @@ module Selective
           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.2"
+      VERSION = "0.2.4"
     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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selective-ruby-core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: x86_64-linux
 authors:
 - Benjamin Wood
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Selective Ruby Client Core