dependabot-hex 0.125.1 → 0.125.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26b5f28280265cfe54780f05f821f5419e1e377a77b9df4f13d2060a9ac7d738
-  data.tar.gz: 737e4c9e908e096f300d57c14f8715e31b3a2ed450da3e15492e63698a4a5be2
+  metadata.gz: bed4c8f21b8fd6245c05c0fbcbf58eeea70284c3e0a8e06048bb646c7aff075c
+  data.tar.gz: a09d464991f1792a06b797b8f25fa7fa31e3b44f45ac30e6d57def4c63e1d991
 SHA512:
-  metadata.gz: 8cd99096a4190cc5257b4572f92eb1ea94bd4de1d523abc195251e9725e5d104e3f85d216993204e2823d48b9c6534c572166c5fe1505cb13ada404b008f658e
-  data.tar.gz: f8d2a2237d0a72ead20c85c5ca22d0e15b8d33e511a8311bc135d7ecc6562b5216de995a47f6588e1b2c67929f18c002cb71e4d8f884ea6815cb6b4b2ee04f79
+  metadata.gz: 0b0c23525b0f017aa751a65330aace45b7a1f5512d5c02d090fa9de876161e967dfde7f8b7afcffced11e3fd637b396adf75bb789c6c1e798a9c9b7d225e86bb
+  data.tar.gz: 269577b87d9d6f0c874a22b15b743965c2bac986242ede7502e6fd638bfaa79b1c9107071d4ed8843ae22d0e5dff24ebac15dcdbd2c180fa6da670a9714f6444

data/lib/dependabot/hex/file_fetcher.rb

@@ -8,8 +8,9 @@ module Dependabot
     class FileFetcher < Dependabot::FileFetchers::Base
       APPS_PATH_REGEX = /apps_path:\s*"(?<path>.*?)"/m.freeze
       STRING_ARG = %{(?:["'](.*?)["'])}
-      EVAL_FILE = /Code\.eval_file\(#{STRING_ARG}(?:\s*,\s*#{STRING_ARG})?\)/.
-                  freeze
+      SUPPORTED_METHODS = %w(eval_file require_file).join("|").freeze
+      SUPPORT_FILE = /Code\.(?:#{SUPPORTED_METHODS})\(#{STRING_ARG}(?:\s*,\s*#{STRING_ARG})?\)/.
+                     freeze
 
       def self.required_files_in?(filenames)
         filenames.include?("mix.exs")
@@ -26,7 +27,7 @@ module Dependabot
         fetched_files << mixfile
         fetched_files << lockfile if lockfile
         fetched_files += subapp_mixfiles
-        fetched_files += evaled_files
+        fetched_files += support_files
         fetched_files
       end
 
@@ -66,9 +67,9 @@ module Dependabot
         []
       end
 
-      def evaled_files
-        mixfile.content.scan(EVAL_FILE).map do |eval_file_args|
-          path = Pathname.new(File.join(*eval_file_args.reverse)).
+      def support_files
+        mixfile.content.scan(SUPPORT_FILE).map do |support_file_args|
+          path = Pathname.new(File.join(*support_file_args.compact.reverse)).
                  cleanpath.to_path
           fetch_file_from_host(path).tap { |f| f.support_file = true }
         end

data/lib/dependabot/hex/file_parser.rb

@@ -42,7 +42,7 @@ module Dependabot
       def dependency_details
         SharedHelpers.in_a_temporary_directory do
           write_sanitized_mixfiles
-          write_supporting_files
+          write_sanitized_supporting_files
           File.write("mix.lock", lockfile.content) if lockfile
           FileUtils.cp(elixir_helper_parse_deps_path, "parse_deps.exs")
 
@@ -73,11 +73,11 @@ module Dependabot
         end
       end
 
-      def write_supporting_files
+      def write_sanitized_supporting_files
         dependency_files.select(&:support_file).each do |file|
           path = file.name
           FileUtils.mkdir_p(Pathname.new(path).dirname)
-          File.write(path, file.content)
+          File.write(path, sanitize_mixfile(file.content))
         end
       end
 

data/lib/dependabot/hex/file_updater/lockfile_updater.rb

@@ -66,7 +66,7 @@ module Dependabot
           dependency_files.select(&:support_file).each do |file|
             path = file.name
             FileUtils.mkdir_p(Pathname.new(path).dirname)
-            File.write(path, file.content)
+            File.write(path, sanitize_mixfile(file.content))
           end
         end
 

data/lib/dependabot/hex/update_checker/version_resolver.rb

@@ -31,7 +31,7 @@ module Dependabot
         def fetch_latest_resolvable_version
           latest_resolvable_version =
             SharedHelpers.in_a_temporary_directory do
-              write_temporary_dependency_files
+              write_temporary_sanitized_dependency_files
               FileUtils.cp(
                 elixir_helper_check_update_path,
                 "check_update.exs"
@@ -109,7 +109,7 @@ module Dependabot
 
         def check_original_requirements_resolvable
           SharedHelpers.in_a_temporary_directory do
-            write_temporary_dependency_files(prepared: false)
+            write_temporary_sanitized_dependency_files(prepared: false)
             FileUtils.cp(
               elixir_helper_check_update_path,
               "check_update.exs"
@@ -125,7 +125,7 @@ module Dependabot
           raise Dependabot::DependencyFileNotResolvable, e.message
         end
 
-        def write_temporary_dependency_files(prepared: true)
+        def write_temporary_sanitized_dependency_files(prepared: true)
           files = if prepared then prepared_dependency_files
                   else original_dependency_files
                   end
@@ -133,12 +133,7 @@ module Dependabot
           files.each do |file|
             path = file.name
             FileUtils.mkdir_p(Pathname.new(path).dirname)
-
-            if file.name.end_with?("mix.exs")
-              File.write(path, sanitize_mixfile(file.content))
-            else
-              File.write(path, file.content)
-            end
+            File.write(path, sanitize_mixfile(file.content))
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-hex
 version: !ruby/object:Gem::Version
-  version: 0.125.1
+  version: 0.125.6
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-27 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.125.1
+        version: 0.125.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.125.1
+        version: 0.125.6
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement