@appthreat/atom 2.1.10 → 2.1.12

package/package.json

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

package/plugins/bin/atom

@@ -154,7 +154,7 @@ addResidual () {
   residual_args+=( "$1" )
 }
 addDebugger () {
-  addJava "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:$1"
+  addJava "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$1"
 }
 
 require_arg () {
@@ -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.10-classpath.jar"
+declare -r app_classpath="$lib_dir/io.appthreat.atom-2.1.12-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.10-classpath.jar"
+set "APP_CLASSPATH=%APP_LIB_DIR%\io.appthreat.atom-2.1.12-classpath.jar"
 set "APP_MAIN_CLASS=io.appthreat.atom.Atom"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 
@@ -156,6 +156,12 @@ rem Processes incoming arguments and places them in appropriate global variables
     goto param_loop
   )
 
+  if "!_TEST_PARAM!"=="-jvm-debug" (
+    set "_JAVA_PARAMS=!_JAVA_PARAMS! -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%~1"
+    shift
+    goto param_loop
+  )
+
   if "!_TEST_PARAM:~0,2!"=="-J" (
     rem strip -J prefix
     call set _TEST_PARAM=!_TEST_PARAM:~2!

package/plugins/bin/bundler

@@ -1,4 +1,4 @@
-#!/usr/bin/env jruby
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #
@@ -11,4 +11,4 @@
 $:.unshift File.expand_path "../rubyastgen/bundle", __dir__
 
 require "bundler/setup"
-load File.expand_path "../rubyastgen/bundle/jruby/3.1.0/gems/bundler-2.6.2/exe/bundler", __dir__
+load File.expand_path "../../../../../../../../../opt/hostedtoolcache/Ruby/3.4.2/x64/lib/ruby/gems/3.4.0/gems/bundler-2.6.2/exe/bundler", __dir__

package/plugins/bin/ruby_ast_gen

@@ -1,4 +1,4 @@
-#!/usr/bin/env jruby
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 #
@@ -11,4 +11,4 @@
 $:.unshift File.expand_path "../rubyastgen/bundle", __dir__
 
 require "bundler/setup"
-load File.expand_path "../rubyastgen/bundle/jruby/3.1.0/bundler/gems/ruby_ast_gen-05140cf67b0c/exe/ruby_ast_gen", __dir__
+load File.expand_path "../rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-d8b6ffa44317/exe/ruby_ast_gen", __dir__

package/plugins/composer/InstalledVersions.php

@@ -32,6 +32,11 @@ class InstalledVersions
      */
     private static $installed;
 
+    /**
+     * @var bool
+     */
+    private static $installedIsLocalDir;
+
     /**
      * @var bool|null
      */
@@ -309,6 +314,12 @@ class InstalledVersions
     {
         self::$installed = $data;
         self::$installedByVendor = array();
+
+        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
+        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
+        // so we have to assume it does not, and that may result in duplicate data being returned when listing
+        // all installed packages for example
+        self::$installedIsLocalDir = false;
     }
 
     /**
@@ -325,7 +336,9 @@ class InstalledVersions
         $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
+            $selfDir = strtr(__DIR__, '\\', '/');
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
@@ -333,11 +346,14 @@ class InstalledVersions
                     $required = require $vendorDir.'/composer/installed.php';
                     self::$installedByVendor[$vendorDir] = $required;
                     $installed[] = $required;
-                    if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
                         self::$installed = $required;
-                        $copiedLocalDir = true;
+                        self::$installedIsLocalDir = true;
                     }
                 }
+                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
+                    $copiedLocalDir = true;
+                }
             }
         }
 

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v2.1.10',
-        'version' => '2.1.10.0',
-        'reference' => '4ff249ce3fd0d4037e296605de794aab530834a1',
+        'pretty_version' => 'v2.1.12',
+        'version' => '2.1.12.0',
+        'reference' => '51f660d7f6e8328dbcdeeb959e0170bb17053f6d',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v2.1.10',
-            'version' => '2.1.10.0',
-            'reference' => '4ff249ce3fd0d4037e296605de794aab530834a1',
+            'pretty_version' => 'v2.1.12',
+            'version' => '2.1.12.0',
+            'reference' => '51f660d7f6e8328dbcdeeb959e0170bb17053f6d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

package/plugins/rubyastgen/Gemfile

@@ -5,8 +5,8 @@ ruby ">=3.1.4"
 source "https://rubygems.org"
 
 group :frontend do
-    gem "ruby_ast_gen", github: 'appthreat/ruby_ast_gen', ref: 'v1.0.0'
-    gem "parser", "~> 3.3.7.0"
+    gem "ruby_ast_gen", github: 'appthreat/ruby_ast_gen', ref: 'v1.0.3'
+    gem "parser", "~> 3.3.7.1"
     gem "ostruct", "~> 0.6.1"
     gem "racc", "~> 1.8.1"
 end

package/plugins/rubyastgen/Gemfile.lock

@@ -1,31 +1,29 @@
 GIT
   remote: https://github.com/appthreat/ruby_ast_gen.git
-  revision: 05140cf67b0c70df3cf726c7cc4706d484c8d8cc
-  ref: v1.0.0
+  revision: d8b6ffa44317c8cc4bb499e0dd1277295422a18f
+  ref: v1.0.3
   specs:
-    ruby_ast_gen (1.0.0)
+    ruby_ast_gen (1.0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     ostruct (0.6.1)
-    parser (3.3.7.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     racc (1.8.1)
-    racc (1.8.1-java)
 
 PLATFORMS
   arm64-darwin-24
   ruby
-  universal-java-21
   x64-mingw-ucrt
   x86_64-darwin-23
 
 DEPENDENCIES
   ostruct (~> 0.6.1)
-  parser (~> 3.3.7.0)
+  parser (~> 3.3.7.1)
   racc (~> 1.8.1)
   ruby_ast_gen!
 

package/plugins/rubyastgen/bundle/bundler/setup.rb

@@ -36,6 +36,7 @@ else
 end
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ast-2.4.2/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ostruct-0.6.1/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/racc-1.8.1-java/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parser-3.3.7.0/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/bundler/gems/ruby_ast_gen-05140cf67b0c/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-linux/#{Gem.extension_api_version}/racc-1.8.1")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/racc-1.8.1/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parser-3.3.7.1/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/bundler/gems/ruby_ast_gen-d8b6ffa44317/lib")

package/plugins/rubyastgen/bundle/{jruby/3.1.0/bundler/gems/ruby_ast_gen-05140cf67b0c → ruby/3.4.0/bundler/gems/ruby_ast_gen-d8b6ffa44317}/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "parser", "~> 3.3.7.0"
+gem "parser", "~> 3.3.7.1"
 gem "ostruct", "~> 0.6.1"
 gem "rake", "~> 13.2"
 gem "rspec", "~> 3.13"

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/{ruby_ast_gen-05140cf67b0c → ruby_ast_gen-d8b6ffa44317}/lib/ruby_ast_gen/node_handling.rb

@@ -58,12 +58,8 @@ module NodeHandling
     return base_hash
   end
 
-  def self.truncate_string(string, max_length, truncation_suffix = "...")
-    if string.length > max_length
-      string[0, max_length] + truncation_suffix
-    else
-      string
-    end
+  def self.trim_string(string)
+    string.gsub(/\n/, " ").gsub(/(\s)+/, " ")
   end
 
   def self.extract_code_snippet(location, source_code)
@@ -71,7 +67,7 @@ module NodeHandling
     range = location.expression || location
     return nil unless range.is_a?(Parser::Source::Range)
     snippet = source_code[range.begin_pos...range.end_pos]
-    self.truncate_string(snippet.strip, 200)
+    self.trim_string(snippet.strip)
   end
 
   def self.add_node_properties(node_type, base_map, file_path)

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/{ruby_ast_gen-05140cf67b0c → ruby_ast_gen-d8b6ffa44317}/lib/ruby_ast_gen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyAstGen
-  VERSION = "1.0.0"
+  VERSION = "1.0.3"
 end

package/plugins/rubyastgen/bundle/{jruby/3.1.0/bundler/gems/ruby_ast_gen-05140cf67b0c → ruby/3.4.0/bundler/gems/ruby_ast_gen-d8b6ffa44317}/lib/ruby_ast_gen.rb

@@ -1,4 +1,6 @@
+$VERBOSE = nil
 require 'parser/current'
+$VERBOSE = true
 require 'fileutils'
 require 'json'
 require 'thread'
@@ -48,7 +50,7 @@ module RubyAstGen
     elsif File.directory?(input_path)
       process_directory(input_path, output_dir, exclude_regex)
     else
-      RubyAstGen::Logger::error "#{input_path} is neither a file nor a directory."
+      RubyAstGen::Logger::info "#{input_path} is neither a file nor a directory."
       exit 1
     end
   end
@@ -62,7 +64,7 @@ module RubyAstGen
     relative_input_path = file_path.sub("#{base_dir}/", '')
     # Skip if the file matches the exclusion regex
     if exclude_regex && exclude_regex.match?(relative_input_path)
-      RubyAstGen::Logger::info "Excluding: #{relative_input_path}"
+      RubyAstGen::Logger::debug "Excluding: #{relative_input_path}"
       return
     end
 
@@ -74,10 +76,9 @@ module RubyAstGen
 
       output_path = File.join(output_dir, "#{relative_path}.json")
 
-      File.write(output_path, JSON.pretty_generate(ast))
-      RubyAstGen::Logger::info "Processed: #{relative_input_path} -> #{output_path}"
+      File.write(output_path, JSON.generate(ast))
     rescue StandardError => e
-      RubyAstGen::Logger::error "'#{relative_input_path}' - #{e.message}"
+      RubyAstGen::Logger::info "'#{relative_input_path}' - #{e.message}"
     end
   end
 
@@ -106,7 +107,7 @@ module RubyAstGen
 
             process_file(path, output_subdir, exclude_regex, dir_path)
           rescue => e
-            RubyAstGen::Logger::error "Error processing #{path}: #{e.message}"
+            RubyAstGen::Logger::info "Error processing #{path}: #{e.message}"
           end
         end
       end
@@ -127,13 +128,13 @@ module RubyAstGen
     json_ast[:rel_file_path] = relative_input_path
     json_ast
   rescue Parser::SyntaxError => e
-    RubyAstGen::Logger::error "Failed to parse #{file_path}: #{e.message}"
+    RubyAstGen::Logger::info "Failed to parse #{file_path}: #{e.message}"
     nil
   end
 
   def self.ruby_file?(file_path)
     ext = File.extname(file_path)
-    ['.rb', '.gemspec', 'Rakefile'].include?(ext) || file_path.end_with?('.rb')
+    %w[.rb .gemspec Rakefile .rake .ru].include?(ext) || file_path.end_with?('.rb')
   end
 
 end

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/{ruby_ast_gen-05140cf67b0c → ruby_ast_gen-d8b6ffa44317}/ruby_ast_gen.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby_ast_gen 1.0.0 ruby lib
+# stub: ruby_ast_gen 1.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby_ast_gen".freeze
-  s.version = "1.0.0".freeze
+  s.version = "1.0.3".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "homepage_uri" => "https://github.com/appthreat/ruby_ast_gen" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["David Baker Effendi".freeze, "Andrei Dreyer".freeze, "Team AppThreat".freeze]
   s.bindir = "exe".freeze
-  s.date = "2025-01-17"
+  s.date = "2025-02-21"
   s.description = "A Ruby parser than dumps the AST as JSON output for atom `rubysrc2cpg` frontend".freeze
   s.email = ["dave@whirlylabs.com".freeze, "andrei@whirlylabs.com".freeze, "hello@appthreat.com".freeze]
   s.executables = ["ruby_ast_gen".freeze]
-  s.files = ["Gemfile".freeze, "exe/ruby_ast_gen".freeze, "lib/ruby_ast_gen".freeze, "lib/ruby_ast_gen.rb".freeze, "lib/ruby_ast_gen/node_handling.rb".freeze, "lib/ruby_ast_gen/version.rb".freeze, "ruby_ast_gen.gemspec".freeze, "sig/ruby_ast_gen.rbs".freeze]
+  s.files = ["Gemfile".freeze, "exe/ruby_ast_gen".freeze, "lib/ruby_ast_gen".freeze, "lib/ruby_ast_gen.rb".freeze, "lib/ruby_ast_gen/node_handling.rb".freeze, "lib/ruby_ast_gen/version.rb".freeze, "ruby_ast_gen.gemspec".freeze]
   s.homepage = "https://github.com/appthreat/ruby_ast_gen".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 3.1.4".freeze)

package/plugins/rubyastgen/bundle/{jruby/3.1.0/bundler/gems/ruby_ast_gen-05140cf67b0c → ruby/3.4.0/bundler/gems/ruby_ast_gen-d8b6ffa44317}/spec/ruby_ast_gen_spec.rb

@@ -85,6 +85,88 @@ end
     code(<<-CODE)
 def foo(a, bar: "default")
   puts(bar)
+end
+    CODE
+    ast = RubyAstGen::parse_file(temp_file.path, temp_name)
+    expect(ast).not_to be_nil
+  end
+
+  it "should parse a large code snippet sucessfully" do
+    code(<<-CODE)
+# frozen_string_literal: true
+Railsgoat::Application.routes.draw do
+
+  get "login" => "sessions#new"
+  get "signup" => "users#new"
+  get "logout" => "sessions#destroy"
+
+  get "forgot_password" => "password_resets#forgot_password"
+  post "forgot_password" => "password_resets#send_forgot_password"
+  get "password_resets" => "password_resets#confirm_token"
+  post "password_resets" => "password_resets#reset_password"
+
+  get "dashboard/doc" => "dashboard#doc"
+
+  resources :sessions
+
+  resources :users do
+    get "account_settings"
+
+    resources :retirement
+    resources :paid_time_off
+    resources :work_info
+    resources :performance
+    resources :benefit_forms
+    resources :messages
+
+    resources :pay do
+      collection do
+        post "update_dd_info"
+        post "decrypted_bank_acct_num"
+      end
+    end
+
+  end
+
+  get "download" => "benefit_forms#download"
+  post "upload" => "benefit_forms#upload"
+
+  resources :tutorials do
+    collection do
+      get "credentials"
+    end
+  end
+
+  resources :schedule do
+    collection do
+      get "get_pto_schedule"
+    end
+  end
+
+  resources :admin do
+    get "dashboard"
+    get "get_user"
+    post "delete_user"
+    patch "update_user"
+    get "get_all_users"
+    get "analytics"
+  end
+
+  resources :dashboard do
+    collection do
+      get "home"
+      get "change_graph"
+    end
+  end
+
+  namespace :api, defaults: {format: "json"} do
+    namespace :v1 do
+      resources :users
+      resources :mobile
+    end
+  end
+
+  root to: "sessions#new"
 end
     CODE
     ast = RubyAstGen::parse_file(temp_file.path, temp_name)

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

@@ -1,18 +1,18 @@
 current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse
-/opt/hostedtoolcache/Ruby/3.4.1/x64/bin/ruby extconf.rb
+/opt/hostedtoolcache/Ruby/3.4.2/x64/bin/ruby extconf.rb
 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.20250117-2717-2braxr sitelibdir\=./.gem.20250117-2717-2braxr clean
+make DESTDIR\= sitearchdir\=./.gem.20250221-2931-1wwbnu sitelibdir\=./.gem.20250221-2931-1wwbnu 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.20250117-2717-2braxr sitelibdir\=./.gem.20250117-2717-2braxr
+make DESTDIR\= sitearchdir\=./.gem.20250221-2931-1wwbnu sitelibdir\=./.gem.20250221-2931-1wwbnu
 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.20250117-2717-2braxr sitelibdir\=./.gem.20250117-2717-2braxr install
-/usr/bin/install -c -m 0755 cparse.so ./.gem.20250117-2717-2braxr/racc
+make DESTDIR\= sitearchdir\=./.gem.20250221-2931-1wwbnu sitelibdir\=./.gem.20250221-2931-1wwbnu install
+/usr/bin/install -c -m 0755 cparse.so ./.gem.20250221-2931-1wwbnu/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.20250117-2717-2braxr sitelibdir\=./.gem.20250117-2717-2braxr clean
+make DESTDIR\= sitearchdir\=./.gem.20250221-2931-1wwbnu sitelibdir\=./.gem.20250221-2931-1wwbnu clean

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.7.0 → parser-3.3.7.1}/lib/parser/current.rb

@@ -102,7 +102,7 @@ module Parser
     CurrentRuby = Ruby31
 
   when /^3\.2\./
-    current_version = '3.2.6'
+    current_version = '3.2.7'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby32', current_version
     end
@@ -120,7 +120,7 @@ module Parser
     CurrentRuby = Ruby33
 
   when /^3\.4\./
-    current_version = '3.4.0'
+    current_version = '3.4.0-dev'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby34', current_version
     end

package/plugins/rubyastgen/bundle/{jruby/3.1.0/gems/parser-3.3.7.0 → ruby/3.4.0/gems/parser-3.3.7.1}/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '3.3.7.0'
+  VERSION = '3.3.7.1'
 end

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse/Makefile

@@ -13,12 +13,12 @@ NULLCMD = :
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/hostedtoolcache/Ruby/3.4.1/x64/include/ruby-3.4.0
+topdir = /opt/hostedtoolcache/Ruby/3.4.2/x64/include/ruby-3.4.0
 hdrdir = $(topdir)
-arch_hdrdir = /opt/hostedtoolcache/Ruby/3.4.1/x64/include/ruby-3.4.0/x86_64-linux
+arch_hdrdir = /opt/hostedtoolcache/Ruby/3.4.2/x64/include/ruby-3.4.0/x86_64-linux
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/opt/hostedtoolcache/Ruby/3.4.1/x64
+prefix = $(DESTDIR)/opt/hostedtoolcache/Ruby/3.4.2/x64
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)

package/plugins/rubyastgen/bundle/ruby/3.4.0/specifications/{parser-3.3.7.0.gemspec → parser-3.3.7.1.gemspec}

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: parser 3.3.7.0 ruby lib
+# stub: parser 3.3.7.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "parser".freeze
-  s.version = "3.3.7.0".freeze
+  s.version = "3.3.7.1".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.metadata = { "bug_tracker_uri" => "https://github.com/whitequark/parser/issues", "changelog_uri" => "https://github.com/whitequark/parser/blob/v3.3.7.0/CHANGELOG.md", "documentation_uri" => "https://www.rubydoc.info/gems/parser/3.3.7.0", "source_code_uri" => "https://github.com/whitequark/parser/tree/v3.3.7.0" } if s.respond_to? :metadata=
+  s.metadata = { "bug_tracker_uri" => "https://github.com/whitequark/parser/issues", "changelog_uri" => "https://github.com/whitequark/parser/blob/v3.3.7.1/CHANGELOG.md", "documentation_uri" => "https://www.rubydoc.info/gems/parser/3.3.7.1", "source_code_uri" => "https://github.com/whitequark/parser/tree/v3.3.7.1" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["whitequark".freeze]
-  s.date = "2025-01-16"
+  s.date = "2025-02-05"
   s.description = "A Ruby parser written in pure Ruby.".freeze
   s.email = ["whitequark@whitequark.org".freeze]
   s.executables = ["ruby-parse".freeze, "ruby-rewrite".freeze]

package/plugins/rubyastgen/setup.ps1

@@ -1,4 +1,4 @@
 $env:GEM_HOME="."
 bundle install --binstubs=../bin --no-cache --standalone=frontend
-Remove-Item -Recurse -Force bundle\ruby\*\bundler\gems\ruby_ast_gen-*\.git*
-Remove-Item -Recurse -Force bundle\ruby\*\cache
+Remove-Item -Recurse -Force bundle\ruby\3.4.0\bundler\gems\ruby_ast_gen-05140cf67b0c\.git*
+Remove-Item -Recurse -Force bundle\ruby\3.4.0\cache

package/rbastgen.js

@@ -14,7 +14,8 @@ const dirName = import.meta ? dirname(fileURLToPath(url)) : __dirname;
 export const PLUGINS_HOME = join(dirName, "plugins");
 const RUBY_ASTGEN_BIN =
   process.env.RUBY_ASTGEN_BIN || join(PLUGINS_HOME, "bin", "ruby_ast_gen");
-
+// Ruby version needed
+const RUBY_VERSION_NEEDED = "3.4.2";
 function main(argvs) {
   const cwd = process.env.ATOM_CWD || process.cwd();
   argvs.splice(
@@ -38,8 +39,10 @@ function main(argvs) {
       env.PATH = `${rubyBinDir}${delimiter}${env.PATH}`;
     }
   }
-  if (!detectRuby()) {
-    console.warn("Ruby is not installed!");
+  if (rubyCmd === "ruby" && !detectRuby(RUBY_VERSION_NEEDED)) {
+    console.warn(
+      `Ruby ${RUBY_VERSION_NEEDED} is not installed! Set the environment variable "ATOM_RUBY_HOME" to the Ruby ${RUBY_VERSION_NEEDED} install directory.`
+    );
     return false;
   }
   spawnSync(rubyCmd, argvs, {

package/utils.mjs

@@ -97,12 +97,18 @@ export const detectPhp = () => {
   return true;
 };
 
-export const detectRuby = () => {
+export const detectRuby = (versionNeeded) => {
   let result = spawnSync(process.env.RUBY_CMD || "ruby", ["--version"], {
     encoding: "utf-8"
   });
   if (result.status !== 0 || result.error) {
     return false;
   }
+  const stdout = result.stdout;
+  if (versionNeeded && stdout) {
+    const cmdOutput = Buffer.from(stdout).toString();
+    const versionStr = cmdOutput.trim().replaceAll("\r", "");
+    return versionStr.startsWith(`ruby ${versionNeeded} `);
+  }
   return true;
 };

package/plugins/rubyastgen/bundle/jruby/3.1.0/bin/bundle

@@ -1,29 +0,0 @@
-#!/usr/bin/env jruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'bundler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0.a"
-
-str = ARGV.first
-if str
-  str = str.b[/\A_(.*)_\z/, 1]
-  if str and Gem::Version.correct?(str)
-    version = str
-    ENV['BUNDLER_VERSION'] = str
-
-    ARGV.shift
-  end
-end
-
-if Gem.respond_to?(:activate_bin_path)
-load Gem.activate_bin_path('bundler', 'bundle', version)
-else
-gem "bundler", version
-load Gem.bin_path("bundler", "bundle", version)
-end