dependabot-common 0.139.2 → 0.141.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a8b637aa9cd5c38c93bcdca2f8e26283e0bbb5bebc70f54bc1ce0f80a93e75
-  data.tar.gz: 1aebc5329c67b401cc630c815bf6abf5bf6a63748e326255ebf37e58db52d256
+  metadata.gz: 1ce8c540f85d77f29a05217fa942c30ceccc1105dec78812b1955f6d047d6a4a
+  data.tar.gz: 79ddaca31b26a954a5174f36c796083545f9c96f7fad03d4cfe7cab7651755f3
 SHA512:
-  metadata.gz: 75e1080fcf2a30249c962597e7fd09916584f8e4488702050dd8bbd775d2a1447c07ac09e1502f832f7e463b7c760a25e348397072f1b5273faf0dea40a8a79f
-  data.tar.gz: 4e14c9377f28242dc67767004e210e30f1f1c185a6e3e5180222a0a80f2227c7995abbcd8b3b6232edb4fea3345e5a55a995a626df6dd05fdee672ac18258f26
+  metadata.gz: a187fd0a04b6ff8a59434e1a6864f23795696c6b37ce132572cc15346fa23abf3600eb8d69242a691909573e3315dc3d5229e780cb0adf93c980b8af146d3e51
+  data.tar.gz: 919ba7bb0228d961e109583c3f769def71feb1dc8bfcb9fd5a767c5eab91f969873ba88441932cced9f9d8ebf0ac0cf5f7f861b1ac12b32780b542a117aad6e9

data/lib/dependabot/dependency_file.rb

@@ -5,23 +5,33 @@ require "pathname"
 module Dependabot
   class DependencyFile
     attr_accessor :name, :content, :directory, :type, :support_file,
-                  :symlink_target, :content_encoding, :deleted
+                  :symlink_target, :content_encoding, :operation
 
     class ContentEncoding
       UTF_8 = "utf-8"
       BASE64 = "base64"
     end
 
+    class Operation
+      UPDATE = "update"
+      CREATE = "create"
+      DELETE = "delete"
+    end
+
     def initialize(name:, content:, directory: "/", type: "file",
                    support_file: false, symlink_target: nil,
-                   content_encoding: ContentEncoding::UTF_8, deleted: false)
+                   content_encoding: ContentEncoding::UTF_8, deleted: false, operation: Operation::UPDATE)
       @name = name
       @content = content
       @directory = clean_directory(directory)
       @symlink_target = symlink_target
       @support_file = support_file
       @content_encoding = content_encoding
-      @deleted = deleted
+      @operation = operation
+
+      # Make deleted override the operation. Deleted is kept when operation
+      # was introduced to keep compatibility with downstream dependants.
+      @operation = Operation::DELETE if deleted
 
       # Type is used *very* sparingly. It lets the git_modules updater know that
       # a "file" is actually a submodule, and lets our Go updaters know which
@@ -44,7 +54,8 @@ module Dependabot
         "type" => type,
         "support_file" => support_file,
         "content_encoding" => content_encoding,
-        "deleted" => deleted
+        "deleted" => deleted,
+        "operation" => operation
       }
 
       details["symlink_target"] = symlink_target if symlink_target
@@ -75,8 +86,16 @@ module Dependabot
       @support_file
     end
 
+    def deleted
+      @operation == Operation::DELETE
+    end
+
+    def deleted=(deleted)
+      @operation = deleted ? Operation::DELETE : Operation::UPDATE
+    end
+
     def deleted?
-      @deleted
+      deleted
     end
 
     def binary?

data/lib/dependabot/file_updaters/vendor_updater.rb

@@ -27,12 +27,20 @@ module Dependabot
           )
           changed_paths = status.split("\n").map { |l| l.split(" ") }
           changed_paths.map do |type, path|
-            deleted = type == "D"
+            # The following types are possible to be returned:
+            # M = Modified = Default for DependencyFile
+            # D = Deleted
+            # ?? = Untracked = Created
+            operation = Dependabot::DependencyFile::Operation::UPDATE
+            operation = Dependabot::DependencyFile::Operation::DELETE if type == "D"
+            operation = Dependabot::DependencyFile::Operation::CREATE if type == "??"
             encoding = ""
-            encoded_content = File.read(path) unless deleted
+            encoded_content = File.read(path) unless operation == Dependabot::DependencyFile::Operation::DELETE
             if binary_file?(path)
               encoding = Dependabot::DependencyFile::ContentEncoding::BASE64
-              encoded_content = Base64.encode64(encoded_content) unless deleted
+              if operation != Dependabot::DependencyFile::Operation::DELETE
+                encoded_content = Base64.encode64(encoded_content)
+              end
             end
 
             project_root =
@@ -44,7 +52,7 @@ module Dependabot
               name: file_path.to_s,
               content: encoded_content,
               directory: base_directory,
-              deleted: deleted,
+              operation: operation,
               content_encoding: encoding
             )
           end

data/lib/dependabot/pull_request_creator/github.rb

@@ -177,7 +177,7 @@ module Dependabot
               sha: file.content
             }
           else
-            content = if file.deleted?
+            content = if file.operation == Dependabot::DependencyFile::Operation::DELETE
                         { sha: nil }
                       elsif file.binary?
                         sha = github_client_for_source.create_blob(

data/lib/dependabot/pull_request_creator/gitlab.rb

@@ -91,23 +91,26 @@ 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|
-          if file.type == "symlink"
-            {
-              action: "update",
-              file_path: file.symlink_target,
-              content: file.content
-            }
-          else
-            {
-              action: "update",
-              file_path: file.path,
-              content: file.content
-            }
-          end
+          {
+            action: file_action(file),
+            file_path: file.type == "symlink" ? file.symlink_target : file.path,
+            content: file.content
+          }
         end
 
         gitlab_client_for_source.create_commit(

data/lib/dependabot/pull_request_updater/github.rb

@@ -132,7 +132,7 @@ module Dependabot
               sha: file.content
             }
           else
-            content = if file.deleted?
+            content = if file.operation == Dependabot::DependencyFile::Operation::DELETE
                         { sha: nil }
                       elsif file.binary?
                         sha = github_client_for_source.create_blob(

data/lib/dependabot/pull_request_updater/gitlab.rb

@@ -62,10 +62,21 @@ 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
+      end
+
       def create_commit
         actions = files.map do |file|
           {
-            action: "update",
+            action: file_action(file),
             file_path: file.type == "symlink" ? file.symlink_target : file.path,
             content: file.content
           }

data/lib/dependabot/shared_helpers.rb

@@ -157,6 +157,8 @@ module Dependabot
       backup_git_config_path = stash_global_git_config
       configure_git_to_use_https_with_credentials(credentials)
       yield
+    rescue Errno::ENOSPC => e
+      raise Dependabot::OutOfDisk, e.message
     ensure
       reset_global_git_config(backup_git_config_path)
     end

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.139.2
+  version: 0.141.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport