dependabot-common 0.201.1 → 0.204.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bde3857302263bc56d86ec920eda97a94615d706bba5d4ca8122ba1d8396677d
-  data.tar.gz: efbe0b854ce892250f828ddef14d791159f63062e9e200fe9433b5006a0a8b82
+  metadata.gz: 46903b68cc8671c6f2b3af7cca55681afa29cbfec4fa1106f26c2a6d15d8e551
+  data.tar.gz: f3ef79e50ac2d5e57c8df93cc631df01b75974f07cfcc48024f53974ed36f93b
 SHA512:
-  metadata.gz: 2103cdd993d1b2d5ea0962105eb226a01c725561d98b839780df086ae4c7c814ae7a6ad8d3f681d162a282c821e7bdb5c4af08189e42c24307e5fb44bca3da38
-  data.tar.gz: 378d623def334e092f4c7dd88b3f541ca864b0486f90b24d421d9590fae2fd209dd05a82cd4bdd1d37ed01c923db7cc403a0734058d3ac333f1e2e0d9da3227c
+  metadata.gz: ddebe2354c01cd9f1556c7d78718bc57702dac0fa7e83f84167b5598ba735062f4d32d3ad41a4043098b19716ebdc8c9b4b1e4e03f84b362dd3763baa94eb578
+  data.tar.gz: da0c796c9e2eda0197d366ece46d792549eb2a4cfeeab7b5baa9a734d1938c8d3ee18e5a18b2f1ad97f29e011b5ca2516c62650dd68419a58274449cb8ab0eeb

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.1"
+  VERSION = "0.204.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.201.1
+  version: 0.204.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-25 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