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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de5a1cbd67c1d87b590371321c194cd39ebb4c48262b2cebcbf9af3a167d4d37
-  data.tar.gz: 1b9841d87eae5f184b4a2048262a7871b48339d0b31f22f8b0f1311d2c79932c
+  metadata.gz: 3b804fafa6a74937094d9db0ceef94c23c00d25c1b86434326f6cbf9d16794ae
+  data.tar.gz: 1d44b1a5aab3c8c2c2c47682d32dab1f66e360bdb53a1b94bc147137de9b85a3
 SHA512:
-  metadata.gz: 32ba16bd2e9818f3bbdd0687715c4804688f12fbf16981688f879615318a6dd17d1f5b7ac7e76e10fa6c159ded6b54bf2e77b2e98affc2e4580935db90fbf345
-  data.tar.gz: 5036c3e0f58bd830f5c7362f051baf5654c85020bd473aa2f9de32b16c3517714b37ac004ec770e3b63d0f8e659593257084b005b1467f5143fbfdbce54830cb
+  metadata.gz: 4b14e06eeff150dd1240894af5f2d94342664d817b9f4e6c6d6507b966cb4617330d64a4193fa680d07ad847b867757487f7e2844878b6d2965b89a86c1ff76e
+  data.tar.gz: 4cf8e3503bb17eff51f6637329c9a86677e26b56e5b8808f7e9da949b58ff7a92b3975748ed0adfae753e5d4b9fd19e364c2150ec8fa5df9ce9b43dc9aca3ef6

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: x86_64-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