eb_deployer 0.2.5 → 0.2.6

data/eb_deployer.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   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.homepage      = "https://github.com/ThoughtWorksStudios/eb_deployer"
+  gem.license = 'MIT'
 
   gem.add_runtime_dependency 'aws-sdk'
   gem.add_development_dependency 'minitest'

data/lib/eb_deployer.rb

@@ -31,7 +31,7 @@ module EbDeployer
   # @option opts [Symbol] :application application name
   # @option opts [Symbol] :environment environment name (e.g. staging, production)
   # @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]
@@ -45,7 +45,7 @@ module EbDeployer
   end
 
 
-  # 
+  #
   # Deploy a package to specfied environments on elastic beanstalk
   #
   # @param [Hash] opts
@@ -112,6 +112,11 @@ module EbDeployer
   #
   # @option opts [Symbol] :settings See `option_settings`
   #
+  # @option opts [Symbol] :package_bucket 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.
+  #
   # @option opts [Symbol] :smoke_test Value should be a proc or a lambda which
   #   accept single argument that will passed in as environment DNS name. Smoke
   #   test proc or lambda will be called at the end of the deployment for
@@ -166,8 +171,9 @@ module EbDeployer
     cname_prefix = opts[:cname_prefix] || [app, env_name].join('-')
     smoke_test = opts[:smoke_test] || Proc.new {}
     phoenix_mode = opts[:phoenix_mode]
+    bucket = opts[:package_bucket] || app
 
-    application = Application.new(app, bs, s3)
+    application = Application.new(app, bs, s3, bucket)
 
     cf = CloudFormationProvisioner.new("#{app}-#{env_name}", cf)
 

data/lib/eb_deployer/application.rb

@@ -1,16 +1,17 @@
 module EbDeployer
   class Application
-    def initialize(name, eb_driver, s3_driver)
+    def initialize(name, eb_driver, s3_driver, bucket = nil)
       @name = name
       @eb_driver = eb_driver
       @s3_driver = s3_driver
+      @bucket = bucket
       raise "application name can only contain any combination of uppercase letters, lowercase letters, numbers, dashes (-)" unless @name =~ /^[a-zA-Z0-9.-]+$/
     end
 
     def create_version(version_label, package)
       create_application_if_not_exists
 
-      package = Package.new(package, @name + "-packages", @s3_driver)
+      package = Package.new(package, @bucket + ".packages", @s3_driver)
       package.upload
 
       unless @eb_driver.application_version_labels.include?(version_label)

data/lib/eb_deployer/default_config.yml

@@ -18,6 +18,12 @@ common:
   # 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

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/config_loader_test.rb

@@ -30,6 +30,7 @@ YAML
 application: myapp
 common:
   strategy: inplace-update
+  package_bucket: thoughtworks
   phoenix_mode: true
   option_settings:
     - namespace: aws:autoscaling:launchconfiguration
@@ -41,6 +42,7 @@ environments:
   production:
 YAML
     assert_equal('inplace-update', config[:strategy])
+    assert_equal('thoughtworks', config[:package_bucket])
     assert_equal([{'namespace' => 'aws:autoscaling:launchconfiguration',
                     'option_name' => 'InstanceType',
                     'value' => 'm1.small'}], config[:option_settings])

data/test/deploy_test.rb

@@ -195,6 +195,13 @@ class DeployTest < Minitest::Test
     assert_equal({'a' => 1 },  @cf_driver.stack_config('simple-production')[:parameters])
   end
 
+  def test_set_s3_bucket_name_on_deployment
+    deploy(:application => 'simple',
+           :environment => "production",
+           :package_bucket => 'thoughtworks.simple')
+
+    assert @s3_driver.bucket_exists?('thoughtworks.simple.packages')
+  end
 
   def test_transforms_resource_provsion_output_to_elastic_beanstalk_settings
     cf_template = temp_file(JSON.dump({

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -84,7 +84,8 @@ files:
 - test/smoke_test_test.rb
 - test/test_helper.rb
 homepage: https://github.com/ThoughtWorksStudios/eb_deployer
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: