beanstalkify 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    beanstalkify (0.0.4)
+    beanstalkify (0.0.5)
       aws-sdk
 
 GEM

data/README.md

@@ -17,7 +17,7 @@ Create a file called `credentials.yml`, with the following format:
 
 # Running
 
-    beanstalkify -k credentials.yml -a app-version.zip -s "64bit Amazon Linux running Node.js" -e env [-c config.yml]
+    beanstalkify -k credentials.yml -a app-version.zip -s "64bit Amazon Linux running Node.js" -e env [-n my-awesome-app] [-c config.yml]
 
 Should do the following
 

data/bin/beanstalkify

@@ -20,6 +20,9 @@ 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|
+        options[:cname] = v
+    end
     opts.on("-c", "--config [file]", "Configuration overrides for the environment (optional)") do |v|
         options[:config] = YAML.load_file(v)
     end
@@ -30,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] [-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] [-o info.yml]"
     exit
 end
 
 Beanstalkify::Beanstalk.configure! options[:credentials]
 
-app = Beanstalkify::Application.new(options[:stack], 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])
 
@@ -44,4 +47,4 @@ deployment_info = app.deploy! archive, environment
 
 File.open(options[:outfile], 'w') { |f| f.puts deployment_info.to_yaml } if options[:outfile]
 
-raise("Deployed environment is not healthy") unless environment.healthy?
+raise("Deployed environment is not healthy") unless environment.healthy?

data/lib/beanstalkify/application.rb

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

data/lib/beanstalkify/environment.rb

@@ -22,14 +22,28 @@ 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, settings=[])
-            @beanstalk.create_environment({
+        def create!(archive, stack, cname, settings=[])
+            params = {
                 :application_name => archive.app_name,
                 :version_label => archive.version,
                 :environment_name => self.name,
                 :solution_stack_name => stack,
                 :option_settings => settings
-            })
+            }
+            if cname
+                if dns_available(cname)
+                    params[:cname_prefix] = cname
+                else
+                    puts "CNAME #{cname} is unavailable."
+                end
+            end
+            @beanstalk.create_environment(params)
+        end
+
+        def dns_available(cname)
+            @beanstalk.check_dns_availability({
+                :cname_prefix => cname
+            })[:available]
         end
 
         def status

data/lib/beanstalkify/version.rb

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

data/test/environment_spec.rb

@@ -4,8 +4,51 @@ require './lib/beanstalkify/environment'
 describe Beanstalkify::Environment do
   before do
     allow(Beanstalkify::Beanstalk).to receive(:api).and_return @beanstalk_api = double
-    archive = Beanstalkify::Archive.new '/path/to/my/archive/app-name-version.zip'
-    @env = Beanstalkify::Environment.new archive, "Test"
+    @archive = Beanstalkify::Archive.new '/path/to/my/archive/app-name-version.zip'
+    @env = Beanstalkify::Environment.new @archive, "Test"
+  end
+
+  it 'creates a new environment with params' do
+      masettings = {}
+      expect(@beanstalk_api).to receive(:create_environment).with(
+            :application_name => 'app-name',
+            :version_label => 'version',
+            :environment_name => 'app-name-Test',
+            :solution_stack_name => 'mastack',
+            :option_settings => masettings
+      ).and_return nil
+      @env.create! @archive, 'mastack', nil, masettings
+  end
+
+  it 'creates a new environment with a cname, if available' do
+      masettings = {}
+      expect(@beanstalk_api).to receive(:create_environment).with(
+            :application_name => 'app-name',
+            :version_label => 'version',
+            :environment_name => 'app-name-Test',
+            :solution_stack_name => 'mastack',
+            :cname_prefix => 'ma-cname',
+            :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
+  end
+
+  it 'creates an environment without the cname, if the cname was unavailable' do
+      masettings = {}
+      expect(@beanstalk_api).to receive(:create_environment).with(
+            :application_name => 'app-name',
+            :version_label => 'version',
+            :environment_name => 'app-name-Test',
+            :solution_stack_name => 'mastack',
+            :option_settings => masettings
+      ).and_return nil
+      expect(@beanstalk_api).to receive(:check_dns_availability).and_return(
+          :available => false
+      )
+      @env.create! @archive, 'mastack', 'ma-cname', 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.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4062555010533808231
+      hash: -3858020732862147076
 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: -4062555010533808231
+      hash: -3858020732862147076
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24