eb_deployer 0.4.3 → 0.4.4.beta1

data/lib/eb_deployer/application.rb

@@ -6,7 +6,7 @@ module EbDeployer
       @name = name
       @eb_driver = eb_driver
       @s3_driver = s3_driver
-      @bucket = bucket
+      @bucket = bucket || @name
       raise "application name can only contain any combination of uppercase letters, lowercase letters, numbers, dashes (-)" unless @name =~ /^[a-zA-Z0-9.-]+$/
     end
 

data/lib/eb_deployer/component.rb

@@ -2,28 +2,36 @@ module EbDeployer
   class Component
     attr_reader :name
 
-    def initialize(name, env, creation_opts, eb_settings, strategy_name, eb_driver)
+    def initialize(name, env, options, eb_driver)
       @name = name
       @env = env
       @eb_driver = eb_driver
-      @creation_opts = creation_opts
-      @eb_settings = eb_settings
+      @options = options.dup
+      @component_eb_settings = @options.delete(:option_settings) || []
+      @component_inactive_settings = @options.delete(:inactive_settings) || []
+      strategy_name = @options[:strategy] || @env.strategy_name
       @strategy = DeploymentStrategy.create(self, strategy_name)
     end
 
     def cname_prefix
-      @creation_opts[:cname_prefix] || default_cname_prefix
+      @options[:cname_prefix] || default_cname_prefix
     end
 
-    def deploy(version_label, eb_settings)
-      @strategy.deploy(version_label, eb_settings + @eb_settings)
+    def deploy(version_label, eb_settings, inactive_settings=[])
+      @strategy.deploy(version_label,
+                       eb_settings + @component_eb_settings,
+                       inactive_settings + @component_inactive_settings)
     end
 
     def new_eb_env(suffix=nil, cname_prefix_overriding=nil)
+      env_name = [@env.name, @name, suffix].compact.join('-')
+      creation_opts = @env.creation_opts.merge(@options)
+      creation_opts = creation_opts.merge(:cname_prefix => cname_prefix_overriding || cname_prefix)
       EbEnvironment.new(@env.app_name,
-                        [@env.name, @name, suffix].compact.join('-'),
+                        env_name,
                         @eb_driver,
-                        @creation_opts.merge(:cname_prefix => cname_prefix_overriding || cname_prefix))
+                        creation_opts)
+
     end
 
     private

data/lib/eb_deployer/default_component.rb

@@ -12,8 +12,8 @@ module EbDeployer
     end
 
 
-    def deploy(version_label, eb_settings)
-      @strategy.deploy(version_label, eb_settings)
+    def deploy(version_label, eb_settings, inactive_settings=[])
+      @strategy.deploy(version_label, eb_settings, inactive_settings)
     end
 
     def new_eb_env(suffix=nil, cname_prefix_overriding=nil)

data/lib/eb_deployer/deployment_strategy/blue_green.rb

@@ -5,7 +5,7 @@ module EbDeployer
         @env = env
       end
 
-      def deploy(version_label, env_settings)
+      def deploy(version_label, env_settings, inactive_settings=[])
         if !ebenvs.any?(&method(:active_ebenv?))
           ebenv('a', @env.cname_prefix).
             deploy(version_label, env_settings)
@@ -17,6 +17,7 @@ module EbDeployer
 
         inactive_ebenv.deploy(version_label, env_settings)
         active_ebenv.swap_cname_with(inactive_ebenv)
+        active_ebenv.apply_settings(inactive_settings) unless inactive_settings.empty?
       end
 
       private

data/lib/eb_deployer/deployment_strategy/inplace_update.rb

@@ -5,7 +5,7 @@ module EbDeployer
         @env = env
       end
 
-      def deploy(version_label, env_settings)
+      def deploy(version_label, env_settings, inactive_settings)
         @env.new_eb_env.deploy(version_label, env_settings)
       end
     end

data/lib/eb_deployer/eb_environment.rb

@@ -18,11 +18,22 @@ module EbDeployer
 
     def deploy(version_label, settings={})
       terminate if @creation_opts[:phoenix_mode]
-      create_or_update_env(version_label, settings)
+
+      if @bs.environment_exists?(@app, @name)
+        update_eb_env(settings, version_label)
+      else
+        create_eb_env(settings, version_label)
+      end
+
       smoke_test
       wait_for_env_become_healthy
     end
 
+    def apply_settings(settings)
+      raise "Env #{self.name} not exists for applying settings" unless @bs.environment_exists?(@app, @name)
+      update_eb_env(settings)
+    end
+
     def cname_prefix
       @bs.environment_cname_prefix(@app, @name)
     end
@@ -46,15 +57,15 @@ module EbDeployer
 
     private
 
-    def create_or_update_env(version_label, settings)
-      if @bs.environment_exists?(@app, @name)
-        with_polling_events(/Environment update completed successfully/i) do
-          @bs.update_environment(@app, @name, version_label, @creation_opts[:tier], settings)
-        end
-      else
-        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)
-        end
+    def create_eb_env(settings, version_label)
+      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)
+      end
+    end
+
+    def update_eb_env(settings, version_label=nil)
+      with_polling_events(/Environment update completed successfully/i) do
+        @bs.update_environment(@app, @name, version_label, @creation_opts[:tier], settings)
       end
     end
 

data/lib/eb_deployer/environment.rb

@@ -1,8 +1,10 @@
 module EbDeployer
   class Environment
     include Utils
+    attr_accessor :creation_opts, :strategy_name
+
+    attr_writer :resource_stacks, :settings, :inactive_settings, :components, :component_under_deploy
 
-    attr_writer :resource_stacks, :settings, :creation_opts, :components, :component_under_deploy, :strategy_name
     attr_reader :name
 
     def initialize(app, name, eb_driver, &block)
@@ -11,6 +13,7 @@ module EbDeployer
       @eb_driver = eb_driver
       @creation_opts = {}
       @settings = []
+      @inactive_settings = []
       @strategy_name = :blue_green
       yield(self) if block_given?
       unless @components
@@ -25,7 +28,7 @@ module EbDeployer
     def deploy(version_label)
       resource_settings = @resource_stacks.provision(resource_stack_name)
       components_to_deploy.each do |component|
-        component.deploy(version_label, @settings + resource_settings)
+        component.deploy(version_label, @settings + resource_settings, @inactive_settings)
       end
     end
 
@@ -33,10 +36,7 @@ module EbDeployer
       return unless components_attrs
       @components = components_attrs.map do |attrs|
         attrs = symbolize_keys(attrs)
-        name = attrs.delete(:name)
-        eb_settings = attrs.delete(:option_settings) || []
-        strategy_name = attrs[:strategy] || @strategy_name
-        Component.new(name, self, @creation_opts.merge(attrs), eb_settings, strategy_name, @eb_driver)
+        Component.new(attrs.delete(:name), self, attrs, @eb_driver)
       end
     end
 

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.4.3"
+  VERSION = "0.4.4.beta1"
 end

data/lib/eb_deployer.rb

@@ -175,32 +175,25 @@ module EbDeployer
     bs = opts[:bs_driver] || AWSDriver::Beanstalk.new
     s3 = opts[:s3_driver] || AWSDriver::S3Driver.new
     cf = opts[:cf_driver] || AWSDriver::CloudFormationDriver.new
-    stack_name = opts[:solution_stack_name] || "64bit Amazon Linux 2013.09 running Tomcat 7 Java 7"
-    app = opts[:application]
-    env_name = opts[:environment]
+    app_name = opts[:application]
     version_prefix = opts[:version_prefix].to_s.strip
     version_label = "#{version_prefix}#{opts[:version_label].to_s.strip}"
-    cname = opts[:cname]
-    eb_settings = opts[:option_settings] || opts[:settings] || []
-    cname_prefix = opts[:cname_prefix]
-    smoke_test = opts[:smoke_test] || Proc.new {}
-    phoenix_mode = opts[:phoenix_mode]
-    bucket = opts[:package_bucket] || app
-    skip_resource = opts[:skip_resource_stack_update]
-    keep_latest = opts[:keep_latest].to_i || 0
-    app_tier = opts[:tier] || 'WebServer'
 
-    resource_stacks = ResourceStacks.new(opts[:resources], cf, skip_resource)
-    application = Application.new(app, bs, s3, bucket)
-    environment = Environment.new(application, env_name, bs) do |env|
+    application = Application.new(app_name, bs, s3, opts[:package_bucket])
+    resource_stacks = ResourceStacks.new(opts[:resources],
+                                         cf,
+                                         opts[:skip_resource_stack_update])
+
+    environment = Environment.new(application, opts[:environment], bs) do |env|
       env.resource_stacks = resource_stacks
-      env.settings = eb_settings
+      env.settings = opts[:option_settings] || opts[:settings] || []
+      env.inactive_settings = opts[:inactve_settings] || []
       env.creation_opts = {
-        :solution_stack => stack_name,
-        :cname_prefix => cname_prefix,
-        :smoke_test => smoke_test,
-        :phoenix_mode => phoenix_mode,
-        :tier => app_tier
+        :solution_stack => opts[:solution_stack_name] || "64bit Amazon Linux 2013.09 running Tomcat 7 Java 7",
+        :cname_prefix =>  opts[:cname_prefix],
+        :smoke_test => opts[:smoke_test] || Proc.new {},
+        :phoenix_mode => opts[:phoenix_mode],
+        :tier => opts[:tier] || 'WebServer'
       }
       env.strategy_name = opts[:strategy] || :blue_green
       env.components = opts[:components]
@@ -209,7 +202,7 @@ module EbDeployer
 
     application.create_version(version_label, opts[:package])
     environment.deploy(version_label)
-    application.clean_versions(version_prefix, keep_latest)
+    application.clean_versions(version_prefix, opts[:keep_latest].to_i || 0)
   end
 
   def self.destroy(opts)

data/test/blue_green_deploy_test.rb

@@ -64,6 +64,27 @@ class BlueGreenDeployTest < DeployTest
     assert !@eb.environment_exists?('simple', t('production-b', 'simple'))
   end
 
+  def test_can_have_inactive_settings_which_will_be_applied_to_inactive_env
+    settings = {:option_settings =>
+      [{:namespace => 'aws:autoscaling:launchconfiguration',
+         :option_name => 'MinSize',
+         :value => 10}],
+      :inactve_settings =>
+      [{:namespace => 'aws:autoscaling:launchconfiguration',
+         :option_name => 'MinSize',
+         :value => 1}]}
+
+    do_deploy(42, settings)
+    assert_equal 10, @eb.environment_settings('simple', t('production-a', 'simple')).last[:value]
+
+    do_deploy(43, settings)
+    assert_equal 1, @eb.environment_settings('simple', t('production-a', 'simple')).last[:value]
+    assert_equal 10, @eb.environment_settings('simple', t('production-b', 'simple')).last[:value]
+
+    do_deploy(44, settings)
+    assert_equal 10, @eb.environment_settings('simple', t('production-a', 'simple')).last[:value]
+    assert_equal 1, @eb.environment_settings('simple', t('production-b', 'simple')).last[:value]
+  end
 
   private
 

data/test/multi_components_deploy_test.rb

@@ -86,6 +86,60 @@ class MultiComponentsDeployTest < DeployTest
     end
   end
 
+
+  def test_can_have_inactive_settings_which_will_be_applied_to_inactive_env
+    settings = {:inactve_settings =>
+      [{:namespace => 'aws:autoscaling:launchconfiguration',
+         :option_name => 'MinSize',
+         :value => 1}],
+      :components =>
+      [{:name => 'web',
+         :option_settings =>
+         [{:namespace => 'aws:autoscaling:launchconfiguration',
+            :option_name => 'MinSize',
+            :value => 10}]}]}
+
+    do_bg_deploy(settings)
+    assert_equal 10, @eb.environment_settings('simple', t('prod-web-a', 'simple')).last[:value]
+
+    do_bg_deploy(settings)
+    assert_equal 1, @eb.environment_settings('simple', t('prod-web-a', 'simple')).last[:value]
+    assert_equal 10, @eb.environment_settings('simple', t('prod-web-b', 'simple')).last[:value]
+
+    do_bg_deploy(settings)
+    assert_equal 10, @eb.environment_settings('simple', t('prod-web-a', 'simple')).last[:value]
+    assert_equal 1, @eb.environment_settings('simple', t('prod-web-b', 'simple')).last[:value]
+  end
+
+  def test_can_provide_inactive_settings_at_component_level
+    settings = {:option_settings =>
+      [{:namespace => 'aws:autoscaling:launchconfiguration',
+         :option_name => 'MinSize',
+         :value => 10}],
+      :components =>
+      [{:name => 'web',
+         :inactive_settings =>
+         [{:namespace => 'aws:autoscaling:launchconfiguration',
+            :option_name => 'MinSize',
+            :value => 2}]},
+       {:name => 'api',
+         :inactive_settings =>
+         [{:namespace => 'aws:autoscaling:launchconfiguration',
+            :option_name => 'MinSize',
+            :value => 1}]}]}
+
+    do_bg_deploy(settings)
+    assert_equal 10, @eb.environment_settings('simple', t('prod-web-a', 'simple')).last[:value]
+    assert_equal 10, @eb.environment_settings('simple', t('prod-api-a', 'simple')).last[:value]
+
+    do_bg_deploy(settings)
+    assert_equal 2, @eb.environment_settings('simple', t('prod-web-a', 'simple')).last[:value]
+    assert_equal 1, @eb.environment_settings('simple', t('prod-api-a', 'simple')).last[:value]
+
+
+  end
+
+
   private
   def do_deploy(options={})
     deploy({:application => 'simple',
@@ -96,8 +150,8 @@ class MultiComponentsDeployTest < DeployTest
            }.merge(options))
   end
 
-  def do_bg_deploy
-    do_deploy(:strategy => 'blue-green')
+  def do_bg_deploy(options={})
+    do_deploy(options.merge(:strategy => 'blue-green'))
   end
 
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.4.4.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - wpc
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -100,16 +100,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 567704794056721741
+      hash: -3919206102584953586
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 567704794056721741
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.29