eb_deployer 0.4.4 → 0.4.5

data/.gitignore

@@ -1,22 +1,7 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/pkg
+/test/tmp
+/tmp
 /.rvmrc
-_site
 /samples/jruby_rails4/jruby_rails4.war
 /samples/jruby_rails4/public/assets/*
 /TAGS

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.4.5
+====
+* Rails 3+ support: Rails Generator to install default configurations with
+	Postgres RDS resource and everything need for blue-green
+	deployment
+* Add ability to tag beanstalk environment (from @pmcfadden)
+
 0.4.4
 =====
 * Fix S3 upload on Windows.

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'redcarpet', :platform => :mri
 gem 'yard'
 gem 'rake'
+gem 'railties', "3.2.18"

data/Gemfile.lock

@@ -0,0 +1,73 @@
+PATH
+  remote: .
+  specs:
+    eb_deployer (0.4.4)
+      aws-sdk (>= 1.33.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
+      builder (~> 3.0.0)
+    activesupport (3.2.18)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    aws-sdk (1.42.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    journey (1.0.4)
+    json (1.8.1)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    railties (3.2.18)
+      actionpack (= 3.2.18)
+      activesupport (= 3.2.18)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.3.2)
+    rdoc (3.9.5)
+    redcarpet (3.0.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.19.1)
+    tilt (1.4.1)
+    yard (0.8.7.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  eb_deployer!
+  railties (= 3.2.18)
+  rake
+  redcarpet
+  yard

data/README.md

@@ -1,4 +1,5 @@
 # EbDeployer [![Build Status](https://travis-ci.org/ThoughtWorksStudios/eb_deployer.png?branch=master)](https://travis-ci.org/ThoughtWorksStudios/eb_deployer)
+[From Thoughtworks Mingle Team](http://getmingle.io)
 
 Low friction deployments should be a breeze. Elastic Beanstalk provides a great foundation for performing Blue-Green deployments, and EbDeployer add a missing link to automate the whole flow out of box.
 
@@ -22,6 +23,9 @@ Create an AWS IAM user for deploy and give it privilege to operate Elastic Beans
 
 You need to package your application for Elastic Beanstalk stack first. For Java app a warball is appropriate. For Ruby on Rails app a tar.gz file is good. You can also package a Rails/Sinatra app as a war ball using warbler and deploy to Java stack. (Please remember to run rake assets:precompile first for a rails app.)
 
+If you were deploying to Elastic Beanstalk Ruby stack, simply zip your codebase is good enough, for example:
+
+		$ git ls-files | zip your-app-name.zip -@
 
 ### Step Three: Generate configuration and Configure deployment process
 
@@ -84,6 +88,71 @@ Later tutorials coming soon will cover
 
 Take a look at code if you can not wait for the documentation.
 
+## Rails 3+ support
+
+EbDeployer ships with a Rails 3+ generator since version 0.4.5.
+
+### Install
+
+Add eb_deployer to your Gemfile
+
+		gem 'eb_deployer'
+
+Setup AWS credentials:
+
+    $ export AWS_ACCESS_KEY_ID=xxx
+    $ export AWS_SECRET_ACCESS_KEY=xxx
+
+### Initial configurations and rake tasks
+
+Run Rails generator to generate configurations and rake file:
+
+		rails generate eb_deployer:install
+
+It will setup AWS Elastic Beanstalk blue-green deployment configuration with a Postgres RDS instance as your Rails' backend database.
+The followings are details:
+
+* Add file "lib/tasks/eb_deployer.rake", please run "rake -T eb" for tasks description. These tasks are simple and designed for you to customize.
+* Add file "config/eb_deployer.yml", it includes basic blue-green configurations with a Postgres RDS instance resource.
+* Add file "config/rds.json", it is a CloudFormation template file which provisions the Postgres RDS instance. A separated CloudFormation stack maintains all resources that are shared between different Elastic Beanstalk environments in blue-green deployment. Notice: each eb_deployer environment will create one.
+* Add "gem 'pg'" to your Gemfile, as this initial configuration is hooking up with a Postgres RDS instance, we need postgres driver.
+* Add file ".ebextenstions/01_postgres_packages.config", which installs Postgres dev packages on EC2 instances, so that we can build gem "pg" on your EC2 machine after deployed.
+* Add a new production database configuration into "config/database.yml" file. Your original production configuration will be commented out.
+
+### Deploy
+
+Add all files that need to be deployed into your Git repository, because we will simply use "git ls-files" to find all files need to be packaged.
+
+Deploy a dev environment for testing your application deployment:
+
+		rake eb:deploy
+
+Then, when you're ready to deploy a production environment:
+
+		EB_DEPLOYER_ENV=production rake eb:deploy
+
+## EbDeployer environment
+
+There are so many things called environment:
+
+* Rails environment: development, test, production
+* Elastic Beanstalk environment
+* Development environment
+* Staging environment
+* Production environment
+
+An EbDeployer environment is your application running environment (= your running application + infrastructure), e.g. staging environment, production environment.
+All EbDeployer environments including dev environment are deployed as Rails production environment.
+
+What is different between EbDeployer environment and Elastic Beanstalk environment?
+
+* There are 2 level concepts in Elastic Beanstalk: Application and Environment
+* EbDeployer environment sits between Elastic Beanstalk Application and Elastic Beanstalk Environment:
+	* One Elastic Beanstalk Application has many EbDeployer environments: dev, staging, production, or whatever names you like.
+	* Depending on deployment strategy, one EbDeployer environment has one or more Elastic Beanstalk environments
+		* For 'inplace-update' deployment strategy, it's one Elastic Beanstalk environment.
+		* For 'blue-green' deployment strategy, it's two Elastic Beanstalk environments.
+* You should consider an Elastic Beanstalk environment is designed to be replacable (by another Elastic Beanstalk environment).
 
 ## Contributing
 

data/TODOS.md

@@ -0,0 +1,10 @@
+* Support warmup_script option,  which runs after smoke test to enhance smoothness of DNS switching in Blue Green deployment.
+* Wait for all auto scaling group to reach MIN size before running smoke tests in Blue Green deployment. This will make sure DNS switching not generating 50x error under big load, even without warmup steps.
+* Refactoring: extract Config class wrapping config defaut and merging logic.
+* Make clear solution_stack is a creation only option in document
+* Updating an EB environment with a different solution_stack should give warning
+* Remove all old environment settings to keep settings always sync up
+* Make it possible to provide an environment specific components settings
+* Support smoke_test_script option
+* Document for how to use components
+* Document for how to use inactive-settings

data/eb_deployer.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/ThoughtWorksStudios/eb_deployer"
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'aws-sdk'
+  gem.add_runtime_dependency 'aws-sdk', '>= 1.33.0'
 
   gem.files         = `git ls-files`.split($\).reject {|f| f =~ /^samples\// }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/eb_deployer.rb

@@ -195,6 +195,7 @@ module EbDeployer
         :cname_prefix =>  opts[:cname_prefix],
         :smoke_test => opts[:smoke_test],
         :phoenix_mode => opts[:phoenix_mode],
+        :tags => opts[:tags],
         :tier => opts[:tier]
       }
       env.strategy_name = opts[:strategy] || :blue_green

data/lib/eb_deployer/aws_driver/beanstalk.rb

@@ -40,7 +40,7 @@ module EbDeployer
         alive_envs(app_name).collect { |env| env[:environment_name] }
       end
 
-      def create_environment(app_name, env_name, stack_name, cname_prefix, version, tier, settings)
+      def create_environment(app_name, env_name, stack_name, cname_prefix, version, tier, tags, settings)
         request = {
           :application_name => app_name,
           :environment_name => env_name,
@@ -48,6 +48,7 @@ module EbDeployer
           :version_label => version,
           :option_settings => settings,
           :tier => environment_tier(tier),
+          :tags => tags,
           :cname_prefix => cname_prefix
         }
 

data/lib/eb_deployer/default_config.yml

@@ -4,7 +4,7 @@ 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 2014.02 v1.0.1 running Tomcat 7 Java 7
+  # solution_stack_name: 64bit Amazon Linux 2014.03 v1.0.3 running Tomcat 7 Java 7
 
   # Tier name for environments. Current supported values are WebServer and Worker
   # tier: WebServer
@@ -37,6 +37,14 @@ common:
   # you override it to 'on' for production environment.
   # phoenix_mode: false
 
+  # The tags you would like to be associated with your resources.
+  # These tags will only be used when you first launch an environment.  If you are using
+  # phoenix_mode set as true each time you deploy you will get a new environment and therefore
+  # any changes to your tags.  If phoenix_mode is false then it will only use your tags on the
+  # initial deploy.
+  # tags:
+  #   my_tag_key: my_tag_value
+
   # Specifies the maximum number of versions to keep. Older versions are removed
   # and deleted from the S3 source bucket as well. If specified as zero or not
   # specified, all versions will be kept.  If a version_prefix is given, only removes

data/lib/eb_deployer/eb_environment.rb

@@ -65,9 +65,10 @@ module EbDeployer
 
     def create_eb_env(settings, version_label)
       solution_stack = @creation_opts[:solution_stack]
+      tags = convert_tags_hash_to_array(@creation_opts.delete(:tags))
       validate_solutions_stack(solution_stack)
       with_polling_events(/Successfully launched environment/i) do
-        @bs.create_environment(@app, @name, 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], tags, settings)
       end
     end
 
@@ -104,6 +105,14 @@ module EbDeployer
       end
     end
 
+    def convert_tags_hash_to_array tags
+      tags ||= {}
+      tags.inject([]) do |arr, (k, v)|
+        arr << {:key => k, :value => v}
+        arr
+      end
+    end
+
     def wait_for_env_become_healthy
       Timeout.timeout(600) do
         current_health_status = @bs.environment_health_state(@app, @name)
@@ -124,7 +133,7 @@ module EbDeployer
 
     def default_create_options
       {
-        :solution_stack => "64bit Amazon Linux 2014.02 v1.0.1 running Tomcat 7 Java 7",
+        :solution_stack => "64bit Amazon Linux 2014.03 v1.0.3 running Tomcat 7 Java 7",
         :smoke_test =>  Proc.new {},
         :tier => 'WebServer'
       }

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/lib/generators/eb_deployer/install/install_generator.rb

@@ -0,0 +1,77 @@
+require 'rails/generators'
+require 'eb_deployer/default_config'
+require 'aws/elastic_beanstalk'
+
+module EbDeployer
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      DEFAULT_STACK_NAME = '64bit Amazon Linux 2014.03 v1.0.3 running Ruby 2.0 (Puma)'
+      source_root File.expand_path("../templates", __FILE__)
+
+      def do_install
+        in_root do
+          copy_file 'eb_deployer.rake', 'lib/tasks/eb_deployer.rake'
+          template 'eb_deployer.yml.erb', 'config/eb_deployer.yml'
+          setup_database
+        end
+      end
+
+      private
+      def setup_database
+        gem 'pg'
+        setup_database_yml
+        copy_file 'postgres_rds.json', 'config/rds.json'
+        directory 'ebextensions', '.ebextensions'
+      end
+
+      def setup_database_yml
+        gsub_file('config/database.yml', /^production:.+/m) do |match|
+          prod_start = false
+          match.split("\n").map do |l|
+            case l
+            when /^production/
+              prod_start = true
+              "# #{l}"
+            when /^\s+/
+              prod_start ? "# #{l}" : l
+            else
+              prod_start = false
+              l
+            end
+          end.join("\n")
+        end
+        append_to_file('config/database.yml', <<-YAML)
+
+
+production:
+  adapter: postgresql
+  database: <%= ENV['DATABASE_NAME'] || '#{app_name}_production' %>
+  host: <%= ENV['DATABASE_HOST'] || 'localhost' %>
+  port: <%= ENV['DATABASE_PORT'] || 5432 %>
+  username: <%= ENV['DATABASE_USERNAME'] || #{ENV['USER'].inspect} %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>
+  min_messages: ERROR
+YAML
+      end
+      def db_password
+        "PleaseChangeMe"
+      end
+
+      def solution_stack_name
+        AWS::ElasticBeanstalk.new.client.list_available_solution_stacks[:solution_stacks].find do |s|
+          s =~ /Amazon Linux/ && s =~ /running Ruby 2.0 \(Puma\)/
+        end
+      rescue
+        '64bit Amazon Linux 2014.03 v1.0.4 running Ruby 2.0 (Puma)'
+      end
+
+      def alphanumeric_name
+        app_name.gsub(/-/, '')
+      end
+
+      def app_name
+        File.basename(Dir.pwd).downcase.gsub(/[^0-9a-z]/, '-').gsub(/--/, '-')
+      end
+    end
+  end
+end

data/lib/generators/eb_deployer/install/templates/eb_deployer.rake

@@ -0,0 +1,31 @@
+namespace :eb do
+  def eb_deployer_env
+    ENV['EB_DEPLOYER_ENV'] || 'dev'
+  end
+
+  def eb_deployer_package
+    name = File.basename(Dir.pwd).downcase.gsub(/[^0-9a-z]/, '-').gsub(/--/, '-')
+    "tmp/#{name}.zip"
+  end
+
+  desc "Remove the package file we generated."
+  task :clean do
+    sh "rm -rf #{eb_deployer_package}"
+  end
+
+  desc "Build package for eb_deployer to deploy to a Ruby environment in tmp directory. It zips all file list by 'git ls-files'"
+  task :package => [:clean, :environment] do
+    sh "git ls-files | zip #{eb_deployer_package} -@"
+  end
+
+  desc "Deploy package we built in tmp directory. default to dev environment, specify environment variable EB_DEPLOYER_ENV to override, for example: EB_DEPLOYER_ENV=production rake eb:deploy."
+  task :deploy => [:package] do
+    app_name = Rails.application.class.parent_name.downcase
+    sh "eb_deploy -p #{eb_deployer_package} -e #{eb_deployer_env}"
+  end
+
+  desc "Destroy Elastic Beanstalk environments. It won't destroy resources defined in eb_deployer.yml. Default to dev environment, specify EB_DEPLOYER_ENV to override."
+  task :destroy do
+    sh "eb_deploy -d -e #{eb_deployer_env}"
+  end
+end

data/lib/generators/eb_deployer/install/templates/eb_deployer.yml.erb

@@ -0,0 +1,148 @@
+# applicaiton name
+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: <%= solution_stack_name %>
+
+  # 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
+
+  # There are two deployment strategies: 'blue-green' or 'inplace-update'.
+  # Blue green deployments keep two elastic beanstalk environments and always deploy to
+  # inactive one, to achieve zero downtime.
+  # Inplace-update strategy will only keep one environment, and update the version inplace on
+  # deploy. Inplace-update will save resources but will suffer from downtime.
+  # (All old environments need be destroyed when you switching between strategies.)
+  # Default strategy is 'blue-green'.
+  # strategy: blue-green
+
+  # Name of s3 bucket where uploaded application packages will be stored.
+  # Note that the string ".packages" will be added as a suffix to your bucket.
+  # So, if "thoughtworks.simple" is passed as the bucket name, the actual s3 bucket
+  # name will be thoughtworks.simple.packages. Default to application name.
+  # package_bucket: my-s3-bucket
+
+  # If phoenix mode is turned 'on', it will terminate the old elastic
+  # beanstalk environment and recreate a new one on deploy. For blue-green
+  # deployment it will terminate the inactive environment first then
+  # recreate it. This is useful to avoid configuration drift and
+  # accumulating state on the ec2 instances. Also it has the benefit of
+  # keeping your ec2 instance system package upto date, because everytime ec2
+  # instance boots up from AMI it does a system update. Default is 'off' but we suggest
+  # you override it to 'on' for production environment.
+  # phoenix_mode: false
+
+  # Specifies the maximum number of versions to keep. Older versions are removed
+  # and deleted from the S3 source bucket as well. If specified as zero or not
+  # specified, all versions will be kept.  If a version_prefix is given, only removes
+  # version starting with the prefix.
+  # keep_latest: 200
+
+  # Specifies a prefix to prepend to the version label.
+  # This can be useful if you want to use different binaries for different
+  # environments.
+  # version_prefix:
+
+  # Generating version label for package to be deployed. A readable version label will
+  # provide better traceablity of your deployment process.
+  # By default setting is:
+  # version_label: <%%= package_digest %>
+  # which means using MD5 digest of the package file. If you deploy using build
+  # pipeline tool such as GO, switching to pipline counter is highly suggested to
+  # increase the readability. Following example will read pipeline counter from environment
+  # variable with a fall back to digest for local deployment:
+  # version_label: <%%= ENV['GO_PIPELINE_COUNTER'] || package_digest %>
+
+
+  # Smoke test value should be a piece of ruby code with access to single variable
+  # "host_name" -- environment DNS name. Smoke test snippet will be evaluated at
+  # the end of the deployment for inplace-update deployment. For blue-green
+  # deployment it will run after inactive environment update is completed and before
+  # switching over.
+  # Defining a smoke test is highly recommended for serious usage. By default we use
+  # The simplest one that just be checking server landing page using curl, e.g.
+  smoke_test: |
+    curl_http_code = "curl -s -o /dev/null -w \"%{http_code}\" http://#{host_name}"
+    Timeout.timeout(600) do
+      until ['200', '301', '302'].include?(`#{curl_http_code}`.strip)
+        sleep 5
+      end
+    end
+
+  # Elastic Beanstalk settings that will apply to the environments you are
+  # deploying.
+  # For all available options take a look at
+  # http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html
+  option_settings:
+    # Following is an example of set EC2 ssh key name. This allow you ssh into the ec2
+    # instance. See http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html
+    # - namespace: aws:autoscaling:launchconfiguration
+    #   option_name: EC2KeyName
+    #   value: <my-ec2-key-name>
+
+    # Following is an example which changes EC2 instance type
+    # from t1.micro (default) to m1.small. Instances with t1.micro type sometime
+    # are not very responsible, so m1.small is suggested for saving time.
+    # But if you care about the marginal cost difference you can comment this out to
+    # go back to t1.micro.
+    - namespace: aws:autoscaling:launchconfiguration
+      option_name: InstanceType
+      value: m1.small
+
+    - namespace: aws:elasticbeanstalk:application:environment
+      option_name: DATABASE_NAME
+      value: <%= alphanumeric_name %>
+    - namespace: aws:elasticbeanstalk:application:environment
+      option_name: DATABASE_USERNAME
+      value: <%= alphanumeric_name %>
+    - namespace: aws:elasticbeanstalk:application:environment
+      option_name: DATABASE_PASSWORD
+      value: <%= db_password %>
+
+
+  # If resources specified, eb_deployer will use the CloudFormation
+  # template you provide to create a default CloudFormation stack with
+  # name <application_name>-<env-name> for the environment current
+  # deploying. And Outputs of the CloudFormation can be mapped to Elastic Beanstalk
+  # options settings.
+  # keys:
+  #    template => CloudFormation template file with JSON format
+  #    inputs => A Hash, input values for the CloudFormation template
+  #    outputs => A Hash with key map to your CloudFormation template outputs and value as elastic beanstalk settings namespace and option_name.
+  #    capabilities => An array. You need set it to ['CAPABILITY_IAM'] if the
+  # template include IAM Instance Profile.
+  resources:
+    # Creating a RDS instance by CloudFormation, so that database will not hook up with any ElasticBeanstalk environment
+    template: config/rds.json
+    inputs:
+      DBName: <%= alphanumeric_name %>
+      DBUser: <%= alphanumeric_name %>
+      DBPassword: <%= db_password %>
+    outputs:
+      RDSPassSecurityGroup:
+        namespace: aws:autoscaling:launchconfiguration
+        option_name: SecurityGroups
+      RDSHost:
+        namespace: aws:elasticbeanstalk:application:environment
+        option_name: DATABASE_HOST
+      RDSPort:
+        namespace: aws:elasticbeanstalk:application:environment
+        option_name: DATABASE_PORT
+
+# You can define environment here. Each environment can overriden any common settings
+environments:
+  dev:
+    # overriding common settings
+    strategy: inplace-update
+  production:
+    option_settings:
+      # example for overriding common option_settings: providing least redundancy
+      # in production environment.
+      # - namespace: aws:autoscaling:asg
+      #   option_name: MinSize
+      #    value: "2"

data/lib/generators/eb_deployer/install/templates/ebextensions/01_postgres_packages.config

@@ -0,0 +1,5 @@
+---
+packages:
+  yum:
+    postgresql-libs: []
+    postgresql-devel: []

data/lib/generators/eb_deployer/install/templates/postgres_rds.json

@@ -0,0 +1,88 @@
+{
+    "Outputs": {
+        "RDSHost": {
+            "Description": "Database endpoint address",
+            "Value": { "Fn::GetAtt": ["RDSDatabase", "Endpoint.Address"] }
+        },
+        "RDSPort": {
+            "Description": "Database endpoint port",
+            "Value": { "Fn::GetAtt": ["RDSDatabase", "Endpoint.Port"] }
+        },
+        "RDSPassSecurityGroup": {
+            "Description": "Security group assign to ec2 instance that need access to rds instance",
+            "Value": {
+                "Ref": "RDSPassSecurityGroup"
+            }
+        }
+    },
+
+    "Parameters": {
+        "DBUser": {
+            "NoEcho": "false",
+            "Description": "The name of master user for the client DB Instance.",
+            "Type": "String",
+            "ConstraintDescription": "must begin with a letter and contain only alphanumeric characters"
+        },
+
+        "DBName": {
+            "NoEcho": "false",
+            "Description": "The DB Name of the RDS instance",
+            "Type": "String",
+            "ConstraintDescription": "must contain only alphanumeric characters"
+        },
+
+        "DBPassword": {
+            "NoEcho": "true",
+            "Description": "The master password for the DB instance.",
+            "Type": "String",
+            "ConstraintDescription": "must contain only alphanumeric characters"
+        }
+    },
+
+    "Resources": {
+        "RDSDBSecurityGroup": {
+            "Type": "AWS::RDS::DBSecurityGroup",
+            "Properties": {
+                "GroupDescription": "Enable database access to Beanstalk application",
+                "DBSecurityGroupIngress": {
+                    "EC2SecurityGroupName": {
+                        "Ref": "RDSPassSecurityGroup"
+                    }
+                }
+            }
+        },
+
+        "RDSDatabase": {
+            "Type": "AWS::RDS::DBInstance",
+            "DeletionPolicy": "Delete",
+            "Properties": {
+                "MasterUsername": {
+                    "Ref": "DBUser"
+                },
+                "DBSecurityGroups": [
+                    {
+                        "Ref": "RDSDBSecurityGroup"
+                    }
+                ],
+                "DBInstanceClass": "db.m1.small",
+                "AllocatedStorage": "5",
+                "MultiAZ": "false",
+                "EngineVersion": "9.3.3",
+                "DBName": {
+                    "Ref": "DBName"
+                },
+                "MasterUserPassword": {
+                    "Ref": "DBPassword"
+                },
+                "Engine": "postgres"
+            }
+        },
+
+        "RDSPassSecurityGroup": {
+            "Type": "AWS::EC2::SecurityGroup",
+            "Properties": {
+                "GroupDescription": "SecurityGroup access RDS database."
+            }
+        }
+    }
+}

data/test/aws_driver_stubs.rb

@@ -22,7 +22,7 @@ class EBStub
     @apps.include?(app)
   end
 
-  def create_environment(app, env, solution_stack, cname_prefix, version, tier, settings)
+  def create_environment(app, env, solution_stack, cname_prefix, version, tier, tags, 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)
@@ -33,6 +33,7 @@ class EBStub
       :version => version,
       :cname_prefix => cname_prefix,
       :tier => tier,
+      :tags => tags,
       :settings => settings }
     set_env_ready(app, env, false)
   end
@@ -150,6 +151,9 @@ class EBStub
     @envs[env_key(app_name, env_name)][:tier]
   end
 
+  def environment_tags(app_name, env_name)
+    @envs[env_key(app_name, env_name)][:tags]
+  end
 
   def environment_settings(app_name, env_name)
     @envs[env_key(app_name, env_name)][:settings]

data/test/eb_environment_test.rb

@@ -26,6 +26,12 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
     assert_equal({s1: 'v1' },  @eb_driver.environment_settings('myapp', t('production', 'myapp')))
   end
 
+  def test_deploy_should_include_tags
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, {:tags => {:my_tag => 'my_value', :tag2 => 'value2'}})
+    env.deploy("version1")
+    assert_equal [{:key => :my_tag, :value => 'my_value'}, {:key => :tag2, :value => 'value2'}], @eb_driver.environment_tags('myapp', t('production', 'myapp'))
+  end
+
   def test_should_run_smoke_test_after_deploy
     smoked_host = nil
     env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :smoke_test => Proc.new { |host| smoked_host = host })

data/test/rails_generators_test.rb

@@ -0,0 +1,67 @@
+require 'test_helper'
+require 'rails'
+require 'shellwords'
+require 'generators/eb_deployer/install/install_generator'
+
+class RailsGenratorsTest < Rails::Generators::TestCase
+  tests EbDeployer::Generators::InstallGenerator
+  destination File.expand_path('../../tmp', __FILE__)
+  setup :prepare_destination
+
+  setup do
+    mkdir_p path('config')
+    touch path('config/database.yml')
+    touch path('Gemfile')
+  end
+
+  test "install" do
+    run_generator
+
+    assert_file 'config/eb_deployer.yml'
+    assert_file 'lib/tasks/eb_deployer.rake'
+
+    assert_file 'config/rds.json'
+    assert_file '.ebextensions/01_postgres_packages.config'
+    assert_file 'config/database.yml', /database: <%= ENV\['RDS_DB_NAME'\]/m, /host: <%= ENV\['RDS_HOSTNAME'\]/m
+    assert_file 'Gemfile', /gem "pg"/
+  end
+
+  test "should comment production configuration in database.yml" do
+    File.open(path('config/database.yml'), 'w') do |f|
+      f.write(<<-YAML)
+development:
+  host: localhost
+
+production:
+  host: localhost
+
+test:
+  host: localhost
+YAML
+    end
+    run_generator
+    assert_file 'config/database.yml', <<-YAML
+development:
+  host: localhost
+
+# production:
+#   host: localhost
+
+test:
+  host: localhost
+
+production:
+  adapter: postgresql
+  database: <%= ENV['RDS_DB_NAME'] || 'tmp_production' %>
+  host: <%= ENV['RDS_HOSTNAME'] || 'localhost' %>
+  port: <%= ENV['RDS_PORT'] || 5432 %>
+  username: <%= ENV['RDS_USERNAME'] || \"xli\" %>
+  password: <%= ENV['RDS_PASSWORD'] %>
+  min_messages: ERROR
+YAML
+  end
+
+  def path(*f)
+    File.join(destination_root, *f)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.33.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.33.0
 description: For automating Blue-Green deployment flows on Elastic Beanstalk.
 email:
 - alex.hal9000@gmail.com
@@ -43,9 +43,11 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- TODOS.md
 - bin/eb_deploy
 - eb_deployer.gemspec
 - lib/eb_deployer.rb
@@ -73,6 +75,11 @@ files:
 - lib/eb_deployer/utils.rb
 - lib/eb_deployer/version.rb
 - lib/eb_deployer/version_cleaner.rb
+- lib/generators/eb_deployer/install/install_generator.rb
+- lib/generators/eb_deployer/install/templates/eb_deployer.rake
+- lib/generators/eb_deployer/install/templates/eb_deployer.yml.erb
+- lib/generators/eb_deployer/install/templates/ebextensions/01_postgres_packages.config
+- lib/generators/eb_deployer/install/templates/postgres_rds.json
 - test/aws_driver_stubs.rb
 - test/blue_green_deploy_test.rb
 - test/cloud_formation_provisioner_test.rb
@@ -81,6 +88,7 @@ files:
 - test/eb_environment_test.rb
 - test/inplace_update_deploy_test.rb
 - test/multi_components_deploy_test.rb
+- test/rails_generators_test.rb
 - test/resources_deploy_test.rb
 - test/smoke_test_test.rb
 - test/test_helper.rb
@@ -122,6 +130,7 @@ test_files:
 - test/eb_environment_test.rb
 - test/inplace_update_deploy_test.rb
 - test/multi_components_deploy_test.rb
+- test/rails_generators_test.rb
 - test/resources_deploy_test.rb
 - test/smoke_test_test.rb
 - test/test_helper.rb