puppet_fixtures 0.2.0 → 1.0.0

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.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/puppet_fixtures.rb +10 -11
  3. metadata +1 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 93cd97a8b04cd357362e28a429b2bb3ed8c6a9ba7d886543c0ed0d81fa7b028a
4
- data.tar.gz: 507527b5a6aeff8d7227f1d7554c7f78075af0ff2f052bdbc84a4dcd74bd4aa7
3
+ metadata.gz: 2da2aad2b8bb2ff1f802d3cb47675a3163d8e5d6007e7c820380e4c6d728d0f7
4
+ data.tar.gz: 9d5c18705abde2484db94bfb3f6cb28c161f0027b1ffda25766129ede6c6da3d
5
5
  SHA512:
6
- metadata.gz: 728373b70e48e5d36e759e1f94db93970ef5d9d4de28c40f3eed93e116c80bd80806723c11edec2834aaf4741ef0208e65b6bd9b24b354c0482f9e7b6685d6af
7
- data.tar.gz: 28f5307dba7d14197ea46abb3922a31b2ea5037f31108a0aee4502b701f9033e29b2ce9ee1ec308f49ea4ef163bfe88f5884a91b91fbcc167e919bb3cd15ed98
6
+ metadata.gz: 4adfefd73703e4911e1f26276523da32a9eceb11535e66206f4b79458902d013beeb106760d8c93c07bbd30ab4da9bad9d03e132f83175232a768beefc9a9321
7
+ data.tar.gz: 56369dba5f9e398fa625fb51a2261858cf08b26eca0f249f870be63bc2488ed67c0849d8fa1a50acf883c1a0b9de32a009bc748eeeffaa3371abf95c22943d75
@@ -267,22 +267,21 @@ module PuppetFixtures
267
267
 
268
268
  private
269
269
 
270
+ def gem_version(name)
271
+ Gem::Specification.find_by_name(name).version.to_s
272
+ rescue Gem::LoadError
273
+ nil
274
+ end
275
+
270
276
  def include_repo?(version_range)
271
277
  return true unless version_range
272
278
 
273
- require 'semantic_puppet'
279
+ puppet_version = gem_version('openvox') || gem_version('puppet')
280
+ raise "Neither 'openvox' nor 'puppet' gem could be found. Please install one of them." unless puppet_version
274
281
 
275
- puppet_spec = begin
276
- Gem::Specification.find_by_name('openvox')
277
- rescue Gem::LoadError
278
- begin
279
- Gem::Specification.find_by_name('puppet')
280
- rescue Gem::LoadError
281
- raise "Neither 'openvox' nor 'puppet' gem could be found. Please install one of them."
282
- end
283
- end
284
- puppet_version = SemanticPuppet::Version.parse(puppet_spec.version.to_s)
282
+ require 'semantic_puppet'
285
283
 
284
+ puppet_version = SemanticPuppet::Version.parse(puppet_version)
286
285
  constraint = SemanticPuppet::VersionRange.parse(version_range)
287
286
  constraint.include?(puppet_version)
288
287
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet_fixtures
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ewoud Kohl van Wijngaarden
@@ -23,20 +23,6 @@ dependencies:
23
23
  - - "~>"
24
24
  - !ruby/object:Gem::Version
25
25
  version: '13.0'
26
- - !ruby/object:Gem::Dependency
27
- name: ostruct
28
- requirement: !ruby/object:Gem::Requirement
29
- requirements:
30
- - - "~>"
31
- - !ruby/object:Gem::Version
32
- version: 0.6.0
33
- type: :runtime
34
- prerelease: false
35
- version_requirements: !ruby/object:Gem::Requirement
36
- requirements:
37
- - - "~>"
38
- - !ruby/object:Gem::Version
39
- version: 0.6.0
40
26
  description: |
41
27
  Originally part of puppetlabs_spec_helper, but with a significant
42
28
  refactoring to make it available standalone.