dependabot-common 0.107.24 → 0.107.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16117d461ff5d98642b4eae9e83a73b7416faf6c29427da3e8343326e30f2944
-  data.tar.gz: f4812b2bb26f8583fce964682df12d2cb2dfe26173f25760a39ae7a8c9b85dcc
+  metadata.gz: 836548667e5c3840e61a77220231c79075f0a5dbbfc6fa78f22402de88fe1e40
+  data.tar.gz: a1b099f9fdb11f5ec3eee39e67b473a3f65abd6669df59ad6dcacb0d39793fa2
 SHA512:
-  metadata.gz: 28d2da19246181cf12046027b81d539c91b003a7ec38752729b9e37ad8ac188fc78037a114eddb7968ae13d786aa60580c64414f56cc1d1695fa9397064e9496
-  data.tar.gz: 0e7d8188214fedd145d5ee4a55eac9e1110720881e9d43de8c6aae5ab3299e8d1e9487973a6efb9f23d84cbdae11c2c511e8f5a71d81574cc6a276ed4bcd3cd6
+  metadata.gz: af7569ae3321492da13679f06616f2fe036e166ef6b05f12587d0871f2e275be3a4d8ab835bb4e6d3905b246b53373c11807699c5ffbb1228b086852c1fbf9bf
+  data.tar.gz: f6072253eef36aca76c7be32d883f2c59771252a401cc9f5665a21faa39f12d6f2e6f2fa89a2de7115da24a33af52892a6d0906f40283e0926f1ead3e793b12c

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -10,6 +10,8 @@ require "dependabot/pull_request_creator"
 module Dependabot
   class PullRequestCreator
     class MessageBuilder
+      require_relative "message_builder/issue_linker"
+
       ANGULAR_PREFIXES = %w(build chore ci docs feat fix perf refactor style
                             test).freeze
       ESLINT_PREFIXES  = %w(Breaking Build Chore Docs Fix New Update
@@ -27,9 +29,6 @@ module Dependabot
                             see_no_evil sparkles speech_balloon tada truck
                             twisted_rightwards_arrows whale wheelchair
                             white_check_mark wrench zap).freeze
-      ISSUE_TAG_REGEX =
-        /(?<=[^A-Za-z0-9\[\\]|^)\\*(?<tag>(?:\#|GH-)\d+)(?=[^A-Za-z0-9\-]|$)/.
-        freeze
       GITHUB_REF_REGEX = %r{
         (?:https?://)?
         github\.com/[^/\s]+/[^/\s]+/
@@ -695,16 +694,9 @@ module Dependabot
       end
 
       def link_issues(text:, dependency:)
-        updated_text = text.gsub(ISSUE_TAG_REGEX) do |mention|
-          number = mention.split("#").last.gsub("GH-", "")
-          "[#{mention}](#{source_url(dependency)}/issues/#{number})"
-        end
-
-        updated_text.gsub(/\[(?<tag>(?:\#|GH-)?\d+)\]\(\)/) do |mention|
-          mention = mention.match(/(?<=\[)(.*)(?=\])/).to_s
-          number = mention.match(/\d+/).to_s
-          "[#{mention}](#{source_url(dependency)}/issues/#{number})"
-        end
+        IssueLinker.
+          new(source_url: source_url(dependency)).
+          link_issues(text: text)
       end
 
       def fix_relative_links(text:, base_url:)

data/lib/dependabot/pull_request_creator/message_builder/issue_linker.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "dependabot/pull_request_creator/message_builder"
+
+module Dependabot
+  class PullRequestCreator
+    class MessageBuilder
+      class IssueLinker
+        TAG_REGEX = /(?<tag>(?:\#|GH-)\d+)/.freeze
+        ISSUE_LINK_REGEXS = [
+          /(?<=[^A-Za-z0-9\[\\]|^)\\*#{TAG_REGEX}(?=[^A-Za-z0-9\-]|$)/.freeze,
+          /\[#{TAG_REGEX}\](?=[^A-Za-z0-9\-\(])/.freeze,
+          /\[(?<tag>(?:\#|GH-)?\d+)\]\(\)/.freeze
+        ].freeze
+
+        attr_reader :source_url
+
+        def initialize(source_url:)
+          @source_url = source_url
+        end
+
+        def link_issues(text:)
+          # Loop through each of the issue link regexes, replacing any instances
+          # of them with an absolute link that uses the source URL
+          ISSUE_LINK_REGEXS.reduce(text) do |updated_text, regex|
+            updated_text.gsub(regex) do |issue_link|
+              tag = issue_link.
+                    match(/(?<tag>(?:\#|GH-)?\d+)/).
+                    named_captures.fetch("tag")
+              number = tag.match(/\d+/).to_s
+              "[#{tag}](#{source_url}/issues/#{number})"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.107.24
+  version: 0.107.25
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
@@ -343,6 +343,7 @@ files:
 - lib/dependabot/pull_request_creator/gitlab.rb
 - lib/dependabot/pull_request_creator/labeler.rb
 - lib/dependabot/pull_request_creator/message_builder.rb
+- lib/dependabot/pull_request_creator/message_builder/issue_linker.rb
 - lib/dependabot/pull_request_updater.rb
 - lib/dependabot/pull_request_updater/github.rb
 - lib/dependabot/security_advisory.rb