fixing more warnings

bin/fog

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog'))
 require 'irb'
 require 'yaml'
 require File.join('fog', 'core', 'credentials')

lib/fog/aws/compute.rb

@@ -74,8 +74,8 @@ module Fog
         def self.data
           @data ||= Hash.new do |hash, region|
             owner_id = Fog::AWS::Mock.owner_id
-            hash[region] = Hash.new do |hash, key|
+            hash[region] = Hash.new do |region_hash, key|
-              hash[key] = {
+              region_hash[key] = {
                 :deleted_at => {},
                 :addresses  => {},
                 :instances  => {},

lib/fog/aws/models/compute/servers.rb

@@ -48,13 +48,13 @@ module Fog
 
           # make sure port 22 is open in the first security group
           security_group = connection.security_groups.get(server.groups.first)
-          ip_permission = security_group.ip_permissions.detect do |ip_permission|
+          authorized = security_group.ip_permissions.detect do |ip_permission|
             ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
             ip_permission['fromPort'] == 22 &&
             ip_permission['ipProtocol'] == 'tcp' &&
             ip_permission['toPort'] == 22
           end
-          unless ip_permission
+          unless authorized
             security_group.authorize_port_range(22..22)
           end
 

lib/fog/aws/parsers/compute/describe_images.rb

@@ -30,7 +30,7 @@ module Fog
               @image[name] = @value
             when 'blockDeviceMapping'
               @in_block_device_mapping = false
-            when 'deviceName', 'virtualName', 'snapshotId', 'volumeSize', 'deleteOnTermination'
+            when 'deviceName', 'virtualName', 'snapshotId', 'deleteOnTermination'
               @block_device_mapping[name] = @value
             when 'isPublic'
               if @value == 'true'

lib/fog/aws/parsers/storage/get_bucket.rb

@@ -33,7 +33,7 @@ module Fog
               @response['MaxKeys'] = @value.to_i
             when 'Size'
               @object['Size'] = @value.to_i
-            when 'Delimeter', 'Key', 'Name', 'StorageClass'
+            when 'Delimeter', 'Key', 'StorageClass'
               @object[name] = @value
             end
           end

lib/fog/aws/parsers/storage/get_bucket_object_versions.rb

@@ -65,17 +65,17 @@ module Fog
               elsif @in_version
                 @version
               end['LastModified'] = Time.parse(@value)
-            when 'KeyMarker', 'Name', 'Prefix', 'VersionIdMarker'
-              @response[name] = @value
             when 'MaxKeys'
               @response['MaxKeys'] = @value.to_i
             when 'Size'
               @version['Size'] = @value.to_i
-            when 'Key', 'Name', 'StorageClass', 'VersionId'
+            when 'Key', 'KeyMarker', 'Name', 'Prefix', 'StorageClass', 'VersionId', 'VersionIdMarker'
               if @in_delete_marker
                 @delete_marker
               elsif @in_version
                 @version
+              else
+                @response
               end[name] = @value
             end
           end

lib/fog/aws/requests/compute/describe_key_pairs.rb

@@ -53,8 +53,8 @@ module Fog
           response.status = 200
           response.body = {
             'requestId' => Fog::AWS::Mock.request_id,
-            'keySet'    => key_set.map do |key|
+            'keySet'    => key_set.map do |key_pair|
-              key.reject {|key,value| !['keyFingerprint', 'keyName'].include?(key)}
+              key_pair.reject {|key,value| !['keyFingerprint', 'keyName'].include?(key)}
             end
           }
           response

lib/fog/aws/storage.rb

@@ -75,8 +75,8 @@ module Fog
 
         def self.data
           @data ||= Hash.new do |hash, region|
-            hash[region] = Hash.new do |hash, key|
+            hash[region] = Hash.new do |region_hash, key|
-              hash[key] = {
+              region_hash[key] = {
                 :buckets => {}
               }
             end

lib/fog/go_grid/models/compute/server.rb

@@ -6,51 +6,51 @@ module Fog
 
       class BlockInstantiationError < StandardError; end
 
-        class Server < Fog::Model
+      class Server < Fog::Model
 
-          identity :id
+        identity :id
 
-          attribute :name
+        attribute :name
-          attribute :image_id        # id or name
+        attribute :image_id        # id or name
-          attribute :ip
+        attribute :ip
-          attribute :memory       # server.ram
+        attribute :memory       # server.ram
-          attribute :state
+        attribute :state
-          attribute :description  # Optional
+        attribute :description  # Optional
-          attribute :sandbox      # Optional. Default: False
+        attribute :sandbox      # Optional. Default: False
 
-          def initialize(attributes={})
+        def initialize(attributes={})
-            super
+          super
-          end
+        end
 
-          def destroy
+        def destroy
-            requires :id
+          requires :id
-            connection.grid_server_destroy(@id)
+          connection.grid_server_destroy(@id)
-            true
+          true
-          end
+        end
 
-          def image
+        def image
-            requires :image_id
+          requires :image_id
-            connection.grid_image_get(@image_id)
+          connection.grid_image_get(@image_id)
-          end
+        end
 
-          def ready?
+        def ready?
-            @state == 'On'
+          @state == 'On'
-          end
+        end
-
-          def save
-            raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-            requires :name, :image_id, :ip, :memory
-            options['isSandbox'] = sandbox if sandbox
-            options['server.ram'] = memory
-            options['image'] = image_id
-            data = connection.grid_server_add(name, image, ip, options)
-            merge_attributes(data.body)
-            true
-          end
 
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          requires :name, :image_id, :ip, :memory
+          options['isSandbox'] = sandbox if sandbox
+          options['server.ram'] = memory
+          options['image'] = image_id
+          data = connection.grid_server_add(name, image, ip, options)
+          merge_attributes(data.body)
+          true
         end
 
       end
 
+    end
+
   end
 end

lib/fog/google/parsers/storage/get_bucket.rb

@@ -33,7 +33,7 @@ module Fog
               @response['MaxKeys'] = @value.to_i
             when 'Size'
               @object['Size'] = @value.to_i
-            when 'Delimeter', 'Key', 'Name', 'StorageClass'
+            when 'Delimeter', 'Key', 'StorageClass'
               @object[name] = @value
             end
           end

lib/fog/local/models/storage/files.rb

@@ -45,10 +45,7 @@ module Fog
               file.close
               new(data)
             else
-              body = nil
+              body = ::File.read(path)
-              ::File.open(path) do |file|
-                body = file.read
-              end
               new(data.merge!(:body => body))
             end
           else

lib/fog/rackspace/requests/compute/delete_image.rb

@@ -22,7 +22,7 @@ module Fog
 
         def delete_image(image_id)
           response = Excon::Response.new
-          if image = list_images_detail.body['images'].detect {|image| image['id'] == image_id}
+          if image = list_images_detail.body['images'].detect {|_| _['id'] == image_id}
             if image['status'] == 'SAVING'
               response.status = 409
               raise(Excon::Errors.status_error({:expects => 202}, response))

lib/fog/rackspace/requests/compute/delete_server.rb

@@ -22,7 +22,7 @@ module Fog
 
         def delete_server(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             if server['status'] == 'BUILD'
               response.status = 409
               raise(Excon::Errors.status_error({:expects => 202}, response))

lib/fog/rackspace/requests/compute/get_server_details.rb

@@ -37,7 +37,7 @@ module Fog
 
         def get_server_details(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             response.status = [200, 203][rand(1)]
             response.body = { 'server' => server }
             response

lib/fog/rackspace/requests/compute/list_addresses.rb

@@ -28,7 +28,7 @@ module Fog
 
         def list_addresses(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             response.status = [200, 203][rand(1)]
             response.body = { 'addresses' => server['addresses'] }
             response

lib/fog/rackspace/requests/compute/list_private_addresses.rb

@@ -26,7 +26,7 @@ module Fog
 
         def list_private_addresses(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             response.status = [200, 203][rand(1)]
             response.body = { 'private' => server['addresses']['private'] }
             response

lib/fog/rackspace/requests/compute/list_public_addresses.rb

@@ -26,7 +26,7 @@ module Fog
 
         def list_public_addresses(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             response.status = [200, 203][rand(1)]
             response.body = { 'public' => server['addresses']['public'] }
             response

lib/fog/rackspace/requests/compute/update_server.rb

@@ -25,7 +25,7 @@ module Fog
 
         def update_server(server_id, options)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             if options['adminPass']
               server['adminPass'] = options['adminPass']
             end

lib/fog/terremark/ecloud.rb

@@ -1,39 +1,40 @@
 module Fog
   module Terremark
-   module Ecloud
+    module Ecloud
 
-     module Bin
+      module Bin
-     end
+      end
 
-     module Defaults
+      module Defaults
-       HOST   = 'services.enterprisecloud.terremark.com'
+        HOST   = 'services.enterprisecloud.terremark.com'
-       PATH   = '/api/v0.8a-ext2.0'
+        PATH   = '/api/v0.8a-ext2.0'
-       PORT   = 443
+        PORT   = 443
-       SCHEME = 'https'
+        SCHEME = 'https'
-     end
+      end
 
-     extend Fog::Terremark::Shared
+      extend Fog::Terremark::Shared
 
-     def self.new(options={})
+      def self.new(options={})
 
-       unless @required
+        unless @required
-         shared_requires
+          shared_requires
-         @required = true
+          @required = true
-       end
+        end
 
-       check_shared_options(options)
+        check_shared_options(options)
 
-       if Fog.mocking?
+        if Fog.mocking?
           Fog::Terremark::Ecloud::Mock.new(options)
-       else
+        else
           Fog::Terremark::Ecloud::Real.new(options)
-       end
+        end
-     end
 
-     class Real
+      end
 
-       include Fog::Terremark::Shared::Real
+      class Real
-       include Fog::Terremark::Shared::Parser
+
+        include Fog::Terremark::Shared::Real
+        include Fog::Terremark::Shared::Parser
 
         def initialize(options={})
           @terremark_password = options[:terremark_ecloud_password]
@@ -45,22 +46,22 @@ module Fog
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
         end
 
+      end
+
+      class Mock
+        include Fog::Terremark::Shared::Mock
+        include Fog::Terremark::Shared::Parser
+
+        def initialize(option = {})
+          super
+          @base_url = Fog::Terremark::Ecloud::Defaults::SCHEME + "://" +
+          Fog::Terremark::Ecloud::Defaults::HOST +
+          Fog::Terremark::Ecloud::Defaults::PATH
+          @data = self.class.data[:terremark_ecloud_username]
+        end
+      end
+
     end
-
-     class Mock
-       include Fog::Terremark::Shared::Mock
-       include Fog::Terremark::Shared::Parser
-
-       def initialize(option = {})
-         super
-         @base_url = Fog::Terremark::Ecloud::Defaults::SCHEME + "://" +
-                     Fog::Terremark::Ecloud::Defaults::HOST +
-                     Fog::Terremark::Ecloud::Defaults::PATH
-         @data = self.class.data[:terremark_ecloud_username]
-       end
-     end
-
-   end
   end
 end