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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ee42cddb33203a7cf1604187c67426b3b7f5af1fa0e6fbb0d1516724c3e6c8e
-  data.tar.gz: d58c25995521db66960c51a860a778303bdb5eb5be5d11b81cf00c066d552b26
+  metadata.gz: b3c47e84c3fe990beb707bfecd730347e6c421fed599079a6c0b840410fafab8
+  data.tar.gz: 9f8f05903a3755eeeb15651ba0fe9c74b14b727d24c81ba5e8636b8b04a889fa
 SHA512:
-  metadata.gz: 85d543fc9a3fd71ce55d8968eb4093c327a900841717f23307edc03a0476b7f10df81622edc4133b0d6fd9c7164689cc031d2a68faefc9700819a64026917ccc
-  data.tar.gz: 36648d460cfb7c7e3604d066645571e936ed3a00b2dcfb44326aa399758190a446313e18575f06e3b9ebcb4fb6748982c9dc066f1d8b22863d1fb253a79783a8
+  metadata.gz: f29321c5faf4f51bebaeeca0844b2ccbb370b29a03039e6cb15f084b4d46f0e48d67491b8ca37fba44bc79519025aabf15c3b4074d0df38a55048a8cb0d685c7
+  data.tar.gz: ba2304b3d33f43b1b33826bf6c3278d5cb24244171b6122f2b37dbfbc910ca7f059e569105b96973d6580540fb29cb63116dd2df9f38d3d9773100a6df0f4cf7

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-linux
 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