capify-ec2 1.4.6 → 1.4.7

data/Changelog.md

@@ -1,3 +1,10 @@
+## 1.4.7 (May 16, 2013)
+
+Features:
+
+  - Added the ability to load AWS credentials from the Fog configuration file, rather than from the 'ec2.yml' file. Refer to the Fog documentation for details on specifying AWS credentials.
+  - Improved error handling when no AWS credentials are found by any supported method.
+
 ## 1.4.6 (May 15, 2013)
 
 Features:

data/lib/capify-ec2.rb

@@ -33,11 +33,20 @@ class CapifyEc2
     regions = determine_regions()
     
     @instances = []
+
     regions.each do |region|
-      Fog::Compute.new(:provider => 'AWS',
-                       :aws_access_key_id => aws_access_key_id,
-                       :aws_secret_access_key => aws_secret_access_key,
-                       :region => region).servers.each do |server|
+      begin
+        servers = Fog::Compute.new( :provider => 'AWS',
+                                    :aws_access_key_id => aws_access_key_id,
+                                    :aws_secret_access_key => aws_secret_access_key,
+                                    :region => region
+                                  ).servers
+      rescue => e
+        puts "[Capify-EC2] Unable to connect to AWS: #{e}.".red.bold
+        exit 1
+      end
+
+      servers.each do |server|
         @instances << server if server.ready?
       end
     end
@@ -48,11 +57,11 @@ class CapifyEc2
   end
 
   def aws_access_key_id
-    @ec2_config[:aws_access_key_id] || ENV['AWS_ACCESS_KEY_ID']
+    @ec2_config[:aws_access_key_id] || Fog.credentials[:aws_access_key_id] || ENV['AWS_ACCESS_KEY_ID'] || raise("Missing AWS Access Key ID")
   end
 
   def aws_secret_access_key
-    @ec2_config[:aws_secret_access_key] || ENV['AWS_SECRET_ACCESS_KEY']
+    @ec2_config[:aws_secret_access_key] || Fog.credentials[:aws_secret_access_key] || ENV['AWS_SECRET_ACCESS_KEY'] || raise("Missing AWS Secret Access Key")
   end
 
   def display_instances

data/lib/capify-ec2/version.rb

@@ -1,6 +1,6 @@
 module Capify
   module Ec2
-    VERSION = "1.4.6"
+    VERSION = "1.4.7"
   end
 end
 

data/readme.md

@@ -31,7 +31,7 @@ require "capify-ec2/capistrano"
 
 #### Configuration
 
-Note: ':aws_access_key_id', ':aws_secret_access_key', and ':region' are required. Other settings are optional.
+Note: ':aws_access_key_id' and ':aws_secret_access_key' are required, unless you provide them via the two alternative methods detailed below. ':region' is also required. Other settings are optional.
 
 * :project_tag
 
@@ -58,10 +58,24 @@ Note: ':aws_access_key_id', ':aws_secret_access_key', and ':region' are required
 
   Use this option to change which EC2 instance tag Capify-EC2 uses to determine instance options. Defaults to 'Options' if ommited.
 
-##### Via Environment Variables
+##### AWS Credentials
+
+###### Via YML Configuration
+
+By default, Capify-EC2 will attempt to use the credentials found in your 'ec2.yml' configuration as detailed above.
+
+###### Via Fog Configuration
+
+If you wish, you can have Capify-EC2 use the AWS credentials found in your Fog configuration, instead of instead of specifying ':aws_access_key_id' and ':aws_secret_access_key' in the YML configuration file. Refer to the Fog documentation for details on specifying AWS credentials.
+
+###### Via Environment Variables
 
 If you wish, you can define AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY as environment variables, instead of specifying ':aws_access_key_id' and ':aws_secret_access_key' in the YML configuration file.
 
+###### Ordering
+
+Capify-EC2 will attempt to load your AWS credentials first from the 'ec2.yml' configuration file, then from your Fog configuration file, and finally from environment variables. It will display an error if no credentials are found by any of these methods.
+
 
 
 #### EC2 Tags

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 4
-  - 6
-  version: 1.4.6
+  - 7
+  version: 1.4.7
 platform: ruby
 authors: 
 - Noah Cantor
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-15 00:00:00 Z
+date: 2013-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog