From cc1e573bdb8d76f47a709cac8776e57ce19badb9 Mon Sep 17 00:00:00 2001
From: Wesley Beary <wbeary@engineyard.com>
Date: Sun, 22 Nov 2009 15:58:42 -0800
Subject: [PATCH] new format for rakefile (preparing to support having multiple
 configured accounts)

---
 Rakefile   | 18 ++++++++++++------
 lib/fog.rb |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Rakefile b/Rakefile
index 960e2eeb7..805ff8feb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -102,12 +102,18 @@ namespace :fog do
   desc 'Provide a sample yaml file for credentials'
   task :yml do
     puts('Copy the following sample to ~/.fog and fill in with your credentials as needed:')
-    print("\n")
-    print(":aws_access_key_id: INTENTIONALLY_LEFT_BLANK\n")
-    print(":aws_secret_access_key: INTENTIONALLY_LEFT_BLANK\n")
-    print(":rackspace_api_key: INTENTIONALLY_LEFT_BLANK\n")
-    print(":rackspace_username: INTENTIONALLY_LEFT_BLANK\n")
-    print("\n")
+yml = <<YML
+
+:default:
+  :aws:
+    :aws_access_key_id: INTENTIONALLY_LEFT_BLANK
+    :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace:
+    :rackspace_api_key: INTENTIONALLY_LEFT_BLANK
+    :rackspace_username: INTENTIONALLY_LEFT_BLANK
+
+YML
+    print(yml)
   end
 
 end
\ No newline at end of file
diff --git a/lib/fog.rb b/lib/fog.rb
index 8d17268fe..e82fa1ac1 100644
--- a/lib/fog.rb
+++ b/lib/fog.rb
@@ -41,7 +41,7 @@ module Fog
     @credentials ||= begin
       credentials = {}
       File.open(path) do |file|
-        credentials = YAML.load(file.read)
+        credentials = YAML.load(file.read)[:default]
       end
       credentials
     end