bibliothecary 6.7.3 → 6.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/bibliothecary/parsers/maven.rb +6 -2
- data/lib/bibliothecary/version.rb +1 -1
- metadata +4 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c957cf70ba85bc4b713d2884060680d5c1e230c75856a740019b7948af605948
|
|
4
|
+
data.tar.gz: 2cb0e0750ac804cfb43abfd7360fb4f5a95e8cbc42b04f34c662c2e33f1740b3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c3a0acdad28442902ec7e3c09fb221acbb3b2d523bf9821b5e6076ecadeed3c41c6eba921cbe56d5c87e23289a0fc445c92b128afed9263bf454d59e69c4e785
|
|
7
|
+
data.tar.gz: fbced6acbb01eca0f3132c23bbe14d7bbf4ad50a591d013fe3e09d418103a325196e6ff671b4948307e9f68747bda8b579e60465b8fec935858484a4f8473fa0
|
|
@@ -193,7 +193,7 @@ module Bibliothecary
|
|
|
193
193
|
prop_value = property_value(xml, property_name, parent_properties)
|
|
194
194
|
return value unless prop_value
|
|
195
195
|
# don't resolve more than 5 levels deep to avoid potential circular references
|
|
196
|
-
|
|
196
|
+
|
|
197
197
|
resolved_value = replace_value_with_prop(value, prop_value, property_name)
|
|
198
198
|
# check to see if we just resolved to another property name
|
|
199
199
|
match = resolved_value.match(MAVEN_PROPERTY_REGEX)
|
|
@@ -202,7 +202,7 @@ module Bibliothecary
|
|
|
202
202
|
return extract_property(xml, match[1], resolved_value, parent_properties, depth)
|
|
203
203
|
else
|
|
204
204
|
return resolved_value
|
|
205
|
-
end
|
|
205
|
+
end
|
|
206
206
|
end
|
|
207
207
|
|
|
208
208
|
def self.property_value(xml, property_name, parent_properties)
|
|
@@ -221,6 +221,10 @@ module Bibliothecary
|
|
|
221
221
|
# see if the value to look up is a field under the project
|
|
222
222
|
# examples are ${project.groupId} or ${project.version}
|
|
223
223
|
xml.locate(non_prop_name).first.nodes.first
|
|
224
|
+
elsif xml.locate("parent/#{non_prop_name}").first
|
|
225
|
+
# see if the value to look up is a field under the project parent
|
|
226
|
+
# examples are ${project.groupId} or ${project.version}
|
|
227
|
+
xml.locate("parent/#{non_prop_name}").first.nodes.first
|
|
224
228
|
end
|
|
225
229
|
end
|
|
226
230
|
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: 6.7.
|
|
4
|
+
version: 6.7.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Andrew Nesbitt
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-07-
|
|
11
|
+
date: 2019-07-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: toml-rb
|
|
@@ -301,7 +301,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
301
301
|
- !ruby/object:Gem::Version
|
|
302
302
|
version: '0'
|
|
303
303
|
requirements: []
|
|
304
|
-
|
|
304
|
+
rubyforge_project:
|
|
305
|
+
rubygems_version: 2.7.6
|
|
305
306
|
signing_key:
|
|
306
307
|
specification_version: 4
|
|
307
308
|
summary: Find and parse manifests
|