dependabot-common 0.140.0 → 0.140.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9891079fbe9ee6f09274dd3f72dd0c5c12b40a8685e3c0747bd92b4cc0ed259b
-  data.tar.gz: 7e52789d37118447e73082cce5263693194cc70b56637495f6985f3266d166f1
+  metadata.gz: b3d8d2c38530262cc825130faa28497e3ce5eed2a6b6e2e53b573ebebf8852e6
+  data.tar.gz: 0ba1270c2b0f274ab20184bb504c9e109e2586ee8a6e1e959d1c5f9c3c665f61
 SHA512:
-  metadata.gz: 8fc90ba04b2b77974f90d7a1d1917e4458038ea263f4c14270fa719e11979947a33e97cff980d19ed05b3d5dbff321e856bfb9717b175b2021e15cdc2c3d0445
-  data.tar.gz: d9aa3ee0b1b0d292de592309981c5e9309579a3ce4caf1e8a509a0f9dfc9fc10934b12944977e8bc655f38f81334203c6e280a27e4392915503c0bb4bd756144
+  metadata.gz: 363e147e1bc8240fba5fb50afbe0b5fa3af4d8b195a621ecaac6de52eacf7df0c9cf0d589ea422a91d1428c9e5841882814e2c37ddeb98e553323123a99b0b2b
+  data.tar.gz: 0ac8544ba1909dab8c0cc47ec3c301b0066af52a2a0519a0697b4556a7715ed7510086f4b9ec787d88160abec8f2b49bc8051985c7e52fe0fb9e94f00de6f820

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/version.rb

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

metadata

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