eb_deployer 0.3.1 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8ff8dea9ecf894a081eabd4d8e790706b7f6f699
+  data.tar.gz: 32fb41ec3baa8c2a40d73cf7a7c69820a645bbc5
+SHA512:
+  metadata.gz: 52589f810e24608c3978a47eadfe5d8a1cd759c025418ea0af29553accabcc0c9ed796b59026e01d6b3083bfd5205f15a5d0b484f5a97352caac7edac0f813de
+  data.tar.gz: ca45f1540987043188a8746ce510c59e6c9dd4f466506f9202b87d557875018a0506349d23b689a8d8d54994ca901bf6c3a853525f31a0a68961054f22b59c8e

data/lib/eb_deployer.rb

@@ -34,7 +34,6 @@ module EbDeployer
   # @option opts [Symbol] :region AWS Region (e.g. "us-west-2", "us-east-1")
   #
   def self.query_resource_output(key, opts)
-    # AWS.config(:logger => Logger.new($stdout))
     if region = opts[:region]
       AWS.config(:region => region)
     end
@@ -162,7 +161,6 @@ module EbDeployer
   #   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.
   def self.deploy(opts)
-    # AWS.config(:logger => Logger.new($stdout))
     if region = opts[:region]
       AWS.config(:region => region)
     end
@@ -278,6 +276,13 @@ module EbDeployer
         exit(0)
       end
 
+      opts.on("--debug", "Output AWS debug log") do |d|
+        require 'logger'
+        logger = Logger.new($stdout)
+        logger.level = Logger::DEBUG
+        AWS.config(:logger => logger)
+      end
+
       opts.on("-h", "--help", "help")  do
         puts opts
         puts ""

data/lib/eb_deployer/application.rb

@@ -11,7 +11,7 @@ module EbDeployer
     def create_version(version_label, package)
       create_application_if_not_exists
 
-      source_bundle = if package =~ /\.yml$/
+      source_bundle = if File.extname(package) == '.yml'
                         YAML.load(File.read(package))
                       else
                         package = Package.new(package, @bucket + ".packages", @s3_driver)

data/lib/eb_deployer/default_config.yml

@@ -102,9 +102,8 @@ common:
   # 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
+  #    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:
 

data/lib/eb_deployer/environment.rb

@@ -1,6 +1,7 @@
 module EbDeployer
   class Environment
     attr_reader :app, :name
+    attr_writer :event_poller
 
     def self.unique_ebenv_name(app_name, env_name)
       raise "Environment name #{env_name} is too long, it must be under 15 chars" if env_name.size > 15
@@ -15,7 +16,7 @@ module EbDeployer
       @creation_opts = creation_opts
     end
 
-    def deploy(version_label, settings)
+    def deploy(version_label, settings={})
       terminate if @creation_opts[:phoenix_mode]
       create_or_update_env(version_label, settings)
       smoke_test
@@ -39,15 +40,6 @@ module EbDeployer
       puts "[#{Time.now.utc}][environment:#{@name}] #{msg}"
     end
 
-    private
-
-    def shorten(str, max_length, digest_length=5)
-      raise "max length (#{max_length}) should be larger than digest_length (#{digest_length})" if max_length < digest_length
-      return self if str.size <= max_length
-      sha1 = Digest::SHA1.hexdigest(str)
-      sha1[0..(digest_length - 1)] + str[(max_length - digest_length - 1)..-1]
-    end
-
     def terminate
       if @bs.environment_exists?(@app, @name)
         with_polling_events(/terminateEnvironment completed successfully/i) do
@@ -56,6 +48,9 @@ module EbDeployer
       end
     end
 
+
+    private
+
     def create_or_update_env(version_label, settings)
       if @bs.environment_exists?(@app, @name)
         with_polling_events(/Environment update completed successfully/i) do
@@ -76,8 +71,14 @@ module EbDeployer
     def with_polling_events(terminate_pattern, &block)
       event_start_time = Time.now
       yield
-      EventPoller.new(@app, @name, @bs).poll(event_start_time) do |event|
-        raise event[:message] if event[:message] =~ /Failed to deploy application/
+      event_poller.poll(event_start_time) do |event|
+        if event[:message] =~ /Failed to deploy application/
+          raise event[:message]
+        end
+
+        if event[:message] =~ /Command failed on instance/
+          raise "Elasticbeanstalk instance provision failed (maybe a problem with your .ebextension files). The original message: #{event[:message]}"
+        end
 
         log_event(event)
         break if event[:message] =~ terminate_pattern
@@ -98,6 +99,10 @@ module EbDeployer
       end
     end
 
+    def event_poller
+      @event_poller || EventPoller.new(@app, @name, @bs)
+    end
+
 
     def log_event(event)
       puts "[#{event[:event_date]}][environment:#{@name}] #{event[:message]}"

data/lib/eb_deployer/version.rb

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

data/test/aws_driver_stubs.rb

@@ -26,6 +26,7 @@ class EBStub
     raise "env name #{env} is longer than 23 chars" if env.size > 23
     raise "app not exists" unless application_exists?(app)
     @envs[env_key(app, env)] = {
+      :name => env,
       :application => app,
       :solution_stack => solution_stack,
       :version => version,
@@ -34,7 +35,7 @@ class EBStub
   end
 
   def delete_environment(app, env)
-    @envs.delete(env)
+    @envs.delete(env_key(app, env))
     @envs_been_deleted[app] ||= []
     @envs_been_deleted[app] << env
   end
@@ -119,8 +120,8 @@ class EBStub
 
   def environment_names_for_application(app)
     @envs.inject([]) do |memo, pair|
-      env_name, env = pair
-      memo << env_name if env[:application] == app
+      key, env = pair
+      memo << env[:name] if env[:application] == app
       memo
     end
   end
@@ -154,6 +155,10 @@ class S3Stub
     @buckets.has_key?(bucket_name)
   end
 
+  def objects(bucket_name)
+    @buckets[bucket_name]
+  end
+
   def object_length(bucket_name, obj_name)
     @buckets[bucket_name][obj_name] && File.size(@buckets[bucket_name][obj_name])
   end
@@ -161,6 +166,7 @@ class S3Stub
   def upload_file(bucket_name, obj_name, file)
     @buckets[bucket_name][obj_name] = file
   end
+
 end
 
 class CFStub

data/test/deploy_test.rb

@@ -392,6 +392,17 @@ class DeployTest < MiniTest::Unit::TestCase
     assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', inactive_env)
   end
 
+  def test_pass_pathname_as_package_file
+    deploy(:package => Pathname.new(@sample_package),
+           :application => 'simple',
+           :environment => "production",
+           :package_bucket => 'thoughtworks.simple')
+
+    s3_objects = @s3_driver.objects('thoughtworks.simple.packages')
+    assert_equal 1, s3_objects.size
+    assert_equal @sample_package, s3_objects.values.first.to_s
+  end
+
   private
 
   def temp_file(content)
@@ -400,10 +411,6 @@ class DeployTest < MiniTest::Unit::TestCase
     f
   end
 
-  def eb_envname(app_name, env_name)
-    EbDeployer::Environment.unique_ebenv_name(app_name, env_name)
-  end
-
   def query_resource_output(key, opts)
     EbDeployer.query_resource_output(key, {:bs_driver => @eb_driver,
                                        :s3_driver => @s3_driver,
@@ -420,7 +427,6 @@ class DeployTest < MiniTest::Unit::TestCase
     EbDeployer.destroy(opts.merge(stubs))
   end
 
-
   def stubs
     { :bs_driver => @eb_driver,
       :s3_driver => @s3_driver,

data/test/environment_test.rb

@@ -0,0 +1,83 @@
+require 'test_helper'
+
+class EnvironmentTest < MiniTest::Unit::TestCase
+  class PollerStub
+    class Deadloop < StandardError; end
+
+    def initialize(messages)
+      start_time = Time.now.utc
+      @events = messages.map do |message|
+        start_time += 1
+        {:event_date => start_time, :message => message}
+      end
+    end
+
+
+    def poll(start_time = Time.now, &block)
+      @events.each(&block)
+      raise Deadloop.new('poll will never terminate if you do not set a break in the block')
+    end
+  end
+
+  def setup
+    @eb_driver = EBStub.new
+    @eb_driver.create_application("myapp")
+  end
+
+  def test_deploy_should_create_corresponding_eb_env
+    env = EbDeployer::Environment.new("myapp", "production", @eb_driver)
+    env.deploy("version1")
+    assert @eb_driver.environment_exists?('myapp', eb_envname('myapp', 'production'))
+  end
+
+  def test_deploy_again_should_update_environment
+    env = EbDeployer::Environment.new("myapp", "production", @eb_driver)
+    env.deploy("version1")
+    env.deploy("version2")
+    assert @eb_driver.environment_exists?('myapp', eb_envname('myapp', 'production'))
+    assert_equal 'version2', @eb_driver.environment_verion_label('myapp', eb_envname('myapp', 'production'))
+  end
+
+  def test_option_setttings_get_set_on_eb_env
+    env = EbDeployer::Environment.new("myapp", "production", @eb_driver)
+    env.deploy("version1", {s1: 'v1'})
+    assert_equal({s1: 'v1' },  @eb_driver.environment_settings('myapp', eb_envname('myapp', 'production')))
+  end
+
+  def test_should_run_smoke_test_after_deploy
+    smoked_host = nil
+    env = EbDeployer::Environment.new("myapp", "production", @eb_driver, :smoke_test => Proc.new { |host| smoked_host = host })
+    env.deploy("version1")
+
+    assert !smoked_host.nil?
+    assert_match( /myapp.*\.elasticbeanstalk\.com/, smoked_host)
+  end
+
+  def test_should_raise_runtime_error_when_deploy_failed
+    env = EbDeployer::Environment.new("myapp", "production", @eb_driver)
+    env.event_poller = PollerStub.new(["start deploying", "Failed to deploy application"])
+    assert_raises(RuntimeError) { env.deploy("version 1") }
+  end
+
+  def test_should_raise_runtime_error_when_eb_extension_execution_failed
+    env = EbDeployer::Environment.new("myapp", "production", @eb_driver)
+
+    env.event_poller = PollerStub.new(["start deploying",
+                                       "create environment",
+                                       "Command failed on instance. Return code: 1 Output: Error occurred during build: Command hooks failed",
+                                       "Successfully launched environment"])
+
+    assert_raises(RuntimeError) { env.deploy("version 1") }
+  end
+
+
+  def test_terminate_should_delete_environment
+    env = EbDeployer::Environment.new("myapp", "production", @eb_driver)
+    env.deploy("version1")
+    env.terminate
+    assert !@eb_driver.environment_exists?('myapp', eb_envname('myapp', 'production'))
+  end
+
+
+
+end

data/test/test_helper.rb

@@ -13,4 +13,9 @@ class MiniTest::Unit::TestCase
     File.open(path, 'w') { |f| f << content }
     path
   end
+
+  def eb_envname(app_name, env_name)
+    EbDeployer::Environment.unique_ebenv_name(app_name, env_name)
+  end
+
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - wpc
@@ -10,22 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: For automate blue green deployment flow on Elasti Beanstalk.
@@ -37,9 +34,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md
@@ -66,32 +63,32 @@ files:
 - test/cloud_formation_provisioner_test.rb
 - test/config_loader_test.rb
 - test/deploy_test.rb
+- test/environment_test.rb
 - test/smoke_test_test.rb
 - test/test_helper.rb
 homepage: https://github.com/ThoughtWorksStudios/eb_deployer
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+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.
@@ -100,6 +97,6 @@ test_files:
 - test/cloud_formation_provisioner_test.rb
 - test/config_loader_test.rb
 - test/deploy_test.rb
+- test/environment_test.rb
 - test/smoke_test_test.rb
 - test/test_helper.rb
-has_rdoc: