eb_deployer 0.0.8 → 0.0.9

data/lib/eb_deployer.rb

@@ -2,6 +2,7 @@ require "eb_deployer/version"
 require "eb_deployer/deployment_strategy"
 require "eb_deployer/beanstalk"
 require "eb_deployer/cloud_formation_provisioner"
+require 'eb_deployer/application'
 require "eb_deployer/environment"
 require "eb_deployer/event_poller"
 require "eb_deployer/package"
@@ -46,8 +47,10 @@ module EbDeployer
     cname_prefix = opts[:cname_prefix] || [app, env_name].join('-')
     smoke_test = opts[:smoke_test] || Proc.new {}
 
-    package = Package.new(opts[:package], app + "-packages", s3)
+    application = Application.new(app, bs, s3)
+
     cf = CloudFormationProvisioner.new("#{app}-#{env_name}", cf)
+
     strategy = DeploymentStrategy.create(strategy_name, app, env_name, bs,
                                          :solution_stack => stack_name,
                                          :cname_prefix => cname_prefix,
@@ -57,12 +60,7 @@ module EbDeployer
       env_settings += cf.provision(resources)
     end
 
-    package.upload
-
-    unless bs.application_version_labels.include?(version_label)
-      bs.create_application_version(app, version_label, package.source_bundle)
-    end
-
+    application.create_version(version_label, opts[:package])
     strategy.deploy(version_label, env_settings)
   end
 

data/lib/eb_deployer/application.rb

@@ -0,0 +1,28 @@
+module EbDeployer
+  class Application
+    def initialize(name, eb_driver, s3_driver)
+      @name = name
+      @eb_driver = eb_driver
+      @s3_driver = s3_driver
+    end
+
+    def create_version(version_label, package)
+      create_application_if_not_exists
+
+      package = Package.new(package, @name + "-packages", @s3_driver)
+      package.upload
+
+      unless @eb_driver.application_version_labels.include?(version_label)
+        @eb_driver.create_application_version(@name, version_label, package.source_bundle)
+      end
+    end
+
+    private
+
+    def create_application_if_not_exists
+      unless @eb_driver.application_exists?(@name)
+        @eb_driver.create_application(@name)
+      end
+    end
+  end
+end

data/lib/eb_deployer/cloud_formation_provisioner.rb

@@ -12,11 +12,12 @@ module EbDeployer
     end
 
     def provision(resources)
-      params = extract_params
       template = File.read(resources[:template])
       transforms = resources[:transforms]
+      capabilities = resources[:capabilities]
+      params = resources[:parameters]
 
-      stack_exists? ? update_stack(template, params) : create_stack(template, params)
+      stack_exists? ? update_stack(template, params, capabilities) : create_stack(template, params, capabilities)
       wait_for_stack_op_terminate
       transform_output_to_settings(transforms)
     end
@@ -29,8 +30,9 @@ module EbDeployer
 
     private
 
-    def update_stack(template, params)
+    def update_stack(template, params, capabilities)
       @cf_driver.update_stack(@stack_name, template,
+                              :capabilities => capabilities,
                               :parameters => params)
     end
 
@@ -38,9 +40,10 @@ module EbDeployer
       @cf_driver.stack_exists?(@stack_name)
     end
 
-    def create_stack(template, params)
+    def create_stack(template, params, capabilities)
       @cf_driver.create_stack(@stack_name, template,
                               :disable_rollback => true,
+                              :capabilities => capabilities,
                               :parameters => params)
     end
 
@@ -66,11 +69,6 @@ module EbDeployer
       end
     end
 
-
-    def extract_params
-      Hash[ENV.map {|k, v| k =~ /^AWSRESOURCES_(.*)/ ? [$1, v] : nil }.compact]
-    end
-
     def log(msg)
       puts "[#{Time.now.utc}][resources-stack] #{msg}"
     end

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/aws_driver_stubs.rb

@@ -1,9 +1,19 @@
 class EBStub
   def initialize
+    @apps = []
     @envs = {}
     @versions = {}
   end
 
+  def create_application(app)
+    raise 'already exists' if application_exists?(app)
+    @apps << app
+  end
+
+  def application_exists?(app)
+    @apps.include?(app)
+  end
+
   def create_environment(app, env, solution_stack, cname_prefix, version, 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
@@ -107,7 +117,7 @@ class CFStub
   end
 
   def update_stack(name, template, opts)
-    @stacks[name] = @stacks[name].merge(:template => template, opts => opts)
+    @stacks[name] = @stacks[name].merge(:template => template, :opts => opts)
   end
 
   def stack_status(name)
@@ -122,4 +132,8 @@ class CFStub
     raise AWS::CloudFormation::Errors::ValidationError.new unless stack_exists?(name)
     "value of #{key}"
   end
+
+  def stack_config(name)
+    @stacks[name][:opts]
+  end
 end

data/test/deploy_test.rb

@@ -1,3 +1,4 @@
+$:.unshift(File.expand_path("../../lib", __FILE__))
 require 'tempfile'
 require 'eb_deployer'
 require 'aws_driver_stubs'
@@ -12,6 +13,12 @@ class DeployTest < Minitest::Test
     File.open(@sample_package, 'w') { |f| f << 's' * 100 }
   end
 
+  def test_first_deplyment_create_eb_application
+    assert !@eb_driver.application_exists?('simple')
+    deploy(:application => 'simple', :environment => "production")
+    assert @eb_driver.application_exists?('simple')
+  end
+
   def test_first_deployment_create_environment
     assert !@eb_driver.environment_exists?('simple', eb_envname('simple', 'production'))
     deploy(:application => 'simple', :environment => "production")
@@ -155,15 +162,27 @@ class DeployTest < Minitest::Test
     assert @cf_driver.stack_exists?('simple-production')
   end
 
-  def test_transforms_resource_provsion_output_to_elastic_beanstalk_settings
+  def test_provision_resources_with_capacities
     cf_template = temp_file(JSON.dump({'Resources' => {'R1' => {}}}))
     deploy(:application => 'simple', :environment => "production",
            :resources => {
-             :template => cf_template
+             :template => cf_template,
+             :capabilities => ['CAPABILITY_IAM']
            })
-    assert @cf_driver.stack_exists?('simple-production')
+    assert_equal ['CAPABILITY_IAM'],  @cf_driver.stack_config('simple-production')[:capabilities]
   end
 
+  def test_provision_resources_with_parameters
+    cf_template = temp_file(JSON.dump({'Resources' => {'R1' => {}}}))
+    deploy(:application => 'simple', :environment => "production",
+           :resources => {
+             :template => cf_template,
+             :parameters => {'a' => 1}
+           })
+    assert_equal({'a' => 1 },  @cf_driver.stack_config('simple-production')[:parameters])
+  end
+
+
   def test_transforms_resource_provsion_output_to_elastic_beanstalk_settings
     cf_template = temp_file(JSON.dump({
                                         'Resources' => {'R1' => {}},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -59,6 +59,7 @@ files:
 - Rakefile
 - eb_deployer.gemspec
 - lib/eb_deployer.rb
+- lib/eb_deployer/application.rb
 - lib/eb_deployer/beanstalk.rb
 - lib/eb_deployer/cloud_formation_driver.rb
 - lib/eb_deployer/cloud_formation_provisioner.rb