selective-ruby-core 0.1.1-x86_64-linux → 0.1.3-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fe8f6598750b984fce4859e7a6c0f84321f7fba8ff2f6218ce924f5eba484d1
-  data.tar.gz: c7fcac04f71b35197d2267fc128ea7b0c8d19637f3f0640a9367782dd35687f4
+  metadata.gz: 61626d843514502b6ebb7bd829345d0a18bc76603fe7c2568838371321eeb3ae
+  data.tar.gz: 360dcffb94500fb62dcb6ce0ce5c9bce85a71247a3750f10a1edec5f1532458c
 SHA512:
-  metadata.gz: 881086af89fa21f30a906cd6a546b144057bb61140e4f99a3813918a9248a233d75ac169ea051fdbedde70e68f6656020b41b40f9cbc325591046a28d4b6b3cd
-  data.tar.gz: abfb6e8be51923474af4bd01e928bbb61f99358d3dbf23c35ebb284d9fa4a7cb2c4528eaf28add4e51ab5de89919c1263f462215d5e0d742bd0711481dccfd06
+  metadata.gz: 8886c9761492e0ee4fc892e2605c2aab1c7e508d2d1a04af7ea9d0d1c80b3d9a03244ed56e4587b36ff7695fc31697db8538ac7e11d241132a026dd04aaf91db
+  data.tar.gz: 779c4a1e9bf5057b2f89d0b4f991a7c149a29f4f70d7df85a4d362f4369cca4885ce42ba3e5837de8685828b47bab84bc1f1840bc942fbe55a5e0505cf14c7ee

data/lib/bin/build_env.sh

@@ -3,20 +3,24 @@
 # Detect the platform (only GitHub Actions in this case)
 if [ -n "$GITHUB_ACTIONS" ]; then
   # Get environment variables
-  platform="github_actions"
-  branch="${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}"
-  pr_title="$PR_TITLE"
-  target_branch="${GITHUB_BASE_REF}"
-  actor="$GITHUB_ACTOR"
-  sha="$GITHUB_SHA"
+  platform=github_actions
+  branch=${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}
+  pr_title=$SELECTIVE_PR_TITLE
+  target_branch=${GITHUB_BASE_REF}
+  actor=$GITHUB_ACTOR
+  sha=$GITHUB_SHA
+  run_id=$GITHUB_RUN_ID
+  run_attempt=$GITHUB_RUN_ATTEMPT
   commit_message=$(git log --format=%s -n 1 $sha)
 else
-  platform="$SELECTIVE_PLATFORM"
-  branch="$SELECTIVE_BRANCH"
-  pr_title="$SELECTIVE_PR_TITLE"
-  target_branch="$SELECTIVE_TARGET_BRANCH"
-  actor="$SELECTIVE_ACTOR"
-  sha="$SELECTIVE_SHA"
+  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)
 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

@@ -1,6 +1,8 @@
 require "logger"
 require "uri"
 require "json"
+require "fileutils"
+require "open3"
 
 module Selective
   module Ruby
@@ -8,12 +10,12 @@ module Selective
       class Controller
         @@selective_suppress_reporting = false
 
-        def initialize(runner, debug = false)
+        def initialize(runner, debug: false, log: false)
           @debug = debug
           @runner = runner
           @retries = 0
           @runner_id = ENV.fetch("SELECTIVE_RUNNER_ID", generate_runner_id)
-          @logger = Logger.new("log/#{runner_id}.log")
+          @logger = init_logger(log)
         end
 
         def start(reconnect: false)
@@ -52,6 +54,15 @@ module Selective
 
         BUILD_ENV_SCRIPT_PATH = "../../../bin/build_env.sh".freeze
 
+        def init_logger(enabled)
+          if enabled
+            FileUtils.mkdir_p("log")
+            Logger.new("log/#{runner_id}.log")
+          else
+            Logger.new("/dev/null")
+          end
+        end
+
         def run_main_loop
           loop do
             message = pipe.read
@@ -90,13 +101,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,
@@ -111,8 +124,10 @@ module Selective
         end
 
         def build_env
-          result = `#{Pathname.new(__dir__) + BUILD_ENV_SCRIPT_PATH}`
-          JSON.parse(result)
+          @build_env ||= begin
+            result = `#{Pathname.new(__dir__) + BUILD_ENV_SCRIPT_PATH}`
+            JSON.parse(result)
+          end
         end
 
         def spawn_transport_process(url)
@@ -123,7 +138,6 @@ module Selective
           # The get_transport script is not released with the gem, so this
           # code is intended for development/CI purposes.
           if !File.exist?(transport_path) && File.exist?(get_transport_path)
-            require "open3"
             output, status = Open3.capture2e(get_transport_path)
             if !status.success?
               puts <<~TEXT
@@ -175,8 +189,8 @@ module Selective
 
         def handle_command(response)
           case response[:command]
-          when "init"
-            print_init(response[:runner_id])
+          when "print_notice"
+            print_notice(response[:message])
           when "test_manifest"
             handle_test_manifest
           when "run_test_cases"
@@ -189,10 +203,11 @@ module Selective
             handle_print_message(response[:message])
           when "close"
             handle_close(response[:exit_status])
-
-            # This is here for the sake of test where we
-            # cannot exit but we need to break the loop
+            # 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
 
           true
@@ -207,10 +222,9 @@ module Selective
         def handle_test_manifest
           self.class.restore_reporting!
           @logger.info("Sending Response: test_manifest")
-          write({type: "test_manifest", data: {
-            test_cases: runner.manifest["examples"],
-            modified_test_files: modified_test_files
-          }})
+          data = {test_cases: runner.manifest["examples"]}
+          data[:modified_test_files] = modified_test_files unless modified_test_files.nil?
+          write({type: "test_manifest", data: data})
         end
 
         def handle_run_test_cases(test_cases)
@@ -227,9 +241,17 @@ module Selective
         end
 
         def modified_test_files
-          # Todo: This should find files changed in the current branch
-          `git diff --name-only`.split("\n").filter do |f|
-            f.match?(/^#{runner.base_test_path}/)
+          @modified_test_files ||= begin
+            target_branch = build_env["target_branch"]
+            return [] if target_branch.nil? || target_branch.empty?
+
+            output, status = Open3.capture2e("git diff #{target_branch} --name-only")
+
+            if status.success?
+              output.split("\n").filter do |f|
+                f.match?(/^#{runner.base_test_path}/)
+              end
+            end
           end
         end
 
@@ -285,10 +307,10 @@ module Selective
           TEXT
         end
 
-        def print_init(runner_id)
+        def print_notice(message)
           puts_indented <<~TEXT
             #{banner}
-            Runner ID: #{runner_id.gsub("selgen-", "")}
+            #{message}
           TEXT
         end
 

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

@@ -3,7 +3,7 @@
 module Selective
   module Ruby
     module Core
-      VERSION = "0.1.1"
+      VERSION = "0.1.3"
     end
   end
 end

data/lib/selective-ruby-core.rb

@@ -24,6 +24,7 @@ module Selective
       class Init
         def initialize(args)
           @debug = !args.delete("--debug").nil?
+          @log = !args.delete("--log").nil?
           @runner_name, @args, @command = parse_args(args)
           require_runner
         end
@@ -34,10 +35,10 @@ module Selective
 
         private
 
-        attr_reader :debug, :runner_name, :args, :command
+        attr_reader :debug, :log, :runner_name, :args, :command
 
         def run
-          Selective::Ruby::Core::Controller.new(runner, debug).send(command)
+          Selective::Ruby::Core::Controller.new(runner, debug: debug, log: log).send(command)
         end
 
         def parse_args(args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selective-ruby-core
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: x86_64-linux
 authors:
 - Benjamin Wood
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk