fog-core 1.24.0 → 1.25.0

data/lib/fog/core/model.rb

@@ -2,7 +2,6 @@ require "fog/core/deprecated_connection_accessors"
 
 module Fog
   class Model
-
     extend Fog::Attributes::ClassMethods
     include Fog::Attributes::InstanceMethods
     include Fog::Core::DeprecatedConnectionAccessors
@@ -11,7 +10,7 @@ module Fog
     attr_reader :service
 
     def initialize(new_attributes = {})
-      # TODO Remove compatibility with old connection option
+      # TODO: Remove compatibility with old connection option
       attribs = new_attributes.clone
       @service = attribs.delete(:service)
       if @service.nil? && attribs[:connection]
@@ -27,7 +26,7 @@ module Fog
       Thread.current[:formatador].indent do
         unless self.class.attributes.empty?
           data << "\n#{Thread.current[:formatador].indentation}"
-          data << self.class.attributes.map {|attribute| "#{attribute}=#{send(attribute).inspect}"}.join(",\n#{Thread.current[:formatador].indentation}")
+          data << self.class.attributes.map { |attribute| "#{attribute}=#{send(attribute).inspect}" }.join(",\n#{Thread.current[:formatador].indentation}")
         end
       end
       data << "\n#{Thread.current[:formatador].indentation}>"
@@ -37,30 +36,32 @@ module Fog
     def reload
       requires :identity
 
-      return unless data = begin
+      data = begin
         collection.get(identity)
       rescue Excon::Errors::SocketError
         nil
       end
 
+      return unless data
+
       new_attributes = data.attributes
       merge_attributes(new_attributes)
       self
     end
 
-    def to_json(options = {})
+    def to_json(_options = {})
       Fog::JSON.encode(attributes)
     end
 
     def symbolize_keys(hash)
       return nil if hash.nil?
-      hash.inject({}) do |options, (key, value)|
+      hash.reduce({}) do |options, (key, value)|
         options[(key.to_sym rescue key) || key] = value
         options
       end
     end
 
-    def wait_for(timeout=Fog.timeout, interval=1, &block)
+    def wait_for(timeout = Fog.timeout, interval = 1, &block)
       reload_has_succeeded = false
       duration = Fog.wait_for(timeout, interval) do # Note that duration = false if it times out
         if reload
@@ -73,20 +74,8 @@ module Fog
       if reload_has_succeeded
         return duration # false if timeout; otherwise {:duration => elapsed time }
       else
-        raise Fog::Errors::Error.new("Reload failed, #{self.class} #{self.identity} not present.")
-      end
-    end
-
-    def method_missing(method_name, *args)
-      if self.class.aliases.include?(method_name)
-        send(self.class.aliases[method_name])
-      else
-        super
+        raise Fog::Errors::Error, "Reload failed, #{self.class} #{identity} not present."
       end
     end
-
-    def respond_to?(method_name, include_private = false)
-      super || self.class.aliases.include?(method_name)
-    end
   end
 end

data/lib/fog/core/provider.rb

@@ -1,17 +1,15 @@
 module Fog
+  class << self
+    attr_writer :providers
+  end
 
   def self.providers
     @providers ||= {}
   end
 
-  def self.providers=(new_providers)
-    @providers = new_providers
-  end
-
   module Provider
-
     def self.extended(base)
-      provider = base.to_s.split('::').last
+      provider = base.to_s.split("::").last
       Fog.providers[provider.downcase.to_sym] = provider
     end
 
@@ -21,14 +19,13 @@ module Fog
 
     def service(new_service, constant_string)
       Fog.services[new_service] ||= []
-      Fog.services[new_service] |= [self.to_s.split('::').last.downcase.to_sym]
+      Fog.services[new_service] |= [to_s.split("::").last.downcase.to_sym]
       @services_registry ||= {}
-      @services_registry[new_service] = [self.to_s, constant_string].join('::')
+      @services_registry[new_service] = [to_s, constant_string].join("::")
     end
 
     def services
       @services_registry.keys
     end
-
   end
 end

data/lib/fog/core/scp.rb

@@ -1,6 +1,5 @@
 module Fog
   module SCP
-
     def self.new(address, username, options = {})
       if Fog.mocking?
         Fog::SCP::Mock.new(address, username, options)
@@ -10,7 +9,6 @@ module Fog
     end
 
     class Mock
-
       def self.data
         @data ||= Hash.new do |hash, key|
           hash[key] = []
@@ -38,25 +36,23 @@ module Fog
                                        :local_path       => local_path,
                                        :download_options => download_options }
       end
-
     end
 
     class Real
-
       def initialize(address, username, options)
-        require 'net/scp'
+        require "net/scp"
 
         key_manager = Net::SSH::Authentication::KeyManager.new(nil, options)
 
         unless options[:key_data] || options[:keys] || options[:password] || key_manager.agent
-          raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH')
+          raise ArgumentError, ":key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH"
         end
 
         options[:timeout] = 30
         if options[:key_data] || options[:keys]
           options[:keys_only] = true
-          #Explicitly set these so net-ssh doesn't add the default keys
-          #as seen at https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/authentication/session.rb#L131-146
+          # Explicitly set these so net-ssh doesn't add the default keys
+          # as seen at https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/authentication/session.rb#L131-146
           options[:keys] = [] unless options[:keys]
           options[:key_data] = [] unless options[:key_data]
         end
@@ -67,30 +63,24 @@ module Fog
       end
 
       def upload(local_path, remote_path, upload_options = {}, &block)
-        begin
-          Net::SCP.start(@address, @username, @options) do |scp|
-            scp.upload!(local_path, remote_path, upload_options) do |ch, name, sent, total|
-              block.call(ch, name, sent, total) if block
-            end
+        Net::SCP.start(@address, @username, @options) do |scp|
+          scp.upload!(local_path, remote_path, upload_options) do |ch, name, sent, total|
+            block.call(ch, name, sent, total) if block
           end
-        rescue Exception => error
-          raise error
         end
+      rescue Exception => error
+        raise error
       end
 
       def download(remote_path, local_path, download_options = {}, &block)
-        begin
-          Net::SCP.start(@address, @username, @options) do |scp|
-            scp.download!(remote_path, local_path, download_options) do |ch, name, sent, total|
-              block.call(ch, name, sent, total) if block
-            end
+        Net::SCP.start(@address, @username, @options) do |scp|
+          scp.download!(remote_path, local_path, download_options) do |ch, name, sent, total|
+            block.call(ch, name, sent, total) if block
           end
-        rescue Exception => error
-          raise error
         end
+      rescue Exception => error
+        raise error
       end
-
     end
-
   end
 end

data/lib/fog/core/service.rb

@@ -11,7 +11,7 @@ module Fog
 
     module NoLeakInspector
       def inspect
-        "#<#{self.class}:#{self.object_id} #{(self.instance_variables - service.secrets).map {|iv| [iv, self.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
 
@@ -117,14 +117,12 @@ module Fog
       end
 
       # @deprecated
-      def fetch_credentials(options)
+      def fetch_credentials(_options)
         # attempt to load credentials from config file
-        begin
-          Fog.credentials.reject { |key, value| !(recognized | requirements).include?(key) }
-        rescue LoadError
-          # if there are no configured credentials, do nothing
-          {}
-        end
+        Fog.credentials.reject { |key, _value| !(recognized | requirements).include?(key) }
+      rescue LoadError
+        # if there are no configured credentials, do nothing
+        {}
       end
 
       def setup_requirements
@@ -133,12 +131,13 @@ module Fog
         end
 
         @required ||= false
-        unless @required
-          require_models
-          require_collections_and_define
-          require_requests_and_mock
-          @required = true
-        end
+
+        return false if @required
+
+        require_models
+        require_collections_and_define
+        require_requests_and_mock
+        @required = true
       end
 
       # @note This path is used to require model and collection files
@@ -163,13 +162,13 @@ module Fog
             options[key] = value.to_i
           else
             options[key] = case value_string
-            when 'false'
-              false
-            when 'true'
-              true
-            else
-              value
-            end
+                           when "false"
+                             false
+                           when "true"
+                             true
+                           else
+                             value
+                           end
           end
         end
       end
@@ -202,7 +201,7 @@ module Fog
         if args.empty?
           @secrets ||= []
         else
-          args.inject(secrets) do |secrets, secret|
+          args.reduce(secrets) do |secrets, secret|
             secrets << "@#{secret}".to_sym
           end
         end
@@ -226,21 +225,19 @@ module Fog
 
       def validate_options(options)
         keys = []
-        for key, value in options
-          unless value.nil?
-            keys << key
-          end
+        options.each_pair do |key, value|
+          keys << key unless value.nil?
         end
         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
@@ -262,7 +259,7 @@ module Fog
         coerce_options(prepared_settings)
       end
 
-      # This will attempt to require all model files declared by the service using fog's DSL
+      # This will attempt to require all model files declared by the service using fog"s DSL
       def require_models
         models.each do |model|
           require File.join(@model_path, model.to_s)
@@ -287,10 +284,10 @@ module Fog
       # @param [String,Symbol] collection The name of the collection broken with underscores
       # @return [String] in camel case
       def camel_case_collection_name(collection)
-        collection.to_s.split('_').map(&:capitalize).join
+        collection.to_s.split("_").map(&:capitalize).join
       end
 
-      # This will attempt to require all request files declared in the service using fog's DSL
+      # This will attempt to require all request files declared in the service using fog"s DSL
       def require_requests_and_mock
         requests.each do |request|
           require File.join(@request_path, request.to_s)

data/lib/fog/core/ssh.rb

@@ -1,8 +1,7 @@
-require 'delegate'
+require "delegate"
 
 module Fog
   module SSH
-
     def self.new(address, username, options = {})
       if Fog.mocking?
         Fog::SSH::Mock.new(address, username, options)
@@ -12,7 +11,6 @@ module Fog
     end
 
     class Mock
-
       def self.data
         @data ||= Hash.new do |hash, key|
           hash[key] = []
@@ -20,7 +18,7 @@ module Fog
       end
 
       def self.reset
-        @data= nil
+        @data = nil
       end
 
       def initialize(address, username, options)
@@ -29,28 +27,26 @@ module Fog
         @options  = options
       end
 
-      def run(commands, &blk)
-        self.class.data[@address] << {:commands => commands, :username => @username, :options => @options}
+      def run(commands, &_blk)
+        self.class.data[@address] << { :commands => commands, :username => @username, :options => @options }
       end
-
     end
 
     class Real
-
       def initialize(address, username, options)
-        require 'net/ssh'
+        require "net/ssh"
 
         key_manager = Net::SSH::Authentication::KeyManager.new(nil, options)
 
         unless options[:key_data] || options[:keys] || options[:password] || key_manager.agent
-          raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH')
+          raise ArgumentError, ":key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH"
         end
 
         options[:timeout] ||= 30
         if options[:key_data] || options[:keys]
           options[:keys_only] = true
-          #Explicitly set these so net-ssh doesn't add the default keys
-          #as seen at https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/authentication/session.rb#L131-146
+          # Explicitly set these so net-ssh doesn"t add the default keys
+          # as seen at https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/authentication/session.rb#L131-146
           options[:keys] = [] unless options[:keys]
           options[:key_data] = [] unless options[:key_data]
         end
@@ -74,22 +70,22 @@ module Fog
                     raise "Could not execute command: #{command.inspect}"
                   end
 
-                  channel.on_data do |ch, data|
+                  channel.on_data do |_ch, data|
                     result.stdout << data
-                    yield [data, ''] if blk
+                    yield [data, ""] if blk
                   end
 
-                  channel.on_extended_data do |ch, type, data|
+                  channel.on_extended_data do |_ch, type, data|
                     next unless type == 1
                     result.stderr << data
-                    yield ['', data] if blk
+                    yield ["", data] if blk
                   end
 
-                  channel.on_request('exit-status') do |ch, data|
+                  channel.on_request("exit-status") do |_ch, data|
                     result.status = data.read_long
                   end
 
-                  channel.on_request('exit-signal') do |ch, data|
+                  channel.on_request("exit-signal") do |_ch, _data|
                     result.status = 255
                   end
                 end
@@ -105,11 +101,9 @@ module Fog
         end
         results
       end
-
     end
 
     class Result
-
       attr_accessor :command, :stderr, :stdout, :status
 
       def display_stdout
@@ -127,11 +121,9 @@ module Fog
 
       def initialize(command)
         @command = command
-        @stderr = ''
-        @stdout = ''
+        @stderr = ""
+        @stdout = ""
       end
-
     end
-
   end
 end

data/lib/fog/core/stringify_keys.rb

@@ -1,27 +1,25 @@
 module Fog
   module StringifyKeys
-
     # Returns a new hash with all keys converted to strings.
     def self.stringify(hash)
-      self.transform_hash(hash) {|hash, key, value|
+      transform_hash(hash) do |hash, key, value|
         hash[key.to_s] = value
-      }
+      end
     end
 
     private
 
     # http://devblog.avdi.org/2009/11/20/hash-transforms-in-ruby/
-    def self.transform_hash(original, options={}, &block)
-      original.inject({}){|result, (key,value)|
-        value = if (options[:deep] && Hash === value)
+    def self.transform_hash(original, options = {}, &block)
+      original.reduce({}) do |result, (key, value)|
+        value = if options[:deep] && Hash === value
                   transform_hash(value, options, &block)
                 else
                   value
                 end
-        block.call(result,key,value)
+        block.call(result, key, value)
         result
-      }
+      end
     end
-
   end
 end