capify-ec2 1.4.5 → 1.4.6

data/Changelog.md

@@ -1,3 +1,9 @@
+## 1.4.6 (May 15, 2013)
+
+Features:
+
+  - Added the ability to specify AWS credentials as environment variables rather than in the 'ec2.yml' file.
+
 ## 1.4.5 (May 15, 2013)
 
 Bugfixes:

data/lib/capify-ec2.rb

@@ -34,9 +34,9 @@ class CapifyEc2
     
     @instances = []
     regions.each do |region|
-      Fog::Compute.new(:provider => 'AWS', 
-                       :aws_access_key_id => @ec2_config[:aws_access_key_id], 
-                       :aws_secret_access_key => @ec2_config[:aws_secret_access_key], 
+      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|
         @instances << server if server.ready?
       end
@@ -46,7 +46,15 @@ class CapifyEc2
   def determine_regions()
     @ec2_config[:aws_params][:regions] || [@ec2_config[:aws_params][:region]]
   end
-    
+
+  def aws_access_key_id
+    @ec2_config[:aws_access_key_id] || ENV['AWS_ACCESS_KEY_ID']
+  end
+
+  def aws_secret_access_key
+    @ec2_config[:aws_secret_access_key] || ENV['AWS_SECRET_ACCESS_KEY']
+  end
+
   def display_instances
     unless desired_instances and desired_instances.any?
       puts "[Capify-EC2] No instances were found using your 'ec2.yml' configuration.".red.bold
@@ -121,7 +129,7 @@ class CapifyEc2
   end
     
   def elb
-    Fog::AWS::ELB.new(:aws_access_key_id => @ec2_config[:aws_access_key_id], :aws_secret_access_key => @ec2_config[:aws_secret_access_key], :region => @ec2_config[:aws_params][:region])
+    Fog::AWS::ELB.new(:aws_access_key_id => aws_access_key_id, :aws_secret_access_key => aws_secret_access_key, :region => @ec2_config[:aws_params][:region])
   end 
 
   def get_load_balancer_by_instance(instance_id)
@@ -276,4 +284,4 @@ class CapifyEC2RollingDeployError < Exception
     super(msg)
     @dns = dns
   end
-end
+end

data/lib/capify-ec2/version.rb

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

data/readme.md

@@ -31,11 +31,11 @@ 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', ':aws_secret_access_key', and ':region' are required. Other settings are optional.
 
 * :project_tag
 
-  If this is defined, Capify-EC2 will only create namespaces and tasks for the EC2 instances that have a matching 'Project' tag. By default, all instances available to the configured AWS access key will be used.
+  If this is defined, Capify-EC2 will only create namespaces and tasks for the EC2 instances that have a matching 'Project' tag. By default, all instances available to the specified AWS access key will be used.
 
   It is possible to include multiple projects simultaneously by using the :project_tags parameter, like so: 
 
@@ -58,6 +58,10 @@ Note: 'aws_access_key_id', 'aws_secret_access_key', and 'region' are required. O
 
   Use this option to change which EC2 instance tag Capify-EC2 uses to determine instance options. Defaults to 'Options' if ommited.
 
+##### 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.
+
 
 
 #### EC2 Tags
@@ -75,9 +79,6 @@ You will need to create instance tags using the AWS Management Console or API, t
 * Tag 'Options'
 
   A comma seperated list of options which will be defined as 'true' for that instance. See the 'Options' section below for more information on their use.
-  task :bob, :only => {:option_nmame => true}
-  on_no_matching_servers => :continue
-  "one of those ten is cron" etc.
 
 
 
@@ -159,6 +160,7 @@ end
 ```
 
 
+
 #### Multiple Roles
 
 If you want to create tasks for servers using multiple roles, you can call 'ec2_roles' multiple times in your 'deploy.rb' as follows:
@@ -257,11 +259,17 @@ For example, if we had the following group of instances in EC2:
 You could then create a task in your 'deploy.rb' that will only be executed on the worker machine, like so:
 
 ```ruby
-task :reload_workers => :web, :only=>{:worker=>true} do
+task :reload_workers, :only=>{:worker=>true} do
   # Do something to a specific server with the 'worker' option in it's EC2 tags.
 end
 ```
 
+```ruby
+task :reload_workers, :roles => :app, :only=>{:worker=>true} do
+  # Do something to a specific 'app' server with the 'worker' option in it's EC2 tags.
+end
+```
+
 ##### Via Role Definitions
 
 As well as defining Options at an instance level via EC2 tags, you can define an Option in your 'deploy.rb' at the same time as defining the role, as follows:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 4
-  - 5
-  version: 1.4.5
+  - 6
+  version: 1.4.6
 platform: ruby
 authors: 
 - Noah Cantor