capify-ec2 1.3.4 → 1.3.5

data/Changelog.md

@@ -1,3 +1,18 @@
+## 1.3.5 (Jan 11, 2013)
+
+Features:
+
+  - Updated output from ec2:status, improving readability, and improving handling of instance attributes that vary in size.
+
+Bugfixes:
+
+  - Region role creation fixed, so that you can deploy just to instances in specific regions again (i.e. cap us-east-1 deploy).
+  - Fixed 'already initialized constant' warning which may be shown to users running some versions of Ruby 1.8.
+
+## 1.3.0 to 1.3.4
+
+Sorry, release notes were not added for these versions.
+
 ## 1.2.9 (June 29, 2012)
 
 Bugfixes:

data/lib/capify-ec2.rb

@@ -7,7 +7,10 @@ require File.expand_path(File.dirname(__FILE__) + '/capify-ec2/server')
 class CapifyEc2
 
   attr_accessor :load_balancer, :instances
-  SLEEP_COUNT = 5
+  
+  unless const_defined? :SLEEP_COUNT
+    SLEEP_COUNT = 5
+  end
   
   def initialize(ec2_config = "config/ec2.yml")
     case ec2_config
@@ -42,12 +45,38 @@ class CapifyEc2
   end
     
   def display_instances
+    # Set minimum widths for the variable length instance attributes.
+    column_widths = { :name_min => 4, :type_min => 4, :dns_min => 5, :roles_min => 5, :options_min => 6 }
+
+    # Find the longest attribute across all instances, to format the columns properly.
+    column_widths[:name]    = desired_instances.map{|i| i.name                              || ' ' * column_widths[:name_min]    }.max_by(&:length).length
+    column_widths[:type]    = desired_instances.map{|i| i.flavor_id                         || ' ' * column_widths[:type_min]    }.max_by(&:length).length
+    column_widths[:dns]     = desired_instances.map{|i| i.contact_point                     || ' ' * column_widths[:dns_min]     }.max_by(&:length).length
+    column_widths[:roles]   = desired_instances.map{|i| i.tags[@ec2_config[:aws_roles_tag]] || ' ' * column_widths[:roles_min]   }.max_by(&:length).length
+    column_widths[:options] = desired_instances.map{|i| i.tags["Options"]                   || ' ' * column_widths[:options_min] }.max_by(&:length).length
+
+    # Title row.
+    puts sprintf "%-3s   %s   %s   %s   %s   %s   %s   %s", 
+      '',
+      'Name'   .ljust( column_widths[:name]    ).bold,
+      'ID'     .ljust( 10                      ).bold,
+      'Type'   .ljust( column_widths[:type]    ).bold,
+      'DNS'    .ljust( column_widths[:dns]     ).bold,
+      'Zone'   .ljust( 10                      ).bold,
+      'Roles'  .ljust( column_widths[:roles]   ).bold,
+      'Options'.ljust( column_widths[:options] ).bold
+
     desired_instances.each_with_index do |instance, i|
-      puts sprintf "%02d:  %-40s  %-20s  %-20s  %-62s  %-20s  (%s)  (%s)",
-        i, (instance.name || "").green, instance.id.red, instance.flavor_id.cyan,
-        instance.contact_point.blue, instance.availability_zone.magenta, (instance.tags[@ec2_config[:aws_roles_tag]] || "").yellow,
-        (instance.tags["Options"] || "").yellow
-      end
+      puts sprintf "%02d:   %-10s   %s   %s   %s   %-10s   %s   %s",
+        i, 
+        (instance.name || '')                             .ljust( column_widths[:name]    ).green,
+        instance.id                                       .ljust( 2                       ).red,
+        instance.flavor_id                                .ljust( column_widths[:type]    ).cyan,
+        instance.contact_point                            .ljust( column_widths[:dns]     ).blue.bold,
+        instance.availability_zone                        .ljust( 10                      ).magenta,
+        (instance.tags[@ec2_config[:aws_roles_tag]] || '').ljust( column_widths[:roles]   ).yellow,
+        (instance.tags["Options"] || '')                  .ljust( column_widths[:options] ).yellow
+    end
   end
 
   def server_names
@@ -68,7 +97,7 @@ class CapifyEc2
   
   def get_instances_by_region(roles, region)
     return unless region
-    desired_instances.select {|instance| instance.availability_zone.match(region) && instance.roles == roles.to_s rescue false}
+    desired_instances.select {|instance| instance.availability_zone.match(region) && instance.tags['Roles'].split(%r{,\s*}).include?(roles.to_s) rescue false}
   end 
   
   def get_instance_by_name(name)

data/lib/capify-ec2/capistrano.rb

@@ -128,7 +128,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end 
   end
 
-  def define_role(role, instance, variables)
+  def define_role(role, instance, variables = {})
     options     = role[:options] || {}
     
     cap_options = options.inject({}) do |cap_options, (key, value)| 

data/lib/capify-ec2/version.rb

@@ -1,6 +1,6 @@
 module Capify
   module Ec2
-    VERSION = "1.3.4"
+    VERSION = "1.3.5"
   end
 end
 

data/readme.md

@@ -1,8 +1,3 @@
-Capify Ec2 is no longer being maintained. It has been superseded by capify-cloud, which adds Brightbox integration.
-You may continue to use this as long as you like, but active development and gems will now be found under the capify-cloud moniker.
-https://github.com/forward/capify-cloud
-
-
 Capify Ec2
 ====================================================
 

metadata

@@ -1,73 +1,79 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: capify-ec2
-version: !ruby/object:Gem::Version
-  version: 1.3.4
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 1
+  - 3
+  - 5
+  version: 1.3.5
 platform: ruby
-authors:
+authors: 
 - Noah Cantor
 - Siddharth Dawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: fog
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '1.2'
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: colored
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: capistrano
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Grabs roles from ec2's tags and autogenerates capistrano tasks
-email:
+email: 
 - noah.cantor@forward.co.uk
 - siddharth.dawara@forward.co.uk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Changelog.md
 - Gemfile
@@ -81,26 +87,36 @@ files:
 - readme.md
 homepage: http://github.com/forward/capify-ec2
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: capify-ec2
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Grabs roles from ec2's tags and autogenerates capistrano tasks
 test_files: []
+