selective-ruby-core 0.1.7-x86_64-darwin → 0.1.9-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bcee1f0c11ea957dd90a8f41b3c53fe7975117ff67e2e90ef961d1f8658e7a1
-  data.tar.gz: 0e37f18b4198d04bf58855db13b8a4f24a0d9be535938b08543738064e3fec93
+  metadata.gz: 2746663da0fe07784b895d8f97f656f4c74840807a72232c349a0d00f1b486f2
+  data.tar.gz: ba160431dd6038984e7ebcff4d7adb1f2f6f6367d3048797a89ab6444d91886e
 SHA512:
-  metadata.gz: de3efdfdea2c7fe2f2556c6ae2679f6239a1b8c89ef0b6b081ef7137fc98f0a1a1ef14c1b7da6d286dffd57c1ff30478e7cc7d97475b385e46508ed34a3a3ec0
-  data.tar.gz: 1d9d4d0c260981f3cff61bb1d02e669925c3aa94d2e323a9866d074d4c10c65b2a6fd20472ddce1ca42969081368160e615e837385b7e0988810dff93c45fc48
+  metadata.gz: 94d96358799b56b9331d2889dad207e39e75c696005d9539c33960ec816be311060be385fb3eab4dab62c08157fabcadd7345280a1c72cc26eae973d36cc3ddf
+  data.tar.gz: e9755f904263b71c6550fc7eaf8f45fcd736645b73c32113fc7a16d4d21adebcce11e1d9d497e8df5184f69ab3c4496a0cacbb5452f260f0a1ed559fbd6ec88b

data/lib/bin/build_env.sh

@@ -33,6 +33,8 @@ fi
 # Output the JSON
 cat <<EOF
   {
+    "api_key": "$SELECTIVE_API_KEY",
+    "host": "${SELECTIVE_HOST:-wss://app.selective.ci}",
     "platform": "$platform",
     "branch": "$branch",
     "pr_title": "$SELECTIVE_PR_TITLE",

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

@@ -9,6 +9,14 @@ module Selective
         include Helper
         @@selective_suppress_reporting = false
 
+        REQUIRED_CONFIGURATION = {
+          "host" => "SELECTIVE_HOST",
+          "api_key" => "SELECTIVE_API_KEY",
+          "platform" => "SELECTIVE_PLATFORM",
+          "run_id" => "SELECTIVE_RUN_ID",
+          "branch" => "SELECTIVE_BRANCH"
+        }.freeze
+
         def initialize(runner, debug: false, log: false)
           @debug = debug
           @runner = runner
@@ -101,12 +109,8 @@ module Selective
 
         def transport_url(reconnect: false)
           @transport_url ||= begin
-            api_key = ENV.fetch("SELECTIVE_API_KEY")
-            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?:\/\//)
-
+            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?
@@ -134,7 +138,20 @@ module Selective
         def build_env
           @build_env ||= begin
             result = `#{File.join(ROOT_GEM_PATH, "lib", "bin", "build_env.sh")}`
-            JSON.parse(result)
+            JSON.parse(result).tap do |env|
+              validate_build_env(env)
+            end
+          end
+        end
+
+        def validate_build_env(env)
+          missing = REQUIRED_CONFIGURATION.each_with_object([]) do |(key, env_var), arry|
+            arry << env_var if env[key].nil? || env[key].empty?
+          end
+          
+          with_error_handling do
+            raise "Missing required environment variables: #{missing.join(", ")}" unless missing.empty?
+            raise "Invalid host: #{env['host']}" unless env['host'].match?(/^wss?:\/\//)
           end
         end
 
@@ -220,9 +237,11 @@ module Selective
         end
 
         def handle_command(data)
-          send("handle_#{data[:command]}", data)
-        rescue NoMethodError
-          raise "Unknown command received: #{data[:command]}" if debug?
+          if respond_to? "handle_#{data[:command]}", true
+            send("handle_#{data[:command]}", data)
+          else
+            raise "Unknown command received: #{data[:command]}" if debug?
+          end
         end
 
         def handle_print_notice(data)
@@ -262,7 +281,7 @@ module Selective
         def handle_close(data)
           exit_status = data[:exit_status]
           self.class.restore_reporting!
-          runner.finish unless exit_status.is_a?(Integer)
+          with_error_handling { runner.finish } unless exit_status.is_a?(Integer)
 
           kill_transport
           pipe.delete_pipes
@@ -291,12 +310,12 @@ module Selective
 
         def get_diff(num_commits)
           target_branch = build_env["target_branch"]
-          return [] if target_branch.nil? || target_branch.empty?
+          return if target_branch.nil? || target_branch.empty?
 
           Open3.capture2e("git fetch origin #{target_branch} --depth=#{num_commits}").then do |output, status|
             unless status.success?
               print_warning "Selective was unable to fetch the target branch. This may result in a sub-optimal test order. If the issue persists, please contact support. The output was:\n\n#{output}"
-              return []
+              return
             end
           end
 
@@ -305,7 +324,7 @@ module Selective
               output.split("\n")
             else
               print_warning "Selective was unable to diff with the target branch. This may result in a sub-optimal test order. If the issue persists, please contact support. The output was:\n\n#{output}"
-              []
+              nil
             end
           end
         end

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

@@ -3,7 +3,7 @@
 module Selective
   module Ruby
     module Core
-      VERSION = "0.1.7"
+      VERSION = "0.1.9"
     end
   end
 end

metadata

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