From 6c929091bcc71218ffdf781d4bb36836ef852a73 Mon Sep 17 00:00:00 2001
From: Athir Nuaimi <anuaimi@devfoundry.com>
Date: Wed, 13 Oct 2010 16:42:11 +0800
Subject: [PATCH] cleaned up some warnings & fixed problem building gem because
 of missing files

---
 fog.gemspec                        |  5 -----
 lib/fog/core/ssh.rb                | 14 +++++++-------
 lib/fog/local/storage.rb           |  2 +-
 lib/fog/terremark/ecloud.rb        |  8 ++++----
 lib/fog/terremark/vcloud.rb        |  8 ++++----
 lib/fog/vcloud/terremark/ecloud.rb |  4 ++--
 6 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/fog.gemspec b/fog.gemspec
index c1ec6ed87..cad61048d 100644
--- a/fog.gemspec
+++ b/fog.gemspec
@@ -563,16 +563,11 @@ Gem::Specification.new do |s|
     spec/aws/requests/simpledb/put_attributes_spec.rb
     spec/aws/requests/simpledb/select_spec.rb
     spec/aws/requests/storage/copy_object_spec.rb
-    spec/aws/requests/storage/delete_bucket_spec.rb
-    spec/aws/requests/storage/delete_object_spec.rb
     spec/aws/requests/storage/get_bucket_location_spec.rb
     spec/aws/requests/storage/get_bucket_spec.rb
     spec/aws/requests/storage/get_object_spec.rb
     spec/aws/requests/storage/get_request_payment_spec.rb
-    spec/aws/requests/storage/get_service_spec.rb
     spec/aws/requests/storage/head_object_spec.rb
-    spec/aws/requests/storage/put_bucket_spec.rb
-    spec/aws/requests/storage/put_object_spec.rb
     spec/aws/requests/storage/put_request_payment_spec.rb
     spec/bluebox/models/compute/flavors_spec.rb
     spec/bluebox/models/compute/server_spec.rb
diff --git a/lib/fog/core/ssh.rb b/lib/fog/core/ssh.rb
index 962cb7db2..6f2cd3c37 100644
--- a/lib/fog/core/ssh.rb
+++ b/lib/fog/core/ssh.rb
@@ -54,27 +54,27 @@ module Fog
               sudoable_command  = command.sub(/^sudo/, %{sudo -p 'fog sudo password:'})
               escaped_command   = sudoable_command.sub(/'/, %{'"'"'})
               result = Result.new(escaped_command)
-              ssh.open_channel do |channel|
-                channel.request_pty
-                channel.exec(%{bash -lc '#{escaped_command}'}) do |channel, success|
+              ssh.open_channel do |ssh_channel|
+                ssh_channel.request_pty
+                ssh_channel.exec(%{bash -lc '#{escaped_command}'}) do |channel, success|
                   unless success
                     raise "Could not execute command: #{command.inspect}"
                   end
 
-                  channel.on_data do |channel, data|
+                  channel.on_data do |ch, data|
                     result.stdout << data
                   end
 
-                  channel.on_extended_data do |channel, type, data|
+                  channel.on_extended_data do |ch, type, data|
                     next unless type == 1
                     result.stderr << data
                   end
 
-                  channel.on_request('exit-status') do |channel, data|
+                  channel.on_request('exit-status') do |ch, data|
                     result.status = data.read_long
                   end
 
-                  channel.on_request('exit-signal') do |channel, data|
+                  channel.on_request('exit-signal') do |ch, data|
                     result.status = 255
                   end
                 end
diff --git a/lib/fog/local/storage.rb b/lib/fog/local/storage.rb
index be75633ed..c7af3f5fa 100644
--- a/lib/fog/local/storage.rb
+++ b/lib/fog/local/storage.rb
@@ -1,6 +1,6 @@
 module Fog
   module Local
-  class Storage < Fog::Service
+    class Storage < Fog::Service
 
       requires :local_root
 
diff --git a/lib/fog/terremark/ecloud.rb b/lib/fog/terremark/ecloud.rb
index bcbb6c589..c0e6a8056 100644
--- a/lib/fog/terremark/ecloud.rb
+++ b/lib/fog/terremark/ecloud.rb
@@ -25,9 +25,9 @@ module Fog
 
        if Fog.mocking?
           Fog::Terremark::Ecloud::Mock.new(options)
-        else
+       else
           Fog::Terremark::Ecloud::Real.new(options)
-        end
+       end
      end
 
      class Real
@@ -45,7 +45,7 @@ module Fog
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
         end
 
-      end
+    end
 
      class Mock
        include Fog::Terremark::Shared::Mock
@@ -60,7 +60,7 @@ module Fog
        end
      end
 
-    end
+   end
   end
 end
 
diff --git a/lib/fog/terremark/vcloud.rb b/lib/fog/terremark/vcloud.rb
index 9c5069766..efa5b1439 100644
--- a/lib/fog/terremark/vcloud.rb
+++ b/lib/fog/terremark/vcloud.rb
@@ -25,9 +25,9 @@ module Fog
 
        if Fog.mocking?
           Fog::Terremark::Vcloud::Mock.new(options)
-        else
+       else
           Fog::Terremark::Vcloud::Real.new(options)
-        end
+       end
      end
 
      class Real
@@ -91,7 +91,7 @@ module Fog
             nil
           end
         end
-      end
+     end
 
      class Mock
        include Fog::Terremark::Shared::Mock
@@ -106,7 +106,7 @@ module Fog
        end
      end
 
-    end
+   end
   end
 end
 
diff --git a/lib/fog/vcloud/terremark/ecloud.rb b/lib/fog/vcloud/terremark/ecloud.rb
index bbb239fe6..6df305a88 100644
--- a/lib/fog/vcloud/terremark/ecloud.rb
+++ b/lib/fog/vcloud/terremark/ecloud.rb
@@ -179,8 +179,8 @@ module Fog
 
           def mock_ip_and_service_from_service_url(uri)
             if ip = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.map { |vdc| vdc[:public_ips] }.flatten.compact.detect { |pip| pip[:services].detect { |service| service[:href] == uri } }
-              if service = ip[:services].detect { |service| service[:href] == uri }
-                [ip, service]
+              if desired_service = ip[:services].detect { |service| service[:href] == uri }
+                [ip, desired_service]
               else
                 [ip, nil]
               end