bibliothecary 6.7.3 → 6.7.4

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: b589f62fb357fbc3134d456ea82c07b7ff20b11217d2c8010c8db5ff3a009337
4
- data.tar.gz: 0a0727d453938b3ce8878aabe623b2ca7dbc928cb207bcdd94eb97173ade521f
3
+ metadata.gz: c957cf70ba85bc4b713d2884060680d5c1e230c75856a740019b7948af605948
4
+ data.tar.gz: 2cb0e0750ac804cfb43abfd7360fb4f5a95e8cbc42b04f34c662c2e33f1740b3
5
5
  SHA512:
6
- metadata.gz: 3d12065e6cd92680e7ed7a0c60770e67704aa949f2d5591126eb20fb6d4c42cbfa763caf60c0a71877d41d6f75231da96d910d8b219c78af81e67bcf5e240918
7
- data.tar.gz: b4c378068bf8ee58bc8a77e44a984a4eff68c0660e0c0ebaca8bee5c29b7ae69534bfead06a0993362a1f3de1b8cf96b7ff925787cdf44abc923fe9a0ffa2c1a
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
@@ -1,3 +1,3 @@
1
1
  module Bibliothecary
2
- VERSION = "6.7.3"
2
+ VERSION = "6.7.4"
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: 6.7.3
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-02 00:00:00.000000000 Z
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
- rubygems_version: 3.0.3
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