dependabot-common 0.111.1 → 0.111.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5532abd75ca995f2f4815c6765e4a55ef067cd131722582a3d57917860680b7e
-  data.tar.gz: 73c9de0fe2e5c26bf37e804584dd8f417b5f7c5548566235a335b0b64f967172
+  metadata.gz: 35b217009843be8eabe9ef89659ed34b10a10ede90b7fd5ee6805df4088773d5
+  data.tar.gz: af229198761bdfde61e9f2cdb3dff967c0923aa0f3d60731288410ccb69c176a
 SHA512:
-  metadata.gz: 5275808780651bda3c209f9d755d9a2ce8eb4f6d1e3d0df3f549005c1f97881242b92491496a634943843d3261e81f4eff916e08033d7f924eb45654a272906d
-  data.tar.gz: 6a0c1d64fe75cb7686469a14c81703182d941d5a95277da880e50b3effee808bb84bd99b9dd686ecbc2d3c0f2e3a0fb1589a367dabea42c41f79e301fb2e67c0
+  metadata.gz: ad0096f35e338d18c597c41f5db959ecbe34dfc66926e7f78a6394685129b34944c9c1514271eb04744d23b5411a97ceacf859193e7a3cdb82c6743fc5fe22f2
+  data.tar.gz: aa9c3b759369886280f9cc6c91d128897b47f1110d361e13ea3aa3817b3553fe5966e8a862734a4326a99fd61e3788cc90b69a86ce054a0a654a2f3f5d20f9b5

data/lib/dependabot/dependency_file.rb

@@ -4,13 +4,15 @@ require "pathname"
 
 module Dependabot
   class DependencyFile
-    attr_accessor :name, :content, :directory, :type, :support_file
+    attr_accessor :name, :content, :directory, :type, :support_file,
+                  :symlink_target
 
     def initialize(name:, content:, directory: "/", type: "file",
-                   support_file: false)
+                   support_file: false, symlink_target: nil)
       @name = name
       @content = content
       @directory = clean_directory(directory)
+      @symlink_target = symlink_target
       @support_file = support_file
 
       # Type is used *very* sparingly. It lets the git_modules updater know that
@@ -19,16 +21,24 @@ module Dependabot
       # New use cases should be avoided if at all possible (and use the
       # support_file flag instead)
       @type = type
+
+      return unless (type == "symlink") ^ symlink_target
+
+      raise "Symlinks must specify a target!" unless symlink_target
+      raise "Only symlinked files must specify a target!" if symlink_target
     end
 
     def to_h
-      {
+      details = {
         "name" => name,
         "content" => content,
         "directory" => directory,
         "type" => type,
         "support_file" => support_file
       }
+
+      details["symlink_target"] = symlink_target if symlink_target
+      details
     end
 
     def path

data/lib/dependabot/file_fetchers/base.rb

@@ -83,12 +83,14 @@ module Dependabot
 
       def fetch_file_from_host(filename, type: "file", fetch_submodules: false)
         path = Pathname.new(File.join(directory, filename)).cleanpath.to_path
+        content = _fetch_file_content(path, fetch_submodules: fetch_submodules)
+        type = @linked_paths.key?(path) ? "symlink" : type
 
         DependencyFile.new(
           name: Pathname.new(filename).cleanpath.to_path,
           directory: directory,
           type: type,
-          content: _fetch_file_content(path, fetch_submodules: fetch_submodules)
+          content: content
         )
       rescue *CLIENT_NOT_FOUND_ERRORS
         raise Dependabot::DependencyFileNotFound, path
@@ -327,6 +329,7 @@ module Dependabot
         raise Octokit::NotFound if tmp.is_a?(Array)
 
         if tmp.type == "symlink"
+          @linked_paths[path] = tmp.target
           tmp = github_client.contents(
             repo,
             path: tmp.target,

data/lib/dependabot/metadata_finders/base/changelog_finder.rb

@@ -137,16 +137,22 @@ module Dependabot
             reject { |f| f.size > 1_000_000 }.
             reject { |f| f.size < 100 }
 
+          select_best_changelog(files)
+        end
+
+        def select_best_changelog(files)
           CHANGELOG_NAMES.each do |name|
             candidates = files.select { |f| f.name =~ /#{name}/i }
             file = candidates.first if candidates.one?
             file ||=
               candidates.find do |f|
                 candidates -= [f] && next if fetch_file_text(f).nil?
-                ChangelogPruner.new(
+                pruner = ChangelogPruner.new(
                   dependency: dependency,
                   changelog_text: fetch_file_text(f)
-                ).includes_new_version?
+                )
+                pruner.includes_new_version? ||
+                  pruner.includes_previous_version?
               end
             file ||= candidates.max_by(&:size)
             return file if file

data/lib/dependabot/metadata_finders/base/changelog_pruner.rb

@@ -17,6 +17,10 @@ module Dependabot
           !new_version_changelog_line.nil?
         end
 
+        def includes_previous_version?
+          !old_version_changelog_line.nil?
+        end
+
         # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/CyclomaticComplexity
         def pruned_text

data/lib/dependabot/pull_request_creator/github.rb

@@ -149,7 +149,7 @@ module Dependabot
             }
           else
             {
-              path: file.path.sub(%r{^/}, ""),
+              path: (file.symlink_target || file.path).sub(%r{^/}, ""),
               mode: "100644",
               type: "blob",
               content: file.content

data/lib/dependabot/pull_request_creator/gitlab.rb

@@ -97,11 +97,19 @@ module Dependabot
         end
 
         actions = files.map do |file|
-          {
-            action: "update",
-            file_path: file.path,
-            content: file.content
-          }
+          if file.type == "symlink"
+            {
+              action: "update",
+              file_path: file.symlink_target,
+              content: file.content
+            }
+          else
+            {
+              action: "update",
+              file_path: file.path,
+              content: file.content
+            }
+          end
         end
 
         gitlab_client_for_source.create_commit(

data/lib/dependabot/pull_request_updater/github.rb

@@ -124,9 +124,9 @@ module Dependabot
 
       def create_tree
         file_trees = files.map do |file|
-          if file.type == "file"
+          if %w(file symlink).include?(file.type)
             {
-              path: file.path.sub(%r{^/}, ""),
+              path: (file.symlink_target || file.path).sub(%r{^/}, ""),
               mode: "100644",
               type: "blob",
               content: file.content

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.111.1
+  version: 0.111.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr