dependabot-julia 0.348.1 → 0.350.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32e7f09482a6674bad0b220cf0282c727f14358f1263edd5344c6931ccb67be5
-  data.tar.gz: 19a4591beda7d2324c3f0d09404d7b2d3f4d9cdd80f149c153ba87a01b97285b
+  metadata.gz: 7b76a691fe02dcf7ba48471e19dbff5bb27c0d11658a28287ba3c4db4fe1f29a
+  data.tar.gz: b5c5348d33c979b5fc367ccb7a43ae70cca8c217d0d76e8985ea041fc50aec33
 SHA512:
-  metadata.gz: daffac3a10018571d7987763ba1485364a0e336eea26d73cc968ec15188378abf7e3594375d03fbd195848ec1e36648a7dd9ceab009685eef7e8746bf45006ff
-  data.tar.gz: a0bfd78e85d9a2146d64c412afe8302929d5a6ab5d722658edb665948819f868ddcf043e9f9a524e1458d95668e636df0ad79d09765f97b2a2f51621301078e7
+  metadata.gz: ee6424e59c7b88244bb9f9ae199431e324b75dbca6960ee5633c59ceaeb324d9030c41e231236a35f796021c8180177dff8829c5c5de449bdb8735a8585db8a4
+  data.tar.gz: 6cdf548f191288ce63c798e3c2b4656eb7c23799b38a01d8342564f9b72d21a0ef3a47d39a6432321a07e9c44716035f935aefe48bf6c22f997761071560a445

data/lib/dependabot/julia/file_updater.rb

@@ -321,15 +321,47 @@ module Dependabot
 
       sig { params(content: String, dependency_name: String, requirement: String).returns(String) }
       def add_compat_entry_to_content(content, dependency_name, requirement)
-        # Find [compat] section or create it
         if content.match?(/^\s*\[compat\]\s*$/m)
-          # Add to existing [compat] section
-          content.gsub(/(\[compat\]\s*\n)/, "\\1#{dependency_name} = \"#{requirement}\"\n")
+          compat_section_match = content.match(/^\[compat\]\s*\n((?:(?!\[)[^\n]*\n)*?)(?=^\[|\z)/m)
+          return content unless compat_section_match
+
+          compat_section = T.must(compat_section_match[1])
+          entries = parse_compat_entries(compat_section)
+          entries[dependency_name] = requirement
+          sorted_entries = sort_compat_entries(entries)
+          new_compat_section = build_compat_section(sorted_entries)
+
+          content.sub(T.must(compat_section_match[0]), "[compat]\n#{new_compat_section}")
         else
-          # Add new [compat] section at the end
           content + "\n[compat]\n#{dependency_name} = \"#{requirement}\"\n"
         end
       end
+
+      sig { params(compat_section: String).returns(T::Hash[String, String]) }
+      def parse_compat_entries(compat_section)
+        entries = {}
+        compat_section.each_line do |line|
+          next if line.strip.empty? || line.strip.start_with?("#")
+
+          match = line.match(/^\s*([^=\s]+)\s*=\s*(.+?)(?:\s*#.*)?$/)
+          next unless match
+
+          key = T.must(match[1]).strip
+          value = T.must(match[2]).strip.gsub(/^["']|["']$/, "")
+          entries[key] = value
+        end
+        entries
+      end
+
+      sig { params(entries: T::Hash[String, String]).returns(T::Hash[String, String]) }
+      def sort_compat_entries(entries)
+        entries.sort.to_h
+      end
+
+      sig { params(entries: T::Hash[String, String]).returns(String) }
+      def build_compat_section(entries)
+        entries.map { |name, requirement| "#{name} = \"#{requirement}\"\n" }.join
+      end
     end
   end
 end

data/lib/dependabot/julia/requirement.rb

@@ -17,19 +17,36 @@ module Dependabot
         # Note: Missing compat entry (nil/empty) means any version is acceptable
         return [new(">= 0")] if requirement_string.nil? || requirement_string.empty?
 
-        # Split by comma for multiple constraints
         constraints = requirement_string.split(",").map(&:strip)
 
-        constraints.map do |constraint|
-          # Handle Julia-specific patterns - returns an array of gem requirement strings
-          normalized_constraints = normalize_julia_constraint(constraint)
-          # Pass the array to Gem::Requirement, which accepts multiple conditions
-          new(normalized_constraints)
+        if compound_constraint?(constraints)
+          parse_compound_constraint(constraints)
+        else
+          parse_separate_constraints(constraints)
         end
       rescue Gem::Requirement::BadRequirementError
         [new(">= 0")]
       end
 
+      sig { params(constraints: T::Array[String]).returns(T::Boolean) }
+      def self.compound_constraint?(constraints)
+        # Compound constraints (e.g., ">= 1.0, < 2.0") have operators and multiple parts
+        constraints.length > 1 && constraints.any? { |c| c.match?(/^[<>=~^]/) }
+      end
+
+      sig { params(constraints: T::Array[String]).returns(T::Array[Dependabot::Julia::Requirement]) }
+      def self.parse_compound_constraint(constraints)
+        # Handle compound constraints (e.g., ">= 1.0, < 2.0") as a single requirement
+        normalized_constraints = constraints.flat_map { |c| normalize_julia_constraint(c) }
+        [new(normalized_constraints)]
+      end
+
+      sig { params(constraints: T::Array[String]).returns(T::Array[Dependabot::Julia::Requirement]) }
+      def self.parse_separate_constraints(constraints)
+        # Handle separate version specs (e.g., "0.34, 0.35") as multiple requirements
+        constraints.map { |constraint| new(normalize_julia_constraint(constraint)) }
+      end
+
       sig { params(requirement_string: String).returns(T::Array[Dependabot::Julia::Requirement]) }
       def self.parse_requirements(requirement_string)
         requirements_array(requirement_string)

data/lib/dependabot/julia/update_checker/latest_version_finder.rb

@@ -96,9 +96,12 @@ module Dependabot
         versions = releases.map(&:version).sort
 
         # Filter out ignored versions
-        versions = versions.reject do |version|
-          ignored_versions.any?(version.to_s)
-        end
+        versions = filter_ignored_versions(versions)
+        return nil if versions.empty?
+
+        # Filter out lower versions
+        versions = filter_lower_versions(versions)
+        return nil if versions.empty?
 
         # Filter out vulnerable versions
         filtered_versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(
@@ -106,8 +109,6 @@ module Dependabot
           security_advisories
         )
 
-        raise Dependabot::AllVersionsIgnored if filtered_versions.empty? && raise_on_ignored
-
         filtered_versions.max
       end
 
@@ -125,6 +126,39 @@ module Dependabot
         end
       end
 
+      sig { params(versions: T::Array[Gem::Version]).returns(T::Array[Gem::Version]) }
+      def filter_ignored_versions(versions)
+        filtered = versions.reject do |version|
+          ignore_requirements.any? { |req| req.satisfied_by?(version) }
+        end
+
+        if versions.count > filtered.count
+          Dependabot.logger.info("Filtered out #{versions.count - filtered.count} ignored versions")
+        end
+
+        if raise_on_ignored && filter_lower_versions(filtered).empty? && filter_lower_versions(versions).any?
+          Dependabot.logger.info("All updates for #{dependency.name} were ignored")
+          raise Dependabot::AllVersionsIgnored
+        end
+
+        filtered
+      end
+
+      sig { params(versions: T::Array[Gem::Version]).returns(T::Array[Gem::Version]) }
+      def filter_lower_versions(versions)
+        return versions unless dependency.version
+
+        current_version = Gem::Version.new(dependency.version)
+        versions.select { |v| v > current_version }
+      end
+
+      sig { returns(T::Array[Dependabot::Requirement]) }
+      def ignore_requirements
+        ignored_versions.flat_map do |req_string|
+          Dependabot::Julia::Requirement.requirements_array(req_string)
+        end
+      end
+
       sig { params(release: Dependabot::Package::PackageRelease).returns(T::Boolean) }
       def cooldown_active_for_release?(release)
         cooldown_days = determine_cooldown_days(release.version)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-julia
 version: !ruby/object:Gem::Version
-  version: 0.348.1
+  version: 0.350.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.348.1
+        version: 0.350.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.348.1
+        version: 0.350.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +260,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.348.1
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.350.0
 rdoc_options: []
 require_paths:
 - lib