dependabot-common 0.118.13 → 0.118.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd6bbc00b1d0c8db23fdad8a48e7c3b50dcde91cd9709066f3dca198bfc0fc12
-  data.tar.gz: ee033ae13291b1ae755a4879a311c92ef1c3f765a7dfc8a1fbaab56b147523f9
+  metadata.gz: 84fc6de52cc27e73d87e47a52eb9f0762d0d25b45c0e8cce770751df9cfbbc8c
+  data.tar.gz: 33d975df35aa3cd3813ee2ac0190b91359cec73a38826fb35e0bb8cf083b9d98
 SHA512:
-  metadata.gz: e785764a18c08b4223903fa24c5193e517a1bf1e0510ae84794edfeeb57c1d150dc848e23cfe2bed1df2912d4dfb043cb97f92d04a08b442d0e7cd3e03f4f031
-  data.tar.gz: 6f3a98da4aa78275dc11ae4935925bc7e429200053ef94d7657e4c98c3e63166d1f0a4752be71d038d8a94df577eea2df4498ce09cdc2dc796d1d017e4b56fe1
+  metadata.gz: d230bcb964358475dfdfe08ba0be8166575c3c53579f6679e3049da2acd5e1c1dabac82fc828be64650f1a0740af6c72cefd8320a5b27e5be2b7a7e5ed754f40
+  data.tar.gz: a1dd576f083646595e238ef04924ccc2e0c208d8e15b356e4f7306655ea9bb59ba699929df0e2fb9038b83b2788d6c0a8dc7eb30de2caeea5c9394a5eff1f2dc

data/lib/dependabot/dependency_file.rb

@@ -79,6 +79,10 @@ module Dependabot
       @deleted
     end
 
+    def binary?
+      content_encoding == ContentEncoding::BASE64
+    end
+
     private
 
     def clean_directory(directory)

data/lib/dependabot/pull_request_creator/github.rb

@@ -170,12 +170,23 @@ module Dependabot
               sha: file.content
             }
           else
+            content = if file.binary?
+                        sha = github_client_for_source.create_blob(
+                          source.repo, file.content, "base64"
+                        )
+                        { sha: sha }
+                      elsif file.deleted?
+                        { sha: nil }
+                      else
+                        { content: file.content }
+                      end
+
             {
-              path: (file.symlink_target || file.path).sub(%r{^/}, ""),
+              path: (file.symlink_target ||
+                     file.path).sub(%r{^/}, ""),
               mode: "100644",
-              type: "blob",
-              content: file.content
-            }
+              type: "blob"
+            }.merge(content)
           end
         end
 

data/lib/dependabot/pull_request_updater/github.rb

@@ -124,14 +124,7 @@ module Dependabot
 
       def create_tree
         file_trees = files.map do |file|
-          if %w(file symlink).include?(file.type)
-            {
-              path: (file.symlink_target || file.path).sub(%r{^/}, ""),
-              mode: "100644",
-              type: "blob",
-              content: file.content
-            }
-          elsif file.type == "submodule"
+          if file.type == "submodule"
             {
               path: file.path.sub(%r{^/}, ""),
               mode: "160000",
@@ -139,7 +132,23 @@ module Dependabot
               sha: file.content
             }
           else
-            raise "Unknown file type #{file.type}"
+            content = if file.binary?
+                        sha = github_client_for_source.create_blob(
+                          source.repo, file.content, "base64"
+                        )
+                        { sha: sha }
+                      elsif file.deleted?
+                        { sha: nil }
+                      else
+                        { content: file.content }
+                      end
+
+            {
+              path: (file.symlink_target ||
+                     file.path).sub(%r{^/}, ""),
+              mode: "100644",
+              type: "blob"
+            }.merge(content)
           end
         end
 

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.118.13
+  version: 0.118.14
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit