dependabot-bundler 0.285.0 → 0.286.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46bd8d058b090759dfbdef246960dd68aaf6805eca3e8ed86dcbbe24bae02f05
-  data.tar.gz: 0104dce3ac3823fb75626420bf71eabebba6cc6a43a5a01a3ab4475c73f5090f
+  metadata.gz: 0ce0397383ee54f28c18dd936362de171d27f055d66754451e17ba8c57e4885a
+  data.tar.gz: 49ac7f319dcb2c6b7a84d434b171cb66ec4757db1f6f68c92be8e3a3b3f448e2
 SHA512:
-  metadata.gz: 29cc464b42b25ae071d77180e16b91e151cc5fb5a5b8fb3375a94908dd6189539b5b23e02d5be93b999fe7e3256671fa4718adc5c63107f18b08332d2f2b0950
-  data.tar.gz: a1ca65abcce69cac328b4d99d1e4fe5319abc1c6fc7f8f3ffd5b99f70f1a3887e07434ba8a69521c7fed2c952c3e6cbb745fa55da547148a09c56408cbecac21
+  metadata.gz: 87221c02650ec120d7dce3b5f65386f9585d2554ced84b6d7ead43449871955a13e621a2cf1d72ad8442caf598105c0bfda19f16e0d17f3d36a848c1d85fb250
+  data.tar.gz: a0a20ecf386feb119de3b653f6fb598a061bda76521c456c713b5683cf2d94ec945b37fa4fa3e01471bee97e5de8888a7638caf014cc5afd8ddb7f7ad3ad1054

data/lib/dependabot/bundler/file_parser.rb

@@ -54,7 +54,9 @@ module Dependabot
       end
 
       def package_manager_requirement
-        @package_manager_requirement ||= Helpers.bundler_dependency_requirement(dependency_files)
+        @package_manager_requirement ||= Helpers.dependency_requirement(
+          Helpers::BUNDLER_GEM_NAME, dependency_files
+        )
       end
 
       sig { returns(T.nilable(Ecosystem::VersionManager)) }
@@ -63,7 +65,13 @@ module Dependabot
 
         return nil if package_manager.unsupported?
 
-        Language.new(ruby_raw_version)
+        Language.new(ruby_raw_version, language_requirement)
+      end
+
+      def language_requirement
+        @language_requirement ||= Helpers.dependency_requirement(
+          Helpers::LANGUAGE, dependency_files
+        )
       end
 
       def check_external_code(dependencies)

data/lib/dependabot/bundler/helpers.rb

@@ -13,10 +13,13 @@ module Dependabot
       V2 = "2"
       DEFAULT = V2
       BUNDLER_MAJOR_VERSION_REGEX = /BUNDLED WITH\s+(?<version>\d+)\./m
+      RUBY_GEMFILE_REGEX = /^ruby\s+['"]([^'"]+)['"]/
+      RUBY_GEMSPEC_REGEX = /required_ruby_version\s+=\s+['"]([^'"]+)['"]/
 
       GEMFILE = "Gemfile"
       GEMSPEC_EXTENSION = ".gemspec"
       BUNDLER_GEM_NAME = "bundler"
+      LANGUAGE = "ruby"
 
       sig { params(lockfile: T.nilable(Dependabot::DependencyFile)).returns(String) }
       def self.bundler_version(lockfile)
@@ -42,10 +45,13 @@ module Dependabot
 
       # Method to get the Requirement object for the 'bundler' dependency
       sig do
-        params(files: T::Array[Dependabot::DependencyFile]).returns(T.nilable(Dependabot::Bundler::Requirement))
+        params(
+          dependency_name: String,
+          files: T::Array[Dependabot::DependencyFile]
+        ).returns(T.nilable(Dependabot::Bundler::Requirement))
       end
-      def self.bundler_dependency_requirement(files)
-        constraints = combined_dependency_constraints(files, BUNDLER_GEM_NAME)
+      def self.dependency_requirement(dependency_name, files)
+        constraints = combined_dependency_constraints(files, dependency_name)
         return nil if constraints.empty?
 
         combined_constraint = constraints.join(", ")
@@ -67,20 +73,35 @@ module Dependabot
           content = file.content
           next unless content
 
-          # Select the appropriate regex based on file type
-          regex = if file.name.end_with?(GEMFILE)
+          # Select the appropriate regex based on file type and dependency name
+          regex = if dependency_name == LANGUAGE
+                    ruby_version_regex(file.name)
+                  elsif file.name.end_with?(GEMFILE)
                     gemfile_dependency_regex(dependency_name)
                   elsif file.name.end_with?(GEMSPEC_EXTENSION)
                     gemspec_dependency_regex(dependency_name)
                   else
-                    next # Skip unsupported file types
+                    next # Skip unsupported file types, including .ruby-version
                   end
 
+          # If regex is nil (unsupported for this file type), skip to the next file
+          next unless regex
+
           # Extract constraints using the chosen regex
           result.concat(extract_constraints_from_file(content, regex))
         end.uniq
       end
 
+      # Method to generate the regex pattern for Ruby version in Gemfile or gemspec
+      sig { params(file_name: String).returns(T.nilable(Regexp)) }
+      def self.ruby_version_regex(file_name)
+        if file_name.end_with?(GEMFILE)
+          RUBY_GEMFILE_REGEX
+        elsif file_name.end_with?(GEMSPEC_EXTENSION)
+          RUBY_GEMSPEC_REGEX
+        end
+      end
+
       # Method to generate the regex pattern for a dependency in a Gemfile
       sig { params(dependency_name: String).returns(Regexp) }
       def self.gemfile_dependency_regex(dependency_name)

data/lib/dependabot/bundler/language.rb

@@ -12,12 +12,9 @@ module Dependabot
     class Language < Dependabot::Ecosystem::VersionManager
       extend T::Sig
 
-      sig { params(raw_version: String).void }
-      def initialize(raw_version)
-        super(
-          LANGUAGE,
-          Version.new(raw_version)
-        )
+      sig { params(raw_version: String, requirement: T.nilable(Requirement)).void }
+      def initialize(raw_version, requirement = nil)
+        super(LANGUAGE, Version.new(raw_version), [], [], requirement)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.285.0
+  version: 0.286.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.285.0
+        version: 0.286.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.285.0
+        version: 0.286.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +322,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.285.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.286.0
 post_install_message: 
 rdoc_options: []
 require_paths: