elbas 0.19.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 8d9387ef3cdb8dba9ce25d682855acfdcd58cdf6
-  data.tar.gz: ef2a6444e7e23d0095097c3ef9ced294ba326c89
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjI4YjhlOTY3ZjBjOTBmMDhlYjg3ZDcwODIzN2M0YjBlY2RkMTNmNQ==
+  data.tar.gz: !binary |-
+    YTdlMDNhMjBiZWZiOTU5MmQ3OGU0YjRkOGUwNWU5MzJiNWJhNTg3ZA==
 SHA512:
-  metadata.gz: ec8a35adf28471878764b1f9f77f98af8e08403682624c94f7580fd060ee31e828a7110fd6b07b309ba2b8f9032cad131fb2b63413a15e12f2b1979931df9d37
-  data.tar.gz: 4c7a50f6812e8e78033e007f0b0b2afc0a6edc08b6dfdf44c56956545a3a463555248be92f3964b19c3b3ce1a66d09f649ee7524ecdd4ccfa05c642bbd9f45dd
+  metadata.gz: !binary |-
+    OWViMWYwMGM1MjAzZGYzODE1NmNjMGNkYjkyOTdkYzczNTg1Zjc5NTFhOWQ3
+    OTRhMWRlYzk0NGQ0NDAyY2EzYWMxZjAxZTdlZmRjNjM2M2U2MTcwODM4MTE3
+    MDhlOTRlYzg5MGQ5MWVhMjU3ZGI2YjFiMmZhOTI2NzAxYTBmNTI=
+  data.tar.gz: !binary |-
+    N2E2NjgzNzhjNzU4NGZmNWE5ODgwNzEyMjQ0OGIzMjU4Y2VhMDY2ZWRjYWJl
+    NWFkODljMzU1Y2NiZjI3OTUxNjljZmQ4Y2RhNmYzYWViYjBjZTRlMTE3MmE0
+    Y2ZlODEwZGI3NzliZjlkMTYwMDM4ZmU4ODJlOTJlZWNjNmUzMGE=

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
-- 2.0.0
+- 2.3.0
 sudo: false
 deploy:
   provider: rubygems
@@ -11,4 +11,4 @@ deploy:
     repo: lserman/capistrano-elbas
     branch: master
   api_key:
-    secure: l7oX8UC0qhvbTQioFOaRy6sx3T1+JKr2MxdcEvgqZDg6hx2l2WhnZemmm0FtvjKBWC65Sk/ygT0PmeekTVzQIcK8E6Bz/mtTTbOfD/wxdOzbJfOXGYKy8amCNvPEQ+DLIkMY0hxx23t7YLj/MIu53vKCAOEwKMKMylUZrYizZWk=
+    secure: gRiZBVBq+/AtMoOeSsMlnCLawQVzN/SVXyOC7+5gni8iKPGDpXL+CBrUv410WStBmA2c4SYn9lNmeLOea31TOA0yIMnjfjA36jPNKzKWThRb9NuUzV8ySGqBcqp1YhvZta46Jv+d3HovGgSJ0aw5tCSfB+gPdwNvkFvqe+zIy3Y=

data/README.md

@@ -30,6 +30,9 @@ set :aws_region,            ENV['AWS_REGION']
 
 set :aws_no_reboot_on_create_ami, true
 set :aws_autoscale_instance_size, 'm1.small'
+
+set :aws_launch_configuration_detailed_instance_monitoring, true
+set :aws_launch_configuration_associate_public_ip, true
 ```
 
 ## Usage

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/elbas.gemspec

@@ -23,8 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency 'aws-sdk', '~> 1'
+  spec.add_dependency 'aws-sdk-v1', '~> 1'
   spec.add_dependency 'capistrano', '> 3.0.0'
   spec.add_dependency 'activesupport', '>= 4.0.0'
-
 end

data/lib/elbas.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-v1'
 require 'capistrano/all'
 require 'active_support/concern'
 

data/lib/elbas/ami.rb

@@ -7,6 +7,7 @@ module Elbas
       ami.cleanup do
         ami.save
         ami.tag 'Deployed-with' => 'ELBAS'
+        ami.tag 'ELBAS-Deploy-group' => ami.autoscale_group_name
         yield ami
       end
     end
@@ -27,7 +28,6 @@ module Elbas
     end
 
     private
-
       def name
         timestamp "#{environment}-AMI"
       end
@@ -37,6 +37,5 @@ module Elbas
           deployed_with_elbas? ami
         end
       end
-
   end
 end

data/lib/elbas/aws/autoscaling.rb

@@ -16,7 +16,6 @@ module Elbas
       def autoscale_group_name
         fetch(:aws_autoscale_group)
       end
-
     end
   end
-end
+end

data/lib/elbas/aws/credentials.rb

@@ -15,7 +15,6 @@ module Elbas
           _credentials
         end
       end
-
     end
   end
-end
+end

data/lib/elbas/aws/ec2.rb

@@ -8,7 +8,6 @@ module Elbas
       def ec2
         @_ec2 ||= ::AWS::EC2.new(credentials)
       end
-
     end
   end
-end
+end

data/lib/elbas/aws_resource.rb

@@ -15,8 +15,7 @@ module Elbas
       self
     end
 
-    protected
-
+    private
       def base_ec2_instance
         @_base_ec2_instance ||= autoscale_group.ec2_instances.filter('instance-state-name', 'running').first
       end
@@ -29,11 +28,9 @@ module Elbas
         "#{str}-#{Time.now.to_i}"
       end
 
-    private
-
       def deployed_with_elbas?(resource)
-        resource.tags['Deployed-with'] == 'ELBAS'
+        resource.tags['Deployed-with'] == 'ELBAS' &&
+          resource.tags['ELBAS-Deploy-group'] == autoscale_group_name
       end
-
   end
 end

data/lib/elbas/launch_configuration.rb

@@ -17,7 +17,7 @@ module Elbas
     end
 
     def attach_to_autoscale_group!
-      info "Attaching Launch Configuration to AutoScale Group"
+      info 'Attaching Launch Configuration to AutoScale Group'
       autoscale_group.update(launch_configuration: aws_counterpart)
     end
 
@@ -29,9 +29,8 @@ module Elbas
     end
 
     private
-
       def name
-        timestamp "ELBAS-#{environment}-LC"
+        timestamp "ELBAS-#{environment}-#{autoscale_group_name}-LC"
       end
 
       def instance_size
@@ -39,21 +38,21 @@ module Elbas
       end
 
       def create_options
-        _options = {
+        options = {
           security_groups: base_ec2_instance.security_groups.to_a,
-          detailed_instance_monitoring: true,
-          associate_public_ip_address: true,
+          detailed_instance_monitoring: fetch(:aws_launch_configuration_detailed_instance_monitoring, true),
+          associate_public_ip_address: fetch(:aws_launch_configuration_associate_public_ip, true)
         }
 
         if user_data = fetch(:aws_launch_configuration_user_data, nil)
-          _options.merge user_data: user_data
+          options.merge user_data: user_data
         end
 
-        _options
+        options
       end
 
       def deployed_with_elbas?(lc)
-        lc.name =~ /ELBAS-#{environment}/
+        lc.name.include? "ELBAS-#{environment}-#{autoscale_group_name}-LC"
       end
 
       def trash
@@ -61,6 +60,5 @@ module Elbas
           deployed_with_elbas? lc
         end
       end
-
   end
 end

data/lib/elbas/logger.rb

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

data/lib/elbas/retryable.rb

@@ -1,6 +1,5 @@
 module Elbas
   module Retryable
-
     def with_retry(max: fetch(:elbas_retry_max, 3), delay: fetch(:elbas_retry_delay, 5))
       tries ||= 0
       tries += 1
@@ -13,6 +12,5 @@ module Elbas
         retry
       end
     end
-
   end
 end

data/lib/elbas/taggable.rb

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

data/lib/elbas/version.rb

@@ -1,3 +1,3 @@
 module Elbas
-  VERSION = '0.19.0'
+  VERSION = '0.21.0'
 end

data/spec/ami_spec.rb

@@ -3,7 +3,7 @@ describe Elbas::AMI do
     subject { Elbas::AMI.new }
 
     it 'retries the tag 3 times' do
-      expect(subject).to receive(:aws_counterpart).exactly(3).times { OpenStruct.new(tags: nil) }
+      expect(subject).to receive(:aws_counterpart).exactly(3).times { fail RuntimeError }
       subject.tag 'Test' => true
     end
   end

data/spec/elbas_spec.rb

@@ -33,6 +33,10 @@ describe 'ELBAS' do
     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
+
+    it 'tags the new AMI with ELBAS-Deploy-group=<autoscale group name>' do
+      expect(WebMock).to have_requested(:post, /ec2.(.*).amazonaws.com\/\z/).with(body: /Action=CreateTags&ResourceId.1=ami-4fa54026&Tag.1.Key=ELBAS-Deploy-group&Tag.1.Value=production/)
+    end
   end
 
   describe 'Launch configuration creation & cleanup' do
@@ -48,12 +52,12 @@ describe 'ELBAS' do
     end
 
     it 'deletes any LCs with name =~ ELBAS-production' do
-      expect(WebMock).to have_requested(:post, /autoscaling.(.*).amazonaws.com\/\z/).with(body: /Action=DeleteLaunchConfiguration&LaunchConfigurationName=ELBAS-production-LC-1234567890/)
+      expect(WebMock).to have_requested(:post, /autoscaling.(.*).amazonaws.com\/\z/).with(body: /Action=DeleteLaunchConfiguration&LaunchConfigurationName=ELBAS-production-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,}/)
+      expect(WebMock).to have_requested(:post, /autoscaling.(.*).amazonaws.com\/\z/).with(body: /Action=UpdateAutoScalingGroup&AutoScalingGroupName=production&LaunchConfigurationName=ELBAS-production-production-LC-\d{10,}/)
     end
   end
 

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

@@ -7,7 +7,7 @@
         <PlacementTenancy>dedicated</PlacementTenancy>
         <CreatedTime>2013-01-21T23:04:42.200Z</CreatedTime>
         <KernelId/>
-        <LaunchConfigurationName>ELBAS-production-LC-1234567890</LaunchConfigurationName>
+        <LaunchConfigurationName>ELBAS-production-production-LC-1234567890</LaunchConfigurationName>
         <UserData/>
         <InstanceType>m1.small</InstanceType>
         <LaunchConfigurationARN>arn:aws:autoscaling:us-east-1:803981987763:launchConfiguration:
@@ -26,4 +26,4 @@
   <ResponseMetadata>
     <RequestId>d05a22f8-b690-11e2-bf8e-2113fEXAMPLE</RequestId>
   </ResponseMetadata>
-</DescribeLaunchConfigurationsResponse>
+</DescribeLaunchConfigurationsResponse>

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

@@ -7,5 +7,11 @@
          <key>Deployed-with</key>
          <value>ELBAS</value>
       </item>
+      <item>
+         <resourceId>ami-1a2b3c4d</resourceId>
+         <resourceType>image</resourceType>
+         <key>ELBAS-Deploy-group</key>
+         <value>production</value>
+      </item>
     </tagSet>
-</DescribeTagsResponse>
+</DescribeTagsResponse>

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: elbas
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Logan Serman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   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: webmock
   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: aws-sdk
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !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
@@ -113,17 +113,19 @@ description: Capistrano plugin for deploying to AWS AutoScale Groups. Deploys to
   AutoScale Group.
 email:
 - logan.serman@metova.com
-executables: []
+executables:
+- rspec
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/rspec
 - elbas.gemspec
 - lib/elbas.rb
 - lib/elbas/ami.rb
@@ -162,17 +164,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Capistrano plugin for deploying to AWS AutoScale Groups.