refactor providers

 - refactor prefatch method

Author: rwaffen

lib/puppet/provider/onecluster/cli.rb

@@ -98,9 +98,8 @@ def self.instances
   def self.prefetch(resources)
     clusters = instances
     resources.keys.each do |name|
-      if provider = clusters.find{ |cluster| cluster.name == name }
-        resources[name].provider = provider
-      end
+      provider = clusters.find{ |cluster| cluster.name == name }
+      resources[name].provider = provider unless provider.nil?
     end
   end
 

lib/puppet/provider/onedatastore/cli.rb

@@ -90,9 +90,8 @@ def self.instances
   def self.prefetch(resources)
     datastores = instances
     resources.keys.each do |name|
-      if provider = datastores.find{ |datastore| datastore.name == name }
-        resources[name].provider = provider
-      end
+      provider = datastores.find{ |datastore| datastore.name == name }
+      resources[name].provider = provider unless provider.nil?
     end
   end
 

lib/puppet/provider/onehost/cli.rb

@@ -53,9 +53,8 @@ def self.instances
   def self.prefetch(resources)
     hosts = instances
     resources.keys.each do |name|
-      if provider = hosts.find{ |host| host.name == name }
-        resources[name].provider = provider
-      end
+      provider = hosts.find{ |host| host.name == name }
+      resources[name].provider = provider unless provider.nil?
     end
   end
 

lib/puppet/provider/oneimage/cli.rb

@@ -105,9 +105,8 @@ def self.instances
   def self.prefetch(resources)
     images = instances
     resources.keys.each do |name|
-      if provider = images.find{ |image| image.name == name }
-        resources[name].provider = provider
-      end
+      provider = images.find{ |image| image.name == name }
+      resources[name].provider = provider unless provider.nil?
     end
   end
 

lib/puppet/provider/onesecgroup/cli.rb

@@ -83,9 +83,8 @@ def self.instances
   def self.prefetch(resources)
     secgroups = instances
     resources.keys.each do |name|
-      if provider = secgroups.find{ |secgroup| secgroup.name == name }
-        resources[name].provider = provider
-      end
+      provider = secgroups.find{ |secgroup| secgroup.name == name }
+      resources[name].provider = provider unless provider.nil?
     end
   end
 

lib/puppet/provider/onevm/cli.rb

@@ -63,14 +63,13 @@ def self.instances
   def self.prefetch(resources)
     vms = instances
     resources.keys.each do |name|
-      if provider = vms.find{ |vm| vm.name == name }
-        resources[name].provider = provider
-      end
+      provider = vms.find{ |vm| vm.name == name }
+      resources[name].provider = provider unless provider.nil?
     end
   end
 
   # setters
   def template=(value)
-      raise "Can not modify a VM template"
+      raise 'Can not modify a VM template'
   end
 end

lib/puppet/provider/onevnet_addressrange/cli.rb

@@ -84,9 +84,8 @@ def self.instances
   def self.prefetch(resources)
     vnets = instances
     resources.keys.each do |name|
-      if provider = vnets.find{ |vnet| vnet.name == name }
-        resources[name].provider = provider
-      end
+      provider = vnets.find{ |vnet| vnet.name == name }
+      resources[name].provider = provider unless provider.nil?
     end
   end