dependabot-common 0.118.15 → 0.119.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20b7004c1f854933ff1bcdca6f7267777cf03f97ac71c5122923025d4408392
-  data.tar.gz: 799ebfb484a33945c48375472d2fb5e3653cb7e370402474ac8a8f49199c2e42
+  metadata.gz: c81b0ca1f68eb6edaf9aba683e0537cf2acc69caccaf95bb777c531c25b936a1
+  data.tar.gz: 70e8b39a6f6f711b68e5033778c1063b3a91fe19f6f2b0377447ae2705e0603d
 SHA512:
-  metadata.gz: 89dcf2894d833225bdbbbf03d99b0a86378487b0b1466a8e4f0f804c733926087eb38d6498c19a0b80bc02b20d41d12a7d9ebfbb3964a35c8d7f009bb098f3f0
-  data.tar.gz: c53832d416fd357292c9dd38f55e1d78b0891064da510b51bc8c4230f3bba29442a24c6bfcb42992f4c14082c40d8680bd71d88fc6e8963da81f04a2f9b04f55
+  metadata.gz: afa8c8f3b5462009ea4b88df0d69bd87ac4c8cddb64419cd7817a1a01e302efac77774f1b093e7b4e92d143860f08f924b81504fb7f06b4149d99a258c3465fd
+  data.tar.gz: e8177d4e247a073d3bd30393c20b724bb342d6863fad8fcc26792556b1092096c533ccdd373dd9b1423308d7925d23741ea0e89f5841c604cd99bdc6f0feb923

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/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.15"
+  VERSION = "0.119.2"
 end

metadata

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