bitfab 0.63.0 → 0.63.1

data/lib/bitfab/cloud_replay_cli.rb

@@ -2,13 +2,15 @@
 
 require "json"
 require "open3"
+require "rbconfig"
 require "tempfile"
 
 module Bitfab
   module CloudReplayCli
-    HELP = "Direct GitHub replay: --cloud PIPELINE --trace-ids UUID[,UUID] [--registry PATH] [--max-concurrency 1..32] [--cloud-include FILE] [--cloud-dry-run] [--cloud-detach] [--cloud-request-id UUID] [--cloud-timeout MINUTES] [--cloud-check] [--fail-on-error] [replay options such as --name, --dataset-ids, --attempts, or --resume, passed to the replay on the runner]. Lifecycle: --cloud-status|--cloud-watch|--cloud-cancel|--cloud-cleanup UUID. Setup: --cloud-init [--config FILE] (creates a setup or updates it in place), --cloud-secrets --env-file FILE [NAME ...]. Requires git, gh auth login, Python 3.10+, and bitfab:setup cloud."
+    HINT = "Add --cloud to run the same replay on GitHub Actions; bitfab-replay --cloud --help explains it."
 
     HELPER = File.expand_path("cloudReplay.py", __dir__)
+    REPLAY_EXECUTABLE = File.expand_path("../../exe/bitfab-replay", __dir__)
 
     module_function
 
@@ -17,13 +19,13 @@ module Bitfab
     end
 
     def run(argv:, stdout:, stderr:, helper: HELPER)
-      if argv.include?("--help") || argv.include?("-h")
-        stdout.puts HELP
-        return {}
-      end
+      env = {
+        "BITFAB_REPLAY_COMMAND" => JSON.generate([RbConfig.ruby, REPLAY_EXECUTABLE]),
+        "BITFAB_SDK_LANGUAGE" => "ruby"
+      }
       Tempfile.create("bitfab-cloud-output") do |file|
         result_status = nil
-        Open3.popen3("python3", helper, *argv) do |input, output_stream, error_stream, thread|
+        Open3.popen3(env, "python3", helper, *argv) do |input, output_stream, error_stream, thread|
           input.close
           reader = Thread.new { IO.copy_stream(output_stream, file) }
           error_stream.each_line { |line| stderr.write(line) }
@@ -36,6 +38,10 @@ module Bitfab
           stdout.puts result_output unless result_output.strip.empty?
           raise ArgumentError, "Cloud replay failed. See diagnostics; use the execution UUID to recover a dispatched job."
         end
+        if argv.include?("--help") || argv.include?("-h")
+          stdout.write result_output
+          return {}
+        end
         result = JSON.parse(result_output)
         stdout.puts JSON.pretty_generate(result)
         result

data/lib/bitfab/replay_cli.rb

@@ -7,7 +7,7 @@ module Bitfab
   # Installed command that loads a project-owned registry module.
   module ReplayCommand
     USAGE = "Usage: bitfab-replay --registry <path> <pipeline> [replay options]"
-    HELP = "#{USAGE}\nRun bitfab-replay --registry <path> --help to list replay options.\n#{CloudReplayCli::HELP}"
+    HELP = "#{USAGE}\nRun bitfab-replay --registry <path> --help to list replay options.\n#{CloudReplayCli::HINT}"
 
     module_function
 
@@ -26,7 +26,7 @@ module Bitfab
     end
 
     def main(argv: ARGV, stdout: $stdout, stderr: $stderr)
-      if (argv.include?("--help") || argv.include?("-h")) && !argv.include?("--registry")
+      if (argv.include?("--help") || argv.include?("-h")) && !argv.include?("--registry") && !CloudReplayCli.cloud?(argv)
         stdout.puts HELP
         return 0
       end

data/lib/bitfab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bitfab
-  VERSION = "0.63.0"
+  VERSION = "0.63.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitfab
 version: !ruby/object:Gem::Version
-  version: 0.63.0
+  version: 0.63.1
 platform: ruby
 authors:
 - Harvest Team