capistrano-ec2tag 0.0.2 → 0.0.3

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in capistrano-ec2tag.gemspec
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011 by Douglas Jarquin
+Copyright (C) 2012 by Douglas Jarquin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.markdown

@@ -1,8 +1,3 @@
-# capistrano-ec2tag
-
-A Capistrano plugin aimed at easing the pain of deploying to Amazon EC2
-instances by using a simple "deploy" tag.
-
 ## Introduction
 
 capistrano-ec2tag is a [Capistrano](https://github.com/capistrano/capistrano) plugin designed to simplify the
@@ -11,11 +6,16 @@ completely inspired by the [capistrano-ec2group](https://github.com/logandk/capi
 
 While the original [capistrano-ec2group](https://github.com/logandk/capistrano-ec2group) plugin served me well, I started to run into limitations pretty quickly. I will say that at the time that the capistrano-ec2group plugin was written, I don't think Amazon EC2 supported tags.
 
+Using Tags instead of Security Groups gives you the ability to change
+which servers get deployed to at any time, without having to reboot the
+instance. This implementation is particularly useful for A/B deployments, or in
+auto-scaling environments.
+
 ## Installation
 
 ### Set the Amazon AWS Credentials
 
-In order for the plugin to list out hostnames of your EC2 instances, it
+In order for the plugin to list out the hostnames of your EC2 instances, it
 will need access to the Amazon EC2 API. Specify the following in your
 Capistrano configuration:
 
@@ -30,7 +30,7 @@ My prefferred method of passing Amazon AWS credentials to the different
 tools is to use environment variables. A trick I picked up from the [Chef
 help site](http://help.opscode.com/discussions/questions/246-best-practices-for-multiple-developers-kniferb-in-chef-repo-or-not).
 
-In my ~/.zshrc I have:
+In my `~/.zshrc` I have:
 
 ```zsh
 # Set the Amazon AWS credentials as environment variables
@@ -38,7 +38,7 @@ export AWS_ACCESS_KEY_ID='...'
 export AWS_SECRET_ACCESS_KEY='...'
 ```
 
-Then, in my ~/.caprc I do the following:
+Then, in a `~/.caprc` I do the following:
 
 ```ruby
 set :aws_access_key_id, $AWS_ACCESS_KEY_ID
@@ -66,8 +66,8 @@ gem install bundler
 Then add the following to your Gemfile:
 
 ```ruby
-source "http://rubygems.org"
-gem "capistrano-ec2tag"
+source 'http://rubygems.org'
+gem 'capistrano-ec2tag'
 ```
 
 Install the gems in your manifest using:
@@ -84,7 +84,13 @@ Using the Amazon EC2 API or the AWS Management Console, add a `deploy`
 tag to all the instances you want Capistrano to deploy to.
 
 The value can be any string, but I do recommend it be both unique and
-somehow explicit to the type of server this is. If you have used the [capistrano-ec2group](https://github.com/logandk/capistrano-ec2group), then this might be equal to whatever security group names you use.
+easy to recognize. If you have used the [capistrano-ec2group](https://github.com/logandk/capistrano-ec2group), then this might be equal to whatever security group names you use.
+
+Personally, we use the folowing convention:
+
+```
+ENVIRONMENT-APP-STACK
+```
 
 ### Configure Capistrano
 
@@ -92,19 +98,19 @@ somehow explicit to the type of server this is. If you have used the [capistrano
 require 'capistrano/ec2tag'
 
 task :production do
-  tag "production-github-web", :web
-  tag "production-github-job", :job
-  logger.info "Deploying to the PRODUCTION environment!"
+  tag 'production-github-web', :web
+  tag 'production-github-job', :job
+  logger.info 'Deploying to the PRODUCTION environment!'
 end
 
 task :staging do
-  tag "staging-github-web", :web
-  tag "staging-github-job", :job
-  logger.info "Deploying to the STAGING environment!"
+  tag 'staging-github-web', :web
+  tag 'staging-github-job', :job
+  logger.info 'Deploying to the STAGING environment!'
 end
 ```
 
 ## License
 
-capistrano-ec2tag is copyright 2011 by [Douglas Jarquin](http://www.douglasjarquin.com/), released under the MIT License (see LICENSE for details).
+capistrano-ec2tag is copyright 2012 by [Douglas Jarquin](http://douglasjarquin.com/), released under the MIT License (see LICENSE for details).
 

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/capistrano-ec2tag.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "capistrano-ec2tag"
-  s.version     = "0.0.2"
-  s.authors     = ["Douglas Jarquin"]
-  s.email       = ["douglasjarquin@gmail.com"]
-  s.homepage    = "https://github.com/douglasjarquin/capistrano-ec2tag"
-  s.summary     = "A Capistrano plugin aimed at easing the pain of deploying to Amazon EC2 instances by using a simple \"deploy\" tag."
-  s.description = "capistrano-ec2tag is a Capistrano plugin designed to simplify the task of deploying to infrastructure hosted on Amazon EC2. It was completely inspired by the capistrano-ec2group plugin, to which all credit is due."
+  s.name        = 'capistrano-ec2tag'
+  s.version     = '0.0.3'
+  s.authors     = ['Douglas Jarquin']
+  s.email       = ['douglasjarquin@me.com']
+  s.homepage    = 'https://github.com/douglasjarquin/capistrano-ec2tag'
+  s.summary     = 'A Capistrano plugin aimed at easing the pain of deploying to Amazon EC2 instances.'
+  s.description = 'capistrano-ec2tag is a Capistrano plugin designed to simplify the task of deploying to infrastructure hosted on Amazon EC2. It was completely inspired by the capistrano-ec2group plugin, to which all credit is due.'
 
-  s.rubyforge_project = "capistrano-ec2tag"
+  s.rubyforge_project = 'capistrano-ec2tag'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_dependency "capistrano", ">=2.1.0"
-  s.add_dependency "right_aws"
+  s.add_dependency 'capistrano', '>=2.1.0'
+  s.add_dependency 'right_aws'
 end

data/lib/capistrano-ec2tag.rb

@@ -1 +1 @@
-require "capistrano/ec2tag"
+require 'capistrano/ec2tag'

data/lib/capistrano/ec2tag.rb

@@ -1,7 +1,7 @@
 require 'right_aws'
 
 unless Capistrano::Configuration.respond_to?(:instance)
-  abort "capistrano/ec2tag requires Capistrano >= 2"
+  abort 'capistrano/ec2tag requires Capistrano >= 2'
 end
 
 module Capistrano
@@ -11,8 +11,8 @@ module Capistrano
       def tag(which, *args)
         @ec2 ||= RightAws::Ec2.new(fetch(:aws_access_key_id), fetch(:aws_secret_access_key), fetch(:aws_params, {}))
 
-        @ec2.describe_instances(:filters => { "tag-key" => "deploy", "tag-value" => "#{which}" }).each do |instance|
-          server(instance[:dns_name], *args) unless instance[:aws_state] != "running"
+        @ec2.describe_instances(:filters => { 'tag-key' => 'deploy', 'tag-value' => "#{which}" }).each do |instance|
+          server(instance[:dns_name].empty? ? instance[:ip_address] : instance[:dns_name], *args) unless instance[:aws_state] != 'running'
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ec2tag
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2158098480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158098480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: right_aws
-  requirement: &2158098080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,12 +37,17 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158098080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: capistrano-ec2tag is a Capistrano plugin designed to simplify the task
   of deploying to infrastructure hosted on Amazon EC2. It was completely inspired
   by the capistrano-ec2group plugin, to which all credit is due.
 email:
-- douglasjarquin@gmail.com
+- douglasjarquin@me.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -70,9 +80,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capistrano-ec2tag
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A Capistrano plugin aimed at easing the pain of deploying to Amazon EC2 instances
-  by using a simple "deploy" tag.
+summary: A Capistrano plugin aimed at easing the pain of deploying to Amazon EC2 instances.
 test_files: []
+has_rdoc: