dependabot-common 0.118.14 → 0.119.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84fc6de52cc27e73d87e47a52eb9f0762d0d25b45c0e8cce770751df9cfbbc8c
-  data.tar.gz: 33d975df35aa3cd3813ee2ac0190b91359cec73a38826fb35e0bb8cf083b9d98
+  metadata.gz: 55d06a3a88c37d000b5380d1b1dcc12179e035967017f61ec7f310279836656a
+  data.tar.gz: 3bdff5a073acdb9d4440319bf3120d20687417ec3b6f4287ec7358f349baaa0a
 SHA512:
-  metadata.gz: d230bcb964358475dfdfe08ba0be8166575c3c53579f6679e3049da2acd5e1c1dabac82fc828be64650f1a0740af6c72cefd8320a5b27e5be2b7a7e5ed754f40
-  data.tar.gz: a1dd576f083646595e238ef04924ccc2e0c208d8e15b356e4f7306655ea9bb59ba699929df0e2fb9038b83b2788d6c0a8dc7eb30de2caeea5c9394a5eff1f2dc
+  metadata.gz: 127a52768582e1e2e179ce49b95229d05b6b6d0c50a4991c131297cfc2ba126e2f82afb786dbd6da3222f567020f51da7273de336e489a88e703571c825f481d
+  data.tar.gz: cef7b76143722481b5c9a034104e211493489fe5815d73ea83dd2f2db0415211d36b8b87ec865f0dd3e01549057eba986e52888621ca31d791ca32e25de38d5e

data/lib/dependabot/dependency_file.rb

@@ -83,6 +83,12 @@ module Dependabot
       content_encoding == ContentEncoding::BASE64
     end
 
+    def decoded_content
+      return Base64.decode64(content) if binary?
+
+      content
+    end
+
     private
 
     def clean_directory(directory)

data/lib/dependabot/file_fetchers/base.rb

@@ -67,6 +67,12 @@ module Dependabot
         raise unless e.message.include?("Repository is empty")
       end
 
+      # Returns the path to the cloned repo
+      def clone_repo_contents(target_directory: nil)
+        @clone_repo_contents ||=
+          _clone_repo_contents(target_directory: target_directory)
+      end
+
       private
 
       def fetch_file_if_present(filename, fetch_submodules: false)
@@ -419,6 +425,24 @@ module Dependabot
           max_by(&:length)
       end
 
+      def _clone_repo_contents(target_directory:)
+        SharedHelpers.with_git_configured(credentials: credentials) do
+          path = target_directory || File.join("tmp", source.repo)
+          # Assume we're retrying the same branch, or that a `target_directory`
+          # is specified when retrying a different branch.
+          return path if Dir.exist?(File.join(path, ".git"))
+
+          FileUtils.mkdir_p(path)
+          br_opt = " --branch=#{source.branch} --single-branch" if source.branch
+          SharedHelpers.run_shell_command(
+            <<~CMD
+              git clone --no-tags --no-recurse-submodules --depth=1#{br_opt} #{source.url} #{path}
+            CMD
+          )
+          path
+        end
+      end
+
       def client_for_provider
         case source.provider
         when "github" then github_client

data/lib/dependabot/file_parsers/base.rb

@@ -3,10 +3,12 @@
 module Dependabot
   module FileParsers
     class Base
-      attr_reader :dependency_files, :credentials, :source
+      attr_reader :dependency_files, :repo_contents_path, :credentials, :source
 
-      def initialize(dependency_files:, source:, credentials: [])
+      def initialize(dependency_files:, repo_contents_path: nil, source:,
+                     credentials: [])
         @dependency_files = dependency_files
+        @repo_contents_path = repo_contents_path
         @credentials = credentials
         @source = source
 

data/lib/dependabot/file_updaters/base.rb

@@ -3,15 +3,18 @@
 module Dependabot
   module FileUpdaters
     class Base
-      attr_reader :dependencies, :dependency_files, :credentials
+      attr_reader :dependencies, :dependency_files, :repo_contents_path,
+                  :credentials
 
       def self.updated_files_regex
         raise NotImplementedError
       end
 
-      def initialize(dependencies:, dependency_files:, credentials:)
+      def initialize(dependencies:, dependency_files:, repo_contents_path: nil,
+                     credentials:)
         @dependencies = dependencies
         @dependency_files = dependency_files
+        @repo_contents_path = repo_contents_path
         @credentials = credentials
 
         check_required_files

data/lib/dependabot/pull_request_creator/github.rb

@@ -170,13 +170,13 @@ module Dependabot
               sha: file.content
             }
           else
-            content = if file.binary?
+            content = if file.deleted?
+                        { sha: nil }
+                      elsif 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

data/lib/dependabot/pull_request_updater/github.rb

@@ -132,13 +132,13 @@ module Dependabot
               sha: file.content
             }
           else
-            content = if file.binary?
+            content = if file.deleted?
+                        { sha: nil }
+                      elsif 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

data/lib/dependabot/shared_helpers.rb

@@ -29,6 +29,19 @@ module Dependabot
       end
     end
 
+    def self.in_a_temporary_repo_directory(directory = "/",
+                                           repo_contents_path = nil,
+                                           &block)
+      if repo_contents_path
+        path = Pathname.new(File.join(repo_contents_path, directory)).
+               expand_path
+        reset_git_repo(repo_contents_path)
+        Dir.chdir(path) { yield(path) }
+      else
+        in_a_temporary_directory(directory, &block)
+      end
+    end
+
     def self.in_a_temporary_directory(directory = "/")
       Dir.mkdir(BUMP_TMP_DIR_PATH) unless Dir.exist?(BUMP_TMP_DIR_PATH)
       Dir.mktmpdir(BUMP_TMP_FILE_PREFIX, BUMP_TMP_DIR_PATH) do |dir|
@@ -209,6 +222,12 @@ module Dependabot
       File.write("git.store", git_store_content)
     end
 
+    def self.reset_git_repo(path)
+      Dir.chdir(path) do
+        run_shell_command("git reset HEAD --hard && git clean -fx")
+      end
+    end
+
     def self.stash_global_git_config
       return unless File.exist?(GIT_CONFIG_GLOBAL_PATH)
 
@@ -234,7 +253,7 @@ module Dependabot
 
       # Raise an error with the output from the shell session if the
       # command returns a non-zero status
-      return if process.success?
+      return stdout if process.success?
 
       error_context = {
         command: command,

data/lib/dependabot/update_checkers/base.rb

@@ -7,16 +7,17 @@ require "dependabot/security_advisory"
 module Dependabot
   module UpdateCheckers
     class Base
-      attr_reader :dependency, :dependency_files, :credentials,
-                  :ignored_versions, :raise_on_ignored,
+      attr_reader :dependency, :dependency_files, :repo_contents_path,
+                  :credentials, :ignored_versions, :raise_on_ignored,
                   :security_advisories, :requirements_update_strategy
 
-      def initialize(dependency:, dependency_files:, credentials:,
-                     ignored_versions: [], raise_on_ignored: false,
-                     security_advisories: [],
+      def initialize(dependency:, dependency_files:, repo_contents_path: nil,
+                     credentials:, ignored_versions: [],
+                     raise_on_ignored: false, security_advisories: [],
                      requirements_update_strategy: nil)
         @dependency = dependency
         @dependency_files = dependency_files
+        @repo_contents_path = repo_contents_path
         @credentials = credentials
         @requirements_update_strategy = requirements_update_strategy
         @ignored_versions = ignored_versions

data/lib/dependabot/version.rb

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

metadata

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