Merge pull request #360 from highb/2020-03-05_unsafe_rubocop_fixes

"Unsafe" rubocop fixes

bin/vmpooler

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'vmpooler'
 

lib/vmpooler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
   require 'date'
   require 'json'
@@ -41,7 +43,7 @@ module Vmpooler
 
     # 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 = [
@@ -94,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']

lib/vmpooler/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
   class API < Sinatra::Base
     def initialize

lib/vmpooler/api/dashboard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
   class API
     class Dashboard < Sinatra::Base

lib/vmpooler/api/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
 
   class API

lib/vmpooler/api/reroute.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
   class API
     class Reroute < Sinatra::Base

lib/vmpooler/api/v1.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
   class API
   class V1 < Sinatra::Base
@@ -934,7 +936,7 @@ module Vmpooler
           end
         end
 
-        if failure.size > 0
+        if !failure.empty?
           status 400
           result['failure'] = failure
         else

lib/vmpooler/dashboard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
   class Dashboard < Sinatra::Base
     def config

lib/vmpooler/dummy_statsd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
   class DummyStatsd
     attr_reader :server, :port, :prefix

lib/vmpooler/generic_connection_pool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'connection_pool'
 
 module Vmpooler

lib/vmpooler/graphite.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems' unless defined?(Gem)
 
 module Vmpooler

lib/vmpooler/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems' unless defined?(Gem)
 
 module Vmpooler

lib/vmpooler/pool_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vmpooler/providers'
 require 'spicy-proton'
 
@@ -54,7 +56,7 @@ module Vmpooler
         pool_keys.each do |k|
           to_set[k] = pool[k]
         end
-        to_set['alias'] = pool['alias'].join(',') if to_set.has_key?('alias')
+        to_set['alias'] = pool['alias'].join(',') if to_set.key?('alias')
         $redis.hmset("vmpooler__pool__#{pool['name']}", to_set.to_a.flatten) unless to_set.empty?
       end
       previously_configured_pools.each do |pool|

lib/vmpooler/providers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 module Vmpooler
@@ -37,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

lib/vmpooler/providers/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vmpooler
   class PoolManager
     class Provider

lib/vmpooler/providers/dummy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'vmpooler/providers/base'
 

lib/vmpooler/providers/vsphere.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vmpooler/providers/base'
 
 module Vmpooler
@@ -483,9 +485,9 @@ module Vmpooler
         end
 
         # vSphere helper methods
-        ADAPTER_TYPE = 'lsiLogic'.freeze
+        ADAPTER_TYPE = 'lsiLogic'
-        DISK_TYPE = 'thin'.freeze
+        DISK_TYPE = 'thin'
-        DISK_MODE = 'persistent'.freeze
+        DISK_MODE = 'persistent'
 
         def ensured_vsphere_connection(connection_pool_object)
           connection_pool_object[:connection] = connect_to_vsphere unless vsphere_connection_ok?(connection_pool_object[:connection])

lib/vmpooler/statsd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems' unless defined?(Gem)
 require 'statsd'
 

lib/vmpooler/version.rb

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