capistrano-ec2tag 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5e4f95baa0aadf31397a7c07698796e0d606513
-  data.tar.gz: 2f14ec4406631bb8ceca262599dea454bc54a716
+  metadata.gz: f188593d827fed3038a2315de953cb656809b8bd
+  data.tar.gz: b7a39128c4eb64836caf8abecad1f09efe1f228b
 SHA512:
-  metadata.gz: 47f38fc1fe9cf498fe730f806985e4e50081af8b2fd219f12498f9529e139801d1d00923ab7b857c5baec7c0e9d4a53fa2d3e97adfd96b146d55b11971c0e2da
-  data.tar.gz: c39ec1c7c7fc9412f6947586d2d775417d85920e106bafe7606ccf641e023de8f8fff848cc0b7cf31efc07737eb3972631ad5cc737706e147ace5ff435a6fddc
+  metadata.gz: a9682b271b3aba6bdabcc03499f79ffb0f7c888d7cd27c2209f26008eb8d044b8b3ae7dddd9d229342417c0f0c93c8ced143cf709fe22db7a7af324e867fe875
+  data.tar.gz: 80854965b7cc82c0b0bb15b02b672777d9b66d35b5219861976221f0def0c486be1384a9c9f1239ba739263fed1f636860e72475b025161624902c85b069ee69

data/README.md

@@ -0,0 +1,71 @@
+## Introduction
+
+capistrano-ec2tag is a [Capistrano](https://github.com/capistrano/capistrano) plugin designed to simplify the
+task of deploying to infrastructure hosted on [Amazon EC2](http://aws.amazon.com/ec2/). It was inspired by the [capistrano-ec2group](https://github.com/logandk/capistrano-ec2group) plugin, to which all credit is due.
+
+While the original [capistrano-ec2group](https://github.com/logandk/capistrano-ec2group) plugin served me well, I started to run into cases where I wanted more flexibility. More specifically, in order to change security groups, instances have to be restarted.
+
+I created capistrano-ec2tag to bypass this limitation. Now, modifying the list of instances that are deployable is as easy as modifying tags.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```
+gem 'capistrano-ec2tag'
+```
+
+And then execute:
+
+```
+$ bundle
+```
+
+Or install it yourself as:
+
+```
+$ gem install capistrano-ec2tag
+```
+
+## Configuration
+
+Tag your instances, using `deploy` as the key. For example:
+
+![tag-example](https://f.cloud.github.com/assets/8209/939801/af9155fc-011d-11e3-9a6a-a07b0d4e9dc6.png)
+
+The tag value can be any string, but I suggest using something like `APP-ENVIRONMENT`.
+
+## Usage
+
+Add this to the top of your `deploy.rb`:
+
+```ruby
+require 'capistrano/ec2tag'
+```
+
+Then supply your AWS credentials with the environment variables (default):
+
+```zsh
+# aws
+export AWS_ACCESS_KEY_ID='...'
+export AWS_SECRET_ACCESS_KEY='...'
+```
+
+Or in your `deploy.rb` with capistrano variables:
+
+```ruby
+set :aws_access_key_id, '...'
+set :aws_secret_access_key, '...'
+```
+
+```ruby
+# old & busted
+server 'web1.example.com', :web
+
+# new hotness
+tag 'github-staging', :web
+```
+
+## License
+
+capistrano-ec2tag is copyright 2013 by [Douglas Jarquin](http://douglasjarquin.com/), released under the MIT License (see LICENSE for details).`

data/capistrano-ec2tag.gemspec

@@ -1,9 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path('../lib', __FILE__)
+require 'capistrano/ec2tag/version'
 
 Gem::Specification.new do |s|
   s.name        = 'capistrano-ec2tag'
-  s.version     = '0.1.1'
+  s.version     = Capistrano::Ec2tag::VERSION
   s.authors     = ['Douglas Jarquin']
   s.email       = ['douglasjarquin@me.com']
   s.homepage    = 'https://github.com/douglasjarquin/capistrano-ec2tag'
@@ -17,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'capistrano', '>=2.14.2'
+  s.add_dependency 'capistrano', '>=2.15.5'
   s.add_dependency 'aws-sdk', '>=1.8.5'
 end

data/lib/capistrano/ec2tag.rb

@@ -1,23 +1,28 @@
+require 'capistrano'
 require 'aws-sdk'
 
-unless Capistrano::Configuration.respond_to?(:instance)
-  abort 'capistrano/ec2tag requires Capistrano >= 2'
-end
-
 module Capistrano
-  class Configuration
-    module Tags
+  module Ec2tag
+    def self.extend(configuration)
+      configuration.load do
+        Capistrano::Configuration.instance.load do
+          _cset(:access_key_id, ENV['AWS_ACCESS_KEY_ID'])
+          _cset(:secret_access_key, ENV['AWS_SECRET_ACCESS_KEY'])
 
-      def tag(which, *args)
-        @ec2 ||= AWS::EC2.new({access_key_id: fetch(:aws_access_key_id), secret_access_key: fetch(:aws_secret_access_key)}.merge! fetch(:aws_params, {}))
+          def tag(which, *args)
+            @ec2 ||= AWS::EC2.new({access_key_id: fetch(:aws_access_key_id), secret_access_key: fetch(:aws_secret_access_key)}.merge! fetch(:aws_params, {}))
 
-        @ec2.instances.filter('tag-key', 'deploy').filter('tag-value', which).each do |instance|
-          server instance.dns_name || instance.ip_address, *args if instance.status == :running
+            @ec2.instances.filter('tag-key', 'deploy').filter('tag-value', which).each do |instance|
+              server instance.ip_address || instance.private_ip_address, *args if instance.status == :running
+            end
+          end
         end
       end
-
     end
-
-    include Tags
   end
 end
+
+if Capistrano::Configuration.instance
+  Capistrano::Ec2tag.extend(Capistrano::Configuration.instance)
+end
+

data/lib/capistrano/ec2tag/version.rb

@@ -0,0 +1,5 @@
+module Capistrano
+  module Ec2tag
+    VERSION = '0.1.2'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ec2tag
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Douglas Jarquin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.2
+        version: 2.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.2
+        version: 2.15.5
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -50,11 +50,12 @@ files:
 - .gitignore
 - Gemfile
 - LICENSE
-- README.markdown
+- README.md
 - Rakefile
 - capistrano-ec2tag.gemspec
 - lib/capistrano-ec2tag.rb
 - lib/capistrano/ec2tag.rb
+- lib/capistrano/ec2tag/version.rb
 homepage: https://github.com/douglasjarquin/capistrano-ec2tag
 licenses: []
 metadata: {}
@@ -74,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capistrano-ec2tag
-rubygems_version: 2.0.0
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A Capistrano plugin aimed at easing the pain of deploying to Amazon EC2 instances.

data/README.markdown

@@ -1,101 +0,0 @@
-## Introduction
-
-capistrano-ec2tag is a [Capistrano](https://github.com/capistrano/capistrano) plugin designed to simplify the
-task of deploying to infrastructure hosted on [Amazon EC2](http://aws.amazon.com/ec2/). It was
-completely inspired by the [capistrano-ec2group](https://github.com/logandk/capistrano-ec2group) plugin, to which all credit is due.
-
-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 yet.
-
-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 the hostnames of your EC2 instances, it
-will need access to the Amazon EC2 API. Specify the following in your
-Capistrano configuration:
-
-```ruby
-set :aws_access_key_id, '...'
-set :aws_secret_access_key, '...'
-```
-
-**Suggestion**
-
-My preferred 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:
-
-
-```zsh
-# aws credentials
-export AWS_ACCESS_KEY_ID='...'
-export AWS_SECRET_ACCESS_KEY='...'
-```
-
-Then, in a `~/.caprc` I do the following:
-
-``` ruby
-set :aws_access_key_id, ENV['AWS_ACCESS_KEY_ID']
-set :aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY']
-```
-
-### Get the gem
-
-The plugin is distributed as a Ruby gem.
-
-**Ruby Gems**
-
-```bash
-gem install capistrano-ec2tag
-```
-
-**Bundler**
-
-Using [bundler](http://gembundler.com/)?
-
-``` ruby
-source 'http://rubygems.org'
-gem 'capistrano-ec2tag'
-```
-
-Install the gems in your manifest using:
-
-``` bash
-bundle install
-```
-
-## Usage
-
-### Tag your instances
-
-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 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:
-
-```
-APP-ENVIRONMENT
-```
-
-### Configure Capistrano
-
-```ruby
-require 'capistrano/ec2tag'
-
-task :production do
-  tag 'github-production', :web
-  logger.info 'Deploying to the PRODUCTION environment!'
-end
-
-task :staging do
-  tag 'github-staging', :web
-  logger.info 'Deploying to the STAGING environment!'
-end
-```
-
-## License
-
-capistrano-ec2tag is copyright 2013 by [Douglas Jarquin](http://douglasjarquin.com/), released under the MIT License (see LICENSE for details).