dependabot-common 0.117.9 → 0.117.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f710414291a0cefb5182b4f60f8da211abcf76b2b42564cc22e03c497a2c9f6
-  data.tar.gz: c7e6f540ecca5e370eec9a7c6632d7a1d3408bbf999a99e222da931160da6de2
+  metadata.gz: a2a9d6ee089d6bb1c3e08a6858d924b995e13bfa7238746ccd8c55d217517185
+  data.tar.gz: 67048f550cf7595808e21d0cdf4864bf662140706261b3843f19bc480028c5c6
 SHA512:
-  metadata.gz: c9840fd6d06b5f0fe8812b18ab2d0a713dea432affb9de3868ad6629730a83cbecfc9ae1c760d6c812a71fca5216e59d9a2a414a40eecfd3997a9d1cbb74a49f
-  data.tar.gz: d954e4e5ca6ba0463ec284afdc200b4e71e35df24801488965e814b68df4b106453e26434175ff0c573f0d7d15d49ea4157a2116688a6faae00f9fd1da71edde
+  metadata.gz: e3211d6c6f5da2b379377cf28552d5173ccda7285bad50e1a85c433a0202655cd414ca21d80b521f925092faa22d1eb64ddb9066d91384f8d19e5399b9c8fcc7
+  data.tar.gz: '087ea4164b328bb0ed195b8a4f44c0c92358b1e763d186f22008f704097a59d16403c8d304cd503c1697631f5c022c7b143d69d10f27ccd458f384050199907c'

data/lib/dependabot/pull_request_creator/labeler.rb

@@ -6,6 +6,8 @@ module Dependabot
   class PullRequestCreator
     class Labeler
       DEPENDENCIES_LABEL_REGEX = %r{^[^/]*dependenc[^/]+$}i.freeze
+      DEFAULT_DEPENDENCIES_LABEL = "dependencies"
+      DEFAULT_SECURITY_LABEL = "security"
 
       @package_manager_labels = {}
 
@@ -170,12 +172,18 @@ module Dependabot
         if custom_labels then custom_labels & labels
         else
           [
-            labels.find { |l| l.match?(DEPENDENCIES_LABEL_REGEX) },
+            default_dependencies_label,
             label_language? ? language_label : nil
           ].compact
         end
       end
 
+      # Find the exact match first and then fallback to *dependenc* label
+      def default_dependencies_label
+        labels.find { |l| l == DEFAULT_DEPENDENCIES_LABEL } ||
+          labels.find { |l| l.match?(DEPENDENCIES_LABEL_REGEX) }
+      end
+
       def dependencies_label_exists?
         labels.any? { |l| l.match?(DEPENDENCIES_LABEL_REGEX) }
       end
@@ -260,7 +268,12 @@ module Dependabot
           self.class.label_details_for_package_manager(package_manager).
           fetch(:name)
 
-        @labels = [*@labels, "dependencies", "security", langauge_name].uniq
+        @labels = [
+          *@labels,
+          DEFAULT_DEPENDENCIES_LABEL,
+          DEFAULT_SECURITY_LABEL,
+          langauge_name
+        ].uniq
       end
 
       def create_dependencies_label
@@ -292,44 +305,44 @@ module Dependabot
 
       def create_github_dependencies_label
         github_client_for_source.add_label(
-          source.repo, "dependencies", "0366d6",
+          source.repo, DEFAULT_DEPENDENCIES_LABEL, "0366d6",
           description: "Pull requests that update a dependency file",
           accept: "application/vnd.github.symmetra-preview+json"
         )
-        @labels = [*@labels, "dependencies"].uniq
+        @labels = [*@labels, DEFAULT_DEPENDENCIES_LABEL].uniq
       rescue Octokit::UnprocessableEntity => e
         raise unless e.errors.first.fetch(:code) == "already_exists"
 
-        @labels = [*@labels, "dependencies"].uniq
+        @labels = [*@labels, DEFAULT_DEPENDENCIES_LABEL].uniq
       end
 
       def create_gitlab_dependencies_label
         gitlab_client_for_source.create_label(
-          source.repo, "dependencies", "#0366d6",
+          source.repo, DEFAULT_DEPENDENCIES_LABEL, "#0366d6",
           description: "Pull requests that update a dependency file"
         )
-        @labels = [*@labels, "dependencies"].uniq
+        @labels = [*@labels, DEFAULT_DEPENDENCIES_LABEL].uniq
       end
 
       def create_github_security_label
         github_client_for_source.add_label(
-          source.repo, "security", "ee0701",
+          source.repo, DEFAULT_SECURITY_LABEL, "ee0701",
           description: "Pull requests that address a security vulnerability",
           accept: "application/vnd.github.symmetra-preview+json"
         )
-        @labels = [*@labels, "security"].uniq
+        @labels = [*@labels, DEFAULT_SECURITY_LABEL].uniq
       rescue Octokit::UnprocessableEntity => e
         raise unless e.errors.first.fetch(:code) == "already_exists"
 
-        @labels = [*@labels, "security"].uniq
+        @labels = [*@labels, DEFAULT_SECURITY_LABEL].uniq
       end
 
       def create_gitlab_security_label
         gitlab_client_for_source.create_label(
-          source.repo, "security", "#ee0701",
+          source.repo, DEFAULT_SECURITY_LABEL, "#ee0701",
           description: "Pull requests that address a security vulnerability"
         )
-        @labels = [*@labels, "security"].uniq
+        @labels = [*@labels, DEFAULT_SECURITY_LABEL].uniq
       end
 
       def create_github_language_label

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.117.9
+  version: 0.117.10
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit