dependabot-common 0.98.73 → 0.98.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb2c2a7a95e4c86934de6cf496bfc29bbf56a69f7b92783b708219145e32067
-  data.tar.gz: 346f7bb4f9f726d6aa65d429222b60bb2f4bf264cfa71a961710cd783d4f642e
+  metadata.gz: b11436c31256a8a130a8094aed97a5fded0ca57933b6bdb6ebecb59f798dea46
+  data.tar.gz: 785ae70fc9d0c4dffcc94fe9dfd5a30d3b7748cb376b00cbf884f16028947cdb
 SHA512:
-  metadata.gz: 4c41b7d1e1f47a436c21abd0efa3fffef617d3d2140d9f738c04314e8e90fdd3de080d174c23a1e25512681e2eadafbede44b79e93f9497e8f89c1ccbb46dce1
-  data.tar.gz: aafffcdb6837b399b1b0505a49a1b193a576276ef9d2f9a0f4bd424f6094b58bb61ec358de29f0baffc2d309fac995ed144db0654c65ab3e8355fb9010aa7278
+  metadata.gz: d867b05b9702bb7491442f985de85d4890d9caa5bfd5a67b3929b0723843d558fa4ac35bde30f4ee13c62d7073f3ad51d2077e3a233489049514bf42d9dd38ff
+  data.tar.gz: bf1afc581e70fccdfde951145c9b018d447d2bd8faf3375ccf5fe341571836df1b2c8cb85e0163d743394e71094a631ee94cea320af7e408b77a377b8b2227a9

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -30,7 +30,11 @@ module Dependabot
       ISSUE_TAG_REGEX =
         /(?<=[^A-Za-z0-9\[\\]|^)\\*(?<tag>(?:\#|GH-)\d+)(?=[^A-Za-z0-9\-]|$)/.
         freeze
-      GITHUB_REF_REGEX = %r{github\.com/[^/\s]+/[^/\s]+/(?:issue|pull)}.freeze
+      GITHUB_REF_REGEX = %r{
+        (?:https?://)?
+        github\.com/[^/\s]+/[^/\s]+/
+        (?:issue|pull)s?/(?<number>\d+)
+      }x.freeze
 
       attr_reader :source, :dependencies, :files, :credentials,
                   :pr_message_footer, :author_details, :vulnerabilities_fixed
@@ -699,7 +703,12 @@ module Dependabot
       end
 
       def sanitize_links_and_mentions(text)
-        text = text.gsub(%r{(?<![A-Za-z0-9])@[\w][\w.-/]*}) do |mention|
+        text = sanitize_mentions(text)
+        sanitize_links(text)
+      end
+
+      def sanitize_mentions(text)
+        text.gsub(%r{(?<![A-Za-z0-9])@[\w][\w.-/]*}) do |mention|
           next mention if mention.include?("/")
 
           last_match = Regexp.last_match
@@ -712,9 +721,22 @@ module Dependabot
             "[#{sanitized_mention}](https://github.com/#{mention.tr('@', '')})"
           end
         end
+      end
 
+      def sanitize_links(text)
         text.gsub(GITHUB_REF_REGEX) do |ref|
-          ref.gsub("github.com", "github-redirect.dependabot.com")
+          last_match = Regexp.last_match
+          previous_char = last_match.pre_match.chars.last
+          next_char = last_match.post_match.chars.first
+
+          sanitized_url =
+            ref.gsub("github.com", "github-redirect.dependabot.com")
+          if (previous_char.nil? || previous_char.match?(/\s/)) &&
+             (next_char.nil? || next_char.match?(/\s/))
+            "[##{last_match.named_captures.fetch('number')}](#{sanitized_url})"
+          else
+            sanitized_url
+          end
         end
       end
 

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.98.73
+  version: 0.98.74
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr