@appthreat/atom 2.1.0 → 2.1.1

package/index.js

@@ -43,15 +43,13 @@ export const executeAtom = (atomArgs) => {
   if (!detectJava()) {
     // If we couldn't detect java but there is a JAVA_HOME defined then
     // try fixing the PATH manually. Usually required for windows users
-    if (process.env.JAVA_HOME) {
+    const atomJavaHome = process.env.ATOM_JAVA_HOME || process.env.JAVA_HOME;
+    if (atomJavaHome) {
       process.env.PATH =
-        process.env.PATH +
-        delimiter +
-        join(process.env.JAVA_HOME, "bin") +
-        delimiter;
+        join(atomJavaHome, "bin") + delimiter + process.env.PATH + delimiter;
     } else {
       console.warn(
-        "A Java JDK is not installed or can't be found. Please install JDK version 17 or higher before running atom."
+        "A Java JDK is not installed or can't be found. Please install JDK version 21 or higher before running atom."
       );
       return false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Create atom (⚛) representation for your application, packages and libraries",
   "exports": "./index.js",
   "type": "module",

package/plugins/bin/atom

@@ -360,7 +360,7 @@ declare -r lib_dir="$(realpath "${app_home}/../lib")"
 declare -a app_mainclass=('io.appthreat.atom.Atom')
 
 declare -r script_conf_file="${app_home}/../conf/application.ini"
-declare -r app_classpath="$lib_dir/io.appthreat.atom-2.1.0-classpath.jar"
+declare -r app_classpath="$lib_dir/io.appthreat.atom-2.1.1-classpath.jar"
 
 # java_cmd is overrode in process_args when -java-home is used
 declare java_cmd=$(get_java_cmd)

package/plugins/bin/atom.bat

@@ -40,7 +40,7 @@ rem "-J" is stripped, "-D" is left as is, and everything is appended to JAVA_OPT
 set _JAVA_PARAMS=
 set _APP_ARGS=
 
-set "APP_CLASSPATH=%APP_LIB_DIR%\io.appthreat.atom-2.1.0-classpath.jar"
+set "APP_CLASSPATH=%APP_LIB_DIR%\io.appthreat.atom-2.1.1-classpath.jar"
 set "APP_MAIN_CLASS=io.appthreat.atom.Atom"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v2.1.0',
-        'version' => '2.1.0.0',
-        'reference' => 'd85060311b2e9f0c8d08bda72016504b947e8b00',
+        'pretty_version' => 'v2.1.1',
+        'version' => '2.1.1.0',
+        'reference' => 'b69d333c11ef856bb6ac75d8d4d0b470e9adca58',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v2.1.0',
-            'version' => '2.1.0.0',
-            'reference' => 'd85060311b2e9f0c8d08bda72016504b947e8b00',
+            'pretty_version' => 'v2.1.1',
+            'version' => '2.1.1.0',
+            'reference' => 'b69d333c11ef856bb6ac75d8d4d0b470e9adca58',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-1c6e88faec50/ruby_ast_gen.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib".freeze]
   s.authors = ["David Baker Effendi".freeze, "Andrei Dreyer".freeze]
   s.bindir = "exe".freeze
-  s.date = "2025-01-10"
+  s.date = "2025-01-11"
   s.description = "A Ruby parser than dumps the AST as JSON output for Joern's `rubysrc2cpg` frontend".freeze
   s.email = ["dave@whirlylabs.com".freeze, "andrei@whirlylabs.com".freeze]
   s.executables = ["ruby_ast_gen".freeze]

package/plugins/rubyastgen/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/racc-1.8.1/gem_make.out

@@ -3,16 +3,16 @@ current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen
 creating Makefile
 
 current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse
-make DESTDIR\= sitearchdir\=./.gem.20250110-2738-8nl9so sitelibdir\=./.gem.20250110-2738-8nl9so clean
+make DESTDIR\= sitearchdir\=./.gem.20250111-2716-i7csk1 sitelibdir\=./.gem.20250111-2716-i7csk1 clean
 
 current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse
-make DESTDIR\= sitearchdir\=./.gem.20250110-2738-8nl9so sitelibdir\=./.gem.20250110-2738-8nl9so
+make DESTDIR\= sitearchdir\=./.gem.20250111-2716-i7csk1 sitelibdir\=./.gem.20250111-2716-i7csk1
 compiling cparse.c
 linking shared-object racc/cparse.so
 
 current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse
-make DESTDIR\= sitearchdir\=./.gem.20250110-2738-8nl9so sitelibdir\=./.gem.20250110-2738-8nl9so install
-/usr/bin/install -c -m 0755 cparse.so ./.gem.20250110-2738-8nl9so/racc
+make DESTDIR\= sitearchdir\=./.gem.20250111-2716-i7csk1 sitelibdir\=./.gem.20250111-2716-i7csk1 install
+/usr/bin/install -c -m 0755 cparse.so ./.gem.20250111-2716-i7csk1/racc
 
 current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse
-make DESTDIR\= sitearchdir\=./.gem.20250110-2738-8nl9so sitelibdir\=./.gem.20250110-2738-8nl9so clean
+make DESTDIR\= sitearchdir\=./.gem.20250111-2716-i7csk1 sitelibdir\=./.gem.20250111-2716-i7csk1 clean

package/rbastgen.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
-import { dirname, join } from "node:path";
+import { existsSync } from "node:fs";
+import { dirname, join, delimiter } from "node:path";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { detectRuby } from "./utils.mjs";
@@ -25,12 +26,24 @@ function main(argvs) {
     0,
     process.env.RUBY_ASTGEN_BIN || join(PLUGINS_HOME, "bin", "ruby_ast_gen")
   );
+  const env = {
+    ...process.env
+  };
+  if (
+    process.env.ATOM_RUBY_HOME &&
+    existsSync(join(process.env.ATOM_RUBY_HOME, "bin"))
+  ) {
+    const rubyBinDir = join(process.env.ATOM_RUBY_HOME, "bin");
+    if (!env.PATH.includes(rubyBinDir)) {
+      env.PATH = `${rubyBinDir}${delimiter}${env.PATH}`;
+    }
+  }
   spawnSync(process.env.RUBY_CMD || "ruby", argvs, {
     encoding: "utf-8",
     cwd,
     stdio: "inherit",
     stderr: "inherit",
-    env: process.env,
+    env,
     timeout: process.env.ATOM_TIMEOUT || process.env.ASTGEN_TIMEOUT
   });
 }