beanstalkify 0.0.6 → 0.0.7

data/Gemfile.lock

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

data/lib/beanstalkify/application.rb

@@ -18,12 +18,14 @@ module Beanstalkify
             if env.status.empty?
                 puts "Creating stack '#{@stack}' for #{archive.app_name}-#{archive.version}..."
                 env.create!(archive, @stack, @cnames, @config)
-                env.wait!("Launching")
+                env.wait_until_status_is_not "Launching"
             else
                 puts "Deploying #{archive.version} to #{env.name}..."
                 env.deploy!(archive, @config)
-                env.wait!("Updating")
+                env.wait_until_status_is_not "Updating"
             end
+            
+            env.wait_until_healthy
             puts "Done. Visit http://#{env.url} in your browser."
             DeploymentInfo.new env, archive
         end

data/lib/beanstalkify/environment.rb

@@ -1,85 +1,98 @@
 require 'beanstalkify/beanstalk'
 
 module Beanstalkify
-    class Environment
-        attr_accessor :name
+  class Environment
+    POLL_INTERVAL = 5
+    STATUS_CHANGE_TIMEOUT = 1200
+    HEALTHY_TIMEOUT = 120
+    
+    attr_accessor :name
 
-        def initialize(archive, name)
-            @name = [archive.app_name, name].join("-")
-            @beanstalk = Beanstalk.api
-        end
-
-        # Assuming the provided app has already been uploaded,
-        # update this environment to the app's version
-        # Optionally pass in a bunch of settings to override
-        def deploy!(app, settings=[])
-            @beanstalk.update_environment({
-                :version_label => app.version,
-                :environment_name => self.name,
-                :option_settings => settings
-            })
-        end
-
-        # Assuming the archive has already been uploaded, 
-        # create a new environment with the app deployed onto the provided stack.
-        # 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,
-                :environment_name => self.name,
-                :solution_stack_name => stack,
-                :option_settings => settings
-            }
-            cnames.each do |c|
-                if dns_available(c)
-                    params[:cname_prefix] = c
-                    break
-                else
-                    puts "CNAME #{c} is unavailable."
-                end
-            end
-            @beanstalk.create_environment(params)
-        end
+    def initialize(archive, name)
+      @name = [archive.app_name, name].join("-")
+      @beanstalk = Beanstalk.api
+    end
 
-        def dns_available(cname)
-            @beanstalk.check_dns_availability({
-                :cname_prefix => cname
-            })[:available]
-        end
+    # Assuming the provided app has already been uploaded,
+    # update this environment to the app's version
+    # Optionally pass in a bunch of settings to override
+    def deploy!(app, settings=[])
+      @beanstalk.update_environment({
+        version_label: app.version,
+        environment_name: self.name,
+        option_settings: settings
+      })
+    end
 
-        def status
-            e = describe_environment
-            e ? e[:status] : ""
+    # Assuming the archive has already been uploaded, 
+    # create a new environment with the app deployed onto the provided stack.
+    # 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,
+        environment_name: self.name,
+        solution_stack_name: stack,
+        option_settings: settings
+      }
+      cnames.each do |c|
+        if dns_available(c)
+          params[:cname_prefix] = c
+          break
+        else
+          puts "CNAME #{c} is unavailable."
         end
+      end
+      @beanstalk.create_environment(params)
+    end
 
-        def url
-            e = describe_environment
-            e ? e[:cname] : ""
-        end
-        
-        def healthy?
-           e = describe_environment
-           e ? e[:health] == 'Green' : false
-        end
+    def dns_available(cname)
+      @beanstalk.check_dns_availability({
+        cname_prefix: cname
+      })[:available]
+    end
 
-        # Wait for the status to change from `old_status` to something else
-        def wait!(old_status)
-            puts "Waiting for #{self.name} to finish #{old_status.downcase}..."
-            while self.status == old_status
-                print '.'              
-                sleep 5
-            end
-            puts
-        end
-        
-        private
-        
-        def describe_environment
-            @beanstalk.describe_environments({
-                :environment_names => [name],
-                :include_deleted => false
-            }).data[:environments].first
-        end
+    def url
+      e = describe_environment
+      e ? e[:cname] : ""
+    end
+  
+    def healthy?
+      e = describe_environment
+      e ? e[:health] == 'Green' : false
+    end
+  
+    def status
+      e = describe_environment
+      e ? e[:status] : ""
+    end
+    
+    def wait_until_status_is_not(old_status)
+      puts "Waiting for #{self.name} to finish #{old_status.downcase}..."      
+      wait_until -> { status != old_status }, STATUS_CHANGE_TIMEOUT
+    end
+    
+    def wait_until_healthy
+      puts "Waiting until #{self.name} is healthy..."
+      wait_until -> { healthy? }, HEALTHY_TIMEOUT
+    end
+    
+    private
+    
+    def describe_environment
+      @beanstalk.describe_environments({
+        environment_names: [name],
+        include_deleted: false
+      }).data[:environments].first
+    end
+    
+    def wait_until(condition, timeout)
+      until condition.call or timeout <= 0
+        print '.'
+        sleep POLL_INTERVAL
+        timeout -= POLL_INTERVAL
+      end
+      puts
     end
+  end
 end

data/lib/beanstalkify/version.rb

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

data/test/environment_spec.rb

@@ -6,49 +6,28 @@ describe Beanstalkify::Environment 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"
+    @settings = {something: 'enabled'}
   end
+  
+  describe 'creation' do
+    it 'creates a new environment with params' do
+      expect_beanstalk_create_environment
+      @env.create! @archive, 'mastack', [], @settings
+    end
+  
+    context 'when a CNAME is specified' do
+      it 'creates a new environment with a cname, if available' do
+        when_beanstalk_cname_availability_is 'ma-cname-1', true
+        expect_beanstalk_create_environment(cname_prefix: 'ma-cname-1')
+        @env.create! @archive, 'mastack', ['ma-cname-1'], @settings
+      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', [], 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-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-1'], 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-1'], masettings
+      it 'creates an environment without the cname, if the cname was unavailable' do
+        when_beanstalk_cname_availability_is 'ma-cname-1', false
+        expect_beanstalk_create_environment
+        @env.create! @archive, 'mastack', ['ma-cname-1'], @settings
+      end
+    end
   end
 
   it 'prepends the application name because environment names must be unique within an AWS account' do
@@ -72,6 +51,40 @@ describe Beanstalkify::Environment do
     @env.should be_healthy
   end
   
+  describe 'waiting for a Beanstalk status change' do
+    before(:each) do
+      @env.stub :sleep  
+    end
+    
+    it 'waits for the value to be different' do
+      expect(@env).to receive(:status).exactly(3).times.and_return 'Launching', 'Launching', 'Running'
+      @env.wait_until_status_is_not 'Launching'
+    end
+  
+    it 'times out after a while but does not throw an error' do
+      attempts = (Beanstalkify::Environment::STATUS_CHANGE_TIMEOUT / Beanstalkify::Environment::POLL_INTERVAL) + 1
+      expect(@env).to receive(:status).exactly(attempts).times.and_return 'Unchanged'
+      @env.wait_until_status_is_not 'Unchanged'
+    end
+  end
+  
+  describe 'waiting until healthy' do
+    before(:each) do
+      @env.stub :sleep  
+    end
+    
+    it 'waits until health is green' do
+      expect(@env).to receive(:healthy?).exactly(3).times.and_return false, false, true
+      @env.wait_until_healthy
+    end
+    
+    it 'times out after a while but does not throw an error' do
+      attempts = (Beanstalkify::Environment::HEALTHY_TIMEOUT / Beanstalkify::Environment::POLL_INTERVAL) + 1
+      expect(@env).to receive(:healthy?).exactly(attempts).times.and_return false
+      @env.wait_until_healthy
+    end
+  end
+  
   def when_beanstalk_describe_environments_returns(env_data)
     expect(@beanstalk_api).to receive(:describe_environments).with(
       environment_names: ["app-name-Test"],
@@ -80,4 +93,19 @@ describe Beanstalkify::Environment do
       data: {environments: [env_data]}
     )
   end
+  
+  def expect_beanstalk_create_environment(additional_opts={})
+    opts = {
+      application_name: 'app-name',
+      version_label: 'version',
+      environment_name: 'app-name-Test',
+      solution_stack_name: 'mastack',
+      option_settings: @settings
+    }.merge additional_opts
+    expect(@beanstalk_api).to receive(:create_environment).with(opts).and_return nil
+  end
+  
+  def when_beanstalk_cname_availability_is(cname_prefix, available)
+    expect(@beanstalk_api).to receive(:check_dns_availability).with(cname_prefix: cname_prefix).and_return(available: available)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalkify
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -637330145255751151
+      hash: 2119341935535763932
 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: -637330145255751151
+      hash: 2119341935535763932
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24