dependabot-npm_and_yarn 0.95.33 → 0.95.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a54605a5d3ad8d33e4aeeb52b5b0a715fdf7ac656d70820cf46b64b6897d5bfa
-  data.tar.gz: 753e5edd7c5e394cae94c53956829567fd1ea45447ea44d9f08ecc593b272b2d
+  metadata.gz: 74643b3d4abfbba5f5d8a78a0f13dae2a65fd190564325c138ae1ee0e9807d02
+  data.tar.gz: ab79d1130f72465c8952001c7e0d7800162ab4710d0a0e59616d60771de8d9d0
 SHA512:
-  metadata.gz: 331554696050713a3510bd9ef6e830fb2da079151af89bd2935bdecd6af9de2ca2dd3a29646b72601209d82c8890d754c5862deb15919fbc2125f7a63c71a773
-  data.tar.gz: 4a5f90be4634a806ae2d2e7ff86aee14cd328c8ac975b6f9c22363a1985055cebbd01cd63eec2b0b87597256cfe5d20105647e3f190584902cc757acb3319ea4
+  metadata.gz: aa6099cb99a700715169c8a04b3b491aa5b416e996338df94a1d0aff365602238cc957a29d2947166617e5182c0ac60185c6cb1879a2ae9825d65cd943d3fb43
+  data.tar.gz: f7dda297d8365ea72edbcb90c64d5b42610acdc397a9755ff43551285894a133bcdd467956b49b4dfeae7d3badf671d2f370e1719db4ab5b90a3f770e8b4f1f3

data/lib/dependabot/npm_and_yarn/metadata_finder.rb

@@ -71,27 +71,25 @@ module Dependabot
       def find_source_from_registry
         # Attempt to use version_listing first, as fetching the entire listing
         # array can be slow (if it's large)
-        potential_source_urls =
+        potential_sources =
           [
-            get_url(latest_version_listing["repository"]),
-            get_url(latest_version_listing["homepage"]),
-            get_url(latest_version_listing["bugs"])
+            get_source(latest_version_listing["repository"]),
+            get_source(latest_version_listing["homepage"]),
+            get_source(latest_version_listing["bugs"])
           ].compact
 
-        source_url = potential_source_urls.find { |url| Source.from_url(url) }
-        return Source.from_url(source_url) if Source.from_url(source_url)
+        return potential_sources.first if potential_sources.any?
 
-        potential_source_urls =
+        potential_sources =
           all_version_listings.flat_map do |_, listing|
             [
-              get_url(listing["repository"]),
-              get_url(listing["homepage"]),
-              get_url(listing["bugs"])
+              get_source(listing["repository"]),
+              get_source(listing["homepage"]),
+              get_source(listing["bugs"])
             ]
           end.compact
 
-        source_url = potential_source_urls.find { |url| Source.from_url(url) }
-        Source.from_url(source_url)
+        potential_sources.first
       end
 
       def new_source
@@ -103,6 +101,17 @@ module Dependabot
         sources.first
       end
 
+      def get_source(details)
+        potential_url = get_url(details)
+        return unless potential_url
+
+        potential_source = Source.from_url(potential_url)
+        return unless potential_source
+
+        potential_source.directory = get_directory(details)
+        potential_source
+      end
+
       def get_url(details)
         case details
         when String then details
@@ -110,6 +119,13 @@ module Dependabot
         end
       end
 
+      def get_directory(details)
+        # Only return a directory if it is explicitly specified
+        return unless details.is_a?(Hash)
+
+        details.fetch("directory", nil)
+      end
+
       def find_source_from_git_url
         url = new_source[:url] || new_source.fetch("url")
         Source.from_url(url)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-npm_and_yarn
 version: !ruby/object:Gem::Version
-  version: 0.95.33
+  version: 0.95.34
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-02-17 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.95.33
+        version: 0.95.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.95.33
+        version: 0.95.34
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement