dependabot-common 0.95.28 → 0.95.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64752d88cd4c2e867088c5d7ab02332a3aba8602e3bb29e90b2072be99cf5077
-  data.tar.gz: 34f059af56773a7b3eb623fbd08c6f3d0f150d0f8090352f0e9ffd31fc47c9ba
+  metadata.gz: 51ab8a1d3293589fe1477093a78ed847908cf3a3dfbb6e336c761dcf3cdcdcb4
+  data.tar.gz: ab73df799221419d36c6e26420c2015e60d69c1b62b43b10d70a7633d436a0c3
 SHA512:
-  metadata.gz: b8f8024905048b64104fccd3cb692ed9cd40dbf47f2bff5bfc8d9d50c311ab73fbb09398965b8935df813a87144ab4402c39f24d595bcaa635c3a9d711fa80d9
-  data.tar.gz: 027b202885e5d8f2505f0ef8a4e81ac7872a935984cf3da99785c94755a5056e967492bdb80bc87948ef1b8bdd16b9c632a7978bd064b482d5d502159f607e2f
+  metadata.gz: be01459381d8a9990d03921f2952a5b2c2cac0c472b9dbaa3029f45886c083a7002625280936b21109aeff72c9340d7ec1b2a7b1e0218d70b0c4def82bff9819
+  data.tar.gz: 842019622a8b0c67d2a57af00bbb5df0edebeb40d0a3811200e3ae8586d625c496abafa34d8142965b6e2790983dfe90546e0cbba4399d5f82e119e8f9d8769c

data/lib/dependabot/file_fetchers/base.rb

@@ -32,7 +32,7 @@ module Dependabot
         @source = source
         @credentials = credentials
 
-        @submodule_directories = {}
+        @linked_paths = {}
       end
 
       def repo
@@ -131,8 +131,8 @@ module Dependabot
 
         return result.call unless fetch_submodules && !retrying
 
-        _find_submodules(path)
-        return result.call unless _submodule_for(path)
+        _find_linked_dirs(path)
+        return result.call unless _linked_dir_for(path)
 
         retrying = true
         retry
@@ -154,17 +154,37 @@ module Dependabot
         path = path.gsub(" ", "%20")
         github_response = github_client.contents(repo, path: path, ref: commit)
 
-        if github_response.respond_to?(:type) &&
-           github_response.type == "submodule"
-          @submodule_directories[path] = github_response
-          raise Octokit::NotFound
-        elsif github_response.respond_to?(:type)
+        if github_response.respond_to?(:type)
+          update_linked_paths(repo, path, commit, github_response)
           raise Octokit::NotFound
         end
 
         github_response.map { |f| _build_github_file_struct(f) }
       end
 
+      def update_linked_paths(repo, path, commit, github_response)
+        case github_response.type
+        when "submodule"
+          sub_source = Source.from_url(github_response.submodule_git_url)
+          return unless sub_source
+
+          @linked_paths[path] = {
+            repo: sub_source.repo,
+            provider: sub_source.provider,
+            commit: github_response.sha,
+            path: "/"
+          }
+        when "symlink"
+          updated_path = File.join(File.dirname(path), github_response.target)
+          @linked_paths[path] = {
+            repo: repo,
+            provider: "github",
+            commit: commit,
+            path: Pathname.new(updated_path).cleanpath.to_path
+          }
+        end
+      end
+
       def _build_github_file_struct(file)
         OpenStruct.new(
           name: file.name,
@@ -212,17 +232,19 @@ module Dependabot
       end
 
       def _full_specification_for(path, fetch_submodules:)
-        if fetch_submodules && _submodule_for(path) &&
-           Source.from_url(
-             @submodule_directories[_submodule_for(path)].submodule_git_url
-           )
-          submodule_details = @submodule_directories[_submodule_for(path)]
-          sub_source = Source.from_url(submodule_details.submodule_git_url)
+        if fetch_submodules && _linked_dir_for(path)
+          linked_dir_details = @linked_paths[_linked_dir_for(path)]
+          sub_path =
+            path.gsub(%r{^#{Regexp.quote(_linked_dir_for(path))}(/|$)}, "")
+          new_path =
+            Pathname.new(File.join(linked_dir_details.fetch(:path), sub_path)).
+            cleanpath.to_path.
+            gsub(%r{^/}, "")
           {
-            repo: sub_source.repo,
-            commit: submodule_details.sha,
-            provider: sub_source.provider,
-            path: path.gsub(%r{^#{Regexp.quote(_submodule_for(path))}(/|$)}, "")
+            repo: linked_dir_details.fetch(:repo),
+            commit: linked_dir_details.fetch(:commit),
+            provider: linked_dir_details.fetch(:provider),
+            path: new_path
           }
         else
           {
@@ -245,10 +267,10 @@ module Dependabot
       rescue *CLIENT_NOT_FOUND_ERRORS
         retrying ||= false
 
-        raise unless fetch_submodules && !retrying && !_submodule_for(path)
+        raise unless fetch_submodules && !retrying && !_linked_dir_for(path)
 
-        _find_submodules(path)
-        raise unless _submodule_for(path)
+        _find_linked_dirs(path)
+        raise unless _linked_dir_for(path)
 
         retrying = true
         retry
@@ -306,10 +328,10 @@ module Dependabot
         raise Dependabot::RepoNotFound, source
       end
 
-      # Update the @submodule_directories hash by exploiting a side-effect of
+      # Update the @linked_paths hash by exploiting a side-effect of
       # recursively calling `repo_contents` for each directory up the tree
-      # until a submodule is found
-      def _find_submodules(path)
+      # until a submodule or symlink is found
+      def _find_linked_dirs(path)
         path = Pathname.new(path).cleanpath.to_path.gsub(%r{^/*}, "")
         dir = File.dirname(path)
 
@@ -323,9 +345,9 @@ module Dependabot
         )
       end
 
-      def _submodule_for(path)
-        submodules = @submodule_directories.keys
-        submodules.
+      def _linked_dir_for(path)
+        linked_dirs = @linked_paths.keys
+        linked_dirs.
           select { |k| path.match?(%r{^#{Regexp.quote(k)}(/|$)}) }.
           max_by(&:length)
       end

data/lib/dependabot/version.rb

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

metadata

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