puppet_fixtures 0.2.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93cd97a8b04cd357362e28a429b2bb3ed8c6a9ba7d886543c0ed0d81fa7b028a
-  data.tar.gz: 507527b5a6aeff8d7227f1d7554c7f78075af0ff2f052bdbc84a4dcd74bd4aa7
+  metadata.gz: b53a2e361e5e579596d952064d66dfe220c494eac254ef1182abe9980e9d29b8
+  data.tar.gz: e643dc886e1b95db27661f61b65028e9a30b3b97f555964843d8d6db9791ca2d
 SHA512:
-  metadata.gz: 728373b70e48e5d36e759e1f94db93970ef5d9d4de28c40f3eed93e116c80bd80806723c11edec2834aaf4741ef0208e65b6bd9b24b354c0482f9e7b6685d6af
-  data.tar.gz: 28f5307dba7d14197ea46abb3922a31b2ea5037f31108a0aee4502b701f9033e29b2ce9ee1ec308f49ea4ef163bfe88f5884a91b91fbcc167e919bb3cd15ed98
+  metadata.gz: d694b20b2344e1b11146c1cb434c27edee67ee39b1efd9dba1101fd8723e2c18ec56e342ef9aecf7a5bb9b7dec1a3881638dca50cf92ca49a9ccf1b1e9622b20
+  data.tar.gz: 89dcec5bea40b9f9bb11a7bd82a9ad2c10ac30acbebdf3a48c883680d3b004cfd334b94e919d208131b471c5b0766483b449fb041a57970d6d58c06651dfa6a3

data/lib/puppet_fixtures.rb

@@ -217,12 +217,18 @@ module PuppetFixtures
 
       threads = thread_count.times.map do |i|
         Thread.new do
-          type, remote, opts = queue.pop(true)
-          case type
-          when :repository
-            instance.download_repository(remote, **opts)
-          when :forge
-            instance.download_module(remote, **opts)
+          loop do
+            begin
+              type, remote, opts = queue.pop(true)
+            rescue ThreadError
+              break # Queue is empty
+            end
+            case type
+            when :repository
+              instance.download_repository(remote, **opts)
+            when :forge
+              instance.download_module(remote, **opts)
+            end
           end
         end
       end
@@ -267,22 +273,21 @@ module PuppetFixtures
 
     private
 
+    def gem_version(name)
+      Gem::Specification.find_by_name(name).version.to_s
+    rescue Gem::LoadError
+      nil
+    end
+
     def include_repo?(version_range)
       return true unless version_range
 
-      require 'semantic_puppet'
+      puppet_version = gem_version('openvox') || gem_version('puppet')
+      raise "Neither 'openvox' nor 'puppet' gem could be found. Please install one of them." unless puppet_version
 
-      puppet_spec = begin
-        Gem::Specification.find_by_name('openvox')
-      rescue Gem::LoadError
-        begin
-          Gem::Specification.find_by_name('puppet')
-        rescue Gem::LoadError
-          raise "Neither 'openvox' nor 'puppet' gem could be found. Please install one of them."
-        end
-      end
-      puppet_version = SemanticPuppet::Version.parse(puppet_spec.version.to_s)
+      require 'semantic_puppet'
 
+      puppet_version = SemanticPuppet::Version.parse(puppet_version)
       constraint = SemanticPuppet::VersionRange.parse(version_range)
       constraint.include?(puppet_version)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_fixtures
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ewoud Kohl van Wijngaarden
@@ -23,20 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: ostruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 description: |
   Originally part of puppetlabs_spec_helper, but with a significant
   refactoring to make it available standalone.