dependabot-common 0.112.21 → 0.112.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 646d659c6c35e04cb766731b17a8156285b345bb9015cf67e373acb917d751f0
-  data.tar.gz: 63b07790fb640afa359ad8286bf394ccd7decc9eabe59850610bc0d0e09d89a5
+  metadata.gz: 8d0cc3dacc3f64a8b5bd86bd99017e5f43fe3494445c01eefa4409975bbe28a2
+  data.tar.gz: '08272b00ef4c7a12428fe475eb296a7c5790cf1cdbbdc8c11aae7feeca9d4b4a'
 SHA512:
-  metadata.gz: 6f18160de727eea5de67b1f95a84026242aaff34e618c04a46e853efb1a155dc86bbad304bd483284433e5f47fe881a5f9ffde1d3c15d831c36877600fa38b42
-  data.tar.gz: ad22556b1e61e8048c085691f03541c75ee947bc21deb62dbaa2cc48b170ab6bd1bbf7cfff75a38e8aad2eb4ab2b3f909e22e0d887b1d5546d198e0f1346966f
+  metadata.gz: 8714dbcbd7858505ea3c23942f93e27c1991fb575b599c2e6aa8fe692ff1ac3e5d2640edc4b98c33563e49e9387722f7e49ded95e9cbb58a99c962f959aab465
+  data.tar.gz: 8d4f8769368db9659837280b671353a7abbe21587358e840c3d92ac63af7346abfcf87e8ffd0ce5ddff0e65c6d64cab9b10c24812b4f35a45b6ea8d57faff39f

data/lib/dependabot/pull_request_creator/branch_namer.rb

@@ -43,7 +43,9 @@ module Dependabot
             end
           end
 
-        branch_name = File.join(prefixes, @name).gsub(%r{/\.}, "/dot-")
+        branch_name = File.join(prefixes, @name).
+                      gsub(%r{/\.}, "/dot-").
+                      gsub(%r{/\.}, "/dot-")
 
         # Some users need branch names without slashes
         branch_name.gsub("/", separator)
@@ -114,7 +116,8 @@ module Dependabot
           gsub(">", "gt-").
           gsub("<", "lt-").
           gsub("*", "star").
-          gsub(",", "-and-")
+          gsub(",", "-and-").
+          sub(/\.$/, "")
       end
 
       def new_version(dependency)

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

@@ -6,9 +6,13 @@ module Dependabot
   class PullRequestCreator
     class MessageBuilder
       class IssueLinker
+        REPO_REGEX = %r{(?<repo>[\w.-]+/(?:(?!\.git|\.\s)[\w.-])+)}.freeze
         TAG_REGEX = /(?<tag>(?:\#|GH-)\d+)/i.freeze
         ISSUE_LINK_REGEXS = [
-          /(?<=[^A-Za-z0-9\[\\]|^)\\*#{TAG_REGEX}(?=[^A-Za-z0-9\-]|$)/.freeze,
+          /
+            (?:(?<=[^A-Za-z0-9\[\\]|^)\\*#{TAG_REGEX}(?=[^A-Za-z0-9\-]|$))|
+            (?:(?<=\s|^)#{REPO_REGEX}#{TAG_REGEX}(?=[^A-Za-z0-9\-]|$))
+          /x.freeze,
           /\[#{TAG_REGEX}\](?=[^A-Za-z0-9\-\(])/.freeze,
           /\[(?<tag>(?:\#|GH-)?\d+)\]\(\)/i.freeze
         ].freeze
@@ -28,7 +32,14 @@ module Dependabot
                     match(/(?<tag>(?:\#|GH-)?\d+)/i).
                     named_captures.fetch("tag")
               number = tag.match(/\d+/).to_s
-              "[#{tag}](#{source_url}/issues/#{number})"
+
+              repo = issue_link.
+                     match("#{REPO_REGEX}#{TAG_REGEX}")&.
+                     named_captures&.
+                     fetch("repo", nil)
+              source = repo ? "https://github.com/#{repo}" : source_url
+
+              "[#{repo ? (repo + tag) : tag}](#{source}/issues/#{number})"
             end
           end
         end

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

@@ -9,7 +9,7 @@ module Dependabot
         GITHUB_USERNAME = /[a-z0-9]+(-[a-z0-9]+)*/i.freeze
         GITHUB_REF_REGEX = %r{
           (?:https?://)?
-          github\.com/#{GITHUB_USERNAME}/[^/\s]+/
+          github\.com/(?<repo>#{GITHUB_USERNAME}/[^/\s]+)/
           (?:issue|pull)s?/(?<number>\d+)
         }x.freeze
 
@@ -76,7 +76,9 @@ module Dependabot
               ref.gsub("github.com", github_redirection_service || "github.com")
             if (previous_char.nil? || previous_char.match?(/\s/)) &&
                (next_char.nil? || next_char.match?(/\s/))
-              "[##{last_match.named_captures.fetch('number')}]"\
+              number = last_match.named_captures.fetch("number")
+              repo = last_match.named_captures.fetch("repo")
+              "[#{repo}##{number}]"\
               "(#{sanitized_url})"
             else
               sanitized_url

data/lib/dependabot/version.rb

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

metadata

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