From 2fddeb01105393d950c17aa68ecb2ec80a668ba9 Mon Sep 17 00:00:00 2001
From: Wesley Beary <wbeary@engineyard.com>
Date: Mon, 21 Dec 2009 13:26:40 -0800
Subject: [PATCH] remove rake task for credentials hint, move into bin

---
 Rakefile | 20 --------------------
 bin/fog  | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/Rakefile b/Rakefile
index 94f1a642f..6937dd709 100644
--- a/Rakefile
+++ b/Rakefile
@@ -96,23 +96,3 @@ begin
 rescue LoadError
   puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
 end
-
-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:')
-yml = <<YML
-
-:default:
-  :aws_access_key_id: INTENTIONALLY_LEFT_BLANK
-  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
-  :rackspace_api_key: INTENTIONALLY_LEFT_BLANK
-  :rackspace_username: INTENTIONALLY_LEFT_BLANK
-  :slicehost_password: INTENTIONALLY_LEFT_BLANK
-
-YML
-    print(yml)
-  end
-
-end
\ No newline at end of file
diff --git a/bin/fog b/bin/fog
index d2b2ae70c..48c2a8abb 100755
--- a/bin/fog
+++ b/bin/fog
@@ -7,6 +7,18 @@ module AWS
   class << self
     key = (ARGV.first && :"#{ARGV.first}") || :default
     unless Fog.credentials(key)
+      print("\n  To run as '#{key}', add credentials like the following to ~/.fog\n")
+      yml = <<-YML
+
+:#{key}:
+  :aws_access_key_id: INTENTIONALLY_LEFT_BLANK
+  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_api_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_username: INTENTIONALLY_LEFT_BLANK
+  :slicehost_password: INTENTIONALLY_LEFT_BLANK
+
+YML
+      print(yml)
       raise ArgumentError.new("No credentials for :#{key}")
     end
     if Fog.credentials(key)[:aws_access_key_id] && Fog.credentials(key)[:aws_secret_access_key]
@@ -57,6 +69,18 @@ module Rackspace
   class << self
     key = (ARGV.first && :"#{ARGV.first}") || :default
     unless Fog.credentials(key)
+      print("\n  To run as '#{key}', add credentials like the following to ~/.fog\n")
+      yml = <<-YML
+
+:#{key}:
+  :aws_access_key_id: INTENTIONALLY_LEFT_BLANK
+  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_api_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_username: INTENTIONALLY_LEFT_BLANK
+  :slicehost_password: INTENTIONALLY_LEFT_BLANK
+
+YML
+      print(yml)
       raise ArgumentError.new("No credentials for :#{key}")
     end
     if Fog.credentials(key)[:rackspace_api_key] && Fog.credentials(key)[:rackspace_username]