galaaz 2.0.0 → 2.1.1

data/Rakefile

@@ -26,7 +26,7 @@ require 'rake/testtask'
 require 'shellwords'
 
 require_relative 'version'
-require_relative 'lib/galaaz_jruby'
+require_relative 'lib/galaaz_ruby'
 
 #----------------------------------------------------------------------------------------
 #
@@ -34,9 +34,15 @@ require_relative 'lib/galaaz_jruby'
 
 class MakeTask < Rake::TaskLib
 
-  # JRuby prefix: required JVM flags from GalaazJRuby + -I lib (see lib/galaaz_jruby.rb).
+  # Ruby prefix for running Galaaz. Uses `ruby` on PATH unless GALAAZ_RUBY is set.
+  # JVM flags only when the selected interpreter is JRuby (see lib/galaaz_ruby.rb).
+  def self.galaaz_ruby_invocation
+    GalaazRuby.shell_invocation('lib')
+  end
+
+  # Alias kept for existing call sites; same as galaaz_ruby_invocation.
   def self.galaaz_jruby_invocation
-    "jruby #{GalaazJRuby.shell_j_arg_string} -I lib"
+    galaaz_ruby_invocation
   end
 
   #----------------------------------------------------------------------------------------
@@ -56,14 +62,15 @@ class MakeTask < Rake::TaskLib
   end
 
   #----------------------------------------------------------------------------------------
-  # Run example or spec with JRuby (Galaaz 2.0 Shadow Bridge)
+  # Run example or spec with Galaaz Ruby (ruby on PATH; GALAAZ_RUBY overrides)
   #----------------------------------------------------------------------------------------
 
   def make_task
+    inv = MakeTask.galaaz_ruby_invocation
     if @rspec
-      sh %{ #{MakeTask.galaaz_jruby_invocation} -S rspec #{@filepath}.rb -f documentation }
+      sh %{ #{inv} -S bundle exec rspec #{@filepath}.rb -f documentation }
     else
-      sh %{ #{MakeTask.galaaz_jruby_invocation} #{@filepath}.rb }
+      sh %{ #{inv} -S bundle exec ruby #{@filepath}.rb }
     end
   end
 
@@ -81,8 +88,8 @@ end
 
 # Run each .rb file in a directory (for groups that don't have an all.rb)
 def run_each_file(file_list)
-  inv = MakeTask.galaaz_jruby_invocation
-  file_list.each { |f| sh "#{inv} #{f}" }
+  inv = MakeTask.galaaz_ruby_invocation
+  file_list.each { |f| sh "#{inv} -S bundle exec ruby #{f}" }
 end
 
 geoms = FileList['examples/sthda_ggplot/**/*.rb']
@@ -240,10 +247,10 @@ task :compile_gatekeeper do
   Dir.chdir('ext/new_bridge') { sh 'make all' }
 end
 
-desc 'Run specs/ and new_bridge_specs/ under JRuby with SimpleCov (same idea as bin/run_all_rspec)'
+desc 'Run specs/ and new_bridge_specs/ with SimpleCov (same idea as bin/run_all_rspec; GALAAZ_RUBY overrides)'
 task :specs_all_with_new_bridge => [:compile_gatekeeper] do
   root = File.expand_path(__dir__)
-  inv = MakeTask.galaaz_jruby_invocation
+  inv = MakeTask.galaaz_ruby_invocation
   top = Dir[File.join(root, 'specs', '*_spec.rb')] + Dir[File.join(root, 'specs', '*.spec.rb')]
   files = top.sort.map { |p| Shellwords.escape(p) }.join(' ')
   nb = Shellwords.escape(File.join(root, 'new_bridge_specs'))

data/bin/galaaz

@@ -1,5 +1,13 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-Dir.chdir(File.dirname(File.expand_path('..', __FILE__)))
+# Galaaz CLI: setup / blogs / doctor / add.
+# Unknown commands still forward to rake (legacy example runners).
 
-system ("rake #{ARGV[0]}")
+root = File.expand_path('..', __dir__)
+lib = File.join(root, 'lib')
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'galaaz/cli'
+
+exit Galaaz::CLI.run(ARGV)

data/bin/galaaz-jruby

@@ -1,14 +1,11 @@
 #!/usr/bin/env bash
 # Run jruby with Galaaz-required JVM flags and lib/ on the load path.
+# Thin JRuby wrapper around bin/galaaz-ruby (forces jruby).
 # Optional: GALAAZ_JRUBY_OPTS (space-separated extra -J... or jruby args).
 #
 # Usage: bin/galaaz-jruby path/to/script.rb [args...]
 #        bin/galaaz-jruby -S rspec specs/foo_spec.rb
 set -e
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-# shellcheck source=galaaz_jruby_env.inc.sh
-source "$ROOT/bin/galaaz_jruby_env.inc.sh"
-exec jruby -I "$ROOT/lib" \
-  $GALAAZ_REQUIRED_JRUBY_J_ARGS \
-  ${GALAAZ_JRUBY_OPTS:-} \
-  "$@"
+export GALAAZ_RUBY=jruby
+exec "$ROOT/bin/galaaz-ruby" "$@"

data/bin/galaaz-ruby

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Run Galaaz with the selected Ruby (default: ruby on PATH; JRuby or CRuby).
+# JVM flags are applied only when the interpreter is JRuby.
+#
+# Usage: bin/galaaz-ruby path/to/script.rb [args...]
+#        GALAAZ_RUBY=jruby bin/galaaz-ruby path/to/script.rb
+#        GALAAZ_RUBY=ruby bin/galaaz-ruby path/to/script.rb
+#        bin/galaaz-ruby -S rspec specs/foo_spec.rb
+set -e
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+# shellcheck source=galaaz_ruby_env.inc.sh
+source "$ROOT/bin/galaaz_ruby_env.inc.sh"
+# shellcheck disable=SC2086
+exec "$GALAAZ_RUBY_BIN" -I "$ROOT/lib" \
+  $GALAAZ_RUBY_J_ARGS \
+  "$@"

data/bin/galaaz_jruby_env.inc.sh

@@ -1,6 +1,22 @@
-# Galaaz required JVM flags for JRuby (Apache Arrow on Java 9+).
+# Galaaz required JVM flags for JRuby (Apache Arrow memory on Java 9+).
 # Source from bin/*.sh:  source "$ROOT/bin/galaaz_jruby_env.inc.sh"
 #
-# Source of truth in Ruby/Rake: lib/galaaz_jruby.rb (GalaazJRuby::REQUIRED_JRUBY_J_ARGS).
+# Source of truth in Ruby/Rake: lib/galaaz_jruby.rb (GalaazJRuby::JAVA_NIO_ADD_OPENS).
 # Optional extra -J flags: export GALAAZ_JRUBY_OPTS="-J-Xmx4g" (space-separated).
-GALAAZ_REQUIRED_JRUBY_J_ARGS='-J--add-opens=java.base/java.nio=ALL-UNNAMED'
+#
+# JAVA_OPTS is exported so *child* JRuby processes (bundle exec rspec, mise exec)
+# get the same opens flag. -J args on the outer command are not inherited by
+# bundle exec's second JVM.
+GALAAZ_JAVA_NIO_ADD_OPENS='--add-opens=java.base/java.nio=ALL-UNNAMED'
+GALAAZ_REQUIRED_JRUBY_J_ARGS="-J${GALAAZ_JAVA_NIO_ADD_OPENS}"
+
+case " ${JAVA_OPTS:-} " in
+  *" ${GALAAZ_JAVA_NIO_ADD_OPENS} "*) ;;
+  *)
+    if [ -n "${JAVA_OPTS:-}" ]; then
+      export JAVA_OPTS="${GALAAZ_JAVA_NIO_ADD_OPENS} ${JAVA_OPTS}"
+    else
+      export JAVA_OPTS="${GALAAZ_JAVA_NIO_ADD_OPENS}"
+    fi
+    ;;
+esac

data/bin/galaaz_ruby_env.inc.sh

@@ -0,0 +1,38 @@
+# Galaaz Ruby interpreter selection for bin/* launchers.
+# Source from bin/*.sh:  source "$ROOT/bin/galaaz_ruby_env.inc.sh"
+#
+# Sets:
+#   GALAAZ_RUBY_BIN   — interpreter to exec (default: ruby on PATH)
+#   GALAAZ_RUBY_J_ARGS — JVM -J flags when that interpreter is JRuby; empty on CRuby
+#
+# JRuby and CRuby are both first-class. Override with GALAAZ_RUBY=jruby, GALAAZ_RUBY=ruby,
+# or a full path. Extra JRuby flags: GALAAZ_JRUBY_OPTS="-J-Xmx4g" (ignored on CRuby).
+# CRuby red-arrow uses system Arrow GLib (Apache Arrow APT / libarrow-glib-dev).
+
+GALAAZ_RUBY_BIN="${GALAAZ_RUBY:-ruby}"
+
+_galaaz_ruby_base="$(basename -- "$GALAAZ_RUBY_BIN")"
+_galaaz_ruby_engine="$("$GALAAZ_RUBY_BIN" -e 'print RUBY_ENGINE' 2>/dev/null || true)"
+case "$_galaaz_ruby_base" in
+  jruby|jruby.*)
+    _galaaz_is_jruby=1
+    ;;
+  *)
+    if [[ "$_galaaz_ruby_engine" == "jruby" ]]; then
+      _galaaz_is_jruby=1
+    else
+      _galaaz_is_jruby=0
+    fi
+    ;;
+esac
+
+if [[ "$_galaaz_is_jruby" -eq 1 ]]; then
+  # shellcheck source=galaaz_jruby_env.inc.sh
+  source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/galaaz_jruby_env.inc.sh"
+  GALAAZ_RUBY_J_ARGS="$GALAAZ_REQUIRED_JRUBY_J_ARGS ${GALAAZ_JRUBY_OPTS:-}"
+  # JAVA_OPTS is exported by galaaz_jruby_env.inc.sh for bundle-exec child JVMs
+else
+  GALAAZ_REQUIRED_JRUBY_J_ARGS=''
+  GALAAZ_RUBY_J_ARGS=''
+fi
+unset _galaaz_ruby_base _galaaz_ruby_engine _galaaz_is_jruby

data/bin/gbookdown

@@ -58,7 +58,6 @@ end
 EOF
 
 libx = File.expand_path('../lib', File.dirname(__FILE__))
-require File.join(libx, 'galaaz_jruby')
-jvm_args = GalaazJRuby.shell_j_arg_string
-exec "jruby #{jvm_args} -I#{libx} -e #{Shellwords.escape(code)}"
+require File.join(libx, 'galaaz_ruby')
+exec "#{GalaazRuby.shell_invocation(libx)} -e #{Shellwords.escape(code)}"
 

data/bin/gknit

@@ -215,11 +215,10 @@ end
 EOF
 
 libx = File.expand_path('../lib', File.dirname(__FILE__))
-require File.join(libx, 'galaaz_jruby')
-jvm_args = GalaazJRuby.shell_j_arg_string
+require File.join(libx, 'galaaz_ruby')
 ENV['GALAAZ_CALLBACK_TIMEOUT_MS'] = options[:callback_timeout_ms].to_s if !options[:callback_timeout_ms].nil?
 ENV['GALAAZ_BRIDGE_TIMEOUT_SEC'] = options[:bridge_timeout_sec].to_s if !options[:bridge_timeout_sec].nil?
-exec "jruby #{jvm_args} -I#{libx} -e #{Shellwords.escape(code)}"
+exec "#{GalaazRuby.shell_invocation(libx)} -e #{Shellwords.escape(code)}"
 
 =begin
 # how to call rmarkdown::render with a parameter list

data/bin/gstudio

@@ -41,13 +41,13 @@ end.parse!
 
 bin_dir = File.expand_path('..', __FILE__)
 libx = File.expand_path('../../lib', __FILE__)
-require File.join(libx, 'galaaz_jruby')
-jvm_args = GalaazJRuby.shell_j_arg_string
+require File.join(libx, 'galaaz_ruby')
+inv = GalaazRuby.shell_invocation(Shellwords.escape(libx))
 
 if options[:pry]
   puts "Loading PRY and Galaaz... Please wait!"
-  exec "jruby #{jvm_args} -I#{Shellwords.escape(libx)} -S pry -r #{Shellwords.escape(File.join(bin_dir, 'gstudio_pry.rb'))}"
+  exec "#{inv} -S pry -r #{Shellwords.escape(File.join(bin_dir, 'gstudio_pry.rb'))}"
 else
   puts "Loading IRB and Galaaz... Please wait!"
-  exec "jruby #{jvm_args} -I#{Shellwords.escape(libx)} -S irb -r #{Shellwords.escape(File.join(bin_dir, 'gstudio_irb.rb'))}"
+  exec "#{inv} -S irb -r #{Shellwords.escape(File.join(bin_dir, 'gstudio_irb.rb'))}"
 end

data/bin/run_all_rspec

@@ -8,6 +8,7 @@
 #   bin/run_all_rspec
 #   bin/run_all_rspec --format documentation
 #   bin/run_all_rspec new_bridge_specs/phase0_protocol_spec.rb
+#   GALAAZ_RUBY=ruby bin/run_all_rspec
 #
 # If the first argument is an option (starts with -), default dirs are prepended
 # so `bin/run_all_rspec --format doc` still runs specs/ + new_bridge_specs/.
@@ -15,8 +16,8 @@
 # For specs/ only (faster day-to-day): bin/run_rspec
 set -e
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-# shellcheck source=galaaz_jruby_env.inc.sh
-source "$ROOT/bin/galaaz_jruby_env.inc.sh"
+# shellcheck source=galaaz_ruby_env.inc.sh
+source "$ROOT/bin/galaaz_ruby_env.inc.sh"
 
 echo "[run_all_rspec] compiling gatekeeper: ext/new_bridge"
 make -C "$ROOT/ext/new_bridge" -s all
@@ -35,9 +36,9 @@ if [ $# -eq 0 ]; then
 elif [[ "${1:-}" == -* ]]; then
   set -- "${DEFAULT_SPECS[@]}" "$@"
 fi
-exec jruby -I "$ROOT/lib" \
-  $GALAAZ_REQUIRED_JRUBY_J_ARGS \
-  ${GALAAZ_JRUBY_OPTS:-} \
+# shellcheck disable=SC2086
+exec "$GALAAZ_RUBY_BIN" -I "$ROOT/lib" \
+  $GALAAZ_RUBY_J_ARGS \
   -S bundle exec rspec \
   -r "$ROOT/specs/spec_helper.rb" \
   "$@"

data/bin/run_example

@@ -1,14 +1,17 @@
 #!/usr/bin/env bash
-# Run a Galaaz example with required JRuby JVM flags (lib/galaaz_jruby.rb).
-# Optional: GALAAZ_JRUBY_OPTS.
+# Run a Galaaz example (default: ruby on PATH). Override with GALAAZ_RUBY=jruby|ruby.
+# Uses bundle exec so msgpack (and other Gemfile deps) resolve under vendor/bundle.
+# Optional: GALAAZ_JRUBY_OPTS (JRuby only).
 #
 # Usage: bin/run_example examples/sthda_ggplot/all.rb
 #        bin/run_example examples/sthda_ggplot/one_variable_continuous/geom_density.rb
+#        GALAAZ_RUBY=ruby bin/run_example examples/misc/subsetting.rb
 set -e
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-# shellcheck source=galaaz_jruby_env.inc.sh
-source "$ROOT/bin/galaaz_jruby_env.inc.sh"
-exec jruby -I "$ROOT/lib" \
-  $GALAAZ_REQUIRED_JRUBY_J_ARGS \
-  ${GALAAZ_JRUBY_OPTS:-} \
+# shellcheck source=galaaz_ruby_env.inc.sh
+source "$ROOT/bin/galaaz_ruby_env.inc.sh"
+# shellcheck disable=SC2086
+exec "$GALAAZ_RUBY_BIN" -I "$ROOT/lib" \
+  $GALAAZ_RUBY_J_ARGS \
+  -S bundle exec ruby -I "$ROOT/lib" \
   "$@"

data/bin/run_old_rspec

@@ -3,17 +3,18 @@
 # Usage:
 #   bin/run_old_rspec
 #   bin/run_old_rspec old_specs/r_environment.spec.rb
+#   GALAAZ_RUBY=ruby bin/run_old_rspec
 set -e
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-# shellcheck source=galaaz_jruby_env.inc.sh
-source "$ROOT/bin/galaaz_jruby_env.inc.sh"
+# shellcheck source=galaaz_ruby_env.inc.sh
+source "$ROOT/bin/galaaz_ruby_env.inc.sh"
 if [ $# -eq 0 ]; then
   shopt -s nullglob
   SPECS=( "$ROOT"/old_specs/*.spec.rb "$ROOT"/old_specs/*_spec.rb )
   IFS=$'\n' SPECS=( $(printf '%s\n' "${SPECS[@]}" | sort) )
   set -- "${SPECS[@]}"
 fi
-exec jruby -I "$ROOT/lib" \
-  $GALAAZ_REQUIRED_JRUBY_J_ARGS \
-  ${GALAAZ_JRUBY_OPTS:-} \
+# shellcheck disable=SC2086
+exec "$GALAAZ_RUBY_BIN" -I "$ROOT/lib" \
+  $GALAAZ_RUBY_J_ARGS \
   -S bundle exec rspec "$@"

data/bin/run_rspec

@@ -1,23 +1,24 @@
 #!/usr/bin/env bash
-# Run rspec with JVM options required for Apache Arrow (see lib/galaaz_jruby.rb).
-# Optional JVM/jruby extras: GALAAZ_JRUBY_OPTS (space-separated).
+# Run rspec with Galaaz (default: ruby on PATH; JRuby or CRuby).
+# JVM options applied only on JRuby. Optional: GALAAZ_RUBY=jruby|ruby; GALAAZ_JRUBY_OPTS.
 #
 # Usage:
 #   bin/run_rspec              # run fast specs in specs/ only
-#   bin/run_all_rspec          # top-level specs/ + new_bridge_specs/ + gatekeeper compile (see docs/testing.md)
+#   bin/run_all_rspec          # top-level specs/ + new_bridge_specs/ + gatekeeper compile
 #   bin/run_slow_rspec         # run slow specs in slow-specs/
 #   bin/run_rspec specs/protocol_result_spec.rb
+#   GALAAZ_RUBY=ruby bin/run_rspec specs/r_bridge_bootstrap_spec.rb
 #   GALAAZ_DEBUG=1 bin/run_rspec specs/r_vector_subsetting.spec.rb:61 ...
 set -e
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-# shellcheck source=galaaz_jruby_env.inc.sh
-source "$ROOT/bin/galaaz_jruby_env.inc.sh"
+# shellcheck source=galaaz_ruby_env.inc.sh
+source "$ROOT/bin/galaaz_ruby_env.inc.sh"
 if [ $# -eq 0 ]; then
   set -- $(find "$ROOT/specs" -maxdepth 1 -type f \( -name '*_spec.rb' -o -name '*.spec.rb' \) | sort)
 fi
-exec jruby -I "$ROOT/lib" \
-  $GALAAZ_REQUIRED_JRUBY_J_ARGS \
-  ${GALAAZ_JRUBY_OPTS:-} \
+# shellcheck disable=SC2086
+exec "$GALAAZ_RUBY_BIN" -I "$ROOT/lib" \
+  $GALAAZ_RUBY_J_ARGS \
   -S bundle exec rspec \
   -r "$ROOT/specs/spec_helper.rb" \
   "$@"

data/bin/run_slow_rspec

@@ -3,17 +3,18 @@
 # Usage:
 #   bin/run_slow_rspec
 #   bin/run_slow_rspec slow-specs/phase2_gknit_chunk_output_spec.rb
+#   GALAAZ_RUBY=ruby bin/run_slow_rspec
 set -e
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-# shellcheck source=galaaz_jruby_env.inc.sh
-source "$ROOT/bin/galaaz_jruby_env.inc.sh"
+# shellcheck source=galaaz_ruby_env.inc.sh
+source "$ROOT/bin/galaaz_ruby_env.inc.sh"
 if [ $# -eq 0 ]; then
   shopt -s nullglob globstar
   SPECS=( "$ROOT"/slow-specs/**/*_spec.rb "$ROOT"/slow-specs/**/*.spec.rb )
   IFS=$'\n' SPECS=( $(printf '%s\n' "${SPECS[@]}" | sort) )
   set -- "${SPECS[@]}"
 fi
-exec jruby -I "$ROOT/lib" \
-  $GALAAZ_REQUIRED_JRUBY_J_ARGS \
-  ${GALAAZ_JRUBY_OPTS:-} \
+# shellcheck disable=SC2086
+exec "$GALAAZ_RUBY_BIN" -I "$ROOT/lib" \
+  $GALAAZ_RUBY_J_ARGS \
   -S bundle exec rspec "$@"