fog-core 1.24.0 → 1.25.0

data/lib/fog/core/time.rb

@@ -1,10 +1,9 @@
-require 'time'
+require "time"
 
 module Fog
   class Time < ::Time
-
-    DAYS = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
-    MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+    DAYS = %w(Sun Mon Tue Wed Thu Fri Sat)
+    MONTHS = %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)
 
     def self.now
       at((::Time.now - offset).to_i)
@@ -21,12 +20,11 @@ module Fog
     end
 
     def to_date_header
-      self.utc.strftime("#{DAYS[self.utc.wday]}, %d #{MONTHS[self.utc.month - 1]} %Y %H:%M:%S +0000")
+      utc.strftime("#{DAYS[utc.wday]}, %d #{MONTHS[utc.month - 1]} %Y %H:%M:%S +0000")
     end
 
     def to_iso8601_basic
-      self.utc.strftime('%Y%m%dT%H%M%SZ')
+      utc.strftime("%Y%m%dT%H%M%SZ")
     end
-
   end
 end

data/lib/fog/core/utils.rb

@@ -1,24 +1,28 @@
-module Fog::Core::Utils
-  # This helper prepares a Hash of settings for passing into {Fog::Service.new}.
-  #
-  # The only special consideration is if +:header+ key is passed in the contents are unchanged. This
-  # allows the headers to be passed through to requests to customise HTTP headers without them being
-  # broken by the +#to_sym+ calls.
-  #
-  # @param [Hash] settings The String based Hash to prepare
-  # @option settings [Hash] :headers Passed to the underlying {Fog::Core::Connection} unchanged
-  # @return [Hash]
-  #
-  def self.prepare_service_settings(settings)
-    if settings.is_a? Hash
-      copy = Array.new
-      settings.each do |key, value|
-        obj = ![:headers].include?(key) ? self.prepare_service_settings(value) : value
-        copy.push(key.to_sym, obj)
+module Fog
+  module Core
+    module Utils
+      # This helper prepares a Hash of settings for passing into {Fog::Service.new}.
+      #
+      # The only special consideration is if +:header+ key is passed in the contents are unchanged. This
+      # allows the headers to be passed through to requests to customise HTTP headers without them being
+      # broken by the +#to_sym+ calls.
+      #
+      # @param [Hash] settings The String based Hash to prepare
+      # @option settings [Hash] :headers Passed to the underlying {Fog::Core::Connection} unchanged
+      # @return [Hash]
+      #
+      def self.prepare_service_settings(settings)
+        if settings.is_a? Hash
+          copy = []
+          settings.each do |key, value|
+            obj = ![:headers].include?(key) ? prepare_service_settings(value) : value
+            copy.push(key.to_sym, obj)
+          end
+          Hash[*copy]
+        else
+          settings
+        end
       end
-      Hash[*copy]
-    else
-      settings
     end
   end
 end

data/lib/fog/core/uuid.rb

@@ -1,9 +1,8 @@
-require 'securerandom'
+require "securerandom"
 
 module Fog
   class UUID
     class << self
-
       def uuid
         if supported?
           SecureRandom.uuid
@@ -20,4 +19,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/core/version.rb

@@ -1,3 +1,5 @@
 module Fog
-  VERSION = "1.24.0"
+  module Core
+    VERSION = "1.25.0"
+  end
 end

data/lib/fog/core/wait_for.rb

@@ -1,5 +1,5 @@
 module Fog
-  def self.wait_for(timeout=Fog.timeout, interval=Fog.interval, &block)
+  def self.wait_for(timeout = Fog.timeout, interval = Fog.interval, &_block)
     duration = 0
     start = Time.now
     retries = 0
@@ -8,7 +8,7 @@ module Fog
       duration = Time.now - start
     end
     if duration > timeout
-      raise Errors::TimeoutError.new("The specified wait_for timeout (#{timeout} seconds) was exceeded")
+      raise Errors::TimeoutError, "The specified wait_for timeout (#{timeout} seconds) was exceeded"
     else
       { :duration => duration }
     end

data/lib/fog/core/wait_for_defaults.rb

@@ -1,31 +1,34 @@
 module Fog
-  @interval = lambda { |retries| [2 ** (retries - 1), @max_interval].min }
-  def self.interval
-    @interval
+  @interval = lambda { |retries| [2**(retries - 1), @max_interval].min }
+
+  class << self
+    attr_reader :interval
   end
 
   def self.interval=(interval)
-    if interval.kind_of?(Proc)
+    if interval.is_a?(Proc)
       raise ArgumentError, "interval proc must return a positive" unless interval.call(1) >= 0
     else
       raise ArgumentError, "interval must be non-negative" unless interval >= 0
     end
     @interval = interval
   end
-  
+
   @timeout = 600
-  def self.timeout
-    @timeout
+
+  class << self
+    attr_reader :timeout
   end
 
   def self.timeout=(timeout)
     raise ArgumentError, "timeout must be non-negative" unless timeout >= 0
     @timeout = timeout
   end
-  
+
   @max_interval = 60
-  def self.max_interval
-    @max_interval
+
+  class << self
+    attr_reader :max_interval
   end
 
   def self.max_interval=(interval)

data/lib/fog/core/whitelist_keys.rb

@@ -2,7 +2,7 @@ module Fog
   module WhitelistKeys
     def self.whitelist(hash, valid_keys)
       valid_hash = StringifyKeys.stringify(hash)
-      valid_hash.select {|k,v| valid_keys.include?(k)}
+      valid_hash.select { |k, _v| valid_keys.include?(k) }
     end
   end
 end

data/lib/fog/dns.rb

@@ -1,26 +1,25 @@
 module Fog
   module DNS
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
       attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider).to_s.downcase.to_sym
       when :stormondemand
-        require 'fog/storm_on_demand/dns'
+        require "fog/storm_on_demand/dns"
         Fog::DNS::StormOnDemand.new(attributes)
       else
-        if self.providers.include?(provider)
+        if providers.include?(provider)
           require "fog/#{provider}/dns"
           begin
             Fog::DNS.const_get(Fog.providers[provider])
           rescue
-            Fog::const_get(Fog.providers[provider])::DNS
+            Fog.const_get(Fog.providers[provider])::DNS
           end.new(attributes)
         else
-          raise ArgumentError.new("#{provider} is not a recognized dns provider")
+          raise ArgumentError, "#{provider} is not a recognized dns provider"
         end
       end
     end
@@ -31,7 +30,7 @@ module Fog
 
     def self.zones
       zones = []
-      for provider in self.providers
+      providers.each do |provider|
         begin
           zones.concat(self[provider].zones)
         rescue # ignore any missing credentials/etc
@@ -39,6 +38,5 @@ module Fog
       end
       zones
     end
-
   end
 end

data/lib/fog/identity.rb

@@ -1,8 +1,7 @@
 module Fog
   module Identity
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
@@ -10,15 +9,15 @@ module Fog
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       unless providers.include?(provider)
-        raise ArgumentError.new("#{provider} has no identity service")
+        raise ArgumentError, "#{provider} has no identity service"
       end
 
       require "fog/#{provider}/identity"
       begin
-        Fog::Identity.const_get(Fog.providers[provider]).new(attributes)
+        Fog::Identity.const_get(Fog.providers[provider])
       rescue
-        Fog::const_get(Fog.providers[provider])::Identity.new(attributes)
-      end
+        Fog.const_get(Fog.providers[provider])::Identity
+      end.new(attributes)
     end
 
     def self.providers

data/lib/fog/image.rb

@@ -1,23 +1,21 @@
 module Fog
   module Image
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
-      if self.providers.include?(provider)
+      if providers.include?(provider)
         require "fog/#{provider}/image"
         return Fog::Image.const_get(Fog.providers[provider]).new(attributes)
       end
-      raise ArgumentError.new("#{provider} has no identity service")
+      raise ArgumentError, "#{provider} has no image service"
     end
 
     def self.providers
       Fog.services[:image]
     end
-
   end
 end

data/lib/fog/metering.rb

@@ -1,25 +1,22 @@
 module Fog
   module Metering
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
-      if self.providers.include?(provider)
+      if providers.include?(provider)
         require "fog/#{provider}/metering"
         return Fog::Metering.const_get(Fog.providers[provider]).new(attributes)
       end
 
-      raise ArgumentError.new("#{provider} has no identity service")
+      raise ArgumentError, "#{provider} has no identity service"
     end
 
     def self.providers
       Fog.services[:metering]
     end
-
   end
 end
-

data/lib/fog/monitoring.rb

@@ -1,24 +1,22 @@
 module Fog
   module Monitoring
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
       attributes = attributes.dup
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if provider == :stormondemand
-        require 'fog/storm_on_demand/billing'
+        require "fog/storm_on_demand/billing"
         Fog::Monitoring::StormOnDemand.new(attributes)
       else
-        raise ArgumentError.new("#{provider} has no monitoring service")
+        raise ArgumentError, "#{provider} has no monitoring service"
       end
     end
 
     def self.providers
       Fog.services[:monitoring]
     end
-
   end
 end

data/lib/fog/network.rb

@@ -1,8 +1,7 @@
 module Fog
   module Network
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
@@ -12,17 +11,16 @@ module Fog
       if provider == :stormondemand
         require "fog/storm_on_demand/network"
         return Fog::Network::StormOnDemand.new(attributes)
-      elsif self.providers.include?(provider)
+      elsif providers.include?(provider)
         require "fog/#{provider}/network"
         return Fog::Network.const_get(Fog.providers[provider]).new(attributes)
       end
 
-      raise ArgumentError.new("#{provider} has no network service")
+      raise ArgumentError, "#{provider} has no network service"
     end
 
     def self.providers
       Fog.services[:network]
     end
-
   end
-end
+end

data/lib/fog/orchestration.rb

@@ -1,25 +1,23 @@
 module Fog
   module Orchestration
-
     def self.[](provider)
-      self.new(:provider => provider)
+      new(:provider => provider)
     end
 
     def self.new(attributes)
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
-      if self.providers.include?(provider)
+      if providers.include?(provider)
         require "fog/#{provider}/network"
         return Fog::Orchestration.const_get(Fog.providers[provider]).new(attributes)
       end
 
-      raise ArgumentError.new("#{provider} has no orchestration service")
+      raise ArgumentError, "#{provider} has no orchestration service"
     end
 
     def self.providers
       Fog.services[:orchestration]
     end
-
   end
 end

data/lib/fog/schema/data_validator.rb

@@ -61,6 +61,10 @@ module Fog
     #     }
     #
     class DataValidator
+      # This returns the last message set by the validator
+      #
+      # @return [String]
+      attr_reader :message
 
       def initialize
         @message = nil
@@ -89,14 +93,7 @@ module Fog
         valid
       end
 
-      # This returns the last message set by the validator
-      #
-      # @return [String]
-      def message
-        @message
-      end
-
-    private
+      private
 
       # This contains a slightly modified version of the Hashidator gem
       # but unfortunately the gem does not cope with Array schemas.
@@ -109,26 +106,24 @@ module Fog
         case validator
         when Array
           return false if value.is_a?(Hash)
-          value.respond_to?(:all?) && value.all? {|x| validate_value(validator[0], x, options)}
+          value.respond_to?(:all?) && value.all? { |x| validate_value(validator[0], x, options) }
         when Symbol
           value.respond_to? validator
         when Hash
           return false if value.is_a?(Array)
 
           # When being strict values not specified in the schema are fails
-          unless options[:allow_extra_keys]
-            if value.respond_to?(:empty?)
-              # Validator is empty but values are not
-              return false if !value.empty? && validator.empty?
-            end
-          end
+          # Validator is empty but values are not
+          return false if !options[:allow_extra_keys] &&
+                          value.respond_to?(:empty?) &&
+                          !value.empty? &&
+                          validator.empty?
 
-          unless options[:allow_optional_rules]
-            if value.respond_to?(:empty?)
-              # Validator has rules left but no more values
-              return false if value.empty? && !validator.empty?
-            end
-          end
+          # Validator has rules left but no more values
+          return false if !options[:allow_optional_rules] &&
+                          value.respond_to?(:empty?) &&
+                          value.empty? &&
+                          !validator.empty?
 
           validator.all? do |key, sub_validator|
             Fog::Logger.write :debug, "[blue][DEBUG] #{key.inspect} against #{sub_validator.inspect}[/]\n"
@@ -138,7 +133,7 @@ module Fog
           result = validator == value
           result = validator === value unless result
           # Repeat unless we have a Boolean already
-          unless (result.is_a?(TrueClass) || result.is_a?(FalseClass))
+          unless result.is_a?(TrueClass) || result.is_a?(FalseClass)
             result = validate_value(result, value, options)
           end
           if result