aerosol 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31c767638dd285ff3db576f4dacdaff662ca52e8
-  data.tar.gz: 4052d794ed7b58ab82fd571a28ce9e9c52255458
+  metadata.gz: 3fe36e5e375099bfc35214d89869ebfd01a56d31
+  data.tar.gz: 62408a6905eee21aa2b00963bf1b7839e0bd0255
 SHA512:
-  metadata.gz: f4b7fcfcb3958c646d6c2707a91fb9cff4b72186f679d63129872cb5d2dcfb4694282c6b0fb3b73d211dabb33cfaf77e2ddd54357c95d4aa37fd8ff2a652d92d
-  data.tar.gz: f1240b253337fd73fd9316808ceb08d0d12676905f539c6d25469ae5431b6be43453d25a4647f080593bf0e5c948616b17f4f4c8cca0b5b11441107bed0c575a
+  metadata.gz: 0fb1282a4e7a02d2a6e0e2fe6f07acb8e2c09bdd2132cb8e158205db96e6ce4740fb2f86f5d203a4c5427715dbc5a1d93e6958ccdd8f0be1358d7b9b9601108b
+  data.tar.gz: 9494fe769e3b3a4a923768d439e5eea4ca49e549ae3223544dfd269e00aed17639e0dfcdf4d022bdd965f42afe037aef1830cf13e2c407462817058fcbb3a1e7

data/aerosol.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'grit'
   gem.add_dependency 'net-ssh'
   gem.add_dependency 'net-ssh-gateway'
-  gem.add_dependency 'dockly-util', '~> 0.0.5'
+  gem.add_dependency 'dockly-util', '~> 0.1.0'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'

data/lib/aerosol/instance.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 class Aerosol::Instance
   include Aerosol::AWSModel
 
@@ -38,10 +40,22 @@ class Aerosol::Instance
     @description ||= describe!
   end
 
+  def self.request_all_for_token(next_token)
+    options = next_token.nil? ? {} : { next_token: next_token }
+    Aerosol::AWS.auto_scaling.describe_auto_scaling_instances(options)
+  end
+
   def self.request_all
-    Aerosol::AWS.auto_scaling
-                .describe_auto_scaling_instances
-                .auto_scaling_instances
+    next_token = nil
+    instances = []
+
+    begin
+      new_instances = request_all_for_token(next_token)
+      instances.concat(new_instances.auto_scaling_instances)
+      next_token = new_instances.next_token
+    end until next_token.nil?
+
+    instances
   end
 
 private

data/lib/aerosol/launch_configuration.rb

@@ -6,9 +6,11 @@ class Aerosol::LaunchConfiguration
   aws_attribute :launch_configuration_name, :image_id, :instance_type, :security_groups, :user_data,
                 :iam_instance_profile, :kernel_id, :key_name, :spot_price, :created_time,
                 :associate_public_ip_address
+  dsl_attribute :meta_data
 
   primary_key :launch_configuration_name
   default_value(:security_groups) { [] }
+  default_value(:meta_data) { {} }
 
   def launch_configuration_name(arg = nil)
     if arg
@@ -90,6 +92,12 @@ class Aerosol::LaunchConfiguration
 }}
   end
 
+  def corrected_user_data
+    realized_user_data = user_data.is_a?(Proc) ? user_data.call : user_data
+
+    Base64.encode64(Aerosol::Util.strip_heredoc(realized_user_data || ''))
+  end
+
 private
   def create_options
     { # TODO Add dsl so that 'BlockDeviceMappings' may be specified
@@ -98,7 +106,7 @@ private
       key_name: key_name,
       security_groups: security_groups,
       spot_price: spot_price,
-      user_data: Base64.encode64(Aerosol::Util.strip_heredoc(user_data || '')),
+      user_data: corrected_user_data,
       associate_public_ip_address: associate_public_ip_address
     }.reject { |k, v| v.nil? }
   end

data/lib/aerosol/version.rb

@@ -1,5 +1,5 @@
 # Copyright Swipely, Inc.  All rights reserved.
 
 module Aerosol
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/aerosol/launch_configuration_spec.rb

@@ -394,4 +394,47 @@ describe Aerosol::LaunchConfiguration do
       end
     end
   end
+
+  describe '#corrected_user_data' do
+    let(:encoded_user_data_string) { Base64.encode64('test') }
+
+    context 'when the user_data is a String' do
+      subject do
+        described_class.new do
+          name :corrected_user_data
+          user_data 'test'
+        end
+      end
+
+      it 'correctly encodes to base64' do
+        expect(subject.corrected_user_data).to eq(encoded_user_data_string)
+      end
+    end
+
+    context 'when the user_data is a Proc' do
+      subject do
+        described_class.new do
+          name :corrected_user_data_2
+          user_data { 'test' }
+        end
+      end
+
+      it 'correctly encodes to base64' do
+        expect(subject.corrected_user_data).to eq(encoded_user_data_string)
+      end
+    end
+  end
+
+  describe '#meta_data' do
+    subject do
+      described_class.new do
+        name :my_launch_config
+        meta_data('Test' => '1')
+      end
+    end
+
+    it 'returns the hash' do
+      expect(subject.meta_data['Test']).to eq('1')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aerosol
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Instance-based deploys made easy
@@ -293,4 +293,3 @@ test_files:
 - spec/aerosol_spec.rb
 - spec/spec_helper.rb
 - spec/support/vcr.rb
-has_rdoc: