eb_deployer 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ff8dea9ecf894a081eabd4d8e790706b7f6f699
-  data.tar.gz: 32fb41ec3baa8c2a40d73cf7a7c69820a645bbc5
+  metadata.gz: 9e8d42e8522c7f436251552c366a5728fc18e296
+  data.tar.gz: c1a3115f32a1af1e620f6459297ecc6e555352ed
 SHA512:
-  metadata.gz: 52589f810e24608c3978a47eadfe5d8a1cd759c025418ea0af29553accabcc0c9ed796b59026e01d6b3083bfd5205f15a5d0b484f5a97352caac7edac0f813de
-  data.tar.gz: ca45f1540987043188a8746ce510c59e6c9dd4f466506f9202b87d557875018a0506349d23b689a8d8d54994ca901bf6c3a853525f31a0a68961054f22b59c8e
+  metadata.gz: a6699965fc55694e54849017d63dfef003a30e122a98d3a58deff42ef4c22670d83e57f5cb4fb2b33362c9fe117b8c18e3e165809d58b7c2648195554399fc19
+  data.tar.gz: c14d0f2152bebd7326fe1206ae9bb0b9208cd0c7ad317f10f6e2f117277ef578e7636043032fdc505f6bb77eec794c3efffa1abf2e3f6acd1aad96a05b353a7d

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p429
+ruby-1.9.3-p429

data/eb_deployer.gemspec

@@ -4,10 +4,10 @@ require File.expand_path('../lib/eb_deployer/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["wpc", "betarelease"]
   gem.email         = ["alex.hal9000@gmail.com", "sudhindra.r.rao@gmail.com"]
-  gem.description   = %q{For automate blue green deployment flow on Elasti Beanstalk.}
-  gem.summary       = %q{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 box.}
+  gem.description   = %q{For automating Blue-Green deployment flows on Elastic Beanstalk.}
+  gem.summary       = %q{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.}
   gem.homepage      = "https://github.com/ThoughtWorksStudios/eb_deployer"
-  gem.license = 'MIT'
+  gem.license       = 'MIT'
 
   gem.add_runtime_dependency 'aws-sdk'
 

data/lib/eb_deployer/application.rb

@@ -25,15 +25,25 @@ module EbDeployer
       end
     end
 
-    def delete
+    def delete(env_name=nil)
       if @eb_driver.application_exists?(@name)
-        @eb_driver.environment_names_for_application(@name).each do |env|
+        env_name = Environment.unique_ebenv_name(@name, env_name) unless env_name.nil?
+        available_envs = @eb_driver.environment_names_for_application(@name)
+
+        unless env_name.nil? || available_envs.include?(env_name)
+          log("Environment #{env_name.inspect} does not exist in application #{@name.inspect}. Skipping delete.")
+          return
+        end
+
+        available_envs.select { |e| env_name.nil? || e == env_name }.each do |env|
           log("Terminating environment #{env}")
           @eb_driver.delete_environment(@name, env)
         end
 
-        log("Deleting application")
-        @eb_driver.delete_application(@name)
+        if env_name.nil?
+          log("Deleting application")
+          @eb_driver.delete_application(@name)
+        end
       end
     end
 

data/lib/eb_deployer/config_loader.rb

@@ -27,16 +27,21 @@ module EbDeployer
       common_settings = symbolize_keys(config_settings.delete(:common))
       common_settings[:version_label] ||= package_digest
 
-      env = options[:environment]
       envs = config_settings.delete(:environments)
-      raise "Environment #{env} is not defined in #{config_file}" unless envs.has_key?(env)
-      env_settings = symbolize_keys(envs[env] || {})
-      env_option_settings = env_settings.delete(:option_settings) || []
+      ret = options.merge(config_settings).merge(common_settings)
+      unless ret.delete(:all_envs)
+        env = ret[:environment]
+        raise "Environment #{env} is not defined in #{config_file}" unless envs.has_key?(env)
+        env_settings = symbolize_keys(envs[env] || {})
+        env_option_settings = env_settings.delete(:option_settings) || []
 
-      ret = options.merge(config_settings).merge(common_settings).merge(env_settings)
+        ret.merge!(env_settings)
 
-      ret[:option_settings] ||= []
-      ret[:option_settings] += env_option_settings
+        ret[:option_settings] ||= []
+        ret[:option_settings] += env_option_settings
+      else
+        ret.delete(:environment)
+      end
       ret
     end
 

data/lib/eb_deployer/version.rb

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

data/lib/eb_deployer.rb

@@ -214,7 +214,7 @@ module EbDeployer
     bs = opts[:bs_driver] || Beanstalk.new
     s3 = opts[:s3_driver] || S3Driver.new
     cf = opts[:cf_driver] || CloudFormationDriver.new
-    Application.new(app, bs, s3).delete
+    Application.new(app, bs, s3).delete(opts[:environment])
   end
 
   def self.cli
@@ -228,6 +228,8 @@ module EbDeployer
     parser.parse!
     action = options.delete(:action)
 
+    raise "--all is only valid with --destroy" if (options[:all_envs] && action != :destroy)
+
     if File.exists?(options[:config_file])
       puts "Found configuration at #{options[:config_file]}."
     else
@@ -255,7 +257,7 @@ module EbDeployer
         options[:package] = v
       end
 
-      opts.on("-e", "--environment [ENV_NAME]", "(Default to 'dev') Environment to operating on, for example dev, staging or production. This must be defined in 'environments' section of the config file") do |v|
+      opts.on("-e", "--environment [ENV_NAME]", "(Defaults to 'dev') Environment on which to operate (e.g. dev, staging, production). This must be defined in 'environments' section of the config file") do |v|
         options[:environment] = v
       end
 
@@ -267,6 +269,10 @@ module EbDeployer
         options[:action] = :destroy
       end
 
+      opts.on("--all", "Operate on all environments, only valid with --destroy") do |v|
+        options[:all_envs] = true
+      end
+
       opts.on("--skip-resource-stack-update", "skip cloud-formation stack update. (only for extreme situation like hitting a cloudformation bug)") do |v|
         options[:skip_resource_stack_update] = true
       end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - wpc
 - betarelease
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: For automate blue green deployment flow on Elasti Beanstalk.
+  prerelease: false
+  type: :runtime
+description: For automating Blue-Green deployment flows on Elastic Beanstalk.
 email:
 - alex.hal9000@gmail.com
 - sudhindra.r.rao@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,28 +70,26 @@ 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.0
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.2.1
+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 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