From 9baffcbd711b7eef572fa26142163e3f9c620104 Mon Sep 17 00:00:00 2001
From: Wesley Beary <wbeary@engineyard.com>
Date: Thu, 15 Oct 2009 13:45:14 -0700
Subject: [PATCH] don't require credentials for aws/rackspace to run cli

---
 bin/fog     | 88 ++++++++++++++++++++++++++++-------------------------
 fog.gemspec | 34 ++++++++++++++++++++-
 2 files changed, 79 insertions(+), 43 deletions(-)

diff --git a/bin/fog b/bin/fog
index 8f4c389bf..22e34fe7e 100755
--- a/bin/fog
+++ b/bin/fog
@@ -15,60 +15,64 @@ end
 
 module AWS
   class << self
+    if credentials[:aws_access_key_id] && credentials[:aws_secret_access_key]
 
-    @@ec2 = Fog::AWS::EC2.new(
-      :aws_access_key_id => credentials[:aws_access_key_id],
-      :aws_secret_access_key => credentials[:aws_secret_access_key]
-    )
+      @@ec2 = Fog::AWS::EC2.new(
+        :aws_access_key_id => credentials[:aws_access_key_id],
+        :aws_secret_access_key => credentials[:aws_secret_access_key]
+      )
 
-    @@s3 = Fog::AWS::S3.new(
-      :aws_access_key_id => credentials[:aws_access_key_id],
-      :aws_secret_access_key => credentials[:aws_secret_access_key]
-    )
+      @@s3 = Fog::AWS::S3.new(
+        :aws_access_key_id => credentials[:aws_access_key_id],
+        :aws_secret_access_key => credentials[:aws_secret_access_key]
+      )
+
+      def addresses
+        @@ec2.addresses
+      end
+
+      def buckets
+        @@s3.buckets
+      end
+
+      def instances
+        @@ec2.instances
+      end
+
+      def key_pairs
+        @@ec2.key_pairs
+      end
+
+      def security_groups
+        @@ec2.security_groups
+      end
+
+      def snapshots
+        @@ec2.snapshots
+      end
+
+      def volumes
+        @@ec2.volumes
+      end
 
-    def addresses
-      @@ec2.addresses
     end
-
-    def buckets
-      @@s3.buckets
-    end
-
-    def instances
-      @@ec2.instances
-    end
-
-    def key_pairs
-      @@ec2.key_pairs
-    end
-
-    def security_groups
-      @@ec2.security_groups
-    end
-
-    def snapshots
-      @@ec2.snapshots
-    end
-
-    def volumes
-      @@ec2.volumes
-    end
-
   end
 end
 
 module Rackspace
   class << self
+    if credentials[:rackspace_api_key] && credentials[:rackspace_username]
 
-    @@servers = Fog::Rackspace::Servers.new(
-      :rackspace_api_key => credentials[:rackspace_api_key],
-      :rackspace_username => credentials[:rackspace_username]
-    )
+      @@servers = Fog::Rackspace::Servers.new(
+        :rackspace_api_key => credentials[:rackspace_api_key],
+        :rackspace_username => credentials[:rackspace_username]
+      )
 
-    def servers
-      @@servers.servers
+      def servers
+        @@servers.servers
+      end
+      
     end
-
   end
 end
 
diff --git a/fog.gemspec b/fog.gemspec
index 43352543a..f5f70a111 100644
--- a/fog.gemspec
+++ b/fog.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-10-09}
+  s.date = %q{2009-10-15}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -136,6 +136,20 @@ Gem::Specification.new do |s|
      "lib/fog/errors.rb",
      "lib/fog/model.rb",
      "lib/fog/parser.rb",
+     "lib/fog/rackspace.rb",
+     "lib/fog/rackspace/files.rb",
+     "lib/fog/rackspace/models/servers/server.rb",
+     "lib/fog/rackspace/models/servers/servers.rb",
+     "lib/fog/rackspace/requests/files/get_containers.rb",
+     "lib/fog/rackspace/requests/files/head_containers.rb",
+     "lib/fog/rackspace/requests/servers/create_server.rb",
+     "lib/fog/rackspace/requests/servers/delete_server.rb",
+     "lib/fog/rackspace/requests/servers/get_flavors.rb",
+     "lib/fog/rackspace/requests/servers/get_images.rb",
+     "lib/fog/rackspace/requests/servers/get_server_details.rb",
+     "lib/fog/rackspace/requests/servers/get_servers.rb",
+     "lib/fog/rackspace/requests/servers/get_servers_details.rb",
+     "lib/fog/rackspace/servers.rb",
      "lib/fog/response.rb",
      "spec/aws/models/ec2/address_spec.rb",
      "spec/aws/models/ec2/addresses_spec.rb",
@@ -205,6 +219,15 @@ Gem::Specification.new do |s|
      "spec/aws/requests/simpledb/put_attributes_spec.rb",
      "spec/aws/requests/simpledb/select_spec.rb",
      "spec/lorem.txt",
+     "spec/rackspace/requests/files/get_containers_spec.rb",
+     "spec/rackspace/requests/files/head_containers_spec.rb",
+     "spec/rackspace/requests/servers/create_server_spec.rb",
+     "spec/rackspace/requests/servers/delete_server_spec.rb",
+     "spec/rackspace/requests/servers/get_flavors_spec.rb",
+     "spec/rackspace/requests/servers/get_images_spec.rb",
+     "spec/rackspace/requests/servers/get_server_details_spec.rb",
+     "spec/rackspace/requests/servers/get_servers_details_spec.rb",
+     "spec/rackspace/requests/servers/get_servers_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -282,6 +305,15 @@ Gem::Specification.new do |s|
      "spec/aws/requests/simpledb/list_domains_spec.rb",
      "spec/aws/requests/simpledb/put_attributes_spec.rb",
      "spec/aws/requests/simpledb/select_spec.rb",
+     "spec/rackspace/requests/files/get_containers_spec.rb",
+     "spec/rackspace/requests/files/head_containers_spec.rb",
+     "spec/rackspace/requests/servers/create_server_spec.rb",
+     "spec/rackspace/requests/servers/delete_server_spec.rb",
+     "spec/rackspace/requests/servers/get_flavors_spec.rb",
+     "spec/rackspace/requests/servers/get_images_spec.rb",
+     "spec/rackspace/requests/servers/get_server_details_spec.rb",
+     "spec/rackspace/requests/servers/get_servers_details_spec.rb",
+     "spec/rackspace/requests/servers/get_servers_spec.rb",
      "spec/spec_helper.rb"
   ]