bitfab 0.63.3 → 0.64.0

data/lib/bitfab/cloud_replay_cli.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
-require "open3"
 require "rbconfig"
-require "tempfile"
 
 module Bitfab
   module CloudReplayCli
@@ -18,52 +16,21 @@ module Bitfab
       argv.any? { |arg| arg == "--cloud" || arg.start_with?("--cloud-") }
     end
 
-    def run(argv:, stdout:, stderr:, helper: HELPER)
+    def run(argv:, helper: HELPER)
       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(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) }
-          reader.join
-          result_status = thread.value
-        end
-        file.rewind
-        result_output = file.read
-        unless result_status.success?
-          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 = parse_result(result_output, stdout)
-        stdout.puts JSON.pretty_generate(result)
-        result
+      pid = Process.spawn(env, "python3", helper, *argv)
+      begin
+        _, status = Process.wait2(pid)
+      rescue Interrupt
+        retry
       end
-    end
-
-    def parse_result(output, stdout)
-      commands, rest = output.lines.partition { |line| line.start_with?("::") }
-      commands.each { |line| stdout.puts line.chomp }
-      stdout.flush
-      (rest.length - 1).downto(0) do |start|
-        next unless rest[start].start_with?("{")
-        begin
-          result = JSON.parse(rest[start..].join)
-          return result if result.is_a?(Hash)
-        rescue JSON::ParserError
-          next
-        end
-      end
-      text = rest.join
-      stdout.puts text unless text.strip.empty?
-      raise ArgumentError, "Cloud replay did not print a JSON result; its output is above"
+      status.exitstatus || ((status.termsig == Signal.list["INT"]) ? 130 : 1)
+    rescue Errno::ENOENT
+      warn "Cloud replay needs Python 3.10+ on PATH as python3"
+      1
     end
   end
 end

data/lib/bitfab/replay_cli.rb

@@ -12,7 +12,6 @@ module Bitfab
     module_function
 
     def run(argv: ARGV, stdout: $stdout, stderr: $stderr, registry_loader: nil)
-      return CloudReplayCli.run(argv:, stdout:, stderr:) if CloudReplayCli.cloud?(argv)
       registry_path, replay_argv = parse(argv)
       loader = registry_loader || method(:load_registry)
       registry = loader.call(registry_path)
@@ -26,7 +25,8 @@ module Bitfab
     end
 
     def main(argv: ARGV, stdout: $stdout, stderr: $stderr)
-      if (argv.include?("--help") || argv.include?("-h")) && !argv.include?("--registry") && !CloudReplayCli.cloud?(argv)
+      return CloudReplayCli.run(argv:) if CloudReplayCli.cloud?(argv)
+      if (argv.include?("--help") || argv.include?("-h")) && !argv.include?("--registry")
         stdout.puts HELP
         return 0
       end

data/lib/bitfab/version.rb

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

metadata

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