dependabot-common 0.106.14 → 0.106.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8372d215fdcc233b16421e8f620a49eb912ea5d9d126f8e338fb1f95b8a8373
-  data.tar.gz: e82c25f7d7b5944792fb90201fad1f70fe1876db362eb9956668914cd86648e4
+  metadata.gz: 9a50686d41bc644c4d8f8861d717e6fe350dcfbeb888fdb0882d5ff1f4a58fc3
+  data.tar.gz: 0755ff3fee07b0aa233fb7bc6868d3eb6a7e2790f168e3f8d8a1f9a82b6bd9e1
 SHA512:
-  metadata.gz: 4497ee9df4fe9fc0c72823cad89e89f53d2f30b5fea45d6e50c5b3503ebdd07295a0a8df7f3a93269fa23f0f8794a66ec031e750aed40d603ebf4caa3a5ac021
-  data.tar.gz: 408e76967ddcc00687577764ce676a2859c71dbf16d8fd0c23d13969a423ab1cb265f4e64a6197009879bdae5af9f539378058c3eb8bdc08471e7c63c2e9b6ab
+  metadata.gz: bb8d58ce89384fdd34e763b4c5585fbbc7ee91c3f1b6ba1663b438a29a298f9c4942b751633696729ab9b07bb0ca2a2cc617d9179320f22ef4319a8a06e90162
+  data.tar.gz: 36a6084e096a9dd7b5b4b5f581189b0fb5e6dbe59961e027f2108d4ebf0179e0266590afaf71e16de3f038638630ede5511ecc52fea47482fc6aadcb3c4fac92

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -406,18 +406,18 @@ module Dependabot
         fixed_vulns = vulnerabilities_fixed[dep.name]
         return "" unless fixed_vulns&.any?
 
-        msg = "\n<details>\n<summary>Vulnerabilities fixed</summary>\n\n"
+        msg = ""
         fixed_vulns.each { |v| msg += serialized_vulnerability_details(v) }
-        msg += "</details>"
-        sanitize_template_tags(msg)
+        msg = sanitize_tags(msg)
+
+        build_details_tag(summary: "Vulnerabilities fixed", body: msg)
       end
 
       def release_cascade(dep)
         return "" unless releases_text(dep) && releases_url(dep)
 
-        msg = "\n<details>\n<summary>Release notes</summary>\n\n"
-        msg += "*Sourced from [#{dep.display_name}'s releases]"\
-               "(#{releases_url(dep)}).*\n\n"
+        msg = "*Sourced from [#{dep.display_name}'s releases]"\
+              "(#{releases_url(dep)}).*\n\n"
         msg +=
           begin
             release_note_lines = releases_text(dep).split("\n").first(50)
@@ -427,21 +427,21 @@ module Dependabot
             end
             release_note_lines.join
           end
-        msg += "</details>"
         msg = link_issues(text: msg, dependency: dep)
         msg = fix_relative_links(
           text: msg,
           base_url: source_url(dep) + "/blob/HEAD/"
         )
-        sanitize_template_tags(msg)
+        msg = sanitize_tags(msg)
+
+        build_details_tag(summary: "Release notes", body: msg)
       end
 
       def changelog_cascade(dep)
         return "" unless changelog_url(dep) && changelog_text(dep)
 
-        msg = "\n<details>\n<summary>Changelog</summary>\n\n"
-        msg += "*Sourced from "\
-               "[#{dep.display_name}'s changelog](#{changelog_url(dep)}).*\n\n"
+        msg = "*Sourced from "\
+              "[#{dep.display_name}'s changelog](#{changelog_url(dep)}).*\n\n"
         msg +=
           begin
             changelog_lines = changelog_text(dep).split("\n").first(50)
@@ -449,19 +449,19 @@ module Dependabot
             changelog_lines << truncated_line if changelog_lines.count == 50
             changelog_lines.join
           end
-        msg += "</details>"
         msg = link_issues(text: msg, dependency: dep)
         msg = fix_relative_links(text: msg, base_url: changelog_url(dep))
-        sanitize_template_tags(msg)
+        msg = sanitize_tags(msg)
+
+        build_details_tag(summary: "Changelog", body: msg)
       end
 
       def upgrade_guide_cascade(dep)
         return "" unless upgrade_url(dep) && upgrade_text(dep)
 
-        msg = "\n<details>\n<summary>Upgrade guide</summary>\n\n"
-        msg += "*Sourced from "\
-               "[#{dep.display_name}'s upgrade guide]"\
-               "(#{upgrade_url(dep)}).*\n\n"
+        msg = "*Sourced from "\
+              "[#{dep.display_name}'s upgrade guide]"\
+              "(#{upgrade_url(dep)}).*\n\n"
         msg +=
           begin
             upgrade_lines = upgrade_text(dep).split("\n").first(50)
@@ -469,16 +469,17 @@ module Dependabot
             upgrade_lines << truncated_line if upgrade_lines.count == 50
             upgrade_lines.join
           end
-        msg += "</details>"
         msg = link_issues(text: msg, dependency: dep)
         msg = fix_relative_links(text: msg, base_url: upgrade_url(dep))
-        sanitize_template_tags(msg)
+        msg = sanitize_tags(msg)
+
+        build_details_tag(summary: "Upgrade guide", body: msg)
       end
 
       def commits_cascade(dep)
         return "" unless commits_url(dep) && commits(dep)
 
-        msg = "\n<details>\n<summary>Commits</summary>\n\n"
+        msg = ""
 
         commits(dep).reverse.first(10).each do |commit|
           title = commit[:message].strip.split("\n").first
@@ -494,18 +495,25 @@ module Dependabot
           else
             "- See full diff in [compare view](#{commits_url(dep)})\n"
           end
-
-        msg += "</details>"
         msg = link_issues(text: msg, dependency: dep)
-        sanitize_template_tags(msg)
+        msg = sanitize_tags(msg)
+
+        build_details_tag(summary: "Commits", body: msg)
       end
 
       def maintainer_changes_cascade(dep)
         return "" unless maintainer_changes(dep)
 
-        msg = "\n<details>\n<summary>Maintainer changes</summary>\n\n"
-        msg += maintainer_changes(dep)
-        msg + "\n</details>"
+        build_details_tag(
+          summary: "Maintainer changes",
+          body: maintainer_changes(dep) + "\n"
+        )
+      end
+
+      def build_details_tag(summary:, body:)
+        msg = "\n<details>\n<summary>#{summary}</summary>\n\n"
+        msg += body
+        msg + "</details>"
       end
 
       def serialized_vulnerability_details(details)
@@ -750,13 +758,15 @@ module Dependabot
         end
       end
 
-      def sanitize_template_tags(text)
+      def sanitize_tags(text)
+        sanitized_tags = %w(del details ins template)
+
         text.gsub(/\<.*?\>/) do |tag|
           tag_contents = tag.match(/\<(.*?)\>/).captures.first.strip
 
           # Unclosed calls to some tags overflow out of the blockquote block,
           # wrecking the rest of our PRs. Other tags don't share this problem.
-          next "\\#{tag}" if tag_contents.start_with?("template", "ins", "del")
+          next "\\#{tag}" if tag_contents.start_with?(*sanitized_tags)
 
           tag
         end

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.106.14"
+  VERSION = "0.106.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.106.14
+  version: 0.106.15
 platform: ruby
 authors:
 - Dependabot