eb_deployer 0.4.1 → 0.4.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.4.2
+=====
+* Allow provding different deploy strategy for different components.
+
 0.4.1
 =====
 * Remove options for delete all environments ("-d --all"), because it is too destructive and not recoverable.

data/lib/eb_deployer/component.rb

@@ -2,21 +2,21 @@ module EbDeployer
   class Component
     attr_reader :name
 
-    def initialize(name, env, creation_opts, eb_settings, eb_driver)
+    def initialize(name, env, creation_opts, eb_settings, strategy_name, eb_driver)
       @name = name
       @env = env
       @eb_driver = eb_driver
       @creation_opts = creation_opts
       @eb_settings = eb_settings
+      @strategy = DeploymentStrategy.create(self, strategy_name)
     end
 
     def cname_prefix
       @creation_opts[:cname_prefix] || default_cname_prefix
     end
 
-    def deploy(version_label, strategy_name, eb_settings)
-      strategy = create_strategy(strategy_name)
-      strategy.deploy(version_label, eb_settings + @eb_settings)
+    def deploy(version_label, eb_settings)
+      @strategy.deploy(version_label, eb_settings + @eb_settings)
     end
 
     def new_eb_env(suffix=nil, cname_prefix_overriding=nil)
@@ -31,10 +31,5 @@ module EbDeployer
     def default_cname_prefix
       [@env.app_name, @env.name, @name].join('-')
     end
-
-    def create_strategy(strategy_name)
-      DeploymentStrategy.create(self, strategy_name)
-    end
-
   end
 end

data/lib/eb_deployer/default_component.rb

@@ -1,9 +1,10 @@
 module EbDeployer
   class DefaultComponent
-    def initialize(env, creation_opts, eb_driver)
+    def initialize(env, creation_opts, strategy_name, eb_driver)
       @env = env
       @eb_driver = eb_driver
       @creation_opts = creation_opts
+      @strategy = DeploymentStrategy.create(self, strategy_name)
     end
 
     def cname_prefix
@@ -11,9 +12,8 @@ module EbDeployer
     end
 
 
-    def deploy(version_label, strategy_name, eb_settings)
-      strategy = create_strategy(strategy_name)
-      strategy.deploy(version_label, eb_settings)
+    def deploy(version_label, eb_settings)
+      @strategy.deploy(version_label, eb_settings)
     end
 
     def new_eb_env(suffix=nil, cname_prefix_overriding=nil)
@@ -28,10 +28,5 @@ module EbDeployer
     def default_cname_prefix
       [@env.app_name, @env.name].join('-')
     end
-
-    def create_strategy(strategy_name)
-      DeploymentStrategy.create(self, strategy_name)
-    end
-
   end
 end

data/lib/eb_deployer/environment.rb

@@ -1,6 +1,6 @@
 module EbDeployer
   class Environment
-    attr_writer :resource_stacks, :settings, :creation_opts, :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)
@@ -9,9 +9,10 @@ module EbDeployer
       @eb_driver = eb_driver
       @creation_opts = {}
       @settings = []
+      @strategy_name = :blue_green
       yield(self) if block_given?
       unless @components
-        @components = [DefaultComponent.new(self, @creation_opts, @eb_driver)]
+        @components = [DefaultComponent.new(self, @creation_opts, @strategy_name, @eb_driver)]
       end
     end
 
@@ -19,10 +20,10 @@ module EbDeployer
       @app.name
     end
 
-    def deploy(version_label, strategy_name)
+    def deploy(version_label)
       resource_settings = @resource_stacks.provision(resource_stack_name)
       components_to_deploy.each do |component|
-        component.deploy(version_label, strategy_name, @settings + resource_settings)
+        component.deploy(version_label, @settings + resource_settings)
       end
     end
 
@@ -32,7 +33,8 @@ module EbDeployer
         attrs = symbolize_keys(attrs)
         name = attrs.delete(:name)
         eb_settings = attrs.delete(:option_settings) || []
-        Component.new(name, self, @creation_opts.merge(attrs), eb_settings, @eb_driver)
+        strategy_name = attrs[:strategy] || @strategy_name
+        Component.new(name, self, @creation_opts.merge(attrs), eb_settings, strategy_name, @eb_driver)
       end
     end
 

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/eb_deployer.rb

@@ -181,7 +181,6 @@ module EbDeployer
     version_label = "#{version_prefix}#{opts[:version_label].to_s.strip}"
     cname = opts[:cname]
     eb_settings = opts[:option_settings] || opts[:settings] || []
-    strategy_name = opts[:strategy] || :blue_green
     cname_prefix = opts[:cname_prefix]
     smoke_test = opts[:smoke_test] || Proc.new {}
     phoenix_mode = opts[:phoenix_mode]
@@ -202,13 +201,13 @@ module EbDeployer
         :phoenix_mode => phoenix_mode,
         :tier => app_tier
       }
-
+      env.strategy_name = opts[:strategy] || :blue_green
       env.components = opts[:components]
       env.component_under_deploy = opts[:component]
     end
 
     application.create_version(version_label, opts[:package])
-    environment.deploy(version_label, strategy_name)
+    environment.deploy(version_label)
     application.clean_versions(version_prefix, keep_latest)
   end
 

data/test/multi_components_deploy_test.rb

@@ -63,6 +63,16 @@ class MultiComponentsDeployTest < DeployTest
     assert_equal [minsize_3, minsize_2], @eb.environment_settings('simple', t('prod-api', 'simple'))
   end
 
+  def test_override_deployment_strategy
+    do_deploy(:components => [{'name' => 'web',
+                                'strategy' => 'blue-green' },
+                              {'name' => 'bg',
+                                'strategy' => 'inplace-update'}])
+
+    assert @eb.environment_exists?('simple', t('prod-web-a', 'simple'))
+    assert @eb.environment_exists?('simple', t('prod-bg', 'simple'))
+  end
+
   def test_can_deploy_single_component
     do_deploy(:component => "bg")
     assert !@eb.environment_exists?('simple', t('prod-web', 'simple'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3040208226803688120
+      hash: -3697140249092762497
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3040208226803688120
+      hash: -3697140249092762497
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.29