elbas 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 777f9507be8cbb8ddff0bfee2f87a3a54da9b8bb
-  data.tar.gz: a9a1a049de02acf64cba7ffb8a6fa178e463536f
+  metadata.gz: 82ca715d8f56637b72b016d89ad7a8e75d0938ca
+  data.tar.gz: ce2d53f9313fa1ced5771dfa158fb6881f1df693
 SHA512:
-  metadata.gz: e9e70b8d18a4b041538514587811ecfbd33701f7268afcba1a4dd31b9bb772a1ce0c7583985163dcbb7b4b178c94aa6c0553cf1ef0c4de443dda402c98b36488
-  data.tar.gz: b41ea79f9df49e617e222058b9213d1c8e823d210d67f7a22502c34b35d4ec086dfd187cb1640ea3771824bc15415f2dc7c5e0c9bf2b3bef0be8faf46429485e
+  metadata.gz: 056e29ee77eb2465ab4869de400b174df75db6bb086267459facb81c36db7f3c65f9f044a2910c0c4a4fa82d52b10c370012ceb4e431839e0a450dadc7a7170b
+  data.tar.gz: e9e5ad103b69da7472262d7790873633a3f2f9c7909f05ac060583e521aebf1b8a3520299ea52367867dbaedc4b68aff562e09a211377b4e6ea76287560e324a

data/README.md

@@ -28,6 +28,7 @@ set :aws_access_key_id,     ENV['AWS_ACCESS_KEY_ID']
 set :aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY']
 set :aws_region,            ENV['AWS_REGION']
 
+set :aws_no_reboot_on_create_ami, true
 set :aws_autoscale_instance_size, 'm1.small'
 ```
 

data/lib/elbas.rb

@@ -3,6 +3,7 @@ require 'capistrano/all'
 require 'active_support/concern'
 
 require 'elbas/version'
+require 'elbas/retryable'
 require 'elbas/taggable'
 require 'elbas/logger'
 require 'elbas/aws/credentials'
@@ -12,6 +13,5 @@ require 'elbas/aws_resource'
 require 'elbas/ami'
 require 'elbas/launch_configuration'
 
-
 module Elbas
 end

data/lib/elbas/ami.rb

@@ -16,7 +16,7 @@ module Elbas
       @aws_counterpart = ec2.images.create \
         name: name,
         instance_id: base_ec2_instance.id,
-        no_reboot: true
+        no_reboot: fetch(:aws_no_reboot_on_create_ami, true)
     end
 
     def destroy(images = [])
@@ -39,4 +39,4 @@ module Elbas
       end
 
   end
-end
+end

data/lib/elbas/aws_resource.rb

@@ -3,6 +3,7 @@ module Elbas
     include Capistrano::DSL
     include Elbas::AWS::AutoScaling
     include Elbas::AWS::EC2
+    include Elbas::Retryable
     include Logger
 
     attr_reader :aws_counterpart

data/lib/elbas/retryable.rb

@@ -0,0 +1,16 @@
+module Elbas
+  module Retryable
+
+    def with_retry(max: 3, delay: 5)
+      tries ||= 0
+      tries += 1
+      yield
+    rescue => e
+      if tries < max
+        sleep delay
+        retry
+      end
+    end
+
+  end
+end

data/lib/elbas/taggable.rb

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

data/lib/elbas/version.rb

@@ -1,3 +1,3 @@
 module Elbas
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/spec/ami_spec.rb

@@ -0,0 +1,10 @@
+describe Elbas::AMI do
+  describe '#tag' 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) }
+      subject.tag 'Test' => true
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elbas
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Logan Serman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,9 +134,11 @@ files:
 - lib/elbas/capistrano.rb
 - lib/elbas/launch_configuration.rb
 - lib/elbas/logger.rb
+- lib/elbas/retryable.rb
 - lib/elbas/taggable.rb
 - lib/elbas/tasks/elbas.rake
 - lib/elbas/version.rb
+- spec/ami_spec.rb
 - spec/elbas_spec.rb
 - spec/spec_helper.rb
 - spec/support/stubs/CreateImage.200.xml
@@ -175,6 +177,7 @@ signing_key:
 specification_version: 4
 summary: Capistrano plugin for deploying to AWS AutoScale Groups.
 test_files:
+- spec/ami_spec.rb
 - spec/elbas_spec.rb
 - spec/spec_helper.rb
 - spec/support/stubs/CreateImage.200.xml