capify-ec2 1.4.7 → 1.4.8

data/Changelog.md

@@ -1,3 +1,10 @@
+## 1.4.8 (May 17, 2013)
+
+Features:
+
+  - The EC2 instance tag used to determine instance Project can now be customised. Defaults to 'Project' if this setting is ommited.
+  - If any project tags are being used, they are now displayed when running the 'ec2:status' command.
+
 ## 1.4.7 (May 16, 2013)
 
 Features:

data/lib/capify-ec2/version.rb

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

data/lib/capify-ec2.rb

@@ -23,6 +23,8 @@ class CapifyEc2
 
     # Maintain backward compatibility with previous config format
     @ec2_config[:project_tags] ||= []
+    # User can change the Project tag string
+    @ec2_config[:aws_project_tag] ||= "Project"
     # User can change the Roles tag string
     @ec2_config[:aws_roles_tag] ||= "Roles"
     # User can change the Options tag string.
@@ -81,6 +83,7 @@ class CapifyEc2
     column_widths[:options] = desired_instances.map{|i| i.tags[@ec2_config[:aws_options_tag]].to_s.ljust( column_widths[:options_min] ) || ' ' * column_widths[:options_min] }.max_by(&:length).length
 
     # Title row.
+    puts "#{@ec2_config[:aws_project_tag].bold}: #{@ec2_config[:project_tags].join(', ')}." if @ec2_config[:project_tags].any?
     puts sprintf "%-3s   %s   %s   %s   %s   %s   %s   %s", 
       'Num'                                                         .bold,
       'Name'                       .ljust( column_widths[:name]    ).bold,
@@ -109,7 +112,7 @@ class CapifyEc2
   end
     
   def project_instances
-    @instances.select {|instance| @ec2_config[:project_tags].include?(instance.tags["Project"])}
+    @instances.select {|instance| @ec2_config[:project_tags].include?(instance.tags[@ec2_config[:aws_project_tag]])}
   end
   
   def desired_instances(region = nil)

data/readme.md

@@ -31,7 +31,7 @@ require "capify-ec2/capistrano"
 
 #### Configuration
 
-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.
+Note: ':aws_access_key_id' and ':aws_secret_access_key' are required, unless you provide them via the two alternative methods detailed below under 'AWS Credentials'. ':region' is also required. Other settings are optional.
 
 * :project_tag
 
@@ -45,10 +45,9 @@ Note: ':aws_access_key_id' and ':aws_secret_access_key' are required, unless you
     - "YOUR OTHER APP NAME"
    ```
 
-* :load_balanced
+* :aws_project_tag
 
-  When ':load_balanced' is set to 'true', Capify-EC2 uses pre and post-deploy hooks to deregister the instance from an associated Elastic Load Balancer, perform the actual deploy, then finally reregister with the ELB and validated the instance health.
-  Note: This options only applies to deployments made to an individual instance, using the command 'cap INSTANCE_NAME_HERE deploy' - it doesn't apply to roles.
+  Use this option to change which EC2 instance tag Capify-EC2 uses to determine instance project. Defaults to 'Project' if ommited.
 
 * :aws_roles_tag
 
@@ -58,6 +57,11 @@ Note: ':aws_access_key_id' and ':aws_secret_access_key' are required, unless you
 
   Use this option to change which EC2 instance tag Capify-EC2 uses to determine instance options. Defaults to 'Options' if ommited.
 
+* :load_balanced
+
+  When ':load_balanced' is set to 'true', Capify-EC2 uses pre and post-deploy hooks to deregister the instance from an associated Elastic Load Balancer, perform the actual deploy, then finally reregister with the ELB and validated the instance health.
+  Note: This options only applies to deployments made to an individual instance, using the command 'cap INSTANCE_NAME_HERE deploy' - it doesn't apply to roles.
+
 ##### AWS Credentials
 
 ###### Via YML Configuration

metadata

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