dependabot-common 0.124.3 → 0.124.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45ddffe6ea8f049656daee7b94bb0ff2c5c73cfb67746789c35a0557367c0ce3
-  data.tar.gz: 245e1180b6bcb30dd120e9d94162ded2d9cdc9cace6cb8fffdb8119ea411c851
+  metadata.gz: 80c540f125632234755c77d16b45d2d94c4bc4329f21e525bbbe16df6bf0fdc9
+  data.tar.gz: 3794b1793d4184c6ae968c922ddf9a614f532787d9f9071209edb8cfdeb019d0
 SHA512:
-  metadata.gz: 7d02322fb6f5a3a140e793deab8c048790750c15244c1b285a03b3df5753e85c799bfbf8c72d3f7686c9d3dd995da554d1e4f787773d15ccd43e1fccf2d63d8d
-  data.tar.gz: 982fbcc7a24947726bd39cddf7814c69fefd6086499f8d4137db1734e750e9649ab256b2faf67acc68b671060656507ab290e0c8de1147aa94a7c32fb98948b9
+  metadata.gz: 887254213c78624a12d5e52bedb87dc991009695ac4d2a80f585c972c1c017b17d67744f9bd5bb6765446d880ab9b200fc2278682a4030bfcffdcce799a681a5
+  data.tar.gz: 309c2e451b0a0dac5b8250c86e130ce529739ca486f0a531a1eeb6c5e6652aac027ef5dfa5f4a0a31334c9a09f196899ff6ccab72cef7e8e146d3627f669345e

data/lib/dependabot/file_updaters/vendor_updater.rb

@@ -18,7 +18,10 @@ module Dependabot
         return [] unless repo_contents_path && vendor_dir
 
         Dir.chdir(repo_contents_path) do
-          relative_dir = vendor_dir.sub("#{repo_contents_path}/", "")
+          relative_dir = Pathname.new(vendor_dir).relative_path_from(
+            repo_contents_path
+          )
+
           status = SharedHelpers.run_shell_command(
             "git status --untracked-files=all --porcelain=v1 #{relative_dir}"
           )
@@ -31,8 +34,14 @@ module Dependabot
               encoding = Dependabot::DependencyFile::ContentEncoding::BASE64
               encoded_content = Base64.encode64(encoded_content) unless deleted
             end
+
+            project_root =
+              Pathname.new(File.expand_path(File.join(Dir.pwd, base_directory)))
+            file_path =
+              Pathname.new(path).expand_path.relative_path_from(project_root)
+
             Dependabot::DependencyFile.new(
-              name: path,
+              name: file_path.to_s,
               content: encoded_content,
               directory: base_directory,
               deleted: deleted,

data/lib/dependabot/shared_helpers.rb

@@ -19,6 +19,7 @@ module Dependabot
                  "#{Excon::USER_AGENT} ruby/#{RUBY_VERSION} "\
                  "(#{RUBY_PLATFORM}) "\
                  "(+https://github.com/dependabot/dependabot-core)"
+    SIGKILL = 9
 
     class ChildProcessFailed < StandardError
       attr_reader :error_class, :error_message, :error_backtrace
@@ -42,6 +43,9 @@ module Dependabot
         path = Pathname.new(File.join(repo_contents_path, directory)).
                expand_path
         reset_git_repo(repo_contents_path)
+        # Handle missing directories by creating an empty one and relying on the
+        # file fetcher to raise a DependencyFileNotFound error
+        FileUtils.mkdir_p(path) unless Dir.exist?(path)
         Dir.chdir(path) { yield(path) }
       else
         in_a_temporary_directory(directory, &block)
@@ -58,13 +62,14 @@ module Dependabot
     end
 
     class HelperSubprocessFailed < StandardError
-      attr_reader :error_class, :error_context
+      attr_reader :error_class, :error_context, :trace
 
-      def initialize(message:, error_context:, error_class: nil)
+      def initialize(message:, error_context:, error_class: nil, trace: nil)
         super(message)
         @error_class = error_class || ""
         @error_context = error_context
         @command = error_context[:command]
+        @trace = trace
       end
 
       def raven_context
@@ -104,7 +109,8 @@ module Dependabot
         args: args,
         time_taken: time_taken,
         stderr_output: stderr ? stderr[0..50_000] : "", # Truncate to ~100kb
-        process_exit_value: process.to_s
+        process_exit_value: process.to_s,
+        process_termsig: process.termsig
       }
 
       response = JSON.parse(stdout)
@@ -113,7 +119,8 @@ module Dependabot
       raise HelperSubprocessFailed.new(
         message: response["error"],
         error_class: response["error_class"],
-        error_context: error_context
+        error_context: error_context,
+        trace: response["trace"]
       )
     rescue JSON::ParserError
       raise HelperSubprocessFailed.new(

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.124.3
+  version: 0.124.8
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit
@@ -438,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.7.3
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Shared code used between Dependabot package managers