dependabot-common 0.111.4 → 0.111.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 998e71dd1ec457900c3bca8e0cd31c426c4506b32d01032c43cf4d1bf517f3f8
-  data.tar.gz: aa5af7f173579faa87ab15ff7ff4df8271f13d8a50d419999c7bfc4de1fd7fc9
+  metadata.gz: ed235a15ba5b7800e7227df7c0e427e78e68d205b48136518fadb21032fc313b
+  data.tar.gz: f2e1477bdbff73b96418d58cbf9cd202cab706aac9e657b64dd0be9036f1a348
 SHA512:
-  metadata.gz: 01af66663ecd9916661e4320cc31e2ad208e48b0d0b564365d72e24e44ec8082c57f0b85fbde33cbb740f87dd40a420da7838643010876640aef1619cf9bfd6d
-  data.tar.gz: e5a5bc7f2ebb2b6d72d5078bae28cd1c8b145c8f4f491ad2c4680d93300c71a47a255a78d5d4f3d908eed735b4172acb0db74dbd6a7a73da354c18a5722b5b5a
+  metadata.gz: 6e99214b62105c357d9009b345a4dd3857badcd63e5da2856a4f45b6b30b9723382a18f75e8310dc6d209fc003b896f6e8c37c3ba89a583c9f3d76455d3fb4f9
+  data.tar.gz: 49fa885e74495ba1971141936cd62706e3a0c2f23a69cf147648ef8f046a6d665033e34251c3abd96f070136f4833d118072e609e337db7718c1a0a1e0b0b86e

data/lib/dependabot/clients/azure.rb

@@ -123,7 +123,8 @@ module Dependabot
         JSON.parse(response.body).fetch("value")
       end
 
-      def create_commit(branch_name, base_commit, commit_message, files)
+      def create_commit(branch_name, base_commit, commit_message, files,
+                        author_details)
         content = {
           refUpdates: [
             { name: "refs/heads/" + branch_name, oldObjectId: base_commit }
@@ -131,6 +132,7 @@ module Dependabot
           commits: [
             {
               comment: commit_message,
+              author: author_details,
               changes: files.map do |file|
                 {
                   changeType: "edit",
@@ -141,7 +143,7 @@ module Dependabot
                   }
                 }
               end
-            }
+            }.compact
           ]
         }
 
@@ -152,7 +154,8 @@ module Dependabot
 
       def create_pull_request(pr_name, source_branch, target_branch,
                               pr_description, labels)
-        # Azure DevOps only support descriptions up to 4000 characters (https://developercommunity.visualstudio.com/content/problem/608770/remove-4000-character-limit-on-pull-request-descri.html)
+        # Azure DevOps only support descriptions up to 4000 characters
+        # https://developercommunity.visualstudio.com/content/problem/608770/remove-4000-character-limit-on-pull-request-descri.html
         azure_max_length = 3999
         if pr_description.length > azure_max_length
           truncated_msg = "...\n\n_Description has been truncated_"

data/lib/dependabot/pull_request_creator.rb

@@ -132,6 +132,7 @@ module Dependabot
         commit_message: message_builder.commit_message,
         pr_description: message_builder.pr_message,
         pr_name: message_builder.pr_name,
+        author_details: author_details,
         labeler: labeler
       )
     end

data/lib/dependabot/pull_request_creator/azure.rb

@@ -8,11 +8,11 @@ module Dependabot
     class Azure
       attr_reader :source, :branch_name, :base_commit, :credentials,
                   :files, :commit_message, :pr_description, :pr_name,
-                  :labeler
+                  :author_details, :labeler
 
       def initialize(source:, branch_name:, base_commit:, credentials:,
                      files:, commit_message:, pr_description:, pr_name:,
-                     labeler:)
+                     author_details:, labeler:)
         @source         = source
         @branch_name    = branch_name
         @base_commit    = base_commit
@@ -21,13 +21,16 @@ module Dependabot
         @commit_message = commit_message
         @pr_description = pr_description
         @pr_name        = pr_name
+        @author_details = author_details
         @labeler        = labeler
       end
 
       def create
         return if branch_exists? && pull_request_exists?
 
-        create_commit unless branch_exists? && commit_exists?
+        # For Azure we create or update a branch in the same request as creating
+        # a commit (so we don't need create or update branch logic here)
+        create_commit
 
         create_pull_request
       end
@@ -43,20 +46,13 @@ module Dependabot
       end
 
       def branch_exists?
-        @branch_ref ||=
-          azure_client_for_source.branch(branch_name)
+        @branch_ref ||= azure_client_for_source.branch(branch_name)
 
         @branch_ref
       rescue ::Azure::Error::NotFound
         false
       end
 
-      def commit_exists?
-        @commits ||=
-          azure_client_for_source.commits(branch_name)
-        commit_message.start_with?(@commits.first.fetch("comment"))
-      end
-
       def pull_request_exists?
         azure_client_for_source.pull_requests(
           branch_name,
@@ -65,11 +61,15 @@ module Dependabot
       end
 
       def create_commit
+        author = author_details&.slice(:name, :email, :date)
+        author = nil unless author&.any?
+
         azure_client_for_source.create_commit(
           branch_name,
           base_commit,
           commit_message,
-          files
+          files,
+          author
         )
       end
 

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.111.4
+  version: 0.111.5
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr