eb_deployer 0.2.9 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2M0YzZlNzgzYzJkODBlNzhmYWEzNjNhZDA5MWVjYTlhMWRmYzkyMg==
+  data.tar.gz: !binary |-
+    MTc3YTc2ODk4YjAzYjEyNzEwYmI3ODE2MTkyNDgzM2FlYjA3MTM1Yw==
+SHA512:
+  metadata.gz: !binary |-
+    MmQwNGE5ZTViNzlmNGE4MDhhMDBjNDg0M2NiNmM3YjIzZWFiZjYyMmQ1NGE5
+    MTE1MDNjYzMwZGMzMjI5NmFmMGQ3OTdkODY1M2E1NGIzOTkyYjZkNGFkNGQw
+    MWY5Mjc1ZTVlOTA0NjU0YmM3NzI1ZWUwODY1YmY3ZDQxMGVhN2I=
+  data.tar.gz: !binary |-
+    Y2UwZTliNTE1ZWI1OTRkMWM0Mzk3NmIxNTJmZDYzNGU4ZGMzOGRiNjIwYTYw
+    ZWM5ZDgyMjkzZmRiNWRkZTQwZDU0ODYyZDM3ZTJkMGQ1M2Q1ZjA0YTk5MWI1
+    OWY5Y2EyOTgzODA4MmM1NzU4MTA5NThkMTU4ODA2ODgxZjQxZWU=

data/.gitignore

@@ -19,3 +19,5 @@ tmp
 _site
 /samples/jruby_rails4/jruby_rails4.war
 /samples/jruby_rails4/public/assets/*
+/TAGS
+/.aws

data/eb_deployer.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |gem|
   gem.license = 'MIT'
 
   gem.add_runtime_dependency 'aws-sdk'
-  gem.add_development_dependency 'minitest'
 
   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/application.rb

@@ -14,7 +14,8 @@ module EbDeployer
       package = Package.new(package, @bucket + ".packages", @s3_driver)
       package.upload
 
-      unless @eb_driver.application_version_labels.include?(version_label)
+      unless @eb_driver.application_version_labels(@name).include?(version_label)
+        log("Create application version with label #{version_label}")
         @eb_driver.create_application_version(@name, version_label, package.source_bundle)
       end
     end
@@ -22,19 +23,47 @@ module EbDeployer
     def delete
       if @eb_driver.application_exists?(@name)
         @eb_driver.environment_names_for_application(@name).each do |env|
+          log("Terminating environment #{env}")
           @eb_driver.delete_environment(@name, env)
         end
 
+        log("Deleting application")
         @eb_driver.delete_application(@name)
       end
     end
 
+    def versions
+      @eb_driver.application_versions(@name).map do |apv|
+        {
+          :version => apv[:version_label],
+          :date_created => apv[:date_created],
+          :date_updated => apv[:date_updated]
+        }
+      end
+    end
+
+    def remove(versions, delete_from_s3)
+      versions.each do |version|
+        begin
+          log("Removing #{version}")
+          @eb_driver.delete_application_version(@name, version, delete_from_s3)
+        rescue AWS::ElasticBeanstalk::Errors::SourceBundleDeletionFailure => e
+          log(e.message)
+        end
+      end
+    end
+
     private
 
     def create_application_if_not_exists
       unless @eb_driver.application_exists?(@name)
+        log("Creating application")
         @eb_driver.create_application(@name)
       end
     end
+
+    def log(msg)
+      puts "[#{Time.now.utc}][application:#{@name}] #{msg}"
+    end
   end
 end

data/lib/eb_deployer/beanstalk.rb

@@ -46,14 +46,28 @@ module EbDeployer
       @client.terminate_environment(:environment_name => env_name)
     end
 
+    def delete_application_version(app_name, version, delete_source_bundle)
+      request = {
+        :application_name => app_name,
+        :version_label => version,
+        :delete_source_bundle => delete_source_bundle
+      }
+      @client.delete_application_version(request)
+    end
+
     def create_application_version(app_name, version_label, source_bundle)
       @client.create_application_version(:application_name => app_name,
                                          :source_bundle => source_bundle,
                                          :version_label => version_label)
     end
 
-    def application_version_labels
-      @client.describe_application_versions[:application_versions].map { |apv| apv[:version_label] }
+    def application_version_labels(app_name)
+      application_versions(app_name).map { |apv| apv[:version_label] }
+    end
+
+    def application_versions(app_name)
+      request = { :application_name => app_name }
+      @client.describe_application_versions(request)[:application_versions]
     end
 
     def fetch_events(app_name, env_name, params, &block)

data/lib/eb_deployer/cloud_formation_driver.rb

@@ -41,7 +41,7 @@ module EbDeployer
     end
 
     def log(msg)
-      puts "[#{Time.now.utc}][cloud_formation] #{msg}"
+      puts "[#{Time.now.utc}][cloud_formation_driver] #{msg}"
     end
   end
 

data/lib/eb_deployer/cloud_formation_provisioner.rb

@@ -88,7 +88,7 @@ module EbDeployer
     end
 
     def log(msg)
-      puts "[#{Time.now.utc}][resources-stack] #{msg}"
+      puts "[#{Time.now.utc}][cloud_formation_provisioner] #{msg}"
     end
   end
 end

data/lib/eb_deployer/config_loader.rb

@@ -29,7 +29,7 @@ module EbDeployer
 
       env = options[:environment]
       envs = config_settings.delete(:environments)
-      raise 'Environment #{evn} is not defined in #{config_file}' unless envs.has_key?(env)
+      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) || []
 

data/lib/eb_deployer/default_config.yml

@@ -34,6 +34,17 @@ common:
   # 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:

data/lib/eb_deployer/environment.rb

@@ -36,7 +36,7 @@ module EbDeployer
     end
 
     def log(msg)
-      puts "[#{Time.now.utc}][beanstalk:#{@name}] #{msg}"
+      puts "[#{Time.now.utc}][environment:#{@name}] #{msg}"
     end
 
     private
@@ -100,7 +100,7 @@ module EbDeployer
 
 
     def log_event(event)
-      puts "[#{event[:event_date]}][beanstalk:#{@name}] #{event[:message]}"
+      puts "[#{event[:event_date]}][environment:#{@name}] #{event[:message]}"
     end
   end
 end

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/lib/eb_deployer/version_cleaner.rb

@@ -0,0 +1,30 @@
+module EbDeployer
+  class VersionCleaner
+    def initialize(app, number_to_keep)
+      @app = app
+      @number_to_keep = number_to_keep
+    end
+
+    def clean(version_prefix = "")
+      if @number_to_keep > 0
+        versions_to_remove = versions_to_clean(version_prefix)
+        @app.remove(versions_to_remove, true)
+      end
+    end
+
+    private
+    def versions_to_clean(version_prefix = "")
+      all_versions = @app.versions.select do |apv|
+        apv[:version].start_with?(version_prefix)
+      end
+
+      all_versions.sort! { |x, y| y[:date_updated] <=> x[:date_updated] }
+      versions_to_keep = all_versions.slice!(range_to_keep)
+      all_versions.map { |apv| apv[:version] }
+    end
+
+    def range_to_keep
+      (0..(@number_to_keep-1))
+    end
+  end
+end

data/lib/eb_deployer.rb

@@ -11,6 +11,7 @@ require 'eb_deployer/cloud_formation_driver'
 require 'eb_deployer/config_loader'
 require 'eb_deployer/default_config'
 require 'eb_deployer/smoke_test'
+require 'eb_deployer/version_cleaner'
 require 'digest'
 require 'set'
 require 'time'
@@ -152,6 +153,14 @@ module EbDeployer
   #      :version_label => ENV['MY_PIPELINE_COUNTER']
   #                       || "dev-" + Digest::MD5.file(my_package).hexdigest
   #
+  # @options opts [Symbol] :version_prefix. Specifies a prefix to prepend to the
+  #   version label. This can be useful if you want to use different binaries for
+  #   different environments.
+  #
+  # @option opts [Symbol] :keep_latest. 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.
   def self.deploy(opts)
     # AWS.config(:logger => Logger.new($stdout))
     if region = opts[:region]
@@ -164,7 +173,8 @@ module EbDeployer
     stack_name = opts[:solution_stack_name] || "64bit Amazon Linux running Tomcat 7"
     app = opts[:application]
     env_name = opts[:environment]
-    version_label = opts[:version_label].to_s.strip
+    version_prefix = opts[:version_prefix].to_s.strip
+    version_label = "#{version_prefix}#{opts[:version_label].to_s.strip}"
     cname = opts[:cname]
     env_settings = opts[:option_settings] || opts[:settings] || []
     strategy_name = opts[:strategy] || :blue_green
@@ -173,6 +183,7 @@ module EbDeployer
     phoenix_mode = opts[:phoenix_mode]
     bucket = opts[:package_bucket] || app
     skip_resource = opts[:skip_resource_stack_update]
+    keep_latest = opts[:keep_latest].to_i || 0
 
     application = Application.new(app, bs, s3, bucket)
 
@@ -184,6 +195,8 @@ module EbDeployer
                                          :smoke_test => smoke_test,
                                          :phoenix_mode => phoenix_mode)
 
+    cleaner = VersionCleaner.new(application, keep_latest)
+
     if resources = opts[:resources]
       cf.provision(resources) unless skip_resource
       env_settings += cf.transform_outputs(resources)
@@ -191,6 +204,7 @@ module EbDeployer
 
     application.create_version(version_label, opts[:package])
     strategy.deploy(version_label, env_settings)
+    cleaner.clean(version_prefix)
   end
 
   def self.destroy(opts)

data/test/aws_driver_stubs.rb

@@ -4,6 +4,7 @@ class EBStub
     @envs = {}
     @versions = {}
     @envs_been_deleted = {}
+    @versions_deleted = {}
   end
 
   def create_application(app)
@@ -48,11 +49,30 @@ class EBStub
 
   def create_application_version(app_name, version_label, source_bundle)
     @versions[app_name] ||= []
-    @versions[app_name] = { version_label => source_bundle }
+    @versions[app_name] << {
+      :version_label => version_label,
+      :source_bundle => source_bundle,
+      :date_created => Time.now,
+      :date_updated => Time.now
+    }
   end
 
-  def application_version_labels
-    @versions.values.map(&:keys).flatten
+  def delete_application_version(app_name, version, delete_source_bundle)
+    @versions_deleted[app_name] ||= []
+    @versions_deleted[app_name] << version
+    @versions[app_name].delete_if { |apv| apv[:version_label] == version }
+  end
+
+  def application_versions(app_name)
+    @versions[app_name]
+  end
+
+  def application_version_labels(app_name)
+    if @versions[app_name]
+      @versions[app_name].map { |appv| appv[:version_label]}
+    else
+      []
+    end
   end
 
   def fetch_events(app_name, env_name, options={})
@@ -88,7 +108,6 @@ class EBStub
     'Green'
   end
 
-
   #test only
   def environment_verion_label(app_name, env_name)
     @envs[env_key(app_name, env_name)][:version]
@@ -110,6 +129,10 @@ class EBStub
     @envs_been_deleted[app] || []
   end
 
+  def versions_deleted(app_name)
+    @versions_deleted[app_name]
+  end
+
   private
 
   def env_key(app, name)

data/test/cloud_formation_provisioner_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class CloudFormationProvisionerTest < Minitest::Test
+class CloudFormationProvisionerTest < MiniTest::Unit::TestCase
   def setup
     @cf = CFStub.new
     @provisioner = EbDeployer::CloudFormationProvisioner.new("myresources", @cf)

data/test/config_loader_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ConfigLoaderTest < Minitest::Test
+class ConfigLoaderTest < MiniTest::Unit::TestCase
   def setup
     @loader = EbDeployer::ConfigLoader.new
     @sample_package = sample_file('app-package.war')
@@ -108,6 +108,20 @@ YAML
                     'value' => "2"}], config[:option_settings])
   end
 
+  def test_env_is_required
+   error = assert_raises(RuntimeError) {
+      @loader.load(generate_input(<<-YAML, :environment => 'non_existant'))
+application: myapp
+common:
+  strategy: inplace-update
+environments:
+  dev:
+YAML
+    }
+
+    assert_match(/non_existant/, error.message)
+  end
+
   private
 
   def md5_digest(file)

data/test/deploy_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class DeployTest < Minitest::Test
+class DeployTest < MiniTest::Unit::TestCase
   def setup
     @eb_driver = EBStub.new
     @s3_driver = S3Stub.new
@@ -60,6 +60,55 @@ class DeployTest < Minitest::Test
     assert_equal '2', @eb_driver.environment_verion_label('simple', eb_envname('simple', 'production'))
   end
 
+  def test_version_prefix_should_be_prepended_to_version_label
+    deploy(:application => 'simple',
+           :environment => "production",
+           :version_label => 1,
+           :version_prefix => "prod-")
+    assert_equal 'prod-1', @eb_driver.environment_verion_label('simple', eb_envname('simple', 'production'))
+  end
+
+  def test_should_keep_only_number_of_versions_specified
+    deploy(:application => 'simple',
+           :environment => "production",
+           :version_label => 1)
+
+    deploy(:application => 'simple',
+           :environment => "production",
+           :version_label => 2)
+
+    deploy(:application => 'simple',
+           :environment => "production",
+           :version_label => 3,
+           :keep_latest => 2)
+
+    assert_equal '1', @eb_driver.versions_deleted('simple').first
+  end
+
+  def test_should_only_remove_versions_with_matching_prefix
+    deploy(:application => 'simple',
+           :environment => "production",
+           :version_label => 1,
+           :version_prefix => "prod1-",
+           :keep_latest => 1)
+    deploy(:application => 'simple',
+           :environment => "production",
+           :version_label => 2,
+           :version_prefix => "prod1-",
+           :keep_latest => 1)
+    deploy(:application => 'simple',
+           :environment => "production",
+           :version_label => 1,
+           :version_prefix => "prod2-",
+           :keep_latest => 1)
+
+    assert_equal 'prod1-1', @eb_driver.versions_deleted('simple').first
+    assert_equal 1, @eb_driver.versions_deleted('simple').count
+
+    app_versions = @eb_driver.application_versions('simple').map { |apv| apv[:version_label] }
+    assert_equal ["prod1-2", "prod2-1"], app_versions
+  end
+
   def test_default_cname_that_deployed_should_app_env_name
     deploy(:application => 'simple',
            :environment => "production",

data/test/smoke_test_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SmokeTestTest < MiniTest::Test
+class SmokeTestTest < MiniTest::Unit::TestCase
   def test_call_proc_type_smoke_tests
     host_name_in_proc = nil
     EbDeployer::SmokeTest.new(lambda {|v| host_name_in_proc = v }).run("foo")

data/test/test_helper.rb

@@ -7,7 +7,7 @@ require 'minitest/autorun'
 require 'minitest/pride'
 
 
-class Minitest::Test
+class MiniTest::Unit::TestCase
   def sample_file(file_name, content='s' * 100)
     path = File.join('/tmp', file_name)
     File.open(path, 'w') { |f| f << content }

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.2.9
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - wpc
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2014-01-07 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
@@ -23,23 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -77,6 +58,7 @@ files:
 - lib/eb_deployer/s3_driver.rb
 - lib/eb_deployer/smoke_test.rb
 - lib/eb_deployer/version.rb
+- lib/eb_deployer/version_cleaner.rb
 - test/aws_driver_stubs.rb
 - test/cloud_formation_provisioner_test.rb
 - test/config_loader_test.rb
@@ -86,27 +68,26 @@ files:
 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.24
+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.