beanstalkify 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    beanstalkify (0.0.5)
+    beanstalkify (0.0.6)
       aws-sdk
 
 GEM
   remote: http://rubygems.org/
   specs:
-    aws-sdk (1.14.1)
+    aws-sdk (1.15.0)
       json (~> 1.4)
       nokogiri (< 1.6.0)
       uuidtools (~> 2.1)

data/bin/beanstalkify

@@ -20,7 +20,7 @@ OptionParser.new do |opts|
     opts.on("-s", "--stack [stack]", "Stack to provision (e.g. '64bit Amazon Linux running Node.js')") do |v|
         options[:stack] = v
     end
-    opts.on("-n", "--cname [cname]", "CNAME prefix (e.g. my-awesome-app)") do |v|
+    opts.on("-n", "--cname [cname]", "CNAME prefixes to try (e.g. my-awesome-app,my-awesome-app-2)") do |v|
         options[:cname] = v
     end
     opts.on("-c", "--config [file]", "Configuration overrides for the environment (optional)") do |v|
@@ -33,13 +33,13 @@ end.parse!
 
 required_params = [:credentials, :archive, :environment, :stack]
 unless (required_params - options.keys).empty?
-    puts "Example usage: beanstalkify -k credentials.yml -a AppName-version.zip -e Test -s '64bit Amazon Linux running Node.js' [-c config.yml] [-n my-awesome-app] [-o info.yml]"
+    puts "Example usage: beanstalkify -k credentials.yml -a AppName-version.zip -e Test -s '64bit Amazon Linux running Node.js' [-c config.yml] [-n my-awesome-app,my-awesome-app-1] [-o info.yml]"
     exit
 end
 
 Beanstalkify::Beanstalk.configure! options[:credentials]
 
-app = Beanstalkify::Application.new(options[:stack], options[:cname], options[:config] || [])
+app = Beanstalkify::Application.new(options[:stack], options[:cname] || '', options[:config] || [])
 archive = Beanstalkify::Archive.new(options[:archive])
 environment = Beanstalkify::Environment.new(archive, options[:environment])
 

data/lib/beanstalkify/application.rb

@@ -4,9 +4,9 @@ module Beanstalkify
 
         # config is an array of hashes:
         #   :namespace, :option_name, :value
-        def initialize(stack, cname, config)
+        def initialize(stack, cnames, config)
             @stack = stack
-            @cname = cname
+            @cnames = cnames.split(',')
             @config = config.map { |c| Hash[c.map { |k, v| [k.to_sym,v]}] }
         end
 
@@ -17,7 +17,7 @@ module Beanstalkify
             
             if env.status.empty?
                 puts "Creating stack '#{@stack}' for #{archive.app_name}-#{archive.version}..."
-                env.create!(archive, @stack, @cname, @config)
+                env.create!(archive, @stack, @cnames, @config)
                 env.wait!("Launching")
             else
                 puts "Deploying #{archive.version} to #{env.name}..."

data/lib/beanstalkify/environment.rb

@@ -22,7 +22,8 @@ module Beanstalkify
 
         # Assuming the archive has already been uploaded, 
         # create a new environment with the app deployed onto the provided stack.
-        def create!(archive, stack, cname, settings=[])
+        # Attempts to use the first available cname in the cnames array.
+        def create!(archive, stack, cnames, settings=[])
             params = {
                 :application_name => archive.app_name,
                 :version_label => archive.version,
@@ -30,11 +31,12 @@ module Beanstalkify
                 :solution_stack_name => stack,
                 :option_settings => settings
             }
-            if cname
-                if dns_available(cname)
-                    params[:cname_prefix] = cname
+            cnames.each do |c|
+                if dns_available(c)
+                    params[:cname_prefix] = c
+                    break
                 else
-                    puts "CNAME #{cname} is unavailable."
+                    puts "CNAME #{c} is unavailable."
                 end
             end
             @beanstalk.create_environment(params)

data/lib/beanstalkify/version.rb

@@ -1,3 +1,3 @@
 module Beanstalkify
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/environment_spec.rb

@@ -17,7 +17,7 @@ describe Beanstalkify::Environment do
             :solution_stack_name => 'mastack',
             :option_settings => masettings
       ).and_return nil
-      @env.create! @archive, 'mastack', nil, masettings
+      @env.create! @archive, 'mastack', [], masettings
   end
 
   it 'creates a new environment with a cname, if available' do
@@ -27,13 +27,13 @@ describe Beanstalkify::Environment do
             :version_label => 'version',
             :environment_name => 'app-name-Test',
             :solution_stack_name => 'mastack',
-            :cname_prefix => 'ma-cname',
+            :cname_prefix => 'ma-cname-1',
             :option_settings => masettings
       ).and_return nil
       expect(@beanstalk_api).to receive(:check_dns_availability).and_return(
           :available => true
       )
-      @env.create! @archive, 'mastack', 'ma-cname', masettings
+      @env.create! @archive, 'mastack', ['ma-cname-1'], masettings
   end
 
   it 'creates an environment without the cname, if the cname was unavailable' do
@@ -48,7 +48,7 @@ describe Beanstalkify::Environment do
       expect(@beanstalk_api).to receive(:check_dns_availability).and_return(
           :available => false
       )
-      @env.create! @archive, 'mastack', 'ma-cname', masettings
+      @env.create! @archive, 'mastack', ['ma-cname-1'], masettings
   end
 
   it 'prepends the application name because environment names must be unique within an AWS account' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalkify
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3858020732862147076
+      hash: -637330145255751151
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3858020732862147076
+      hash: -637330145255751151
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24