dependabot-common 0.108.25 → 0.109.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e19166e8dd3259f294f40be2ad0cc775c00abba15b80ab10c79a08a96879e20
-  data.tar.gz: 945f70c1450779cd54a17970720f9e721a52abfa59b2ebb1c206ca08241b520c
+  metadata.gz: 958e2831cb2d5ddd319e55c1e66944ad7d1ded3c1aa8992508f9d4a6ea5f8f2d
+  data.tar.gz: 42ac5477caabdcd19a606b82872169b3e7860e26f2e2435788c986d7eab6f015
 SHA512:
-  metadata.gz: 51f5bf012596199324b57244c28f702d6841e2606eb2294b3e4818704fc32935d766a8ec88a98a5c30d2b3ff927463e6fafa26d607db1724ec7db6a275a963c6
-  data.tar.gz: facd9702327a4e844223fcbe8337d0310b978225a61e8520df2802790ad375f4deb2a34901bac00cb5aa95a9340a9330ee9509e92ca159264b21f7557dbed89a
+  metadata.gz: 45eb816d0cb4a8950699534d8deac680db71666ff3702d6d047e2e7f86ce8914ca60dd1fbcbf2d2e4db7aef7ab9d5495f620a15f010a3d4eb660d838bd0e8055
+  data.tar.gz: 93987f39728087398cf50409b1bffd41df56d02e9dbc853b6b02bd7bd4a54903ef49559f7c1851382aae3038ce174b150dd4579355feb8df371cf6a3cc0ca058

data/lib/dependabot/clients/bitbucket_with_retries.rb

@@ -47,7 +47,6 @@ module Dependabot
         @client.respond_to?(method_name) || super
       end
 
-      # rubocop:disable Naming/RescuedExceptionsVariableName
       def retry_connection_failures
         retry_attempt = 0
 
@@ -58,7 +57,6 @@ module Dependabot
           retry_attempt <= @max_retries ? retry : raise
         end
       end
-      # rubocop:enable Naming/RescuedExceptionsVariableName
     end
   end
 end

data/lib/dependabot/clients/github_with_retries.rb

@@ -108,7 +108,6 @@ module Dependabot
         @clients.first.respond_to?(method_name) || super
       end
 
-      # rubocop:disable Naming/RescuedExceptionsVariableName
       def retry_connection_failures
         retry_attempt = 0
 
@@ -119,7 +118,6 @@ module Dependabot
           retry_attempt <= @max_retries ? retry : raise
         end
       end
-      # rubocop:enable Naming/RescuedExceptionsVariableName
     end
   end
 end

data/lib/dependabot/clients/gitlab_with_retries.rb

@@ -75,7 +75,6 @@ module Dependabot
         @client.respond_to?(method_name) || super
       end
 
-      # rubocop:disable Naming/RescuedExceptionsVariableName
       def retry_connection_failures
         retry_attempt = 0
 
@@ -86,7 +85,6 @@ module Dependabot
           retry_attempt <= @max_retries ? retry : raise
         end
       end
-      # rubocop:enable Naming/RescuedExceptionsVariableName
     end
   end
 end

data/lib/dependabot/file_fetchers/base.rb

@@ -51,7 +51,6 @@ module Dependabot
         @files ||= fetch_files
       end
 
-      # rubocop:disable Naming/RescuedExceptionsVariableName
       def commit
         branch = target_branch || default_branch_for_repo
 
@@ -61,11 +60,9 @@ module Dependabot
       rescue Octokit::Conflict => e
         raise unless e.message.include?("Repository is empty")
       end
-      # rubocop:enable Naming/RescuedExceptionsVariableName
 
       private
 
-      # rubocop:disable Naming/RescuedExceptionsVariableName
       def fetch_file_if_present(filename, fetch_submodules: false)
         dir = File.dirname(filename)
         basename = File.basename(filename)
@@ -81,9 +78,7 @@ module Dependabot
         path = Pathname.new(File.join(directory, filename)).cleanpath.to_path
         raise Dependabot::DependencyFileNotFound, path
       end
-      # rubocop:enable Naming/RescuedExceptionsVariableName
 
-      # rubocop:disable Naming/RescuedExceptionsVariableName
       def fetch_file_from_host(filename, type: "file", fetch_submodules: false)
         path = Pathname.new(File.join(directory, filename)).cleanpath.to_path
 
@@ -96,7 +91,6 @@ module Dependabot
       rescue *CLIENT_NOT_FOUND_ERRORS
         raise Dependabot::DependencyFileNotFound, path
       end
-      # rubocop:enable Naming/RescuedExceptionsVariableName
 
       def repo_contents(dir: ".", ignore_base_directory: false,
                         raise_errors: true, fetch_submodules: false)
@@ -115,7 +109,6 @@ module Dependabot
       # INTERNAL METHODS (not for use by sub-classes) #
       #################################################
 
-      # rubocop:disable Naming/RescuedExceptionsVariableName
       def _fetch_repo_contents(path, fetch_submodules: false,
                                raise_errors: true)
         path = path.gsub(" ", "%20")
@@ -144,7 +137,6 @@ module Dependabot
         retrying = true
         retry
       end
-      # rubocop:enable Naming/RescuedExceptionsVariableName
 
       def _fetch_repo_contents_fully_specified(provider, repo, path, commit)
         case provider
@@ -270,7 +262,6 @@ module Dependabot
         end
       end
 
-      # rubocop:disable Naming/RescuedExceptionsVariableName
       def _fetch_file_content(path, fetch_submodules: false)
         path = path.gsub(%r{^/*}, "")
 
@@ -290,7 +281,6 @@ module Dependabot
         retrying = true
         retry
       end
-      # rubocop:enable Naming/RescuedExceptionsVariableName
 
       def _fetch_file_content_fully_specified(provider, repo, path, commit)
         case provider
@@ -337,14 +327,12 @@ module Dependabot
       end
       # rubocop:enable Metrics/AbcSize
 
-      # rubocop:disable Naming/RescuedExceptionsVariableName
       def default_branch_for_repo
         @default_branch_for_repo ||= client_for_provider.
                                      fetch_default_branch(repo)
       rescue *CLIENT_NOT_FOUND_ERRORS
         raise Dependabot::RepoNotFound, source
       end
-      # rubocop:enable Naming/RescuedExceptionsVariableName
 
       # Update the @linked_paths hash by exploiting a side-effect of
       # recursively calling `repo_contents` for each directory up the tree

data/lib/dependabot/pull_request_creator.rb

@@ -16,7 +16,7 @@ module Dependabot
 
     attr_reader :source, :dependencies, :files, :base_commit,
                 :credentials, :pr_message_footer, :custom_labels,
-                :author_details, :signature_key, :signoff_details,
+                :author_details, :signature_key, :commit_message_options,
                 :vulnerabilities_fixed,
                 :reviewers, :assignees, :milestone, :branch_name_separator,
                 :branch_name_prefix, :github_redirection_service,
@@ -25,7 +25,7 @@ module Dependabot
     def initialize(source:, base_commit:, dependencies:, files:, credentials:,
                    pr_message_footer: nil, custom_labels: nil,
                    author_details: nil, signature_key: nil,
-                   signoff_details: nil,
+                   commit_message_options: {},
                    reviewers: nil, assignees: nil, milestone: nil,
                    vulnerabilities_fixed: {}, branch_name_separator: "/",
                    branch_name_prefix: "dependabot",
@@ -40,7 +40,7 @@ module Dependabot
       @pr_message_footer          = pr_message_footer
       @author_details             = author_details
       @signature_key              = signature_key
-      @signoff_details            = signoff_details
+      @commit_message_options     = commit_message_options
       @custom_labels              = custom_labels
       @reviewers                  = reviewers
       @assignees                  = assignees
@@ -127,7 +127,7 @@ module Dependabot
           dependencies: dependencies,
           files: files,
           credentials: credentials,
-          signoff_details: signoff_details,
+          commit_message_options: commit_message_options,
           pr_message_footer: pr_message_footer,
           vulnerabilities_fixed: vulnerabilities_fixed,
           github_redirection_service: github_redirection_service

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -15,18 +15,18 @@ module Dependabot
       require_relative "pr_name_prefixer"
 
       attr_reader :source, :dependencies, :files, :credentials,
-                  :pr_message_footer, :signoff_details, :vulnerabilities_fixed,
-                  :github_redirection_service
+                  :pr_message_footer, :commit_message_options,
+                  :vulnerabilities_fixed, :github_redirection_service
 
       def initialize(source:, dependencies:, files:, credentials:,
-                     pr_message_footer: nil, signoff_details: nil,
+                     pr_message_footer: nil, commit_message_options: {},
                      vulnerabilities_fixed: {}, github_redirection_service: nil)
         @dependencies               = dependencies
         @files                      = files
         @source                     = source
         @credentials                = credentials
         @pr_message_footer          = pr_message_footer
-        @signoff_details            = signoff_details
+        @commit_message_options     = commit_message_options
         @vulnerabilities_fixed      = vulnerabilities_fixed
         @github_redirection_service = github_redirection_service
       end
@@ -127,6 +127,7 @@ module Dependabot
       end
 
       def signoff_message
+        signoff_details = commit_message_options[:signoff_details]
         return unless signoff_details.is_a?(Hash)
         return unless signoff_details[:name] && signoff_details[:email]
 
@@ -134,6 +135,7 @@ module Dependabot
       end
 
       def on_behalf_of_message
+        signoff_details = commit_message_options[:signoff_details]
         return unless signoff_details.is_a?(Hash)
         return unless signoff_details[:org_name] && signoff_details[:org_email]
 
@@ -525,6 +527,7 @@ module Dependabot
             source: source,
             dependencies: dependencies,
             credentials: credentials,
+            commit_message_options: commit_message_options,
             security_fix: vulnerabilities_fixed.values.flatten.any?
           )
       end

data/lib/dependabot/pull_request_creator/pr_name_prefixer.rb

@@ -4,6 +4,7 @@ require "dependabot/clients/github_with_retries"
 require "dependabot/clients/gitlab_with_retries"
 require "dependabot/pull_request_creator"
 
+# rubocop:disable Metrics/ClassLength
 module Dependabot
   class PullRequestCreator
     class PrNamePrefixer
@@ -25,11 +26,13 @@ module Dependabot
                             twisted_rightwards_arrows whale wheelchair
                             white_check_mark wrench zap).freeze
 
-      def initialize(source:, dependencies:, credentials:, security_fix: false)
-        @dependencies = dependencies
-        @source       = source
-        @credentials  = credentials
-        @security_fix = security_fix
+      def initialize(source:, dependencies:, credentials:, security_fix: false,
+                     commit_message_options: {})
+        @dependencies           = dependencies
+        @source                 = source
+        @credentials            = credentials
+        @security_fix           = security_fix
+        @commit_message_options = commit_message_options
       end
 
       def pr_name_prefix
@@ -39,45 +42,63 @@ module Dependabot
       end
 
       def capitalize_first_word?
-        case last_dependabot_commit_style
-        when :gitmoji then true
-        when :conventional_prefix, :conventional_prefix_with_scope
-          last_dependabot_commit_message.match?(/: (\[Security\] )?(B|U)/)
-        else
-          if using_angular_commit_messages? || using_eslint_commit_messages?
-            prefixes = ANGULAR_PREFIXES + ESLINT_PREFIXES
-            semantic_msgs = recent_commit_messages.select do |message|
-              prefixes.any? { |pre| message.match?(/#{pre}[:(]/i) }
-            end
-
-            return true if semantic_msgs.all? { |m| m.match?(/:\s+\[?[A-Z]/) }
-            return false if semantic_msgs.all? { |m| m.match?(/:\s+\[?[a-z]/) }
-          end
+        if commit_message_options.key?(:prefix)
+          return !commit_message_options[:prefix]&.strip&.match?(/\A[a-z]/)
+        end
 
-          !commit_prefix&.match(/\A[a-z]/)
+        if last_dependabot_commit_style
+          return capitalise_first_word_from_last_dependabot_commit_style
         end
+
+        capitalise_first_word_from_previous_commits
       end
 
       private
 
-      attr_reader :source, :dependencies, :credentials
+      attr_reader :source, :dependencies, :credentials, :commit_message_options
 
       def security_fix?
         @security_fix
       end
 
       def commit_prefix
-        # If there is a previous Dependabot commit, and it used a known style,
-        # use that as our model for subsequent commits
+        # If a preferred prefix has been explicitly provided, use it
+        if commit_message_options.key?(:prefix)
+          return prefix_from_explicitly_provided_details
+        end
+
+        # Otherwise, if there is a previous Dependabot commit and it used a
+        # known style, use that as our model for subsequent commits
+        if last_dependabot_commit_style
+          return prefix_for_last_dependabot_commit_style
+        end
+
+        # Otherwise we need to detect the user's preferred style from the
+        # existing commits on their repo
+        build_commit_prefix_from_previous_commits
+      end
+
+      def prefix_from_explicitly_provided_details
+        unless commit_message_options.key?(:prefix)
+          raise "No explicitly provided prefix!"
+        end
+
+        prefix = commit_message_options[:prefix].to_s
+        return if prefix.empty?
+
+        prefix += "(#{scope})" if commit_message_options[:include_scope]
+        prefix += ":" if prefix.match?(/[A-Za-z0-9\)\]]\Z/)
+        prefix += " " unless prefix.end_with?(" ")
+        prefix
+      end
+
+      def prefix_for_last_dependabot_commit_style
         case last_dependabot_commit_style
         when :gitmoji then "⬆️ "
         when :conventional_prefix then "#{last_dependabot_commit_prefix}: "
         when :conventional_prefix_with_scope
           "#{last_dependabot_commit_prefix}(#{scope}): "
-        else
-          # Otherwise we need to detect the user's preferred style from the
-          # existing commits on their repo
-          build_commit_prefix_from_previous_commits
+        else raise "Unknown commit style #{last_dependabot_commit_style}"
         end
       end
 
@@ -104,6 +125,29 @@ module Dependabot
         dependencies.any?(&:production?) ? "deps" : "deps-dev"
       end
 
+      def capitalise_first_word_from_last_dependabot_commit_style
+        case last_dependabot_commit_style
+        when :gitmoji then true
+        when :conventional_prefix, :conventional_prefix_with_scope
+          last_dependabot_commit_message.match?(/: (\[[Ss]ecurity\] )?(B|U)/)
+        else raise "Unknown commit style #{last_dependabot_commit_style}"
+        end
+      end
+
+      def capitalise_first_word_from_previous_commits
+        if using_angular_commit_messages? || using_eslint_commit_messages?
+          prefixes = ANGULAR_PREFIXES + ESLINT_PREFIXES
+          semantic_msgs = recent_commit_messages.select do |message|
+            prefixes.any? { |pre| message.match?(/#{pre}[:(]/i) }
+          end
+
+          return true if semantic_msgs.all? { |m| m.match?(/:\s+\[?[A-Z]/) }
+          return false if semantic_msgs.all? { |m| m.match?(/:\s+\[?[a-z]/) }
+        end
+
+        !commit_prefix&.match(/\A[a-z]/)
+      end
+
       def last_dependabot_commit_style
         return unless (msg = last_dependabot_commit_message)
 
@@ -250,11 +294,12 @@ module Dependabot
       end
 
       def last_dependabot_commit_message
-        case source.provider
-        when "github" then last_github_dependabot_commit_message
-        when "gitlab" then last_gitlab_dependabot_commit_message
-        else raise "Unsupported provider: #{source.provider}"
-        end
+        @last_dependabot_commit_message ||=
+          case source.provider
+          when "github" then last_github_dependabot_commit_message
+          when "gitlab" then last_gitlab_dependabot_commit_message
+          else raise "Unsupported provider: #{source.provider}"
+          end
       end
 
       def last_github_dependabot_commit_message
@@ -305,3 +350,4 @@ module Dependabot
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.108.25
+  version: 0.109.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
@@ -266,14 +266,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 0.72.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 0.72.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement