eb_deployer 0.4.4.beta5 → 0.4.4.beta6

data/lib/eb_deployer.rb

@@ -191,11 +191,11 @@ module EbDeployer
       env.settings = opts[:option_settings] || opts[:settings] || []
       env.inactive_settings = opts[:inactive_settings] || []
       env.creation_opts = {
-        :solution_stack => opts[:solution_stack_name] || "64bit Amazon Linux 2013.09 running Tomcat 7 Java 7",
+        :solution_stack => opts[:solution_stack_name],
         :cname_prefix =>  opts[:cname_prefix],
-        :smoke_test => opts[:smoke_test] || Proc.new {},
+        :smoke_test => opts[:smoke_test],
         :phoenix_mode => opts[:phoenix_mode],
-        :tier => opts[:tier] || 'WebServer'
+        :tier => opts[:tier]
       }
       env.strategy_name = opts[:strategy] || :blue_green
       env.components = opts[:components]

data/lib/eb_deployer/eb_environment.rb

@@ -1,5 +1,7 @@
 module EbDeployer
   class EbEnvironment
+    include Utils
+
     attr_reader :app, :name
     attr_writer :event_poller
 
@@ -13,7 +15,7 @@ module EbDeployer
       @app = app
       @name = self.class.unique_ebenv_name(name, app)
       @bs = eb_driver
-      @creation_opts = creation_opts
+      @creation_opts = default_create_options.merge(reject_nil(creation_opts))
     end
 
     def deploy(version_label, settings={})
@@ -61,8 +63,10 @@ module EbDeployer
     private
 
     def create_eb_env(settings, version_label)
+      solution_stack = @creation_opts[:solution_stack]
+      validate_solutions_stack(solution_stack)
       with_polling_events(/Successfully launched environment/i) do
-        @bs.create_environment(@app, @name, @creation_opts[:solution_stack], @creation_opts[:cname_prefix], version_label, @creation_opts[:tier], settings)
+        @bs.create_environment(@app, @name, solution_stack, @creation_opts[:cname_prefix], version_label, @creation_opts[:tier], settings)
       end
     end
 
@@ -72,6 +76,11 @@ module EbDeployer
       end
     end
 
+    def validate_solutions_stack(stack_name)
+      names = @bs.list_solution_stack_names
+      raise "'#{stack_name}' is not a valid solution stack name, available solution stack names are: #{names.join(', ')}" unless names.include?(stack_name)
+    end
+
     def smoke_test
       host_name = @bs.environment_cname(@app, @name)
       SmokeTest.new(@creation_opts[:smoke_test]).run(host_name, self)
@@ -112,6 +121,13 @@ module EbDeployer
       @event_poller || EventPoller.new(@app, @name, @bs)
     end
 
+    def default_create_options
+      {
+        :solution_stack => "64bit Amazon Linux 2013.09 running Tomcat 7 Java 7",
+        :smoke_test =>  Proc.new {},
+        :tier => 'WebServer'
+      }
+    end
 
     def log_event(event)
       puts "[#{event[:event_date]}][environment:#{@name}] #{event[:message]}"

data/lib/eb_deployer/utils.rb

@@ -24,5 +24,10 @@ module EbDeployer
     def symbolize_keys(hash)
       hash.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
     end
+
+
+    def reject_nil(hash)
+      hash.reject{| k, v| v.nil?}
+    end
   end
 end

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.4.4.beta5"
+  VERSION = "0.4.4.beta6"
 end

data/test/aws_driver_stubs.rb

@@ -127,11 +127,19 @@ class EBStub
     @envs[env_key(app_name, env_name)][:version]
   end
 
+  def list_solution_stack_names
+    @solution_stacks || ["64bit Amazon Linux 2013.09 running Tomcat 7 Java 7"]
+  end
+
   #test only
   def mark_all_envs_ready
     @envs.values.each { |env| set_env_ready(env[:application], env[:name], true) }
   end
 
+  def set_solution_stacks(names)
+    @solution_stacks = names
+  end
+
   def environment_tier(app_name, env_name)
     @envs[env_key(app_name, env_name)][:tier]
   end

data/test/eb_environment_test.rb

@@ -51,11 +51,20 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) { env.deploy("version 1") }
   end
 
-
   def test_terminate_should_delete_environment
     env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
     env.deploy("version1")
     env.terminate
     assert !@eb_driver.environment_exists?('myapp', t('production', 'myapp'))
   end
+
+  def test_should_raise_runtime_error_when_solution_stack_is_not_valid
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, {
+                                          :solution_stack => "python"
+                                        })
+    @eb_driver.set_solution_stacks(["java", "ruby"])
+    assert_raises(RuntimeError) { env.deploy("version 1") }
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.4.4.beta5
+  version: 0.4.4.beta6
   prerelease: 6
 platform: ruby
 authors: