selective-ruby-core 0.1.5-x86_64-darwin → 0.1.6-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22afe8088a4aa4a2b46f40431f052719b62802279c261b3dc7370070f4946821
-  data.tar.gz: 7274e8250b81e8eb9e7b672f1fe09a43887d489b692ccf325117e0314007f79a
+  metadata.gz: 52bc426a0bd0a0f89a42565923fe7a56b39fe5e3ccb85818f6fbf5d80a9db930
+  data.tar.gz: 7659c45d74078a348ecdef940df164a46110dbdd4275973a8863c233d108b0a0
 SHA512:
-  metadata.gz: 2b47ea408fb2cb47ab7f672245041704a4773c9ba7d0a02e428d1668713ebfa20e67ccfc7dfbabbff8d7115d1a09e02efdb83bec0371c0a7bdd9b7587c0f3cab
-  data.tar.gz: 106c05167bf26666607fd696346b5782f28a01579c68b6d5d7b5d061967503ebd4e5b659b63f206688bf63a9366c0dc569a041bc44c33071445b85780ddeea15
+  metadata.gz: a49e387e6cdf21d20cdc35b7bc63726f0bcd57433e5d2533552fa597c38f095c03e09ae346e999925dcd9a22bd9340d423c5e0fadb70daaf3239a771a3f7f20f
+  data.tar.gz: 158a9217e73199e77c260467c8d7c3ec07b2e998bed8ba7f4ab651906ddb4a6ff2b67b1209b6803708644fe602ecaa1f10e66f01d97af9c6db597665f35abd7a

data/lib/bin/build_env.sh

@@ -2,26 +2,32 @@
 
 # Detect the platform (only GitHub Actions in this case)
 if [ -n "$GITHUB_ACTIONS" ]; then
-  # Get environment variables
   platform=github_actions
   branch=${SELECTIVE_BRANCH:-${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}}
-  pr_title=$SELECTIVE_PR_TITLE
   target_branch=${SELECTIVE_TARGET_BRANCH:-$GITHUB_BASE_REF}
   actor=$GITHUB_ACTOR
   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)
+  runner_id=$SELECTIVE_RUNNER_ID
+elif [ -n "$CIRCLECI" ]; then
+  platform=circleci
+  branch=${SELECTIVE_BRANCH:-$CIRCLE_BRANCH}
+  target_branch=$SELECTIVE_TARGET_BRANCH
+  actor=${SELECTIVE_ACTOR:-${CIRCLE_USERNAME:-$CIRCLE_PR_USERNAME}}
+  sha=${SELECTIVE_SHA:-$CIRCLE_SHA1}
+  run_id=$SELECTIVE_RUN_ID
+  run_attempt=${SELECTIVE_RUN_ATTEMPT:-$CIRCLE_BUILD_NUM}
+  runner_id=${SELECTIVE_RUNNER_ID:-$CIRCLE_NODE_INDEX}
 else
   platform=$SELECTIVE_PLATFORM
   branch=$SELECTIVE_BRANCH
-  pr_title=$SELECTIVE_PR_TITLE
   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)
+  runner_id=$SELECTIVE_RUNNER_ID
 fi
 
 # Output the JSON
@@ -29,12 +35,13 @@ cat <<EOF
   {
     "platform": "$platform",
     "branch": "$branch",
-    "pr_title": "$pr_title",
+    "pr_title": "$SELECTIVE_PR_TITLE",
     "target_branch": "$target_branch",
     "actor": "$actor",
     "sha": "$sha",
     "run_id": "$run_id",
     "run_attempt": "$run_attempt",
-    "commit_message": "$commit_message"
+    "commit_message": "$(git log --format=%s -n 1 $sha)",
+    "runner_id": "$runner_id"
   }
 EOF

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

@@ -14,13 +14,13 @@ module Selective
           @debug = debug
           @runner = runner
           @retries = 0
-          @runner_id = safe_filename(ENV.fetch("SELECTIVE_RUNNER_ID", generate_runner_id))
+          @runner_id = safe_filename(get_runner_id)
           @logger = init_logger(log)
         end
 
         def start(reconnect: false)
           @pipe = NamedPipe.new("/tmp/#{runner_id}_2", "/tmp/#{runner_id}_1")
-          @transport_pid = spawn_transport_process(reconnect ? transport_url + "&reconnect=true" : transport_url)
+          @transport_pid = spawn_transport_process(reconnect: reconnect)
 
           handle_termination_signals(transport_pid)
           wait_for_connectivity
@@ -53,7 +53,14 @@ module Selective
 
         attr_reader :runner, :pipe, :transport_pid, :retries, :logger, :runner_id
 
-        BUILD_ENV_SCRIPT_PATH = "../../../bin/build_env.sh".freeze
+        ROOT_GEM_PATH = Gem.loaded_specs["selective-ruby-core"].full_gem_path
+
+        def get_runner_id
+          runner_id = build_env.delete("runner_id")
+          return generate_runner_id if runner_id.nil? || runner_id.empty?
+
+          runner_id
+        end
 
         def init_logger(enabled)
           if enabled
@@ -70,9 +77,7 @@ module Selective
             response = JSON.parse(message, symbolize_names: true)
 
             @logger.info("Received Command: #{response}")
-            next if handle_command(response)
-
-            break
+            break if handle_command(response) == :break
           end
         end
 
@@ -97,7 +102,7 @@ module Selective
           "selgen-#{SecureRandom.hex(4)}"
         end
 
-        def transport_url
+        def transport_url(reconnect: false)
           @transport_url ||= begin
             api_key = ENV.fetch("SELECTIVE_API_KEY")
             host = ENV.fetch("SELECTIVE_HOST", "wss://app.selective.ci")
@@ -113,9 +118,16 @@ module Selective
               "run_id" => run_id,
               "run_attempt" => run_attempt,
               "api_key" => api_key,
-              "runner_id" => runner_id
+              "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}"
@@ -124,15 +136,14 @@ module Selective
 
         def build_env
           @build_env ||= begin
-            result = `#{Pathname.new(__dir__) + BUILD_ENV_SCRIPT_PATH}`
+            result = `#{File.join(ROOT_GEM_PATH, "lib", "bin", "build_env.sh")}`
             JSON.parse(result)
           end
         end
 
-        def spawn_transport_process(url)
-          root_path = Gem.loaded_specs["selective-ruby-core"].full_gem_path
-          transport_path = File.join(root_path, "lib", "bin", "transport")
-          get_transport_path = File.join(root_path, "bin", "get_transport")
+        def spawn_transport_process(reconnect: false)
+          transport_path = File.join(ROOT_GEM_PATH, "lib", "bin", "transport")
+          get_transport_path = File.join(ROOT_GEM_PATH, "bin", "get_transport")
 
           # The get_transport script is not released with the gem, so this
           # code is intended for development/CI purposes.
@@ -147,7 +158,7 @@ module Selective
             end
           end
 
-          Process.spawn(transport_path, url, runner_id).tap do |pid|
+          Process.spawn(transport_path, transport_url(reconnect: reconnect), runner_id).tap do |pid|
             Process.detach(pid)
           end
         end
@@ -211,39 +222,23 @@ module Selective
           # Process already gone noop
         end
 
-        def handle_command(response)
-          case response[:command]
-          when "print_notice"
-            print_notice(response[:message])
-          when "test_manifest"
-            handle_test_manifest
-          when "run_test_cases"
-            handle_run_test_cases(response[:test_case_ids])
-          when "remove_failed_test_case_result"
-            handle_remove_failed_test_case_result(response[:test_case_id])
-          when "reconnect"
-            handle_reconnect
-          when "print_message"
-            handle_print_message(response[:message])
-          when "close"
-            handle_close(response[:exit_status])
-            # This return is here for the sake of test where
-            # we cannot exit but we need to break the loop
-            return false
-          else
-            raise "Unknown command received: #{response[:command]}" if debug?
-          end
+        def handle_command(data)
+          send("handle_#{data[:command]}", data)
+        rescue NoMethodError
+          raise "Unknown command received: #{data[:command]}" if debug?
+        end
 
-          true
+        def handle_print_notice(data)
+          print_notice(data[:message])
         end
 
-        def handle_reconnect
+        def handle_reconnect(_data)
           kill_transport
           pipe.reset!
           start(reconnect: true)
         end
 
-        def handle_test_manifest
+        def handle_test_manifest(_data)
           self.class.restore_reporting!
           @logger.info("Sending Response: test_manifest")
           data = {test_cases: runner.manifest["examples"]}
@@ -251,8 +246,29 @@ module Selective
           write({type: "test_manifest", data: data})
         end
 
-        def handle_run_test_cases(test_cases)
-          runner.run_test_cases(test_cases, method(:test_case_callback))
+        def handle_run_test_cases(data)
+          runner.run_test_cases(data[:test_case_ids], method(:test_case_callback))
+        end
+
+        def handle_remove_failed_test_case_result(data)
+          runner.remove_failed_test_case_result(data[:test_case_id])
+        end
+
+        def handle_print_message(data)
+          print_warning(data[:message])
+        end
+
+        def handle_close(data)
+          exit_status = data[:exit_status]
+          self.class.restore_reporting!
+          runner.finish unless exit_status.is_a?(Integer)
+
+          kill_transport
+          pipe.delete_pipes
+          exit(exit_status || runner.exit_status)
+          # This :break is here for the sake of test where
+          # we cannot exit but we need to break the loop
+          :break
         end
 
         def test_case_callback(test_case)
@@ -260,10 +276,6 @@ module Selective
           write({type: "test_case_result", data: test_case})
         end
 
-        def handle_remove_failed_test_case_result(test_case_id)
-          runner.remove_failed_test_case_result(test_case_id)
-        end
-
         def modified_test_files
           @modified_test_files ||= begin
             target_branch = build_env["target_branch"]
@@ -279,19 +291,6 @@ module Selective
           end
         end
 
-        def handle_print_message(message)
-          print_warning(message)
-        end
-
-        def handle_close(exit_status = nil)
-          self.class.restore_reporting!
-          runner.finish unless exit_status.is_a?(Integer)
-
-          kill_transport
-          pipe.delete_pipes
-          exit(exit_status || runner.exit_status)
-        end
-
         def debug?
           @debug
         end

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

@@ -3,7 +3,7 @@
 module Selective
   module Ruby
     module Core
-      VERSION = "0.1.5"
+      VERSION = "0.1.6"
     end
   end
 end

data/lib/selective-ruby-core.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "zeitwerk"
+require "#{__dir__}/selective/ruby/core/version"
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/selective-ruby-core.rb")

metadata

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