@appthreat/atom-parsetools 1.2.0 → 1.2.1

package/astgen.js

@@ -248,18 +248,27 @@ const babelSyntaxPlugins = [
   "dynamicImport",
   "importAttributes",
   "explicitResourceManagement",
-  "topLevelAwait",
-  "jsx"
+  "topLevelAwait"
 ];
 
-const makeTypescriptPlugin = (file) => [
+const isNonJsxTypeScriptFile = (file) =>
+  /(?:^|\/).*\.(?:d\.)?(?:ts|mts|cts)$/i.test(file);
+
+const isJsLikeNonJsxFile = (file) => /(?:^|\/).*\.(?:js|cjs|mjs)$/i.test(file);
+
+const shouldEnableJsxSyntax = (file) => !isNonJsxTypeScriptFile(file);
+
+const makeTypescriptPlugin = (
+  file,
+  { disallowAmbiguousJSXLike = isNonJsxTypeScriptFile(file) } = {}
+) => [
   "typescript",
   {
     dts:
       file.endsWith(".d.ts") ||
       file.endsWith(".d.mts") ||
       file.endsWith(".d.cts"),
-    disallowAmbiguousJSXLike: false
+    disallowAmbiguousJSXLike
   }
 ];
 
@@ -281,20 +290,32 @@ const mergeBabelPlugins = (...pluginGroups) => {
   return merged;
 };
 
-const makeBabelOptions = (baseOptions, file, extraPlugins = []) => ({
+const makeBabelOptions = (
+  baseOptions,
+  file,
+  extraPlugins = [],
+  { enableJsxSyntax = shouldEnableJsxSyntax(file), disallowAmbiguousJSXLike } = {}
+) => ({
   ...baseOptions,
   plugins: mergeBabelPlugins(
     baseOptions.plugins,
     extraPlugins,
     babelSyntaxPlugins,
+    enableJsxSyntax ? ["jsx"] : [],
     (baseOptions.plugins || []).some(
       (plugin) => getBabelPluginName(plugin) === "flow"
     )
       ? []
-      : [makeTypescriptPlugin(file)]
+      : [makeTypescriptPlugin(file, { disallowAmbiguousJSXLike })]
   )
 });
 
+const shouldTryNonJsxTypescriptFallback = (file, projectType) =>
+  projectType !== "flow" &&
+  !/\.tsx$/i.test(file) &&
+  !/\.jsx$/i.test(file) &&
+  (isNonJsxTypeScriptFile(file) || isJsLikeNonJsxFile(file));
+
 const babelParserOptions = {
   sourceType: "unambiguous",
   allowImportExportEverywhere: true,
@@ -446,9 +467,25 @@ const codeToJsAst = (file, code, projectType) => {
   const primaryOptions = makeBabelOptions(primaryBabelOptions, file);
   const secondaryOptions = makeBabelOptions(secondaryBabelOptions, file);
   const safeOptions = makeBabelOptions(babelSafeParserOptions, file);
+  const nonJsxTypeScriptFallbackOptions = shouldTryNonJsxTypescriptFallback(
+    file,
+    projectType
+  )
+    ? makeBabelOptions(primaryBabelOptions, file, [], {
+        enableJsxSyntax: false,
+        disallowAmbiguousJSXLike: true
+      })
+    : undefined;
   try {
     return parse(code, primaryOptions);
   } catch (errPrimary) {
+    if (nonJsxTypeScriptFallbackOptions) {
+      try {
+        return parse(code, nonJsxTypeScriptFallbackOptions);
+      } catch {
+        // Fall through to the broader parser fallback chain below.
+      }
+    }
     try {
       return parse(code, secondaryOptions);
     } catch (errSecondary) {
@@ -853,6 +890,17 @@ function createTsc(srcFiles, src) {
       }
     };
 
+    const getExplicitTypeAnnotationString = (typeNode) => {
+      if (!typeNode) {
+        return undefined;
+      }
+      try {
+        return safeTypeToString(typeChecker.getTypeFromTypeNode(typeNode), typeNode);
+      } catch {
+        return undefined;
+      }
+    };
+
     const addTypeAtPosition = (currentSeenTypes, position, typeStr) => {
       const scoreTypeString = (value) => {
         if (!value || isUnresolvedTypeString(value)) {
@@ -1128,8 +1176,8 @@ function createTsc(srcFiles, src) {
           node.kind === tsc.SyntaxKind.NonNullExpression
         ) {
           typeStr = safeTypeWithContextToString(
-            typeChecker.getTypeAtLocation(node.expression),
-            node.expression
+            typeChecker.getTypeAtLocation(node),
+            node
           );
         }
         // FUNCTION/METHOD SIGNATURES - extract return type AND parameter types
@@ -1208,9 +1256,13 @@ function createTsc(srcFiles, src) {
           node.kind === tsc.SyntaxKind.VariableDeclaration &&
           node.name
         ) {
+          const explicitDeclaredType = getExplicitTypeAnnotationString(node.type);
           const varType = typeChecker.getTypeAtLocation(node.name);
-          typeStr = safeTypeWithContextToString(varType, node.name);
-          if (node.initializer) {
+          typeStr =
+            explicitDeclaredType && !isUnresolvedTypeString(explicitDeclaredType)
+              ? explicitDeclaredType
+              : safeTypeWithContextToString(varType, node.name);
+          if (node.initializer && !explicitDeclaredType) {
             const initializerTarget = tsc.isPropertyAccessExpression(
               node.initializer
             )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom-parsetools",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Parsing tools that complement the @appthreat/atom project.",
   "main": "./index.js",
   "type": "module",

package/plugins/bin/bundler

@@ -11,4 +11,4 @@
 $:.unshift File.expand_path "../rubyastgen/bundle", __dir__
 
 require "bundler/setup"
-load File.expand_path "../rubyastgen/bundle/ruby/4.0.0/gems/bundler-2.6.7/exe/bundler", __dir__
+load File.expand_path "../rubyastgen/bundle/ruby/4.0.0/gems/bundler-2.6.9/exe/bundler", __dir__

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v1.2.0',
-        'version' => '1.2.0.0',
-        'reference' => '1d87f81079871844a24fd94e714a577bd98f1ea9',
+        'pretty_version' => 'v1.2.1',
+        'version' => '1.2.1.0',
+        'reference' => 'afc68f061af5b27948f4408573df918fdbda4162',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v1.2.0',
-            'version' => '1.2.0.0',
-            'reference' => '1d87f81079871844a24fd94e714a577bd98f1ea9',
+            'pretty_version' => 'v1.2.1',
+            'version' => '1.2.1.0',
+            'reference' => 'afc68f061af5b27948f4408573df918fdbda4162',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

package/plugins/rubyastgen/Gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 group :frontend do
-    gem "ruby_ast_gen", github: 'appthreat/ruby_ast_gen', ref: 'v1.3.0'
+    gem "ruby_ast_gen", github: 'appthreat/ruby_ast_gen', ref: 'cc312ebf06b4b5b1a8ef4c3c9c71ca98eb9fcd01'
     gem "parser", "~> 3.3.11.1"
     gem "prism", "~> 1.9"
     gem "ostruct", "~> 0.6.3"

package/plugins/rubyastgen/Gemfile.lock

@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/appthreat/ruby_ast_gen.git
   revision: cc312ebf06b4b5b1a8ef4c3c9c71ca98eb9fcd01
-  ref: v1.3.0
+  ref: cc312ebf06b4b5b1a8ef4c3c9c71ca98eb9fcd01
   specs:
     ruby_ast_gen (1.3.0)
 
@@ -17,10 +17,8 @@ GEM
     racc (1.8.1)
 
 PLATFORMS
-  arm64-darwin-24
+  arm64-darwin-25
   ruby
-  x64-mingw-ucrt
-  x86_64-darwin-23
 
 DEPENDENCIES
   ostruct (~> 0.6.3)
@@ -30,4 +28,4 @@ DEPENDENCIES
   ruby_ast_gen!
 
 BUNDLED WITH
-   2.6.7
+   2.6.9

package/plugins/rubyastgen/bundle/ruby/4.0.0/extensions/x86_64-linux/4.0.0/prism-1.9.0/gem_make.out

@@ -6,10 +6,10 @@ checking for whether -fvisibility=hidden is accepted as CFLAGS... yes
 creating Makefile
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/prism-1.9.0/ext/prism
-make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2565-nt66um sitelibdir\=./.gem.20260527-2565-nt66um clean
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2573-bep84q sitelibdir\=./.gem.20260527-2573-bep84q clean
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/prism-1.9.0/ext/prism
-make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2565-nt66um sitelibdir\=./.gem.20260527-2565-nt66um
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2573-bep84q sitelibdir\=./.gem.20260527-2573-bep84q
 compiling api_node.c
 compiling api_pack.c
 compiling extension.c
@@ -37,8 +37,8 @@ compiling ./../../src/util/pm_strpbrk.c
 linking shared-object prism/prism.so
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/prism-1.9.0/ext/prism
-make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2565-nt66um sitelibdir\=./.gem.20260527-2565-nt66um install
-/usr/bin/install -c -m 0755 prism.so ./.gem.20260527-2565-nt66um/prism
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2573-bep84q sitelibdir\=./.gem.20260527-2573-bep84q install
+/usr/bin/install -c -m 0755 prism.so ./.gem.20260527-2573-bep84q/prism
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/prism-1.9.0/ext/prism
-make DESTDIR\= sitearchdir\=./.gem.20260527-2565-nt66um sitelibdir\=./.gem.20260527-2565-nt66um clean
+make DESTDIR\= sitearchdir\=./.gem.20260527-2573-bep84q sitelibdir\=./.gem.20260527-2573-bep84q clean

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

@@ -3,16 +3,16 @@ current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rub
 creating Makefile
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/racc-1.8.1/ext/racc/cparse
-make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2565-xiulvb sitelibdir\=./.gem.20260527-2565-xiulvb clean
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2573-dcu8v1 sitelibdir\=./.gem.20260527-2573-dcu8v1 clean
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/racc-1.8.1/ext/racc/cparse
-make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2565-xiulvb sitelibdir\=./.gem.20260527-2565-xiulvb
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2573-dcu8v1 sitelibdir\=./.gem.20260527-2573-dcu8v1
 compiling cparse.c
 linking shared-object racc/cparse.so
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/racc-1.8.1/ext/racc/cparse
-make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2565-xiulvb sitelibdir\=./.gem.20260527-2565-xiulvb install
-/usr/bin/install -c -m 0755 cparse.so ./.gem.20260527-2565-xiulvb/racc
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260527-2573-dcu8v1 sitelibdir\=./.gem.20260527-2573-dcu8v1 install
+/usr/bin/install -c -m 0755 cparse.so ./.gem.20260527-2573-dcu8v1/racc
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/racc-1.8.1/ext/racc/cparse
-make DESTDIR\= sitearchdir\=./.gem.20260527-2565-xiulvb sitelibdir\=./.gem.20260527-2565-xiulvb clean
+make DESTDIR\= sitearchdir\=./.gem.20260527-2573-dcu8v1 sitelibdir\=./.gem.20260527-2573-dcu8v1 clean

package/plugins/rubyastgen/bundle/ruby/4.0.0/gems/{bundler-2.6.7 → bundler-2.6.9}/lib/bundler/build_metadata.rb

@@ -5,7 +5,7 @@ module Bundler
   module BuildMetadata
     # begin ivars
     @built_at = "1980-01-02".freeze
-    @git_commit_sha = "32896b3570e".freeze
+    @git_commit_sha = "8a2a14d63da".freeze
     @release = true
     # end ivars
 

package/plugins/rubyastgen/bundle/ruby/4.0.0/gems/{bundler-2.6.7/lib/bundler/cli/doctor.rb → bundler-2.6.9/lib/bundler/cli/doctor/diagnose.rb}

@@ -4,7 +4,7 @@ require "rbconfig"
 require "shellwords"
 
 module Bundler
-  class CLI::Doctor
+  class CLI::Doctor::Diagnose
     DARWIN_REGEX = /\s+(.+) \(compatibility /
     LDD_REGEX = /\t\S+ => (\S+) \(\S+\)/
 
@@ -24,7 +24,7 @@ module Bundler
 
     def dylibs_darwin(path)
       output = `/usr/bin/otool -L #{path.shellescape}`.chomp
-      dylibs = output.split("\n")[1..-1].map {|l| l.match(DARWIN_REGEX).captures[0] }.uniq
+      dylibs = output.split("\n")[1..-1].filter_map {|l| l.match(DARWIN_REGEX)&.match(1) }.uniq
       # ignore @rpath and friends
       dylibs.reject {|dylib| dylib.start_with? "@" }
     end
@@ -65,14 +65,20 @@ module Bundler
     end
 
     def check!
-      require_relative "check"
+      require_relative "../check"
       Bundler::CLI::Check.new({}).run
     end
 
+    def diagnose_ssl
+      require_relative "ssl"
+      Bundler::CLI::Doctor::SSL.new({}).run
+    end
+
     def run
       Bundler.ui.level = "warn" if options[:quiet]
       Bundler.settings.validate!
       check!
+      diagnose_ssl if options[:ssl]
 
       definition = Bundler.definition
       broken_links = {}

package/plugins/rubyastgen/bundle/ruby/4.0.0/gems/bundler-2.6.9/lib/bundler/cli/doctor/ssl.rb

@@ -0,0 +1,249 @@
+# frozen_string_literal: true
+
+require "rubygems/remote_fetcher"
+require "uri"
+
+module Bundler
+  class CLI::Doctor::SSL
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      return unless openssl_installed?
+
+      output_ssl_environment
+      bundler_success = bundler_connection_successful?
+      rubygem_success = rubygem_connection_successful?
+
+      return unless net_http_connection_successful?
+
+      Explanation.summarize(bundler_success, rubygem_success, host)
+    end
+
+    private
+
+    def host
+      @options[:host] || "rubygems.org"
+    end
+
+    def tls_version
+      @options[:"tls-version"].then do |version|
+        "TLS#{version.sub(".", "_")}".to_sym if version
+      end
+    end
+
+    def verify_mode
+      mode = @options[:"verify-mode"] || :peer
+
+      @verify_mode ||= mode.then {|mod| OpenSSL::SSL.const_get("verify_#{mod}".upcase) }
+    end
+
+    def uri
+      @uri ||= URI("https://#{host}")
+    end
+
+    def openssl_installed?
+      require "openssl"
+
+      true
+    rescue LoadError
+      Bundler.ui.warn(<<~MSG)
+        Oh no! Your Ruby doesn't have OpenSSL, so it can't connect to #{host}.
+        You'll need to recompile or reinstall Ruby with OpenSSL support and try again.
+      MSG
+
+      false
+    end
+
+    def output_ssl_environment
+      Bundler.ui.info(<<~MESSAGE)
+        Here's your OpenSSL environment:
+
+        OpenSSL:       #{OpenSSL::VERSION}
+        Compiled with: #{OpenSSL::OPENSSL_VERSION}
+        Loaded with:   #{OpenSSL::OPENSSL_LIBRARY_VERSION}
+      MESSAGE
+    end
+
+    def bundler_connection_successful?
+      Bundler.ui.info("\nTrying connections to #{uri}:\n")
+
+      bundler_uri = Gem::URI(uri.to_s)
+      Bundler::Fetcher.new(
+        Bundler::Source::Rubygems::Remote.new(bundler_uri)
+      ).send(:connection).request(bundler_uri)
+
+      Bundler.ui.info("Bundler:       success")
+
+      true
+    rescue StandardError => error
+      Bundler.ui.warn("Bundler:       failed     (#{Explanation.explain_bundler_or_rubygems_error(error)})")
+
+      false
+    end
+
+    def rubygem_connection_successful?
+      Gem::RemoteFetcher.fetcher.fetch_path(uri)
+      Bundler.ui.info("RubyGems:      success")
+
+      true
+    rescue StandardError => error
+      Bundler.ui.warn("RubyGems:      failed     (#{Explanation.explain_bundler_or_rubygems_error(error)})")
+
+      false
+    end
+
+    def net_http_connection_successful?
+      ::Gem::Net::HTTP.new(uri.host, uri.port).tap do |http|
+        http.use_ssl = true
+        http.min_version = tls_version
+        http.max_version = tls_version
+        http.verify_mode = verify_mode
+      end.start
+
+      Bundler.ui.info("Ruby net/http: success")
+      warn_on_unsupported_tls12
+
+      true
+    rescue StandardError => error
+      Bundler.ui.warn(<<~MSG)
+        Ruby net/http: failed
+
+        Unfortunately, this Ruby can't connect to #{host}.
+
+        #{Explanation.explain_net_http_error(error, host, tls_version)}
+      MSG
+
+      false
+    end
+
+    def warn_on_unsupported_tls12
+      ctx = OpenSSL::SSL::SSLContext.new
+      supported = true
+
+      if ctx.respond_to?(:min_version=)
+        begin
+          ctx.min_version = ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+        rescue OpenSSL::SSL::SSLError, NameError
+          supported = false
+        end
+      else
+        supported = OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1_2) # rubocop:disable Naming/VariableNumber
+      end
+
+      Bundler.ui.warn(<<~EOM) unless supported
+
+        WARNING: Although your Ruby can connect to #{host} today, your OpenSSL is very old!
+        WARNING: You will need to upgrade OpenSSL to use #{host}.
+
+      EOM
+    end
+
+    module Explanation
+      extend self
+
+      def explain_bundler_or_rubygems_error(error)
+        case error.message
+        when /certificate verify failed/
+          "certificate verification"
+        when /read server hello A/
+          "SSL/TLS protocol version mismatch"
+        when /tlsv1 alert protocol version/
+          "requested TLS version is too old"
+        else
+          error.message
+        end
+      end
+
+      def explain_net_http_error(error, host, tls_version)
+        case error.message
+        # Check for certificate errors
+        when /certificate verify failed/
+          <<~MSG
+            #{show_ssl_certs}
+            Your Ruby can't connect to #{host} because you are missing the certificate files OpenSSL needs to verify you are connecting to the genuine #{host} servers.
+          MSG
+        # Check for TLS version errors
+        when /read server hello A/, /tlsv1 alert protocol version/
+          if tls_version.to_s == "TLS1_3"
+            "Your Ruby can't connect to #{host} because #{tls_version} isn't supported yet.\n"
+          else
+            <<~MSG
+              Your Ruby can't connect to #{host} because your version of OpenSSL is too old.
+              You'll need to upgrade your OpenSSL install and/or recompile Ruby to use a newer OpenSSL.
+            MSG
+          end
+        # OpenSSL doesn't support TLS version specified by argument
+        when /unknown SSL method/
+          "Your Ruby can't connect because #{tls_version} isn't supported by your version of OpenSSL."
+        else
+          <<~MSG
+            Even worse, we're not sure why.
+
+            Here's the full error information:
+            #{error.class}: #{error.message}
+              #{error.backtrace.join("\n  ")}
+
+            You might have more luck using Mislav's SSL doctor.rb script. You can get it here:
+            https://github.com/mislav/ssl-tools/blob/8b3dec4/doctor.rb
+
+            Read more about the script and how to use it in this blog post:
+            https://mislav.net/2013/07/ruby-openssl/
+          MSG
+        end
+      end
+
+      def summarize(bundler_success, rubygems_success, host)
+        guide_url = "http://ruby.to/ssl-check-failed"
+
+        message = if bundler_success && rubygems_success
+          <<~MSG
+            Hooray! This Ruby can connect to #{host}.
+            You are all set to use Bundler and RubyGems.
+
+          MSG
+        elsif !bundler_success && !rubygems_success
+          <<~MSG
+            For some reason, your Ruby installation can connect to #{host}, but neither RubyGems nor Bundler can.
+            The most likely fix is to manually upgrade RubyGems by following the instructions at #{guide_url}.
+            After you've done that, run `gem install bundler` to upgrade Bundler, and then run this script again to make sure everything worked. ❣
+
+          MSG
+        elsif !bundler_success
+          <<~MSG
+            Although your Ruby installation and RubyGems can both connect to #{host}, Bundler is having trouble.
+            The most likely way to fix this is to upgrade Bundler by running `gem install bundler`.
+            Run this script again after doing that to make sure everything is all set.
+            If you're still having trouble, check out the troubleshooting guide at #{guide_url}.
+
+          MSG
+        else
+          <<~MSG
+            It looks like Ruby and Bundler can connect to #{host}, but RubyGems itself cannot.
+            You can likely solve this by manually downloading and installing a RubyGems update.
+            Visit #{guide_url} for instructions on how to manually upgrade RubyGems.
+
+          MSG
+        end
+
+        Bundler.ui.info("\n#{message}")
+      end
+
+      private
+
+      def show_ssl_certs
+        ssl_cert_file = ENV["SSL_CERT_FILE"] || OpenSSL::X509::DEFAULT_CERT_FILE
+        ssl_cert_dir  = ENV["SSL_CERT_DIR"]  || OpenSSL::X509::DEFAULT_CERT_DIR
+
+        <<~MSG
+          Below affect only Ruby net/http connections:
+          SSL_CERT_FILE: #{File.exist?(ssl_cert_file) ? "exists     #{ssl_cert_file}" : "is missing #{ssl_cert_file}"}
+          SSL_CERT_DIR:  #{Dir.exist?(ssl_cert_dir)   ? "exists     #{ssl_cert_dir}"  : "is missing #{ssl_cert_dir}"}
+        MSG
+      end
+    end
+  end
+end

package/plugins/rubyastgen/bundle/ruby/4.0.0/gems/bundler-2.6.9/lib/bundler/cli/doctor.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Doctor < Thor
+    default_command(:diagnose)
+
+    desc "diagnose [OPTIONS]", "Checks the bundle for common problems"
+    long_desc <<-D
+      Doctor scans the OS dependencies of each of the gems requested in the Gemfile. If
+      missing dependencies are detected, Bundler prints them and exits status 1.
+      Otherwise, Bundler prints a success message and exits with a status of 0.
+    D
+    method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
+    method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
+    method_option "ssl", type: :boolean, default: false, banner: "Diagnose SSL problems."
+    def diagnose
+      require_relative "doctor/diagnose"
+      Diagnose.new(options).run
+    end
+
+    desc "ssl [OPTIONS]", "Diagnose SSL problems"
+    long_desc <<-D
+      Diagnose SSL problems, especially related to certificates or TLS version while connecting to https://rubygems.org.
+    D
+    method_option "host", type: :string, banner: "The host to diagnose."
+    method_option "tls-version", type: :string, banner: "Specify the SSL/TLS version when running the diagnostic. Accepts either <1.1> or <1.2>"
+    method_option "verify-mode", type: :string, banner: "Specify the mode used for certification verification. Accepts either <peer> or <none>"
+    def ssl
+      require_relative "doctor/ssl"
+      SSL.new(options).run
+    end
+  end
+end

package/plugins/rubyastgen/bundle/ruby/4.0.0/gems/{bundler-2.6.7 → bundler-2.6.9}/lib/bundler/cli/issue.rb

@@ -34,8 +34,8 @@ module Bundler
     end
 
     def doctor
-      require_relative "doctor"
-      Bundler::CLI::Doctor.new({}).run
+      require_relative "doctor/diagnose"
+      Bundler::CLI::Doctor::Diagnose.new({}).run
     end
   end
 end

package/plugins/rubyastgen/bundle/ruby/4.0.0/gems/{bundler-2.6.7 → bundler-2.6.9}/lib/bundler/cli.rb

@@ -610,17 +610,8 @@ module Bundler
     end
 
     desc "doctor [OPTIONS]", "Checks the bundle for common problems"
-    long_desc <<-D
-      Doctor scans the OS dependencies of each of the gems requested in the Gemfile. If
-      missing dependencies are detected, Bundler prints them and exits status 1.
-      Otherwise, Bundler prints a success message and exits with a status of 0.
-    D
-    method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
-    method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
-    def doctor
-      require_relative "cli/doctor"
-      Doctor.new(options).run
-    end
+    require_relative "cli/doctor"
+    subcommand("doctor", Doctor)
 
     desc "issue", "Learn how to report an issue in Bundler"
     def issue