selective-ruby-core 0.2.0-x86_64-linux → 0.2.2-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdb083ff41ad745a6088ebc292f5f00abebacfa64b6cae83434b9ceb155b0935
-  data.tar.gz: 76a45629bc7ee9b8e4e08e1179a8134e1d9714f47b91e1463196be9aead33831
+  metadata.gz: 0b4696012125323f44de397fe520cd5f37770a7182ad3df3a69f0cf10d4cbbf0
+  data.tar.gz: 2c1ea6d1eb4d118ec556b1989f298a350c583789c6d5cf85e901605e7487e622
 SHA512:
-  metadata.gz: adcf129a879357453b9b96d1d5bbfb9d98bb4cd675a517662b4d4acd73e3e143fe9a7706bc1d20716adb05ca11f4ca8d0a5864c101ef3c10fb046256f81b1050
-  data.tar.gz: e1186135b661ed5f094466f42db535372ecc4d1f710ea97497407274decef630d954339d480e4046e590b2eb37a12738e56a15b7ca8ac63ced1e34d7565feb7d
+  metadata.gz: e3382682940c2c4293c88e5b3cfaad302245bcb8f6505686d199a742d5bf12bfda3c983e8d8a8922ad0662c209050f8024dc09ce92cc3a8a6a2c3ad6f031e87a
+  data.tar.gz: 674a0719f90878cffdfad02c630369991a53bc84c4794754af5edbaad3a2f30f42210e1946b5b6e0b108563b5a5cd91b735e76664db4c667272c48e950775aab

data/lib/bin/build_env.sh

@@ -3,31 +3,32 @@
 # Detect the platform (only GitHub Actions in this case)
 if [ -n "$GITHUB_ACTIONS" ]; then
   platform=github_actions
-  branch=${SELECTIVE_BRANCH:-${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}}
-  target_branch=${SELECTIVE_TARGET_BRANCH:-$GITHUB_BASE_REF}
+  branch=${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}
+  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}
+  sha=$GITHUB_SHA
+  run_id=$GITHUB_RUN_ID
+  run_attempt=$GITHUB_RUN_ATTEMPT
   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
-  target_branch=$SELECTIVE_TARGET_BRANCH
-  actor=$SELECTIVE_ACTOR
-  sha=$SELECTIVE_SHA
-  run_id=$SELECTIVE_RUN_ID
-  run_attempt=$SELECTIVE_RUN_ATTEMPT
-  runner_id=$SELECTIVE_RUNNER_ID
+  branch=$CIRCLE_BRANCH
+  actor=${CIRCLE_USERNAME:-$CIRCLE_PR_USERNAME}
+  sha=$CIRCLE_SHA1
+  run_attempt=$CIRCLE_BUILD_NUM
+  runner_id=$CIRCLE_NODE_INDEX
+elif [ -n "$SEMAPHORE" ]; then
+  platform=semaphore
+  branch=${SEMAPHORE_GIT_PR_BRANCH:-$SEMAPHORE_GIT_BRANCH}
+  if [ -n "$SEMAPHORE_GIT_PR_BRANCH" ]; then
+    target_branch=$SEMAPHORE_GIT_BRANCH
+  fi
+  actor=$SEMAPHORE_GIT_COMMITTER
+  sha=$SEMAPHORE_GIT_SHA
+  run_id=$SEMAPHORE_WORKFLOW_ID
+  run_attempt=1
+  runner_id=$SEMAPHORE_JOB_ID
+  pr_title=$SEMAPHORE_GIT_PR_NAME
 fi
 
 # Output the JSON
@@ -35,16 +36,16 @@ cat <<EOF
   {
     "api_key": "$SELECTIVE_API_KEY",
     "host": "${SELECTIVE_HOST:-wss://app.selective.ci}",
-    "platform": "$platform",
-    "branch": "$branch",
-    "pr_title": "$SELECTIVE_PR_TITLE",
-    "target_branch": "$target_branch",
-    "actor": "$actor",
-    "sha": "$sha",
-    "run_id": "$run_id",
-    "run_attempt": "$run_attempt",
+    "platform": "${SELECTIVE_PLATFORM:-$platform}",
+    "branch": "${SELECTIVE_BRANCH:-$branch}",
+    "pr_title": "${SELECTIVE_PR_TITLE:-$pr_title}",
+    "target_branch": "${SELECTIVE_TARGET_BRANCH:-$target_branch}",
+    "actor": "${SELECTIVE_ACTOR:-$actor}",
+    "sha": "${SELECTIVE_SHA:-$sha}",
+    "run_id": "${SELECTIVE_RUN_ID:-$run_id}",
+    "run_attempt": "${SELECTIVE_RUN_ATTEMPT:-$run_attempt}",
+    "runner_id": "${SELECTIVE_RUNNER_ID:-$runner_id}",
     "commit_message": "$(git log --format=%s -n 1 $sha)",
-    "runner_id": "$runner_id",
     "committer_name": "$(git show -s --format='%an' -n 1 $sha)",
     "committer_email": "$(git show -s --format='%ae' -n 1 $sha)"
   }

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

@@ -14,12 +14,13 @@ module Selective
           "api_key" => "SELECTIVE_API_KEY",
           "platform" => "SELECTIVE_PLATFORM",
           "run_id" => "SELECTIVE_RUN_ID",
+          "run_attempt" => "SELECTIVE_RUN_ATTEMPT",
           "branch" => "SELECTIVE_BRANCH"
         }.freeze
 
-        def initialize(runner, debug: false, log: false)
+        def initialize(runner_class, runner_args, debug: false, log: false)
           @debug = debug
-          @runner = runner
+          @runner = runner_class.new(runner_args, method(:test_case_callback))
           @retries = 0
           @runner_id = safe_filename(get_runner_id)
           @logger = init_logger(log)
@@ -113,7 +114,6 @@ module Selective
             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?
 
             params = {
               "run_id" => run_id,
@@ -267,7 +267,7 @@ module Selective
         end
 
         def handle_run_test_cases(data)
-          runner.run_test_cases(data[:test_case_ids], method(:test_case_callback))
+          runner.run_test_cases(data[:test_case_ids])
         end
 
         def handle_remove_failed_test_case_result(data)

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

@@ -17,7 +17,10 @@ module Selective
         def correlate
           JSON.parse(get_correlated_files, symbolize_names: true)
         rescue FileCorrelatorError, JSON::ParserError
-          print_warning "Selective was unable to correlate the diff to test files. This may result in a sub-optimal test order. If the issue persists, please contact support."
+          print_warning(<<~MSG)
+            Selective was unable to correlate the diff to test files. This may result in a sub-optimal test order.
+            If the issue persists, please contact support.
+          MSG
         end
 
         private

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

@@ -3,7 +3,7 @@
 module Selective
   module Ruby
     module Core
-      VERSION = "0.2.0"
+      VERSION = "0.2.2"
     end
   end
 end

data/lib/selective-ruby-core.rb

@@ -44,7 +44,7 @@ module Selective
         attr_reader :debug, :log, :runner_name, :args, :command
 
         def run
-          Selective::Ruby::Core::Controller.new(runner, debug: debug, log: log).send(command)
+          Selective::Ruby::Core::Controller.new(runner_class, args, debug: debug, log: log).send(command)
         end
 
         def parse_args(args)
@@ -56,8 +56,8 @@ module Selective
           end
         end
 
-        def runner
-          Selective::Ruby::Core.runner_for(runner_name).new(args)
+        def runner_class
+          Selective::Ruby::Core.runner_for(runner_name)
         end
 
         def require_runner

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selective-ruby-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: x86_64-linux
 authors:
 - Benjamin Wood
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk