eb_deployer 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e8d42e8522c7f436251552c366a5728fc18e296
-  data.tar.gz: c1a3115f32a1af1e620f6459297ecc6e555352ed
+  metadata.gz: db0cf300a1d06c7b6ed063eef7ef69c7cab8d025
+  data.tar.gz: 5acf245e16a6c1ce4b4d35ad1d1544d5185b2329
 SHA512:
-  metadata.gz: a6699965fc55694e54849017d63dfef003a30e122a98d3a58deff42ef4c22670d83e57f5cb4fb2b33362c9fe117b8c18e3e165809d58b7c2648195554399fc19
-  data.tar.gz: c14d0f2152bebd7326fe1206ae9bb0b9208cd0c7ad317f10f6e2f117277ef578e7636043032fdc505f6bb77eec794c3efffa1abf2e3f6acd1aad96a05b353a7d
+  metadata.gz: 35071cab562e78eae3485b15b2d81d328c5ae5618ea5fdc56dd7b8d7335bca0aa5c8937547b3474fe9194175ab093f75b2bca139b58740bb737da23ad7ae37f9
+  data.tar.gz: 9a4f03e8d7a4a0a769e749d4d191b9feeec7def2ad598ffa41b36e72191dad9b46964efc8b9e5d8b37670678d322eaec57f46e640813dcafe5ad07065808e8e6

data/README.md

@@ -73,8 +73,12 @@ Once this new stack is stable or has run for a while you can choose to delete th
 ### Destroying a stack
 So you are done with this application or environment, you can destroy it easily as well.
 
+    # destroy one environment
     $ eb_deployer -d -e <environment>
 
+    # alternatively, destroy all environments and the application along with it
+    $ eb_deployer -d --all
+
 and you are done!
 
 Later tutorials coming soon will cover

data/lib/eb_deployer.rb

@@ -24,6 +24,15 @@ require 'fileutils'
 
 module EbDeployer
 
+  TIERS = [
+    {:name=>"Worker", :type=>"SQS/HTTP", :version=>"1.0"},
+    {:name=>"WebServer", :type=>"Standard", :version=>"1.0"}
+  ]
+
+  def environment_tier(name)
+    TIERS.find {|t| t[:name].downcase == name.downcase} || raise("No tier found with name #{name.inspect}")
+  end
+  module_function :environment_tier
   #
   # Query ouput value of the cloud formation stack
   #
@@ -140,9 +149,12 @@ module EbDeployer
   #   inplace-update strategy will only keep one environment, and update the
   #   version inplace on deploy. this will save resources but will have downtime.
   #
-  # @option opts [Symbol] :solution_stack_name ("64bit Amazon Linux running Tomcat 7")
+  # @option opts [Symbol] :solution_stack_name ("64bit Amazon Linux 2013.09 running Tomcat 7 Java 7")
   #   The elastic beanstalk solution stack you want to deploy on top of.
   #
+  # @option opts [Symbol] :tier ("WebServer")
+  #   The environment tier. Either "WebServer" or "Worker"
+  #
   # @option opts [Symbol] :version_label *required*. Version label give the
   #   package uploaded a unique identifier.  Should use something related to
   #   pipeline counter if you have build pipeline setup to build the installer.
@@ -168,7 +180,7 @@ module EbDeployer
     bs = opts[:bs_driver] || Beanstalk.new
     s3 = opts[:s3_driver] || S3Driver.new
     cf = opts[:cf_driver] || CloudFormationDriver.new
-    stack_name = opts[:solution_stack_name] || "64bit Amazon Linux running Tomcat 7"
+    stack_name = opts[:solution_stack_name] || "64bit Amazon Linux 2013.09 running Tomcat 7 Java 7"
     app = opts[:application]
     env_name = opts[:environment]
     version_prefix = opts[:version_prefix].to_s.strip
@@ -182,16 +194,21 @@ module EbDeployer
     bucket = opts[:package_bucket] || app
     skip_resource = opts[:skip_resource_stack_update]
     keep_latest = opts[:keep_latest].to_i || 0
+    app_tier = self.environment_tier(opts[:tier] || 'WebServer')
 
     application = Application.new(app, bs, s3, bucket)
 
     cf = CloudFormationProvisioner.new("#{app}-#{env_name}", cf)
 
-    strategy = DeploymentStrategy.create(strategy_name, app, env_name, bs,
-                                         :solution_stack => stack_name,
-                                         :cname_prefix => cname_prefix,
-                                         :smoke_test => smoke_test,
-                                         :phoenix_mode => phoenix_mode)
+    creation_opts = {
+      :solution_stack => stack_name,
+      :cname_prefix => cname_prefix,
+      :smoke_test => smoke_test,
+      :phoenix_mode => phoenix_mode,
+      :tier => app_tier
+    }
+
+    strategy = DeploymentStrategy.create(strategy_name, app, env_name, bs, creation_opts)
 
     cleaner = VersionCleaner.new(application, keep_latest)
 

data/lib/eb_deployer/beanstalk.rb

@@ -1,6 +1,7 @@
 module EbDeployer
   class Beanstalk
     attr_reader :client
+
     def initialize(client=AWS::ElasticBeanstalk.new.client)
       @client = client
     end
@@ -17,11 +18,16 @@ module EbDeployer
       @client.describe_applications(:application_names => [app])[:applications].any?
     end
 
-    def update_environment(app_name, env_name, version, settings)
+    def update_environment(app_name, env_name, version, tier, settings)
       env_id = convert_env_name_to_id(app_name, [env_name]).first
-      @client.update_environment(:environment_id => env_id,
-                                 :version_label => version,
-                                 :option_settings => settings)
+      request = {
+        :environment_id => env_id,
+        :version_label => version,
+        :option_settings => settings,
+        :tier => tier
+      }
+
+      @client.update_environment(request)
     end
 
     def environment_exists?(app_name, env_name)
@@ -32,13 +38,17 @@ module EbDeployer
       alive_envs(app_name).collect { |env| env[:environment_name] }
     end
 
-    def create_environment(app_name, env_name, stack_name, cname_prefix, version, settings)
-      request = {:application_name => app_name,
+    def create_environment(app_name, env_name, stack_name, cname_prefix, version, tier, settings)
+      request = {
+        :application_name => app_name,
         :environment_name => env_name,
         :solution_stack_name => stack_name,
         :version_label => version,
-        :option_settings => settings }
-      request[:cname_prefix] = cname_prefix if cname_prefix
+        :option_settings => settings,
+        :tier => tier,
+        :cname_prefix => cname_prefix
+      }
+
       @client.create_environment(request)
     end
 

data/lib/eb_deployer/default_config.yml

@@ -4,7 +4,10 @@ application: <%= app_name %>
 # common settings for all environments
 common:
   # Solution stack for elastic beanstalk, default is 64bit tomcat 7 for JAVA app
-  # solution_stack_name: 64bit Amazon Linux running Tomcat 7
+  # solution_stack_name: 64bit Amazon Linux 2013.09 running Tomcat 7 Java 7
+
+  # Tier name for environments. Current supported values are WebServer and Worker
+  # tier: WebServer
 
   # AWS region to deploy. Default to us-east-1
   # region: us-west-1

data/lib/eb_deployer/environment.rb

@@ -54,11 +54,11 @@ module EbDeployer
     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, settings)
+          @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, settings)
+          @bs.create_environment(@app, @name, @creation_opts[:solution_stack], @creation_opts[:cname_prefix], version_label, @creation_opts[:tier], settings)
         end
       end
     end

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/aws_driver_stubs.rb

@@ -21,7 +21,7 @@ class EBStub
     @apps.include?(app)
   end
 
-  def create_environment(app, env, solution_stack, cname_prefix, version, settings)
+  def create_environment(app, env, solution_stack, cname_prefix, version, tier, settings)
     raise 'cname prefix is not avaible' if @envs.values.detect { |env| env[:cname_prefix] == cname_prefix }
     raise "env name #{env} is longer than 23 chars" if env.size > 23
     raise "app not exists" unless application_exists?(app)
@@ -31,6 +31,7 @@ class EBStub
       :solution_stack => solution_stack,
       :version => version,
       :cname_prefix => cname_prefix,
+      :tier => tier,
       :settings => settings}
   end
 
@@ -40,8 +41,8 @@ class EBStub
     @envs_been_deleted[app] << env
   end
 
-  def update_environment(app, env, version, settings)
-    @envs[env_key(app, env)].merge!(:version => version, :settings => settings)
+  def update_environment(app, env, version, tier, settings)
+    @envs[env_key(app, env)].merge!(:version => version, :settings => settings, :tier => tier)
   end
 
   def environment_exists?(app_name, env_name)
@@ -114,6 +115,11 @@ class EBStub
     @envs[env_key(app_name, env_name)][:version]
   end
 
+  def environment_tier(app_name, env_name)
+    @envs[env_key(app_name, env_name)][:tier]
+  end
+
+
   def environment_settings(app_name, env_name)
     @envs[env_key(app_name, env_name)][:settings]
   end

data/test/deploy_test.rb

@@ -403,6 +403,23 @@ class DeployTest < MiniTest::Unit::TestCase
     assert_equal @sample_package, s3_objects.values.first.to_s
   end
 
+  def test_sets_default_tier_as_webserver
+    deploy(:application => 'simple', :environment => "production")
+    assert_equal EbDeployer.environment_tier('WebServer'), @eb_driver.environment_tier('simple', eb_envname('simple', 'production'))
+  end
+
+  def test_can_change_tier
+    deploy(:application => 'simple', :environment => "production", :tier => 'Worker')
+    assert_equal EbDeployer.environment_tier('Worker'), @eb_driver.environment_tier('simple', eb_envname('simple', 'production'))
+  end
+
+  def test_should_raise_error_when_tier_setting_is_not_recognized
+    assert_raises(RuntimeError) do
+      deploy(:application => 'simple', :environment => "production", :tier => 'Gum')
+    end
+  end
+
+
   private
 
   def temp_file(content)

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - wpc
 - betarelease
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 description: For automating Blue-Green deployment flows on Elastic Beanstalk.
 email:
 - alex.hal9000@gmail.com
@@ -34,9 +34,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md
@@ -70,26 +70,28 @@ homepage: https://github.com/ThoughtWorksStudios/eb_deployer
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.2.1
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
-summary: Low friction deployments should be a breeze. Elastic Beanstalk provides a great foundation for performing Blue-Green deployments, and EbDeployer add a missing top to automate the whole flow out of the box.
+summary: Low friction deployments should be a breeze. Elastic Beanstalk provides a
+  great foundation for performing Blue-Green deployments, and EbDeployer add a missing
+  top to automate the whole flow out of the box.
 test_files:
 - test/aws_driver_stubs.rb
 - test/cloud_formation_provisioner_test.rb