dependabot-bundler 0.121.0 → 0.121.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bc52373798c13a207c93c926fa89fc1ba7f072c950895b0457e9303cce433ac
-  data.tar.gz: 0645a89f44241cd6a91eb4b887d7c38abf9a9801112b8c410abbfb8980e3dd82
+  metadata.gz: b9702d2fb4d55854395b475a6cf258c881222f6052aa2866c9afa3e7ccf380af
+  data.tar.gz: 31e57d6a1b51ca27333521e539ab891599a6339ca39b9bce2dc5a5213a64657c
 SHA512:
-  metadata.gz: d8f9b85f728adcfef047bcbcbd28ed85280db7c8e03f62e573713940bda2cdeb4061bf20466846f956ad71332469faffa4c6d9b44c28254fb2f17e91590ad0dc
-  data.tar.gz: 56970fff452967df6a30678eabd61fea04013381fb380b98b2e2bfa929ce69e0ca0c68e0517daf53155bc12e77ad91b195e6938bca45a848907ad3800903079b
+  metadata.gz: d287fdf1b96b8ef28491c6325f83cab75a8ef5f571e0b45e2462fc2ddbc81969a4628932564f48780e3563fd0ecff3409c9a185f96ba02a8da6f20fea9cad6ac
+  data.tar.gz: 385581b53698e6dfbbbdce6e9d76f8c47a2e207b6e2dc8fabcd0942012304ef9952a59939648849dd7a01717f5908ba3ddcfdd7461444e51691a227f7a2b48dc

data/lib/dependabot/bundler/file_updater.rb

@@ -2,6 +2,7 @@
 
 require "dependabot/file_updaters"
 require "dependabot/file_updaters/base"
+require "dependabot/file_updaters/vendor_updater"
 
 module Dependabot
   module Bundler
@@ -21,6 +22,7 @@ module Dependabot
       end
 
       # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/AbcSize
       def updated_dependency_files
         updated_files = []
 
@@ -54,13 +56,16 @@ module Dependabot
         check_updated_files(updated_files)
 
         base_dir = updated_files.first.directory
-        updated_vendor_cache_files(base_directory: base_dir).each do |file|
+        vendor_updater.
+          updated_vendor_cache_files(base_directory: base_dir).
+          each do |file|
           updated_files << file
         end
 
         updated_files
       end
       # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/AbcSize
 
       private
 
@@ -76,69 +81,11 @@ module Dependabot
           end
       end
 
-      # Returns changed files in the vendor/cache folder
-      #
-      # @param base_directory [String] Update config base directory
-      # @return [Array<Dependabot::DependencyFile>]
-      def updated_vendor_cache_files(base_directory:)
-        return [] unless repo_contents_path && vendor_cache_dir
-
-        Dir.chdir(repo_contents_path) do
-          relative_dir = vendor_cache_dir.sub("#{repo_contents_path}/", "")
-          status = SharedHelpers.run_shell_command(
-            "git status --untracked-files=all --porcelain=v1 #{relative_dir}"
-          )
-          changed_paths = status.split("\n").map { |l| l.split(" ") }
-          changed_paths.map do |type, path|
-            deleted = type == "D"
-            encoding = ""
-            encoded_content = File.read(path) unless deleted
-            if binary_file?(path)
-              encoding = Dependabot::DependencyFile::ContentEncoding::BASE64
-              encoded_content = Base64.encode64(encoded_content) unless deleted
-            end
-            Dependabot::DependencyFile.new(
-              name: path,
-              content: encoded_content,
-              directory: base_directory,
-              deleted: deleted,
-              content_encoding: encoding
-            )
-          end
-        end
-      end
-
-      # notable filenames without a reliable extension:
-      TEXT_FILE_NAMES = [
-        "Gemfile",
-        "Gemfile.lock",
-        ".bundlecache",
-        ".gitignore"
-      ].freeze
-
-      TEXT_FILE_EXTS = [
-        # code
-        ".rb",
-        ".erb",
-        ".gemspec",
-        ".js",
-        ".html",
-        # config
-        ".json",
-        ".xml",
-        ".toml",
-        ".yaml",
-        ".yml",
-        # docs
-        ".md",
-        ".txt"
-      ].freeze
-
-      def binary_file?(path)
-        return false if TEXT_FILE_NAMES.include?(File.basename(path))
-        return false if TEXT_FILE_EXTS.include?(File.extname(path))
-
-        true
+      def vendor_updater
+        Dependabot::FileUpdaters::VendorUpdater.new(
+          repo_contents_path: repo_contents_path,
+          vendor_dir: vendor_cache_dir
+        )
       end
 
       def check_required_files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.121.0
+  version: 0.121.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.121.0
+        version: 0.121.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.121.0
+        version: 0.121.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement