galaaz 2.1.3 → 2.1.5

data/specs/gknit_install_timeout_report_spec.rb

@@ -15,12 +15,13 @@ describe 'gknit install timeout reporting' do
     path = ([*extra, path].join(File::PATH_SEPARATOR)) unless extra.empty?
     ENV.to_h.merge(
       'JAVA_OPTS' => '--add-opens=java.base/java.nio=ALL-UNNAMED',
-      'PATH' => path
+      'PATH' => path,
+      # Job await limit (bridge --bridge_timeout_sec no longer drives CRAN installs).
+      'GALAAZ_INSTALL_TIMEOUT_SEC' => '1'
     )
   end
 
   it 'continues processing and prints timeout in final report' do
-    skip('Temporarily skipped: installation timeout behavior will be reviewed in a dedicated pass')
     root = File.expand_path('..', __dir__)
     workdir = Dir.mktmpdir('gknit_install_timeout_', root)
 
@@ -34,11 +35,28 @@ describe 'gknit install timeout reporting' do
         ---
 
         ```{ruby setup_stub}
-        R.bridge.eval_r("install.packages <- function(...) { Sys.sleep(2); invisible(NULL) }")
+        # Deterministic slow "install": child Rscript sleeps instead of CRAN work.
+        # Use ::R — bare R in chunks is RC::R (gknit scope), not the Galaaz module.
+        module ::R
+          class Job
+            def self.install(*packages, lib_dir: default_lib_dir, repos: DEFAULT_REPOS, wait: true, timeout: nil, &block)
+              pkgs = packages.flatten.map(&:to_s).reject(&:empty?)
+              raise ArgumentError, 'R::Job.install requires at least one package name' if pkgs.empty?
+
+              FileUtils.mkdir_p(lib_dir)
+              FileUtils.mkdir_p(jobs_root)
+              with_install_lock do
+                job = new(kind: 'install', packages: pkgs, lib_dir: lib_dir)
+                job.send(:spawn_eval!, 'Sys.sleep(30)')
+                finish_job(job, wait: wait, timeout: timeout, &block)
+              end
+            end
+          end
+        end
         ```
 
         ```{ruby timeout_install}
-        R.install_and_loads('definitely_fake_pkg_for_timeout_spec')
+        ::R.install_and_loads('definitely_fake_pkg_for_timeout_spec')
         ```
 
         ```{ruby after_timeout}
@@ -49,18 +67,20 @@ describe 'gknit install timeout reporting' do
       rel_rmd = File.basename(workdir) + '/' + File.basename(rmd_path)
       out, err, st = Open3.capture3(
         self.class.gknit_env,
-        'bin/gknit', '--output_format', 'github_document', '--bridge_timeout_sec', '1', rel_rmd,
+        'bin/gknit', '--output_format', 'github_document',
+        '--install_timeout_sec', '1',
+        rel_rmd,
         chdir: root
       )
 
       md_path = File.join(workdir, 'install_timeout.md')
-      expect(st.success?).to be(true)
+      expect(st.success?).to be(true), "gknit failed (status=#{st.exitstatus}):\n#{err}\n#{out}"
       expect(File.exist?(md_path)).to be(true)
       md = File.read(md_path)
       expect(md).to include('AFTER_TIMEOUT_CHUNK_OK')
       expect(err).to include('gknit internal errors detected:')
       expect(err).to include('chunk=timeout_install')
-      expect(err).to include('no RET for')
+      expect(err).to match(/install job timed out/i)
       expect(out).not_to be_nil
     ensure
       FileUtils.rm_rf(workdir) if workdir && File.directory?(workdir)

data/specs/r_job_spec.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+# Fast R::Job coverage (child Rscript; bridge stays free).
+# Run: bin/run_rspec specs/r_job_spec.rb
+
+require 'fileutils'
+require 'tmpdir'
+require 'galaaz'
+
+describe 'R::Job' do
+  around do |example|
+    Dir.mktmpdir('galaaz_jobs_') do |jobs|
+      old = ENV['GALAAZ_JOBS_DIR']
+      ENV['GALAAZ_JOBS_DIR'] = jobs
+      begin
+        example.run
+      ensure
+        ENV['GALAAZ_JOBS_DIR'] = old
+      end
+    end
+  end
+
+  it 'awaits eval in a block and load_rds on the bridge' do
+    coef = R::Job.eval(<<~R) { |job| job.load_rds }
+      fit <- lm(mpg ~ wt, data = mtcars)
+      saveRDS(unname(coef(fit)), result_path)
+    R
+
+    expect(coef).to be_a(R::Vector)
+    expect(coef.length).to eq(2)
+  end
+
+  it 'returns a Job without a block and supports wait: false' do
+    job = R::Job.eval('Sys.sleep(0.2); saveRDS(42L, result_path)', wait: false, timeout: 30)
+    expect(job).to be_a(R::Job)
+    expect(job.alive? || !job.finished?).to eq(true)
+
+    job.wait(timeout: 30)
+    job.raise_if_failed!
+    expect(job.status).to eq(:ok)
+    expect(job.load_rds.to_s).to include('42')
+  end
+
+  it 'kills the child process group on await timeout' do
+    expect {
+      R::Job.eval('Sys.sleep(30)', wait: true, timeout: 1)
+    }.to raise_error(R::Job::Timeout, /still running after/)
+  end
+
+  it 'runs a script with trailing args and load_rds' do
+    Dir.mktmpdir('galaaz_job_script_') do |dir|
+      path = File.join(dir, 'train.R')
+      File.write(path, <<~R)
+        args <- commandArgs(trailingOnly = TRUE)
+        n <- as.integer(args[[1]])
+        saveRDS(n, result_path)
+      R
+
+      n = R::Job.script(path, '7') { |job| job.load_rds }
+      expect(n.to_s).to include('7')
+    end
+  end
+
+  it 'clears a stale 00LOCK before install' do
+    Dir.mktmpdir('galaaz_job_lib_') do |lib|
+      lock = File.join(lib, '00LOCK-definitely_not_a_cran_pkg_xyzzy')
+      FileUtils.mkdir_p(lock)
+      File.write(File.join(lock, 'marker'), 'stale')
+
+      job = R::Job.install(
+        'definitely_not_a_cran_pkg_xyzzy',
+        lib_dir: lib,
+        wait: true,
+        timeout: 120
+      )
+
+      expect(File.exist?(lock)).to eq(false)
+      expect(job.status).to eq(:failed)
+    end
+  end
+end

data/version.rb

@@ -1,2 +1,2 @@
 $gem_name = "galaaz"
-$version="2.1.3"
+$version="2.1.5"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: galaaz
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.5
 platform: ruby
 authors:
 - Rodrigo Botafogo
 bindir: bin
 cert_chain: []
-date: 2026-09-04 00:00:00.000000000 Z
+date: 2026-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -310,6 +310,7 @@ files:
 - lib/R_interface/new_bridge_adapter.rb
 - lib/R_interface/r.rb
 - lib/R_interface/r_arrow.rb
+- lib/R_interface/r_job.rb
 - lib/R_interface/r_libs.R
 - lib/R_interface/r_methods.rb
 - lib/R_interface/r_module_s.rb
@@ -450,6 +451,7 @@ files:
 - specs/r_eval.spec.rb
 - specs/r_function.spec.rb
 - specs/r_instance_manager_spec.rb
+- specs/r_job_spec.rb
 - specs/r_list_apply.spec.rb
 - specs/r_matrix.spec.rb
 - specs/r_nse.spec.rb