elbas 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d8f971b000e61faf36f0e9ab36c7232ff89221
-  data.tar.gz: 9cd09cc94338f8113371a7dac1f86961b5c1f3f0
+  metadata.gz: 809a76ffd1ba7661372b03f0caf54e1ec35ba980
+  data.tar.gz: b3a525b53a4e13406585aa90e073ebeedf3e9111
 SHA512:
-  metadata.gz: fc9c23c1a5c7c8d5f0a032c1ca93a7bb0f6f6848cfbf2e851ae8f788961ac9c7746b822356ebdbee957d03dc4c8efd54fb678e6b67fe88bb532a004811f8da2e
-  data.tar.gz: 72fbceef214a4dc4703ec16d343bae24e37532eed5c130a75bff4b2cb223525552976e2c8f9338e3ce5b6357a2fb66253a3f0f31899bb9b59dd7419faf21d8b5
+  metadata.gz: 9da3a2d3d86aa9949492914666bed49165aeccc8c239d287245b8483e851dd2654615ded41ed826c2e1973fbde9273d72a3b564c0de91b27f5c36b7b5f9ec510
+  data.tar.gz: 039bf59b076fd2cb3f651afff972582a4136c0906ea2f649ddc717edf5a86694494d30dffb36fe0fdff5a487798243cabba21242d3678b8872047032c4b75404

data/.gitignore

@@ -1,9 +1,9 @@
 *.gem
 *.rbc
+/Gemfile.lock
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -11,7 +11,6 @@ doc/
 lib/bundler/man
 pkg
 rdoc
-spec/reports
 test/tmp
 test/version_tmp
 tmp

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+cache: bundler
+rvm:
+- 2.0.0
+deploy:
+  provider: rubygems
+  gem:
+    release: elbas
+  on:
+    repo: lserman/capistrano-elbas
+    branch: master
+  api_key:
+    secure: l7oX8UC0qhvbTQioFOaRy6sx3T1+JKr2MxdcEvgqZDg6hx2l2WhnZemmm0FtvjKBWC65Sk/ygT0PmeekTVzQIcK8E6Bz/mtTTbOfD/wxdOzbJfOXGYKy8amCNvPEQ+DLIkMY0hxx23t7YLj/MIu53vKCAOEwKMKMylUZrYizZWk=

data/Rakefile

@@ -1,6 +1,5 @@
 require "bundler/gem_tasks"
-require 'rake/testtask'
 
-Rake::TestTask.new do |t|
-  t.pattern = "test/**/*_test.rb"
-end
+require 'rspec/core/rake_task'
+task :default => :spec
+RSpec::Core::RakeTask.new

data/elbas.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Elbas::VERSION
   spec.authors       = ["Logan Serman"]
   spec.email         = ["logan.serman@metova.com"]
-  spec.summary       = 'Capistrano plugin for deploying to AWS ASGroups.'
-  spec.description   = "#{spec.summary}. Deploys to all instances in a group, creates a fresh AMI post-deploy, and attaches the AMI to your ASGroup."
+  spec.summary       = 'Capistrano plugin for deploying to AWS AutoScale Groups.'
+  spec.description   = "#{spec.summary} Deploys to all instances in a group, creates a fresh AMI post-deploy, and attaches the AMI to your AutoScale Group."
   spec.homepage      = "http://github.com/metova/elbas"
   spec.license       = "MIT"
 
@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
 
   spec.add_dependency 'aws-sdk', '~> 1'
   spec.add_dependency 'capistrano', '> 3.0.0'
+  spec.add_dependency 'activesupport', '>= 4.0.0'
 
 end

data/lib/elbas.rb

@@ -1,4 +1,16 @@
-require "elbas/version"
+require 'aws-sdk'
+require 'active_support/concern'
+
+require 'elbas/version'
+require 'elbas/taggable'
+require 'elbas/logger'
+require 'elbas/aws/credentials'
+require 'elbas/aws/autoscaling'
+require 'elbas/aws/ec2'
+require 'elbas/aws_resource'
+require 'elbas/ami'
+require 'elbas/launch_configuration'
+
 
 module Elbas
 end

data/lib/elbas/ami.rb

@@ -1,39 +1,40 @@
 module Elbas
-  class AMI < AWS
-    include Capistrano::DSL
+  class AMI < AWSResource
+    include Taggable
 
     def self.create(&block)
       ami = new
       ami.cleanup do
         ami.save
+        ami.tag 'Deployed-with' => 'ELBAS'
         yield ami
       end
     end
 
     def save
-      info "Creating EC2 AMI from #{base_ec2_instance.id}"
+      info "Creating EC2 AMI from EC2 Instance: #{base_ec2_instance.id}"
       @aws_counterpart = ec2.images.create \
-        name: timestamp(name_prefix),
+        name: name,
         instance_id: base_ec2_instance.id,
         no_reboot: true
     end
 
     def destroy(images = [])
       images.each do |i|
-        info "Deleting old image: #{i.id}"
+        info "Deleting old AMI: #{i.id}"
         i.delete
       end
     end
 
     private
 
-      def name_prefix
-        "elbas-ami-#{environment}"
+      def name
+        timestamp "#{environment}-AMI"
       end
 
-      def garbage
-        ec2.images.with_owner('self').to_a.select do |i|
-          i.name =~ /#{name_prefix}/i
+      def trash
+        ec2.images.with_owner('self').to_a.select do |ami|
+          deployed_with_elbas? ami
         end
       end
 

data/lib/elbas/aws/autoscaling.rb

@@ -0,0 +1,22 @@
+module Elbas
+  module AWS
+    module AutoScaling
+      extend ActiveSupport::Concern
+      include Elbas::AWS::Credentials
+      include Capistrano::DSL
+
+      def autoscaling
+        @_autoscaling ||= ::AWS::AutoScaling.new(credentials)
+      end
+
+      def autoscale_group
+        @_autoscale_group ||= autoscaling.groups[autoscale_group_name]
+      end
+
+      def autoscale_group_name
+        fetch(:aws_autoscale_group)
+      end
+
+    end
+  end
+end

data/lib/elbas/aws/credentials.rb

@@ -0,0 +1,21 @@
+module Elbas
+  module AWS
+    module Credentials
+      extend ActiveSupport::Concern
+      include Capistrano::DSL
+
+      def credentials
+        @_credentials ||= begin
+          _credentials = {
+            access_key_id: fetch(:aws_access_key_id, ENV['AWS_ACCESS_KEY_ID']),
+            secret_access_key: fetch(:aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY'])
+          }
+
+          _credentials.merge! region: fetch(:aws_region) if fetch(:aws_region)
+          _credentials
+        end
+      end
+
+    end
+  end
+end

data/lib/elbas/aws/ec2.rb

@@ -0,0 +1,14 @@
+module Elbas
+  module AWS
+    module EC2
+      extend ActiveSupport::Concern
+      include Elbas::AWS::Credentials
+      include Capistrano::DSL
+
+      def ec2
+        @_ec2 ||= ::AWS::EC2.new(credentials)
+      end
+
+    end
+  end
+end

data/lib/elbas/aws_resource.rb

@@ -0,0 +1,38 @@
+module Elbas
+  class AWSResource
+    include Capistrano::DSL
+    include Elbas::AWS::AutoScaling
+    include Elbas::AWS::EC2
+    include Logger
+
+    attr_reader :aws_counterpart
+
+    def cleanup(&block)
+      items = trash || []
+      yield
+      destroy items
+      self
+    end
+
+    protected
+
+      def base_ec2_instance
+        @_base_ec2_instance ||= autoscale_group.ec2_instances.filter('instance-state-name', 'running').first
+      end
+
+      def environment
+        fetch(:rails_env, 'production')
+      end
+
+      def timestamp(str)
+        "#{str}-#{Time.now.to_i}"
+      end
+
+    private
+
+      def deployed_with_elbas?(resource)
+        resource.tags['Deployed-with'] == 'ELBAS'
+      end
+
+  end
+end

data/lib/elbas/capistrano.rb

@@ -5,11 +5,12 @@ load File.expand_path("../tasks/elbas.rake", __FILE__)
 
 def autoscale(groupname, *args)
   include Capistrano::DSL
+  include Elbas::AWS::AutoScaling
 
-  asgroup = autoscaling.groups[groupname]
+  autoscale_group = autoscaling.groups[groupname]
   set :aws_autoscale_group, groupname
 
-  asgroup.ec2_instances.filter('instance-state-name', 'running').each do |instance|
+  autoscale_group.ec2_instances.filter('instance-state-name', 'running').each do |instance|
     hostname = instance.dns_name || instance.private_ip_address
     p "ELBAS: Adding server: #{hostname}"
     server(hostname, *args)
@@ -17,11 +18,3 @@ def autoscale(groupname, *args)
 
   after('deploy', 'elbas:scale')
 end
-
-private
-
-def autoscaling
-  @_autoscaling ||= AWS::AutoScaling.new \
-    access_key_id: fetch(:aws_access_key_id, ENV['AWS_ACCESS_KEY_ID']),
-    secret_access_key: fetch(:aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY'])
-end

data/lib/elbas/launch_configuration.rb

@@ -1,5 +1,5 @@
 module Elbas
-  class LaunchConfiguration < AWS
+  class LaunchConfiguration < AWSResource
 
     def self.create(ami, &block)
       lc = new
@@ -10,13 +10,13 @@ module Elbas
     end
 
     def save(ami)
-      info "Creating an EC2 Launch Configuration for AMI: #{ami.id}"
-      @aws_counterpart = autoscaling.launch_configurations.create(timestamp(name_prefix), ami.id, instance_size, create_options)
+      info "Creating an EC2 Launch Configuration for AMI: #{ami.aws_counterpart.id}"
+      @aws_counterpart = autoscaling.launch_configurations.create(name, ami.aws_counterpart.id, instance_size, create_options)
     end
 
-    def attach_to_asgroup!
+    def attach_to_autoscale_group!
       info "Attaching Launch Configuration to AutoScale Group"
-      asgroup.update(launch_configuration: aws_counterpart)
+      autoscale_group.update(launch_configuration: aws_counterpart)
     end
 
     def destroy(launch_configurations = [])
@@ -28,8 +28,12 @@ module Elbas
 
     private
 
-      def name_prefix
-        "elbas-lc-#{environment}"
+      def name
+        timestamp "ELBAS-#{environment}-LC"
+      end
+
+      def instance_size
+        fetch(:aws_autoscale_instance_size, 'm1.small')
       end
 
       def create_options
@@ -39,28 +43,20 @@ module Elbas
           associate_public_ip_address: true,
         }
 
-        if asgroup_already_had_launch_configuration_attached?
-          _options.merge user_data: old_launch_configuration.user_data
+        if user_data = fetch(:aws_launch_configuration_user_data, nil)
+          _options.merge user_data: user_data
         end
 
         _options
       end
 
-      def asgroup_already_had_launch_configuration_attached?
-        !!old_launch_configuration
-      end
-
-      def old_launch_configuration
-        @_old_launch_configuration ||= asgroup.launch_configurations.first
-      end
-
-      def instance_size
-        fetch(:aws_autoscale_instance_size, 'm1.small')
+      def deployed_with_elbas?(lc)
+        lc.name =~ /ELBAS/
       end
 
-      def garbage
+      def trash
         autoscaling.launch_configurations.to_a.select do |lc|
-          lc.name =~ /#{name_prefix}/i
+          deployed_with_elbas? lc
         end
       end
 

data/lib/elbas/logger.rb

@@ -0,0 +1,9 @@
+module Elbas
+  module Logger
+
+    def info(message)
+      p "ELBAS: #{message}"
+    end
+
+  end
+end

data/lib/elbas/taggable.rb

@@ -0,0 +1,11 @@
+module Elbas
+  module Taggable
+
+    def tag(tags = {})
+      tags.each do |k, v|
+        aws_counterpart.tags[k] = v
+      end
+    end
+
+  end
+end

data/lib/elbas/tasks/elbas.rake

@@ -1,7 +1,4 @@
 require 'elbas'
-require 'elbas/aws'
-require 'elbas/ami'
-require 'elbas/launch_configuration'
 
 namespace :elbas do
   task :scale do
@@ -12,8 +9,9 @@ namespace :elbas do
       p "ELBAS: Created AMI: #{ami.id}"
       Elbas::LaunchConfiguration.create(ami) do |lc|
         p "ELBAS: Created Launch Configuration: #{lc.name}"
-        lc.attach_to_asgroup!
+        lc.attach_to_autoscale_group!
       end
     end
+
   end
 end

data/lib/elbas/version.rb

@@ -1,3 +1,3 @@
 module Elbas
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/elbas_spec.rb

@@ -0,0 +1,60 @@
+describe 'ELBAS' do
+
+  before do
+    allow_any_instance_of(Elbas::AWSResource).to receive(:autoscale_group_name) { 'production' }
+    webmock :get, /security-credentials/ => 'security-credentials.200.json'
+    webmock(:post, /ec2.(.*).amazonaws.com\/\z/ => 'DescribeImages.200.xml') { Hash[body: /Action=DescribeImages/] }
+    webmock(:post, /ec2.(.*).amazonaws.com\/\z/ => 'DescribeTags.200.xml') { Hash[body: /Action=DescribeTags/] }
+    webmock(:post, /ec2.(.*).amazonaws.com\/\z/ => 'DescribeInstances.200.xml') { Hash[body: /Action=DescribeInstances/] }
+    webmock(:post, /ec2.(.*).amazonaws.com\/\z/ => 'CreateImage.200.xml') { Hash[body: /Action=CreateImage/] }
+    webmock(:post, /ec2.(.*).amazonaws.com\/\z/ => 'DeregisterImage.200.xml') { Hash[body: /Action=DeregisterImage/] }
+    webmock(:post, /ec2.(.*).amazonaws.com\/\z/ => 'CreateTags.200.xml') { Hash[body: /Action=CreateTags/] }
+    webmock(:post, /autoscaling.(.*).amazonaws.com\/\z/ => 'DescribeLaunchConfigurations.200.xml') { Hash[body: /Action=DescribeLaunchConfigurations/] }
+    webmock(:post, /autoscaling.(.*).amazonaws.com\/\z/ => 'CreateLaunchConfiguration.200.xml') { Hash[body: /Action=CreateLaunchConfiguration/] }
+    webmock(:post, /autoscaling.(.*).amazonaws.com\/\z/ => 'DeleteLaunchConfiguration.200.xml') { Hash[body: /Action=DeleteLaunchConfiguration/] }
+    webmock(:post, /autoscaling.(.*).amazonaws.com\/\z/ => 'UpdateAutoScalingGroup.200.xml') { Hash[body: /Action=UpdateAutoScalingGroup/] }
+  end
+
+  let!(:ami) do
+    _ami = nil
+    Elbas::AMI.create { |ami| _ami = ami }
+    _ami
+  end
+
+  describe 'AMI creation & cleanup' do
+    it 'creates a new AMI on Amazon' do
+      expect(ami.aws_counterpart.id).to eq 'ami-4fa54026'
+    end
+
+    it 'deletes any AMIs tagged with Deployed-with=ELBAS' do
+      expect(WebMock).to have_requested(:post, /ec2.(.*).amazonaws.com\/\z/).with(body: /Action=DeregisterImage&ImageId=ami-1a2b3c4d/)
+    end
+
+    it 'tags the new AMI with Deployed-with=ELBAS' do
+      expect(WebMock).to have_requested(:post, /ec2.(.*).amazonaws.com\/\z/).with(body: /Action=CreateTags&ResourceId.1=ami-4fa54026&Tag.1.Key=Deployed-with&Tag.1.Value=ELBAS/)
+    end
+  end
+
+  describe 'Launch configuration creation & cleanup' do
+    let!(:launch_configuration) do
+      _lc = nil
+      Elbas::LaunchConfiguration.create(ami) { |lc| _lc = lc }
+      _lc
+    end
+
+    it 'creates a new Launch Configuration on AWS' do
+      expect(WebMock).to have_requested(:post, /autoscaling.(.*).amazonaws.com\/\z/).
+        with(body: /Action=CreateLaunchConfiguration&AssociatePublicIpAddress=true&ImageId=ami-4fa54026&InstanceMonitoring.Enabled=true&InstanceType=m1.small&LaunchConfigurationName=ELBAS-production/)
+    end
+
+    it 'deletes any LCs with name =~ ELBAS' do
+      expect(WebMock).to have_requested(:post, /autoscaling.(.*).amazonaws.com\/\z/).with(body: /Action=DeleteLaunchConfiguration&LaunchConfigurationName=ELBAS-production-LC-1234567890/)
+    end
+
+    it 'attaches the LC to the autoscale group' do
+      launch_configuration.attach_to_autoscale_group!
+      expect(WebMock).to have_requested(:post, /autoscaling.(.*).amazonaws.com\/\z/).with(body: /Action=UpdateAutoScalingGroup&AutoScalingGroupName=production&LaunchConfigurationName=ELBAS-production-LC-\d{10,}/)
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,32 @@
+require 'webmock'
+require 'capistrano/all'
+require 'elbas'
+require 'webmock/rspec'
+
+WebMock.disable_net_connect!
+
+Dir[File.join(File.expand_path('../..', __FILE__), 'spec', 'support', '**', '*.rb')].each { |f| require f }
+
+module WebMock
+  module RSpec
+    module Helper
+
+      def webmock(method, mocks = {})
+        mocks.each do |regex, filename|
+          status = filename[/\.(\d+)\./, 1] || 200
+          body = File.read File.join(File.expand_path('../..', __FILE__), 'spec', 'support', 'stubs', filename)
+          if block_given? && with_options = yield
+            WebMock.stub_request(method, regex).with(with_options).to_return status: status.to_i, body: body
+          else
+            WebMock.stub_request(method, regex).to_return status: status.to_i, body: body
+          end
+        end
+      end
+
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include WebMock::RSpec::Helper
+end

data/spec/support/stubs/CreateImage.200.xml

@@ -0,0 +1,4 @@
+<CreateImageResponse xmlns="http://ec2.amazonaws.com/doc/2014-10-01/">
+   <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+   <imageId>ami-4fa54026</imageId>
+</CreateImageResponse>

data/spec/support/stubs/CreateLaunchConfiguration.200.xml

@@ -0,0 +1,5 @@
+<CreateLaunchConfigurationResponse xmlns="http://autoscaling.amazonaws.com/doc/2011-01-01/">
+<ResponseMetadata>
+   <RequestId>7c6e177f-f082-11e1-ac58-3714bEXAMPLE</RequestId>
+</ResponseMetadata>
+</CreateLaunchConfigurationResponse>

data/spec/support/stubs/CreateTags.200.xml

@@ -0,0 +1,5 @@
+<CreateTagsResponse
+xmlns="http://ec2.amazonaws.com/doc/2014-10-01/">
+  <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
+  <return>true</return>
+</CreateTagsResponse>

data/spec/support/stubs/DeleteLaunchConfiguration.200.xml

@@ -0,0 +1,5 @@
+<DeleteLaunchConfigurationResponse xmlns="http://autoscaling.amazonaws.com/doc/2011-01-01/">
+  <ResponseMetadata>
+    <RequestId>7347261f-97df-11e2-8756-35eEXAMPLE</RequestId>
+  </ResponseMetadata>
+</DeleteLaunchConfigurationResponse>

data/spec/support/stubs/DeregisterImage.200.xml

@@ -0,0 +1,4 @@
+<DeregisterImageResponse xmlns="http://ec2.amazonaws.com/doc/2014-10-01/">
+  <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+  <return>true</return>
+</DeregisterImageResponse>

data/spec/support/stubs/DescribeImages.200.xml

@@ -0,0 +1,35 @@
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2014-10-01/">
+  <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+  <imagesSet>
+    <item>
+      <imageId>ami-1a2b3c4d</imageId>
+      <imageLocation>amazon/getting-started</imageLocation>
+      <imageState>available</imageState>
+      <imageOwnerId>123456789012</imageOwnerId>
+      <isPublic>true</isPublic>
+      <architecture>i386</architecture>
+      <imageType>machine</imageType>
+      <kernelId>aki-1a2b3c4d</kernelId>
+      <ramdiskId>ari-1a2b3c4d</ramdiskId>
+      <imageOwnerAlias>amazon</imageOwnerAlias>
+      <name>getting-started</name>
+      <description>Image Description</description>
+      <rootDeviceType>ebs</rootDeviceType>
+      <rootDeviceName>/dev/sda</rootDeviceName>
+      <blockDeviceMapping>
+        <item>
+          <deviceName>/dev/sda1</deviceName>
+          <ebs>
+            <snapshotId>snap-1a2b3c4d</snapshotId>
+            <volumeSize>15</volumeSize>
+            <deleteOnTermination>false</deleteOnTermination>
+            <volumeType>standard</volumeType>
+          </ebs>
+        </item>
+      </blockDeviceMapping>
+      <virtualizationType>paravirtual</virtualizationType>
+      <tagSet/>
+      <hypervisor>xen</hypervisor>
+    </item>
+  </imagesSet>
+</DescribeImagesResponse>

data/spec/support/stubs/DescribeInstances.200.xml

@@ -0,0 +1,124 @@
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2014-10-01/">
+  <requestId>fdcdcab1-ae5c-489e-9c33-4637c5dda355</requestId>
+    <reservationSet>
+      <item>
+        <reservationId>r-1a2b3c4d</reservationId>
+        <ownerId>123456789012</ownerId>
+        <groupSet>
+          <item>
+            <groupId>sg-1a2b3c4d</groupId>
+            <groupName>my-security-group</groupName>
+          </item>
+        </groupSet>
+        <instancesSet>
+          <item>
+            <instanceId>i-1a2b3c4d</instanceId>
+            <imageId>ami-1a2b3c4d</imageId>
+            <instanceState>
+              <code>16</code>
+              <name>running</name>
+            </instanceState>
+            <privateDnsName/>
+            <dnsName/>
+            <reason/>
+            <keyName>my-key-pair</keyName>
+            <amiLaunchIndex>0</amiLaunchIndex>
+            <productCodes/>
+            <instanceType>c1.medium</instanceType>
+            <launchTime>Y2035-02-09T23:17:13Z+0000</launchTime>
+            <placement>
+              <availabilityZone>us-west-2a</availabilityZone>
+              <groupName/>
+              <tenancy>default</tenancy>
+            </placement>
+            <platform>windows</platform>
+            <monitoring>
+              <state>disabled</state>
+            </monitoring>
+            <subnetId>subnet-1a2b3c4d</subnetId>
+            <vpcId>vpc-1a2b3c4d</vpcId>
+            <privateIpAddress>10.0.0.12</privateIpAddress>
+            <ipAddress>46.51.219.63</ipAddress>
+            <sourceDestCheck>true</sourceDestCheck>
+            <groupSet>
+              <item>
+                <groupId>sg-1a2b3c4d</groupId>
+                <groupName>my-security-group</groupName>
+              </item>
+            </groupSet>
+            <architecture>x86_64</architecture>
+            <rootDeviceType>ebs</rootDeviceType>
+            <rootDeviceName>/dev/sda1</rootDeviceName>
+            <blockDeviceMapping>
+              <item>
+                <deviceName>/dev/sda1</deviceName>
+                <ebs>
+                  <volumeId>vol-1a2b3c4d</volumeId>
+                  <status>attached</status>
+                  <attachTime>2035-02-09T23:17:13Z</attachTime>
+                  <deleteOnTermination>true</deleteOnTermination>
+                </ebs>
+              </item>
+            </blockDeviceMapping>
+            <virtualizationType>hvm</virtualizationType>
+            <clientToken>ABCDE1234567890123</clientToken>
+            <tagSet>
+              <item>
+                <key>Name</key>
+                <value>Windows Instance</value>
+              </item>
+            </tagSet>
+            <hypervisor>xen</hypervisor>
+            <networkInterfaceSet>
+              <item>
+                <networkInterfaceId>eni-1a2b3c4d</networkInterfaceId>
+                <subnetId>subnet-1a2b3c4d</subnetId>
+                <vpcId>vpc-1a2b3c4d</vpcId>
+                <description>Primary network interface</description>
+                <ownerId>123456789012</ownerId>
+                <status>in-use</status>
+                <macAddress>1b:2b:3c:4d:5e:6f</macAddress>
+                <privateIpAddress>10.0.0.12</privateIpAddress>
+                <sourceDestCheck>true</sourceDestCheck>
+                <groupSet>
+                  <item>
+                    <groupId>sg-1a2b3c4d</groupId>
+                    <groupName>my-security-group</groupName>
+                  </item>
+                </groupSet>
+                <attachment>
+                  <attachmentId>eni-attach-1a2b3c4d</attachmentId>
+                  <deviceIndex>0</deviceIndex>
+                  <status>attached</status>
+                  <attachTime>2035-02-09T23:17:13Z</attachTime>
+                  <deleteOnTermination>true</deleteOnTermination>
+                </attachment>
+                <association>
+                  <publicIp>198.51.100.63</publicIp>
+                  <ipOwnerId>123456789012</ipOwnerId>
+                </association>
+                <privateIpAddressesSet>
+                  <item>
+                    <privateIpAddress>10.0.0.12</privateIpAddress>
+                    <primary>true</primary>
+                    <association>
+                      <publicIp>198.51.100.63</publicIp>
+                      <ipOwnerId>123456789012</ipOwnerId>
+                    </association>
+                  </item>
+                  <item>
+                    <privateIpAddress>10.0.0.14</privateIpAddress>
+                    <primary>false</primary>
+                    <association>
+                      <publicIp>198.51.100.177</publicIp>
+                      <ipOwnerId>123456789012</ipOwnerId>
+                    </association>
+                  </item>
+                </privateIpAddressesSet>
+              </item>
+            </networkInterfaceSet>
+          </item>
+        </instancesSet>
+      </item>
+    </reservationSet>
+    </DescribeInstancesResponse>

data/spec/support/stubs/DescribeLaunchConfigurations.200.xml

@@ -0,0 +1,29 @@
+<DescribeLaunchConfigurationsResponse xmlns="http://autoscaling.amazonaws.com/doc/2011-01-01/">
+  <DescribeLaunchConfigurationsResult>
+    <LaunchConfigurations>
+      <member>
+        <AssociatePublicIpAddress>true</AssociatePublicIpAddress>
+        <SecurityGroups/>
+        <PlacementTenancy>dedicated</PlacementTenancy>
+        <CreatedTime>2013-01-21T23:04:42.200Z</CreatedTime>
+        <KernelId/>
+        <LaunchConfigurationName>ELBAS-production-LC-1234567890</LaunchConfigurationName>
+        <UserData/>
+        <InstanceType>m1.small</InstanceType>
+        <LaunchConfigurationARN>arn:aws:autoscaling:us-east-1:803981987763:launchConfiguration:
+        9dbbbf87-6141-428a-a409-0752edbe6cad:launchConfigurationName/my-test-lc</LaunchConfigurationARN>
+        <BlockDeviceMappings/>
+        <ImageId>ami-514ac838</ImageId>
+        <KeyName/>
+        <RamdiskId/>
+        <InstanceMonitoring>
+          <Enabled>true</Enabled>
+        </InstanceMonitoring>
+        <EbsOptimized>false</EbsOptimized>
+      </member>
+    </LaunchConfigurations>
+  </DescribeLaunchConfigurationsResult>
+  <ResponseMetadata>
+    <RequestId>d05a22f8-b690-11e2-bf8e-2113fEXAMPLE</RequestId>
+  </ResponseMetadata>
+</DescribeLaunchConfigurationsResponse>

data/spec/support/stubs/DescribeTags.200.xml

@@ -0,0 +1,11 @@
+<DescribeTagsResponse xmlns="http://ec2.amazonaws.com/doc/2014-10-01/">
+   <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
+   <tagSet>
+      <item>
+         <resourceId>ami-1a2b3c4d</resourceId>
+         <resourceType>image</resourceType>
+         <key>Deployed-with</key>
+         <value>ELBAS</value>
+      </item>
+    </tagSet>
+</DescribeTagsResponse>

data/spec/support/stubs/UpdateAutoScalingGroup.200.xml

@@ -0,0 +1,5 @@
+<UpdateAutoScalingGroupResponse xmlns="http://autoscaling.amazonaws.com/doc/2011-01-01/">
+  <ResponseMetadata>
+    <RequestId>adafead0-ab8a-11e2-ba13-ab0ccEXAMPLE</RequestId>
+  </ResponseMetadata>
+</UpdateAutoScalingGroupResponse>

data/spec/support/stubs/security-credentials.200.json

@@ -0,0 +1,9 @@
+{
+  "Code" : "Success",
+  "LastUpdated" : "2013-11-22T20:03:48Z",
+  "Type" : "AWS-HMAC",
+  "AccessKeyId" : "akid",
+  "SecretAccessKey" : "secret",
+  "Token" : "token",
+  "Expiration" : "2035-02-09T21:53:57Z"
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elbas
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Logan Serman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,21 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,8 +94,23 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.0.0
-description: Capistrano plugin for deploying to AWS ASGroups.. Deploys to all instances
-  in a group, creates a fresh AMI post-deploy, and attaches the AMI to your ASGroup.
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+description: Capistrano plugin for deploying to AWS AutoScale Groups. Deploys to all
+  instances in a group, creates a fresh AMI post-deploy, and attaches the AMI to your
+  AutoScale Group.
 email:
 - logan.serman@metova.com
 executables: []
@@ -117,6 +118,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -124,14 +127,29 @@ files:
 - elbas.gemspec
 - lib/elbas.rb
 - lib/elbas/ami.rb
-- lib/elbas/aws.rb
+- lib/elbas/aws/autoscaling.rb
+- lib/elbas/aws/credentials.rb
+- lib/elbas/aws/ec2.rb
+- lib/elbas/aws_resource.rb
 - lib/elbas/capistrano.rb
 - lib/elbas/launch_configuration.rb
+- lib/elbas/logger.rb
+- lib/elbas/taggable.rb
 - lib/elbas/tasks/elbas.rake
 - lib/elbas/version.rb
-- test/aws/ami_test.rb
-- test/stubs.rb
-- test/test_helper.rb
+- spec/elbas_spec.rb
+- spec/spec_helper.rb
+- spec/support/stubs/CreateImage.200.xml
+- spec/support/stubs/CreateLaunchConfiguration.200.xml
+- spec/support/stubs/CreateTags.200.xml
+- spec/support/stubs/DeleteLaunchConfiguration.200.xml
+- spec/support/stubs/DeregisterImage.200.xml
+- spec/support/stubs/DescribeImages.200.xml
+- spec/support/stubs/DescribeInstances.200.xml
+- spec/support/stubs/DescribeLaunchConfigurations.200.xml
+- spec/support/stubs/DescribeTags.200.xml
+- spec/support/stubs/UpdateAutoScalingGroup.200.xml
+- spec/support/stubs/security-credentials.200.json
 homepage: http://github.com/metova/elbas
 licenses:
 - MIT
@@ -155,8 +173,18 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Capistrano plugin for deploying to AWS ASGroups.
+summary: Capistrano plugin for deploying to AWS AutoScale Groups.
 test_files:
-- test/aws/ami_test.rb
-- test/stubs.rb
-- test/test_helper.rb
+- spec/elbas_spec.rb
+- spec/spec_helper.rb
+- spec/support/stubs/CreateImage.200.xml
+- spec/support/stubs/CreateLaunchConfiguration.200.xml
+- spec/support/stubs/CreateTags.200.xml
+- spec/support/stubs/DeleteLaunchConfiguration.200.xml
+- spec/support/stubs/DeregisterImage.200.xml
+- spec/support/stubs/DescribeImages.200.xml
+- spec/support/stubs/DescribeInstances.200.xml
+- spec/support/stubs/DescribeLaunchConfigurations.200.xml
+- spec/support/stubs/DescribeTags.200.xml
+- spec/support/stubs/UpdateAutoScalingGroup.200.xml
+- spec/support/stubs/security-credentials.200.json

data/lib/elbas/aws.rb

@@ -1,62 +0,0 @@
-require 'aws-sdk'
-
-module Elbas
-  class AWS
-    include Capistrano::DSL
-
-    attr_reader :aws_counterpart
-
-    def cleanup(&block)
-      items = garbage || []
-      yield
-      destroy items
-      self
-    end
-
-    def info(message)
-      p "ELBAS: #{message}"
-    end
-
-    def method_missing(_method, *args, &block)
-      aws_counterpart.send _method, *args
-    end
-
-    protected
-
-      def autoscaling
-        @_autoscaling ||= ::AWS::AutoScaling.new(credentials)
-      end
-
-      def ec2
-        @_ec2 ||= ::AWS::EC2.new(credentials)
-      end
-
-      def asgroup
-        @_asgroup ||= autoscaling.groups[fetch(:aws_autoscale_group)]
-      end
-
-      def base_ec2_instance
-        @_base_ec2_instance ||= asgroup.ec2_instances.filter('instance-state-name', 'running').first
-      end
-
-      def environment
-        fetch(:rails_env, 'production')
-      end
-
-      def timestamp(str)
-        "#{str}-#{Time.now.to_i}"
-      end
-
-    private
-
-      def credentials
-        {
-          access_key_id: fetch(:aws_access_key_id, ENV['AWS_ACCESS_KEY_ID']),
-          secret_access_key: fetch(:aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY']),
-        }.tap do |_credentials|
-          _credentials.merge! region: fetch(:aws_region) if fetch(:aws_region)
-        end
-      end
-
-  end
-end

data/test/aws/ami_test.rb

@@ -1,9 +0,0 @@
-require_relative '../test_helper'
-
-class AMITest < Minitest::Test
-  def test_creates_ec2_instance
-    Elbas::AMI.create do |ami|
-      p ami
-    end
-  end
-end

data/test/stubs.rb

@@ -1,26 +0,0 @@
-def stub(url, method = :get, with = {}, &block)
-  body = yield
-  WebMock.stub_request(method, %r[#{url}]).with(with).to_return body: body
-end
-
-stub %r[(.*)/meta-data/iam/security-credentials] do
-<<-BODY
-  {
-    "Code" : "Success",
-    "LastUpdated" : "2012-04-26T16:39:16Z",
-    "Type" : "AWS-HMAC",
-    "AccessKeyId" : "FAKE_ACCESS_KEY_ID",
-    "SecretAccessKey" : "FAKE_SECRET_ACCESS_KEY",
-    "Token" : "token",
-    "Expiration" : "2012-04-27T22:39:16Z"
-  }
-BODY
-end
-
-stub %r[ec2.us-east-1.amazonaws.com], :post, body: /DescribeImages&Owner.1=self/ do
-<<-BODY
-{
-    "ImageId": "ami-5731123e"
-}
-BODY
-end

data/test/test_helper.rb

@@ -1,15 +0,0 @@
-require 'minitest/autorun'
-require 'minitest/reporters'
-require 'webmock'
-
-require 'capistrano/all'
-
-require 'elbas'
-require 'elbas/aws'
-require 'elbas/ami'
-require 'elbas/launch_configuration'
-
-Minitest::Reporters.use!
-
-WebMock.disable_net_connect!
-load File.expand_path("../stubs.rb", __FILE__)