capistrano-ec2tag 0.0.4 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3049d7749456e7d84bf7b582e60cc4ad4763ae3d
-  data.tar.gz: 918a38bd9e999f902ffa6727ca8243b0e0f423e1
+  metadata.gz: e5e4f95baa0aadf31397a7c07698796e0d606513
+  data.tar.gz: 2f14ec4406631bb8ceca262599dea454bc54a716
 SHA512:
-  metadata.gz: 2a963f92c3cb54e4a56284f18911905f11b6b197b1308219e40cb90c1331e97226b16f0c8a3a642d4bb9f4c23f4193cefb75edc0b043d6f3577b2ab4cd233a64
-  data.tar.gz: 96e39a7ec688a7d729d959eb8c2976ad5c49c9f3ba4df1b6517150e6a2764e2b96a7630c00a638802190d05bedefece0d7b16df0146dd97adff43d9a8fe77a49
+  metadata.gz: 47f38fc1fe9cf498fe730f806985e4e50081af8b2fd219f12498f9529e139801d1d00923ab7b857c5baec7c0e9d4a53fa2d3e97adfd96b146d55b11971c0e2da
+  data.tar.gz: c39ec1c7c7fc9412f6947586d2d775417d85920e106bafe7606ccf641e023de8f8fff848cc0b7cf31efc07737eb3972631ad5cc737706e147ace5ff435a6fddc

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2012 by Douglas Jarquin
+Copyright (C) 2013 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

@@ -4,12 +4,9 @@ capistrano-ec2tag is a [Capistrano](https://github.com/capistrano/capistrano) pl
 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.
+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.
+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
 
@@ -26,23 +23,22 @@ set :aws_secret_access_key, '...'
 
 **Suggestion**
 
-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).
+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
-# Set the Amazon AWS credentials as environment variables
+# 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, $AWS_ACCESS_KEY_ID
-set :aws_secret_access_key, $AWS_SECRET_ACCESS_KEY
+``` ruby
+set :aws_access_key_id, ENV['AWS_ACCESS_KEY_ID']
+set :aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY']
 ```
 
 ### Get the gem
@@ -59,20 +55,14 @@ gem install capistrano-ec2tag
 
 Using [bundler](http://gembundler.com/)?
 
-```bash
-gem install bundler
-```
-
-Then add the following to your Gemfile:
-
-```ruby
+``` ruby
 source 'http://rubygems.org'
 gem 'capistrano-ec2tag'
 ```
 
 Install the gems in your manifest using:
 
-```bash
+``` bash
 bundle install
 ```
 
@@ -80,16 +70,14 @@ bundle install
 
 ### 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.
+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.
+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:
 
 ```
-ENVIRONMENT-APP-STACK
+APP-ENVIRONMENT
 ```
 
 ### Configure Capistrano
@@ -98,19 +86,16 @@ ENVIRONMENT-APP-STACK
 require 'capistrano/ec2tag'
 
 task :production do
-  tag 'production-github-web', :web
-  tag 'production-github-job', :job
+  tag 'github-production', :web
   logger.info 'Deploying to the PRODUCTION environment!'
 end
 
 task :staging do
-  tag 'staging-github-web', :web
-  tag 'staging-github-job', :job
+  tag 'github-staging', :web
   logger.info 'Deploying to the STAGING environment!'
 end
 ```
 
 ## License
 
-capistrano-ec2tag is copyright 2012 by [Douglas Jarquin](http://douglasjarquin.com/), released under the MIT License (see LICENSE for details).
-
+capistrano-ec2tag is copyright 2013 by [Douglas Jarquin](http://douglasjarquin.com/), released under the MIT License (see LICENSE for details).

data/capistrano-ec2tag.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'capistrano-ec2tag'
-  s.version     = '0.0.4'
+  s.version     = '0.1.1'
   s.authors     = ['Douglas Jarquin']
   s.email       = ['douglasjarquin@me.com']
   s.homepage    = 'https://github.com/douglasjarquin/capistrano-ec2tag'
@@ -17,6 +17,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.1.0'
-  s.add_dependency 'aws-sdk'
+  s.add_dependency 'capistrano', '>=2.14.2'
+  s.add_dependency 'aws-sdk', '>=1.8.5'
 end

data/lib/capistrano/ec2tag.rb

@@ -9,12 +9,11 @@ module Capistrano
     module Tags
 
       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 ||= 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 { |instance|
+        @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
-        }
-
+        end
       end
 
     end
@@ -22,4 +21,3 @@ module Capistrano
     include Tags
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ec2tag
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.1
 platform: ruby
 authors:
 - Douglas Jarquin
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.14.2
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.5
 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.