bibliothecary 8.7.0 → 8.7.2

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: 39af4653f19e0376f945656791b9dc2eb6e60f5d519a9a0e947e4623827376d2
4
- data.tar.gz: c2a6b01a1d14abffde071d07a95a28e851e85c61a89fe3ebb5239c82f2cef3fd
3
+ metadata.gz: 1c9c1312c6588259452d5c80c4196cef2df7da9b72bfcee0edc470d38937b90c
4
+ data.tar.gz: c5cb844eea89ab1799a87374aa68313b997fcf05d6df1580898c66b2675743ed
5
5
  SHA512:
6
- metadata.gz: 5e923a36a18760a6f3acdc05f7330de7704c42f235fd1bbee880dc7d7ea3bf1604ea8ecd060f6984db7a32ac6b552d10cd19d8b6257153fc7c19f55430234661
7
- data.tar.gz: a65aed02e5de4338a4c48ce44f77b2119fee0a26be51c7bac1bd18cdf8a51ceebed0305e16b965483cf4d2452ba63f3557de93acd29b474428245d62bceac707
6
+ metadata.gz: e9f226b41b25dd246f2fefe16982ef99b43a2d3ae046ae67882acc0b8a69ba4dfab2213d091ca93f306dbe5e5a97ba59c38c352d9b99a2e90ee09b2b79f569e5
7
+ data.tar.gz: 2fb86982c8305897c48718ed8fd358438d4bb7231369127d320baa1663347a7dac49e56493c60f1e0593ddde6894ec8556ed4202f7415222589b3bd9b556ba9c
@@ -254,6 +254,10 @@ module Bibliothecary
254
254
  end
255
255
 
256
256
  def self.parse_resolved_dep_line(line)
257
+ # filter out anything that doesn't look like a
258
+ # resolved dep line
259
+ return unless line[/ .*:[^-]+-- /]
260
+
257
261
  dep_parts = line.strip.split(":")
258
262
  return unless dep_parts.length == 5
259
263
  # org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE:compile -- module spring.boot.starter.web [auto]
@@ -365,6 +369,8 @@ module Bibliothecary
365
369
 
366
370
  value = field.nodes.first
367
371
  value = value.value if value.is_a?(Ox::CData)
372
+ # whitespace in dependency tags should be ignored
373
+ value = value&.strip
368
374
  match = value&.match(MAVEN_PROPERTY_REGEX)
369
375
  if match
370
376
  return extract_property(xml, match[1], value, parent_properties)
@@ -65,15 +65,17 @@ module Bibliothecary
65
65
 
66
66
  frameworks = {}
67
67
  manifest.fetch('dependencies',[]).each do |framework, deps|
68
- frameworks[framework] = deps.map do |name, details|
69
- {
70
- name: name,
71
- # 'resolved' has been set in all examples so far
72
- # so fallback to requested is pure paranoia
73
- requirement: details.fetch('resolved', details.fetch('requested', '*')),
74
- type: 'runtime'
75
- }
76
- end
68
+ frameworks[framework] = deps
69
+ .reject { |_name, details| details["type"] == "Project" } # Projects do not have versions
70
+ .map do |name, details|
71
+ {
72
+ name: name,
73
+ # 'resolved' has been set in all examples so far
74
+ # so fallback to requested is pure paranoia
75
+ requirement: details.fetch('resolved', details.fetch('requested', '*')),
76
+ type: 'runtime'
77
+ }
78
+ end
77
79
  end
78
80
 
79
81
  if frameworks.size > 0
@@ -1,3 +1,3 @@
1
1
  module Bibliothecary
2
- VERSION = "8.7.0"
2
+ VERSION = "8.7.2"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bibliothecary
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.7.0
4
+ version: 8.7.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Nesbitt
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-09-11 00:00:00.000000000 Z
11
+ date: 2023-11-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: tomlrb
@@ -248,7 +248,7 @@ dependencies:
248
248
  - - ">="
249
249
  - !ruby/object:Gem::Version
250
250
  version: '0'
251
- description:
251
+ description:
252
252
  email:
253
253
  - andrewnez@gmail.com
254
254
  executables:
@@ -326,7 +326,7 @@ homepage: https://github.com/librariesio/bibliothecary
326
326
  licenses:
327
327
  - AGPL-3.0
328
328
  metadata: {}
329
- post_install_message:
329
+ post_install_message:
330
330
  rdoc_options: []
331
331
  require_paths:
332
332
  - lib
@@ -341,8 +341,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
341
341
  - !ruby/object:Gem::Version
342
342
  version: '0'
343
343
  requirements: []
344
- rubygems_version: 3.3.22
345
- signing_key:
344
+ rubygems_version: 3.1.6
345
+ signing_key:
346
346
  specification_version: 4
347
347
  summary: Find and parse manifests
348
348
  test_files: []