selective-ruby-core 0.1.2-arm64-darwin → 0.1.4-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd2f641485ecb6675d7c6700eed1b77586a156ccc0c254e915f1f3fdca305120
-  data.tar.gz: fa0762a5b475c8c29b4bcd36e6f6daf1fd8ff59859dde705e7c60f8c44da6512
+  metadata.gz: 8367e139f147f3a3d385b6559a7abf7cc233b55dce6a9efdd7fb3ad560e2bea8
+  data.tar.gz: f08c207e0e7269048b4aa4a277fb0d930412b1f01115de6059c0a42adfcb6ff3
 SHA512:
-  metadata.gz: 54bbddc47043d539af6dd2cd17fce44e497af4b843b03cb6072f0d8bf952bde6efcc8040c51a6f7d0e83223aa11f01dfa30a0dbf80d131053da793424f5cc344
-  data.tar.gz: 1ac666a5ae47115034febb659cbf1fec6f22a45f7621a15275d36dbcc37b0e2f25861db4d8498fa9a37947866c6794d7c328bb443e43de41501bc8f005313949
+  metadata.gz: 86b82b6d7aa53161760d4b3472543f23dc547f555914c212f29f7230f8d694c0bcbbe433afa8f481191c740e02d31612e0a98348ba829e2a2f4257e90df33c17
+  data.tar.gz: 85b1d0dee79c85655963fd744134c3bf655b3d283e93c098e3637b94ce6f1a2af27d6bb8acc88805927ab9cb58af7ce6603983d2e822a08e9113b7d17870704f

data/lib/bin/build_env.sh

@@ -4,11 +4,13 @@
 if [ -n "$GITHUB_ACTIONS" ]; then
   # Get environment variables
   platform=github_actions
-  branch=${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}
+  branch=${SELECTIVE_BRANCH:-${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}}
   pr_title=$SELECTIVE_PR_TITLE
-  target_branch=${GITHUB_BASE_REF}
+  target_branch=${SELECTIVE_TARGET_BRANCH:-$GITHUB_BASE_REF}
   actor=$GITHUB_ACTOR
-  sha=$GITHUB_SHA
+  sha=${SELECTIVE_SHA:-$GITHUB_SHA}
+  run_id=${SELECTIVE_RUN_ID:-$GITHUB_RUN_ID}
+  run_attempt=${SELECTIVE_RUN_ATTEMPT:-$GITHUB_RUN_ATTEMPT}
   commit_message=$(git log --format=%s -n 1 $sha)
 else
   platform=$SELECTIVE_PLATFORM
@@ -17,6 +19,8 @@ else
   target_branch=$SELECTIVE_TARGET_BRANCH
   actor=$SELECTIVE_ACTOR
   sha=$SELECTIVE_SHA
+  run_id=$SELECTIVE_RUN_ID
+  run_attempt=$SELECTIVE_RUN_ATTEMPT
   commit_message=$(git log --format=%s -n 1 $sha)
 fi
 
@@ -29,6 +33,8 @@ cat <<EOF
     "target_branch": "$target_branch",
     "actor": "$actor",
     "sha": "$sha",
+    "run_id": "$run_id",
+    "run_attempt": "$run_attempt",
     "commit_message": "$commit_message"
   }
 EOF

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

@@ -14,7 +14,7 @@ module Selective
           @debug = debug
           @runner = runner
           @retries = 0
-          @runner_id = ENV.fetch("SELECTIVE_RUNNER_ID", generate_runner_id)
+          @runner_id = safe_filename(ENV.fetch("SELECTIVE_RUNNER_ID", generate_runner_id))
           @logger = init_logger(log)
         end
 
@@ -23,6 +23,7 @@ module Selective
           @transport_pid = spawn_transport_process(reconnect ? transport_url + "&reconnect=true" : transport_url)
 
           handle_termination_signals(transport_pid)
+          wait_for_connectivity
           run_main_loop
         rescue NamedPipe::PipeClosedError
           retry!
@@ -66,8 +67,6 @@ module Selective
         def run_main_loop
           loop do
             message = pipe.read
-            next sleep(0.1) if message.nil? || message.empty?
-
             response = JSON.parse(message, symbolize_names: true)
 
             @logger.info("Received Command: #{response}")
@@ -101,13 +100,15 @@ module Selective
         def transport_url
           @transport_url ||= begin
             api_key = ENV.fetch("SELECTIVE_API_KEY")
-            run_id = ENV.fetch("SELECTIVE_RUN_ID")
-            run_attempt = ENV.fetch("SELECTIVE_RUN_ATTEMPT", SecureRandom.uuid)
             host = ENV.fetch("SELECTIVE_HOST", "wss://app.selective.ci")
 
             # Validate that host is a valid websocket url(starts with ws:// or wss://)
             raise "Invalid host: #{host}" unless host.match?(/^wss?:\/\//)
 
+            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 = {
               "run_id" => run_id,
               "run_attempt" => run_attempt,
@@ -151,6 +152,31 @@ module Selective
           end
         end
 
+        def wait_for_connectivity
+          @connectivity = false
+
+          Thread.new do
+            sleep(5)
+            unless @connectivity
+              puts "Transport process failed to start. Exiting..."
+              kill_transport
+              exit(1)
+            end
+          end
+
+          loop do
+            message = pipe.read
+
+            # The message is nil until the transport opens the pipe
+            # for writing. So, we must handle that here.
+            next sleep(0.1) if message.nil?
+            
+            response = JSON.parse(message, symbolize_names: true)
+            @connectivity = true if response[:command] == "connected"
+            break
+          end
+        end
+
         def handle_termination_signals(pid)
           ["INT", "TERM"].each do |signal|
             Signal.trap(signal) do
@@ -173,7 +199,7 @@ module Selective
 
               sleep(1)
             end
-          rescue NamedPipe::PipeClosedError
+          rescue NamedPipe::PipeClosedError, IOError
             # If the pipe is close, move straight to killing
             # it forcefully.
           end
@@ -270,6 +296,13 @@ module Selective
           @debug
         end
 
+        def safe_filename(filename)
+          filename
+            .gsub(/[\/\\:*?"<>|\n\r]+/, '_')
+            .gsub(/^\.+|\.+$/, '')
+            .strip[0, 255]
+        end
+
         def with_error_handling(include_header: true)
           yield
         rescue => e

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

@@ -3,7 +3,7 @@
 module Selective
   module Ruby
     module Core
-      VERSION = "0.1.2"
+      VERSION = "0.1.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selective-ruby-core
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: arm64-darwin
 authors:
 - Benjamin Wood
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk