dependabot-common 0.112.23 → 0.112.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9739bf9ed6384753d23d7c9f5aa511b19bfeeed400ebf206866e2a5a87cd2e02
-  data.tar.gz: 470dd4daf818626c0c2824fd38e18b91e7a3df3390fbde07cd9aabfb7b4e0c00
+  metadata.gz: 857342c9058ee42bb8cf593f7ee5a5ecc6fb2b2582e58e75b5ecf5ba03db023c
+  data.tar.gz: de753e9fcc04de01fbdb4b8e7eae877747f67bc7448711e3eb128e70beb93e25
 SHA512:
-  metadata.gz: 224772f202fd16546bd3be6de1cc749b7bc221e21e5f2eab192240b99d21b581bbe963231cb0440a0cc38ae1f805695cd9c07aa3ad80bdd97a10997e61df115a
-  data.tar.gz: b721cf9ddff2395a5d0af942a1f1df0954ad58e3649d018ef9275bf75c12e44c3b9c3e9f5480661f274bbd3c2799f2eb8432ec6ed34e78f4666224f330a78aac
+  metadata.gz: 11f0f5c54393e6479e34309db26ae4619e8e302e89ecda71a6cec9ae69e5eae34311fec3ef557080b972246d6c123a962d90d8fe1a0170daa94353f9919e45bf
+  data.tar.gz: 93a0210a3d8e4054f5c46c884b98fa360c05f2e2175b9669410fd12ca91a516afb6bfd273ffcf0cfc011102a06f408702c2206293b879cd0c05dd776d9ea9984

data/lib/dependabot/pull_request_creator/github.rb

@@ -258,7 +258,10 @@ module Dependabot
           team_reviewers: reviewers_hash[:team_reviewers] || []
         )
       rescue Octokit::UnprocessableEntity => e
-        return if invalid_reviewer?(e.message)
+        if invalid_reviewer?(e.message)
+          comment_with_invalid_reviewer(pull_request, e.message)
+          return
+        end
 
         raise
       end
@@ -271,6 +274,36 @@ module Dependabot
         false
       end
 
+      def comment_with_invalid_reviewer(pull_request, message)
+        reviewers_hash =
+          Hash[reviewers.keys.map { |k| [k.to_sym, reviewers[k]] }]
+        reviewers = []
+        reviewers += reviewers_hash[:reviewers] || []
+        reviewers += (reviewers_hash[:team_reviewers] || []).
+                     map { |rv| "#{source.repo.split('/').first}/#{rv}" }
+
+        reviewers_string =
+          if reviewers.count == 1
+            "`@#{reviewers.first}`"
+          else
+            names = reviewers.map { |rv| "`@#{rv}`" }
+            "#{names[0..-2].join(', ')} and #{names[-1]}"
+          end
+
+        msg = "Dependabot tried to add #{reviewers_string} as "
+        msg += reviewers.count > 1 ? "reviewers" : "a reviewer"
+        msg += " to this PR, but received the following error from GitHub:\n\n"\
+               "```\n" \
+               "#{message}\n"\
+               "```"
+
+        github_client_for_source.add_comment(
+          source.repo,
+          pull_request.number,
+          msg
+        )
+      end
+
       def add_assignees_to_pull_request(pull_request)
         github_client_for_source.add_assignees(
           source.repo,

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.23"
+  VERSION = "0.112.28"
 end

metadata

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