dependabot-common 0.201.0 → 0.203.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6932b8b455adfaee9b4fcc574e9699c2007c2cf8480def19fdfc366c72e6ed4f
-  data.tar.gz: db4f5bab2b777bcfcf6bad80b43c616031d493f8d1f871ad00ca0b6202d2e228
+  metadata.gz: 50face4c31cf6a3d4d59bc68f550a63e471f9bdc123eb5745674d5db16329dc2
+  data.tar.gz: 8d9726bc4cb44625e2d5506cccace40f5b523a81abbd50651670a3d4284c2fb7
 SHA512:
-  metadata.gz: 78c752bb72ff73ca58f04aef14b03644f800cc69a3e057f8d2c01fca924ebaf7afd9b8a5634bd566f6b5d3662ec9cb1b90425e01d404ce70e01b1f0509694fa3
-  data.tar.gz: c18ae4a872846056d39f8d089630174853e33dcd4dc7f72ca6cade16a2135116cc9466609d6740a88c936a796f3f67a9a7fb3a3796f60ebe316cf304ff53f9e2
+  metadata.gz: c8d9a0df757d61ccba5e21208a714a4985f82f94d376bb2efca5438dbc22cb97fdbe3ae913726ca5a141d548efd01d7eecbad3ff52391dfed27e0815b850e089
+  data.tar.gz: e90053b6bd68c411df8890b4681370caa57f9ff666a2bc688e69134df40c8e7d33c622bc1fb54d48104a4a797eb9a8bd21d2f5973df75e8a2f2c68823c39fa9f

data/lib/dependabot/pull_request_creator/gitlab.rb

@@ -92,34 +92,36 @@ module Dependabot
         )
       end
 
-      # @param [DependencyFile] file
-      def file_action(file)
-        if file.operation == Dependabot::DependencyFile::Operation::DELETE
-          "delete"
-        elsif file.operation == Dependabot::DependencyFile::Operation::CREATE
-          "create"
-        else
-          "update"
-        end
-      end
-
       def create_commit
         return create_submodule_update_commit if files.count == 1 && files.first.type == "submodule"
 
-        actions = files.map do |file|
+        gitlab_client_for_source.create_commit(
+          source.repo,
+          branch_name,
+          commit_message,
+          file_actions
+        )
+      end
+
+      def file_actions
+        files.map do |file|
           {
             action: file_action(file),
             file_path: file.type == "symlink" ? file.symlink_target : file.path,
             content: file.content
           }
         end
+      end
 
-        gitlab_client_for_source.create_commit(
-          source.repo,
-          branch_name,
-          commit_message,
-          actions
-        )
+      # @param [DependencyFile] file
+      def file_action(file)
+        if file.operation == Dependabot::DependencyFile::Operation::DELETE
+          "delete"
+        elsif file.operation == Dependabot::DependencyFile::Operation::CREATE
+          "create"
+        else
+          "update"
+        end
       end
 
       def create_submodule_update_commit

data/lib/dependabot/pull_request_updater/gitlab.rb

@@ -63,34 +63,36 @@ module Dependabot
         gitlab_client_for_source.commit(source.repo, old_commit)
       end
 
-      # @param [DependencyFile] file
-      def file_action(file)
-        if file.operation == Dependabot::DependencyFile::Operation::DELETE
-          "delete"
-        elsif file.operation == Dependabot::DependencyFile::Operation::CREATE
-          "create"
-        else
-          "update"
-        end
+      def create_commit
+        gitlab_client_for_source.create_commit(
+          source.repo,
+          merge_request.source_branch,
+          commit_being_updated.title,
+          file_actions,
+          force: true,
+          start_branch: merge_request.target_branch
+        )
       end
 
-      def create_commit
-        actions = files.map do |file|
+      def file_actions
+        files.map do |file|
           {
             action: file_action(file),
             file_path: file.type == "symlink" ? file.symlink_target : file.path,
             content: file.content
           }
         end
+      end
 
-        gitlab_client_for_source.create_commit(
-          source.repo,
-          merge_request.source_branch,
-          commit_being_updated.title,
-          actions,
-          force: true,
-          start_branch: merge_request.target_branch
-        )
+      # @param [DependencyFile] file
+      def file_action(file)
+        if file.operation == Dependabot::DependencyFile::Operation::DELETE
+          "delete"
+        elsif file.operation == Dependabot::DependencyFile::Operation::CREATE
+          "create"
+        else
+          "update"
+        end
       end
     end
   end

data/lib/dependabot/source.rb

@@ -21,8 +21,8 @@ module Dependabot
     GITLAB_SOURCE = %r{
       (?<provider>gitlab)
       (?:\.com)[/:]
-      (?<repo>[\w.-]+/(?:(?!\.git|\.\s)[\w.-])+)
-      (?:(?:/tree|/blob)/(?<branch>[^/]+)/(?<directory>.*)[\#|/])?
+      (?<repo>(?!\.git|/tree|/blob)[\w./-]+?)(?:\.git)?
+      (?:(?:/tree|/blob)/(?<branch>[^/]+)/(?<directory>.*)[\#|/].*)?$
     }x.freeze
 
     BITBUCKET_SOURCE = %r{

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.201.0
+  version: 0.203.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement