break out credential files for easier access

bin/fog

@@ -4,6 +4,7 @@ require File.join(lib_dir, 'fog')
 require 'irb'
 require 'yaml'
 
+require File.join(lib_dir, 'fog', 'credentials')
 require File.join(lib_dir, 'fog', 'bin')
 
 Fog.credential = (ARGV.first && :"#{ARGV.first}") || :default

lib/fog/bin.rb

@@ -1,46 +1,6 @@
 module Fog
   class << self
 
-    def credential=(new_credential)
-      @credential = new_credential
-      @credentials = nil
-    end
-
-    def credential
-      @credential || :default
-    end
-
-    def credentials
-      @credentials ||= begin
-        path = File.expand_path('~/.fog')
-        credentials = if File.exists?(path)
-          File.open(path) do |file|
-            YAML.load(file.read)
-          end
-        else
-          nil
-        end
-        unless credentials && credentials[credential]
-          print("\n  To run as '#{credential}', add the following to ~/.fog\n")
-          yml = <<-YML
-
-:#{credential}:
-  :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
-  :terremark_username:    INTENTIONALLY_LEFT_BLANK
-  :terremark_password:    INTENTIONALLY_LEFT_BLANK
-
-YML
-          print(yml)
-          raise(ArgumentError.new("Missing Credentials"))
-        end
-        credentials[credential]
-      end
-    end
-
     def services
       services = []
       [::AWS, ::Rackspace, ::Slicehost, ::Terremark].each do |service|

lib/fog/credentials.rb

@@ -0,0 +1,45 @@
+module Fog
+  class << self
+
+    def credential=(new_credential)
+      @credential = new_credential
+      @credentials = nil
+    end
+
+    def credential
+      @credential || :default
+    end
+
+    def credentials
+      @credentials ||= begin
+        path = File.expand_path('~/.fog')
+        credentials = if File.exists?(path)
+          File.open(path) do |file|
+            YAML.load(file.read)
+          end
+        else
+          nil
+        end
+        unless credentials && credentials[credential]
+          print("\n  To run as '#{credential}', add the following to ~/.fog\n")
+          yml = <<-YML
+
+:#{credential}:
+  :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
+  :terremark_username:    INTENTIONALLY_LEFT_BLANK
+  :terremark_password:    INTENTIONALLY_LEFT_BLANK
+
+YML
+          print(yml)
+          raise(ArgumentError.new("Missing Credentials"))
+        end
+        credentials[credential]
+      end
+    end
+
+  end
+end