fog-core 2.3.0 → 2.4.0

data/lib/fog/core/scp.rb

@@ -22,19 +22,23 @@ module Fog
       end
 
       def upload(local_path, remote_path, upload_options = {})
-        self.class.data[@address] << { :username       => @username,
-                                       :options        => @options,
-                                       :local_path     => local_path,
-                                       :remote_path    => remote_path,
-                                       :upload_options => upload_options }
+        self.class.data[@address] << {
+          username: @username,
+          options: @options,
+          local_path: local_path,
+          remote_path: remote_path,
+          upload_options: upload_options
+        }
       end
 
       def download(remote_path, local_path, download_options = {})
-        self.class.data[@address] << { :username         => @username,
-                                       :options          => @options,
-                                       :remote_path      => remote_path,
-                                       :local_path       => local_path,
-                                       :download_options => download_options }
+        self.class.data[@address] << {
+          username: @username,
+          options: @options,
+          remote_path: remote_path,
+          local_path: local_path,
+          download_options: download_options
+        }
       end
     end
 
@@ -64,7 +68,7 @@ module Fog
 
         @address  = address
         @username = username
-        @options  = { :paranoid => false, :verify_host_key => :never }.merge(options)
+        @options  = { paranoid: false, verify_host_key: :never }.merge(options)
         @options.delete(:paranoid) if Net::SSH::VALID_OPTIONS.include? :verify_host_key
         @options[:verify_host_key] = false unless Net::SSH::Verifiers.const_defined?(:Never)
       end

data/lib/fog/core/service.rb

@@ -11,7 +11,7 @@ module Fog
 
     module NoLeakInspector
       def inspect
-        "#<#{self.class}:#{object_id} #{(instance_variables - service.secrets).map { |iv| [iv, instance_variable_get(iv).inspect].join("=") }.join(" ")}>"
+        "#<#{self.class}:#{object_id} #{(instance_variables - service.secrets).map { |iv| [iv, instance_variable_get(iv).inspect].join('=') }.join(' ')}>"
       end
     end
 
@@ -119,7 +119,7 @@ module Fog
       # @deprecated
       def fetch_credentials(_options)
         # attempt to load credentials from config file
-        Fog.credentials.reject { |key, _value| !(recognized | requirements).include?(key) }
+        Fog.credentials.select { |key, _value| (recognized | requirements).include?(key) }
       rescue ::Fog::Errors::LoadError
         # if there are no configured credentials, do nothing
         {}
@@ -241,13 +241,13 @@ module Fog
         missing = requirements - keys
 
         unless missing.empty?
-          raise ArgumentError, "Missing required arguments: #{missing.join(", ")}"
+          raise ArgumentError, "Missing required arguments: #{missing.join(', ')}"
         end
 
         unless recognizes.empty?
           unrecognized = options.keys - requirements - recognized
           unless unrecognized.empty?
-            Fog::Logger.warning("Unrecognized arguments: #{unrecognized.join(", ")}")
+            Fog::Logger.warning("Unrecognized arguments: #{unrecognized.join(', ')}")
           end
         end
       end

data/lib/fog/core/services_mixin.rb

@@ -1,12 +1,12 @@
 module Fog
   module ServicesMixin
-    E_SERVICE_PROVIDER_CONSTANT = <<-EOS.gsub(/\s+/, ' ').strip.freeze
+    E_SERVICE_PROVIDER_CONSTANT = <<-EOS.gsub(/\s+/, " ").strip.freeze
       Falling back to deprecated constant Fog::%<service>s::%<provider>s. The
       preferred format of service provider constants has changed from
       service::provider to provider::service. Please update this service
       provider to use the preferred format.
     EOS
-    E_SERVICE_PROVIDER_PATH = <<-EOS.gsub(/\s+/, ' ').strip.freeze
+    E_SERVICE_PROVIDER_PATH = <<-EOS.gsub(/\s+/, " ").strip.freeze
       Falling back to deprecated path fog/%<service>s/%<provider>s. The
       preferred file path format has changed from service/provider to
       provider/service. Please update this service provider to use the preferred
@@ -14,7 +14,7 @@ module Fog
     EOS
 
     def [](provider)
-      new(:provider => provider)
+      new(provider: provider)
     end
 
     def new(attributes)
@@ -75,22 +75,22 @@ module Fog
     def check_provider_alias(provider)
       case provider
       when :baremetalcloud
-        Fog::Logger.deprecation(':baremetalcloud is deprecated. Use :bare_metal_cloud instead!')
+        Fog::Logger.deprecation(":baremetalcloud is deprecated. Use :bare_metal_cloud instead!")
         :bare_metal_cloud
       when :gogrid
-        Fog::Logger.deprecation(':gogrid is deprecated. Use :go_grid instead!')
+        Fog::Logger.deprecation(":gogrid is deprecated. Use :go_grid instead!")
         :go_grid
       when :internetarchive
-        Fog::Logger.deprecation(':internetarchive is deprecated. Use :internet_archive instead!')
+        Fog::Logger.deprecation(":internetarchive is deprecated. Use :internet_archive instead!")
         :internet_archive
       when :new_servers
-        Fog::Logger.deprecation(':new_servers is deprecated. Use :bare_metal_cloud instead!')
+        Fog::Logger.deprecation(":new_servers is deprecated. Use :bare_metal_cloud instead!")
         :bare_metal_cloud
       when :stormondemand
-        Fog::Logger.deprecation(':stormondemand is deprecated. Use :storm_on_demand instead!')
+        Fog::Logger.deprecation(":stormondemand is deprecated. Use :storm_on_demand instead!")
         :storm_on_demand
       when :vclouddirector
-        Fog::Logger.deprecation(':vclouddirector is deprecated. Use :vcloud_director instead!')
+        Fog::Logger.deprecation(":vclouddirector is deprecated. Use :vcloud_director instead!")
         :vcloud_director
       else provider
       end

data/lib/fog/core/ssh.rb

@@ -28,7 +28,7 @@ module Fog
       end
 
       def run(commands, &_blk)
-        self.class.data[@address] << { :commands => commands, :username => @username, :options => @options }
+        self.class.data[@address] << { commands: commands, username: @username, options: @options }
       end
     end
 
@@ -61,6 +61,7 @@ module Fog
 
                   channel.on_extended_data do |_ch, type, data|
                     next unless type == 1
+
                     result.stderr << data
                     yield ["", data] if blk
                   end
@@ -116,7 +117,7 @@ module Fog
 
         # net-ssh has deprecated :paranoid in favor of :verify_host_key
         # https://github.com/net-ssh/net-ssh/pull/524
-        opts = { :paranoid => false, :verify_host_key => :never }.merge(options)
+        opts = { paranoid: false, verify_host_key: :never }.merge(options)
         if Net::SSH::VALID_OPTIONS.include? :verify_host_key
           opts.delete(:paranoid)
         end

data/lib/fog/core/stringify_keys.rb

@@ -7,8 +7,6 @@ module Fog
       end
     end
 
-    private
-
     # http://devblog.avdi.org/2009/11/20/hash-transforms-in-ruby/
     def self.transform_hash(original, &block)
       original.reduce({}) do |result, (key, value)|

data/lib/fog/core/time.rb

@@ -2,8 +2,8 @@ require "time"
 
 module Fog
   class Time < ::Time
-    DAYS = %w(Sun Mon Tue Wed Thu Fri Sat)
-    MONTHS = %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)
+    DAYS = %w(Sun Mon Tue Wed Thu Fri Sat).freeze
+    MONTHS = %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec).freeze
 
     def self.now
       at(::Time.now - offset)

data/lib/fog/core/uuid.rb

@@ -4,16 +4,10 @@ module Fog
   class UUID
     class << self
       def uuid
-        if supported?
-          SecureRandom.uuid
-        else
-          ary = SecureRandom.random_bytes(16).unpack("NnnnnN")
-          ary[2] = (ary[2] & 0x0fff) | 0x4000
-          ary[3] = (ary[3] & 0x3fff) | 0x8000
-          "%08x-%04x-%04x-%04x-%04x%08x" % ary
-        end
+        SecureRandom.uuid
       end
 
+      # :nodoc: This method is used by other plugins, so preserve it for the compatibility
       def supported?
         SecureRandom.respond_to?(:uuid)
       end

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "2.3.0"
+    VERSION = "2.4.0".freeze
   end
 end

data/lib/fog/core/wait_for.rb

@@ -8,9 +8,10 @@ module Fog
       if duration > timeout
         raise Errors::TimeoutError, "The specified wait_for timeout (#{timeout} seconds) was exceeded"
       end
+
       sleep(interval.respond_to?(:call) ? interval.call(retries += 1).to_f : interval.to_f)
       duration = Time.now - start
     end
-    { :duration => duration }
+    { duration: duration }
   end
 end

data/lib/fog/core/wait_for_defaults.rb

@@ -22,6 +22,7 @@ module Fog
 
   def self.timeout=(timeout)
     raise ArgumentError, "timeout must be non-negative" unless timeout >= 0
+
     @timeout = timeout
   end
 
@@ -33,6 +34,7 @@ module Fog
 
   def self.max_interval=(interval)
     raise ArgumentError, "interval must be non-negative" unless interval >= 0
+
     @max_interval = interval
   end
 end

data/lib/fog/core.rb

@@ -11,67 +11,66 @@ require "timeout"
 require "ipaddr"
 
 # internal core dependencies
-require File.expand_path('../core/version', __FILE__)
+require File.expand_path("core/version", __dir__)
 
 # Mixins
-require File.expand_path('../core/services_mixin', __FILE__)
+require File.expand_path("core/services_mixin", __dir__)
 
-require File.expand_path('../core/attributes', __FILE__)
-require File.expand_path('../core/attributes/default', __FILE__)
-require File.expand_path('../core/attributes/array', __FILE__)
-require File.expand_path('../core/attributes/boolean', __FILE__)
-require File.expand_path('../core/attributes/float', __FILE__)
-require File.expand_path('../core/attributes/integer', __FILE__)
-require File.expand_path('../core/attributes/string', __FILE__)
-require File.expand_path('../core/attributes/time', __FILE__)
-require File.expand_path('../core/attributes/timestamp', __FILE__)
-require File.expand_path('../core/associations/default', __FILE__)
-require File.expand_path('../core/associations/many_identities', __FILE__)
-require File.expand_path('../core/associations/many_models', __FILE__)
-require File.expand_path('../core/associations/one_model', __FILE__)
-require File.expand_path('../core/associations/one_identity', __FILE__)
-require File.expand_path('../core/collection', __FILE__)
-require File.expand_path('../core/association', __FILE__)
-require File.expand_path('../core/connection', __FILE__)
-require File.expand_path('../core/credentials', __FILE__)
-require File.expand_path('../core/current_machine', __FILE__)
-require File.expand_path('../core/deprecation', __FILE__)
-require File.expand_path('../core/errors', __FILE__)
-require File.expand_path('../core/hmac', __FILE__)
-require File.expand_path('../core/logger', __FILE__)
-require File.expand_path('../core/model', __FILE__)
-require File.expand_path('../core/mock', __FILE__)
-require File.expand_path('../core/provider', __FILE__)
-require File.expand_path('../core/service', __FILE__)
-require File.expand_path('../core/ssh', __FILE__)
-require File.expand_path('../core/scp', __FILE__)
-require File.expand_path('../core/time', __FILE__)
-require File.expand_path('../core/utils', __FILE__)
-require File.expand_path('../core/wait_for', __FILE__)
-require File.expand_path('../core/wait_for_defaults', __FILE__)
-require File.expand_path('../core/uuid', __FILE__)
-require File.expand_path('../core/stringify_keys', __FILE__)
-require File.expand_path('../core/whitelist_keys', __FILE__)
-
-require File.expand_path('../account', __FILE__)
-require File.expand_path('../baremetal', __FILE__)
-require File.expand_path('../billing', __FILE__)
-require File.expand_path('../cdn', __FILE__)
-require File.expand_path('../compute', __FILE__)
-require File.expand_path('../dns', __FILE__)
-require File.expand_path('../identity', __FILE__)
-require File.expand_path('../image', __FILE__)
-require File.expand_path('../introspection', __FILE__)
-require File.expand_path('../metering', __FILE__)
-require File.expand_path('../monitoring', __FILE__)
-require File.expand_path('../nfv', __FILE__)
-require File.expand_path('../network', __FILE__)
-require File.expand_path('../orchestration', __FILE__)
-require File.expand_path('../storage', __FILE__)
-require File.expand_path('../support', __FILE__)
-require File.expand_path('../volume', __FILE__)
-require File.expand_path('../vpn', __FILE__)
+require File.expand_path("core/attributes", __dir__)
+require File.expand_path("core/attributes/default", __dir__)
+require File.expand_path("core/attributes/array", __dir__)
+require File.expand_path("core/attributes/boolean", __dir__)
+require File.expand_path("core/attributes/float", __dir__)
+require File.expand_path("core/attributes/integer", __dir__)
+require File.expand_path("core/attributes/string", __dir__)
+require File.expand_path("core/attributes/time", __dir__)
+require File.expand_path("core/attributes/timestamp", __dir__)
+require File.expand_path("core/associations/default", __dir__)
+require File.expand_path("core/associations/many_identities", __dir__)
+require File.expand_path("core/associations/many_models", __dir__)
+require File.expand_path("core/associations/one_model", __dir__)
+require File.expand_path("core/associations/one_identity", __dir__)
+require File.expand_path("core/collection", __dir__)
+require File.expand_path("core/association", __dir__)
+require File.expand_path("core/connection", __dir__)
+require File.expand_path("core/credentials", __dir__)
+require File.expand_path("core/current_machine", __dir__)
+require File.expand_path("core/deprecation", __dir__)
+require File.expand_path("core/errors", __dir__)
+require File.expand_path("core/hmac", __dir__)
+require File.expand_path("core/logger", __dir__)
+require File.expand_path("core/model", __dir__)
+require File.expand_path("core/mock", __dir__)
+require File.expand_path("core/provider", __dir__)
+require File.expand_path("core/service", __dir__)
+require File.expand_path("core/ssh", __dir__)
+require File.expand_path("core/scp", __dir__)
+require File.expand_path("core/time", __dir__)
+require File.expand_path("core/utils", __dir__)
+require File.expand_path("core/wait_for", __dir__)
+require File.expand_path("core/wait_for_defaults", __dir__)
+require File.expand_path("core/uuid", __dir__)
+require File.expand_path("core/stringify_keys", __dir__)
+require File.expand_path("core/whitelist_keys", __dir__)
 
+require File.expand_path("account", __dir__)
+require File.expand_path("baremetal", __dir__)
+require File.expand_path("billing", __dir__)
+require File.expand_path("cdn", __dir__)
+require File.expand_path("compute", __dir__)
+require File.expand_path("dns", __dir__)
+require File.expand_path("identity", __dir__)
+require File.expand_path("image", __dir__)
+require File.expand_path("introspection", __dir__)
+require File.expand_path("metering", __dir__)
+require File.expand_path("monitoring", __dir__)
+require File.expand_path("nfv", __dir__)
+require File.expand_path("network", __dir__)
+require File.expand_path("orchestration", __dir__)
+require File.expand_path("storage", __dir__)
+require File.expand_path("support", __dir__)
+require File.expand_path("volume", __dir__)
+require File.expand_path("vpn", __dir__)
 
 # Utility
-require File.expand_path('../formatador', __FILE__)
+require File.expand_path("formatador", __dir__)

data/lib/fog/formatador.rb

@@ -9,7 +9,7 @@ module Fog
       Thread.current[:formatador] ||= ::Formatador.new
     end
 
-    def self.format(object, opts = { :include_nested => true })
+    def self.format(object, opts = { include_nested: true })
       string = init_string(object)
       indent { string << object_string(object, opts) }
       string << "#{indentation}>"
@@ -32,11 +32,9 @@ module Fog
     end
 
     def self.redisplay_progressbar(current, total, options = {})
-      ::Formatador.redisplay_progressbar(current, total, options = {})
+      ::Formatador.redisplay_progressbar(current, total, options)
     end
 
-    private
-
     def self.indent(&block)
       formatador.indent(&block)
     end
@@ -50,13 +48,14 @@ module Fog
     end
 
     def self.object_string(object, opts)
-      string = "#{attribute_string(object)}"
-      string << "#{nested_objects_string(object)}" if opts[:include_nested]
+      string = attribute_string(object).to_s
+      string << nested_objects_string(object).to_s if opts[:include_nested]
       string
     end
 
     def self.attribute_string(object)
       return "" unless object.class.respond_to?(:attributes)
+
       if object.class.attributes.empty?
         ""
       else
@@ -68,6 +67,7 @@ module Fog
       nested = ""
       return nested if object.respond_to?(:empty) and object.empty?
       return nested unless object.is_a?(Enumerable)
+
       nested = "#{indentation}[\n"
       indent { nested << indentation + inspect_object(object) }
       nested << "#{indentation}\n#{indentation}]\n"
@@ -82,6 +82,7 @@ module Fog
 
     def self.inspect_object(object)
       return "" unless object.is_a?(Enumerable)
+
       object.map { |o| indentation + o.inspect }.join(", \n#{indentation}")
     end
   end

data/lib/fog/schema/data_validator.rb

@@ -106,6 +106,7 @@ 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) }
         when Symbol
           value.respond_to? validator

data/lib/fog/storage.rb

@@ -1,8 +1,8 @@
 begin
   # Use mime/types/columnar if available, for reduced memory usage
-  require 'mime/types/columnar'
+  require "mime/types/columnar"
 rescue LoadError
-  require 'mime/types'
+  require "mime/types"
 end
 
 module Fog
@@ -24,18 +24,18 @@ module Fog
       if body.respond_to?(:encoding)
         original_encoding = body.encoding
         body = body.dup if body.frozen?
-        body = body.force_encoding('BINARY')
+        body = body.force_encoding("BINARY")
       end
 
       size = if body.respond_to?(:bytesize)
-        body.bytesize
-      elsif body.respond_to?(:size)
-        body.size
-      elsif body.respond_to?(:stat)
-        body.stat.size
-      else
-        0
-      end
+               body.bytesize
+             elsif body.respond_to?(:size)
+               body.size
+             elsif body.respond_to?(:stat)
+               body.stat.size
+             else
+               0
+             end
 
       if body.respond_to?(:encoding)
         body.force_encoding(original_encoding)
@@ -55,10 +55,10 @@ module Fog
 
     def self.parse_data(data)
       {
-        :body     => data,
-        :headers  => {
-          "Content-Length"  => get_body_size(data),
-          "Content-Type"    => get_content_type(data)
+        body: data,
+        headers: {
+          "Content-Length" => get_body_size(data),
+          "Content-Type" => get_content_type(data)
           # "Content-MD5" => Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
         }
       }

data/lib/fog/test_helpers/collection_helper.rb

@@ -35,6 +35,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
 
       methods.each do |enum_method|
         next unless collection.respond_to?(enum_method)
+
         tests("##{enum_method}").succeeds do
           block_called = false
           collection.send(enum_method) { block_called = true }
@@ -44,6 +45,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
 
       %w(max_by min_by).each do |enum_method|
         next unless collection.respond_to?(enum_method)
+
         tests("##{enum_method}").succeeds do
           block_called = false
           collection.send(enum_method) do

data/lib/fog/test_helpers/formats_helper.rb

@@ -60,9 +60,9 @@ module Shindo
     def formats(format, strict = true)
       test("has proper format") do
         if strict
-          options = { :allow_extra_keys => false, :allow_optional_rules => true }
+          options = { allow_extra_keys: false, allow_optional_rules: true }
         else
-          options = { :allow_extra_keys => true, :allow_optional_rules => true }
+          options = { allow_extra_keys: true, allow_optional_rules: true }
         end
         validator = Fog::Schema::DataValidator.new
         valid = validator.validate(yield, format, options)

data/lib/fog/test_helpers/helper.rb

@@ -1,11 +1,11 @@
 require "excon"
 
-ENV["FOG_RC"]         = ENV["FOG_RC"] || File.expand_path("../.fog", __FILE__)
+ENV["FOG_RC"]         = ENV["FOG_RC"] || File.expand_path(".fog", __dir__)
 ENV["FOG_CREDENTIAL"] = ENV["FOG_CREDENTIAL"] || "default"
 
-Excon.defaults.merge!(:debug_request => true, :debug_response => true)
+Excon.defaults.merge!(debug_request: true, debug_response: true)
 
-LOREM = <<HERE
+LOREM = <<HERE.freeze
 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
 incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
 nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

data/lib/fog/test_helpers/minitest/assertions.rb

@@ -1,6 +1,6 @@
 require "fog/schema/data_validator"
 
-module MiniTest::Assertions
+module Minitest::Assertions
   # Compares a hash's structure against a reference schema hash and returns true
   # when they match. Fog::Schema::Datavalidator is used for the validation.
   def assert_match_schema(actual, schema, message = nil, options = {})

data/lib/fog/test_helpers/minitest/expectations.rb

@@ -1,3 +1,3 @@
-module MiniTest::Expectations
+module Minitest::Expectations
   infect_an_assertion :assert_match_schema, :must_match_schema, :reverse
 end