vmpooler 0.10.3 → 0.11.0

data/lib/vmpooler/providers.rb

@@ -1,27 +1,28 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 module Vmpooler
   class Providers
-
     # @param names [Array] - an array of names or string name of a provider
     # @return [Array] - list of provider files loaded
     # ie. ["lib/vmpooler/providers/base.rb", "lib/vmpooler/providers/dummy.rb", "lib/vmpooler/providers/vsphere.rb"]
     def self.load_by_name(names)
       names = Array(names)
-      instance = self.new
-      names.map {|name| instance.load_from_gems(name)}.flatten
+      instance = new
+      names.map { |name| instance.load_from_gems(name) }.flatten
     end
 
     # @return [Array] - array of provider files
     # ie. ["lib/vmpooler/providers/base.rb", "lib/vmpooler/providers/dummy.rb", "lib/vmpooler/providers/vsphere.rb"]
     # although these files can come from any gem
     def self.load_all_providers
-      self.new.load_from_gems
+      new.load_from_gems
     end
 
     # @return [Array] - returns an array of gem names that contain a provider
     def self.installed_providers
-      self.new.vmpooler_provider_gem_list.map(&:name)
+      new.vmpooler_provider_gem_list.map(&:name)
     end
 
     # @return [Array] returns a list of vmpooler providers gem plugin specs
@@ -38,7 +39,7 @@ module Vmpooler
         # we don't exactly know if the provider name matches the main file name that should be loaded
         # so we use globs to get everything like the name
         # this could mean that vsphere5 and vsphere6 are loaded when only vsphere5 is used
-        Dir.glob(File.join(gem_path, "*#{name}*.rb")).each do |file|
+        Dir.glob(File.join(gem_path, "*#{name}*.rb")).sort.each do |file|
           require file
         end
       end
@@ -50,7 +51,7 @@ module Vmpooler
     # @return [String] - the relative path to the vmpooler provider dir
     # this is used when searching gems for this path
     def provider_path
-      File.join('lib','vmpooler','providers')
+      File.join('lib', 'vmpooler', 'providers')
     end
 
     # Add constants to array to skip over classes, ie. Vmpooler::PoolManager::Provider::Dummy
@@ -81,26 +82,24 @@ module Vmpooler
       @plugin_map ||= Hash[plugin_classes.map { |gem| [gem.send(:name), gem] }]
     end
 
-
-
     # Internal: Retrieve a list of available gem paths from RubyGems.
     #
     # Returns an Array of Pathname objects.
     def gem_directories
       dirs = []
-      if has_rubygems?
+      if rubygems?
         dirs = gemspecs.map do |spec|
-          lib_path = File.expand_path(File.join(spec.full_gem_path,provider_path))
-          lib_path if File.exists? lib_path
+          lib_path = File.expand_path(File.join(spec.full_gem_path, provider_path))
+          lib_path if File.exist? lib_path
         end + included_lib_dirs
       end
-      dirs.reject { |dir| dir.nil? }.uniq
+      dirs.reject(&:nil?).uniq
     end
 
     # Internal: Check if RubyGems is loaded and available.
     #
     # Returns true if RubyGems is available, false if not.
-    def has_rubygems?
+    def rubygems?
       defined? ::Gem
     end
 
@@ -114,6 +113,5 @@ module Vmpooler
                       Gem.searcher.init_gemspecs
                     end
     end
-
   end
 end

data/lib/vmpooler/statsd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems' unless defined?(Gem)
 require 'statsd'
 
@@ -6,9 +8,7 @@ module Vmpooler
     attr_reader :server, :port, :prefix
 
     def initialize(params = {})
-      if params['server'].nil? || params['server'].empty?
-        raise ArgumentError, "Statsd server is required. Config: #{params.inspect}"
-      end
+      raise ArgumentError, "Statsd server is required. Config: #{params.inspect}" if params['server'].nil? || params['server'].empty?
 
       host    = params['server']
       @port   = params['port'] || 8125
@@ -18,20 +18,20 @@ module Vmpooler
 
     def increment(label)
       server.increment(prefix + '.' + label)
-    rescue => err
-      $stderr.puts "Failure incrementing #{prefix}.#{label} on statsd server [#{server}:#{port}]: #{err}"
+    rescue StandardError => e
+      warn "Failure incrementing #{prefix}.#{label} on statsd server [#{server}:#{port}]: #{e}"
     end
 
     def gauge(label, value)
       server.gauge(prefix + '.' + label, value)
-    rescue => err
-      $stderr.puts "Failure updating gauge #{prefix}.#{label} on statsd server [#{server}:#{port}]: #{err}"
+    rescue StandardError => e
+      warn "Failure updating gauge #{prefix}.#{label} on statsd server [#{server}:#{port}]: #{e}"
     end
 
     def timing(label, duration)
       server.timing(prefix + '.' + label, duration)
-    rescue => err
-      $stderr.puts "Failure updating timing #{prefix}.#{label} on statsd server [#{server}:#{port}]: #{err}"
+    rescue StandardError => e
+      warn "Failure updating timing #{prefix}.#{label} on statsd server [#{server}:#{port}]: #{e}"
     end
   end
 end

data/lib/vmpooler/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
-  VERSION = '0.10.3'.freeze
+  VERSION = '0.11.0'
 end

data/lib/vmpooler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
   require 'date'
   require 'json'
@@ -27,13 +29,21 @@ module Vmpooler
       # Take the name of the config file either from an ENV variable or from the filepath argument
       config_file = ENV['VMPOOLER_CONFIG_FILE'] || filepath
       parsed_config = YAML.load_file(config_file) if File.exist? config_file
+      parsed_config[:config]['extra_config'] = ENV['EXTRA_CONFIG'] if ENV['EXTRA_CONFIG']
+      if parsed_config[:config]['extra_config']
+        extra_configs = parsed_config[:config]['extra_config'].split(',')
+        extra_configs.each do |config|
+          extra_config = YAML.load_file(config)
+          parsed_config.merge!(extra_config)
+        end
+      end
     end
 
     parsed_config ||= { config: {} }
 
     # Bail out if someone attempts to start vmpooler with dummy authentication
     # without enbaling debug mode.
-    if parsed_config.has_key? :auth
+    if parsed_config.key? :auth
       if parsed_config[:auth]['provider'] == 'dummy'
         unless ENV['VMPOOLER_DEBUG']
           warning = [
@@ -50,7 +60,7 @@ module Vmpooler
     parsed_config[:config]['task_limit'] = string_to_int(ENV['TASK_LIMIT']) || parsed_config[:config]['task_limit'] || 10
     parsed_config[:config]['migration_limit'] = string_to_int(ENV['MIGRATION_LIMIT']) if ENV['MIGRATION_LIMIT']
     parsed_config[:config]['vm_checktime'] = string_to_int(ENV['VM_CHECKTIME']) || parsed_config[:config]['vm_checktime'] || 1
-    parsed_config[:config]['vm_lifetime'] = string_to_int(ENV['VM_LIFETIME']) || parsed_config[:config]['vm_lifetime']  || 24
+    parsed_config[:config]['vm_lifetime'] = string_to_int(ENV['VM_LIFETIME']) || parsed_config[:config]['vm_lifetime'] || 24
     parsed_config[:config]['prefix'] = ENV['PREFIX'] || parsed_config[:config]['prefix'] || ''
 
     parsed_config[:config]['logfile'] = ENV['LOGFILE'] if ENV['LOGFILE']
@@ -86,7 +96,7 @@ module Vmpooler
     parsed_config[:graphite]['port'] = string_to_int(ENV['GRAPHITE_PORT']) if ENV['GRAPHITE_PORT']
 
     parsed_config[:auth] = parsed_config[:auth] || {} if ENV['AUTH_PROVIDER']
-    if parsed_config.has_key? :auth
+    if parsed_config.key? :auth
       parsed_config[:auth]['provider'] = ENV['AUTH_PROVIDER'] if ENV['AUTH_PROVIDER']
       parsed_config[:auth][:ldap] = parsed_config[:auth][:ldap] || {} if parsed_config[:auth]['provider'] == 'ldap'
       parsed_config[:auth][:ldap]['host'] = ENV['LDAP_HOST'] if ENV['LDAP_HOST']
@@ -122,10 +132,8 @@ module Vmpooler
       end
     end
 
-    if parsed_config[:tagfilter]
-      parsed_config[:tagfilter].keys.each do |tag|
-        parsed_config[:tagfilter][tag] = Regexp.new(parsed_config[:tagfilter][tag])
-      end
+    parsed_config[:tagfilter]&.keys&.each do |tag|
+      parsed_config[:tagfilter][tag] = Regexp.new(parsed_config[:tagfilter][tag])
     end
 
     parsed_config[:uptime] = Time.now
@@ -171,7 +179,7 @@ module Vmpooler
   def self.pool_index(pools)
     pools_hash = {}
     index = 0
-    for pool in pools
+    pools.each do |pool|
       pools_hash[pool['name']] = index
       index += 1
     end
@@ -182,14 +190,15 @@ module Vmpooler
     # Returns a integer if input is a string
     return if s.nil?
     return unless s =~ /\d/
-    return Integer(s)
+
+    Integer(s)
   end
 
   def self.true?(obj)
-    obj.to_s.downcase == "true"
+    obj.to_s.downcase == 'true'
   end
 
-  def self.set_linked_clone(parsed_config)
+  def self.set_linked_clone(parsed_config) # rubocop:disable Naming/AccessorMethodName
     parsed_config[:config]['create_linked_clones'] = parsed_config[:config]['create_linked_clones'] || true
     parsed_config[:config]['create_linked_clones'] = ENV['CREATE_LINKED_CLONES'] if ENV['CREATE_LINKED_CLONES'] =~ /true|false/
     parsed_config[:config]['create_linked_clones'] = true?(parsed_config[:config]['create_linked_clones']) if parsed_config[:config]['create_linked_clones']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup