dependabot-npm_and_yarn 0.112.34 → 0.112.35

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7c49c4c9e8ba081cde0eef30ebab77f2f04b9dd7b9a0b2c32082067b1095a07c
4
- data.tar.gz: a7e09c9eacf36a9a3d18ba4b27b6ef8e518983d5270431385a21169c3a0235da
3
+ metadata.gz: 209e32be58e020002ca4534c2d28185c7909d8f83a88f89d9c42d6eceb1c47cb
4
+ data.tar.gz: 18610860403eb4a322241c33d421735885f3372bfcafe4bda9566e5333ec81f4
5
5
  SHA512:
6
- metadata.gz: 7ad4a02b9cc7a80e678dd5eb892efbc20e7314f5a58870990bba86f2f374d00b1e0c7bb83c3e53cedfd1202239ede771b8965edb012ac600fe9375561309d69a
7
- data.tar.gz: b519b4b4780def55a20062ecdf85b335e77ecf9830db25451612e6b42b6c0a8644d5e8b7b5e40590ddc98046140fb49ddfa4983d1b0cf891a5e8bb347bcb9ae4
6
+ metadata.gz: 7ac2ff31aab2bdb57a587ff71936d3189a1857b653447f55601896017dce57738b052de36c5564633f921c1910c0bef1c3c678e5f733157f1b0ef40156e53e98
7
+ data.tar.gz: 6bfae1d5cf3d079d1aa3c45619a81d964fa85c0754a9de96126f3c694d833ea12ff3e3753388fc81b54b52b9940054df64f0c84d41a808267f01ab64d56ecc04
@@ -294,8 +294,9 @@ module Dependabot
294
294
  # Gemfury format
295
295
  resolved_url.split("/~/").first
296
296
  elsif resolved_url.include?("/#{name}/-/#{name}")
297
- # MyGet format
298
- resolved_url.split("/#{name}/-/#{name}").first
297
+ # MyGet / Bintray format
298
+ resolved_url.split("/#{name}/-/#{name}").first.
299
+ gsub("dl.bintray.com//", "api.bintray.com/npm/")
299
300
  elsif resolved_url.include?("/#{name}/-/#{name.split('/').last}")
300
301
  # Sonatype Nexus / Artifactory JFrog format
301
302
  resolved_url.split("/#{name}/-/#{name.split('/').last}").first
@@ -92,7 +92,13 @@ module Dependabot
92
92
  yarn_lock.content.scan(/ resolved "(.*?)"/).flatten
93
93
  end
94
94
 
95
- @dependency_urls
95
+ # The registry URL for Bintray goes into the lockfile in a
96
+ # modified format, so we modify it back before checking against
97
+ # our credentials
98
+ @dependency_urls =
99
+ @dependency_urls.map do |url|
100
+ url.gsub("dl.bintray.com//", "api.bintray.com/npm/")
101
+ end
96
102
  end
97
103
 
98
104
  def complete_npmrc_from_credentials
@@ -42,14 +42,17 @@ module Dependabot
42
42
  def first_registry_with_dependency_details
43
43
  @first_registry_with_dependency_details ||=
44
44
  known_registries.find do |details|
45
- Excon.get(
45
+ response = Excon.get(
46
46
  "https://#{details['registry'].gsub(%r{/+$}, '')}/"\
47
47
  "#{escaped_dependency_name}",
48
48
  headers: auth_header_for(details["token"]),
49
49
  idempotent: true,
50
50
  **SharedHelpers.excon_defaults
51
- ).status < 400
52
- rescue Excon::Error::Timeout, Excon::Error::Socket
51
+ )
52
+ response.status < 400 && JSON.parse(response.body)
53
+ rescue Excon::Error::Timeout,
54
+ Excon::Error::Socket,
55
+ JSON::ParserError
53
56
  nil
54
57
  end&.fetch("registry")
55
58
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-npm_and_yarn
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.112.34
4
+ version: 0.112.35
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-09-09 00:00:00.000000000 Z
11
+ date: 2019-09-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.112.34
19
+ version: 0.112.35
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.112.34
26
+ version: 0.112.35
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement