eb_deployer 0.2.6 → 0.2.7

data/lib/eb_deployer/version.rb

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

data/lib/eb_deployer.rb

@@ -172,6 +172,7 @@ module EbDeployer
     smoke_test = opts[:smoke_test] || Proc.new {}
     phoenix_mode = opts[:phoenix_mode]
     bucket = opts[:package_bucket] || app
+    skip_resource = opts[:skip_resource_stack_update]
 
     application = Application.new(app, bs, s3, bucket)
 
@@ -183,7 +184,7 @@ module EbDeployer
                                          :smoke_test => smoke_test,
                                          :phoenix_mode => phoenix_mode)
 
-    if resources = opts[:resources]
+    if !skip_resource && resources = opts[:resources]
       env_settings += cf.provision(resources)
     end
 
@@ -214,7 +215,14 @@ module EbDeployer
     parser.parse!
     action = options.delete(:action)
 
-    unless File.exists?(options[:config_file])
+    if File.exists?(options[:config_file])
+      if !options[:package]
+        puts "Found configuration at #{options[:config_file]}."
+        puts "Now execute 'eb_deploy -p <package name>' to deploy"
+        puts "'eb_deploy --help') for more options"
+        exit(2)
+      end
+    else
       puts "Generated default configuration at #{options[:config_file]}."
       DefaultConfig.new(File.basename(Dir.pwd)).write_to(options[:config_file])
       exit(2)
@@ -251,6 +259,10 @@ module EbDeployer
         options[:action] = :destroy
       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
+
       opts.on("-v", "--version", "Print current version") do |v|
         puts "eb_deployer v#{VERSION}"
         exit(0)

data/test/deploy_test.rb

@@ -195,6 +195,31 @@ class DeployTest < Minitest::Test
     assert_equal({'a' => 1 },  @cf_driver.stack_config('simple-production')[:parameters])
   end
 
+  def test_skip_resource_update
+    cf_template = temp_file(JSON.dump({'Resources' => {'R1' => {}}}))
+    deploy(:application => 'simple', :environment => "production",
+           :resources => {
+             :template => cf_template,
+             :parameters => {'a' => 1 }
+           })
+    assert_equal(1, @cf_driver.stack_config('simple-production')[:parameters]['a'])
+    deploy(:application => 'simple', :environment => "production",
+           :resources => {
+             :template => cf_template,
+             :parameters => {'a' => 2 }
+           })
+    assert_equal(2, @cf_driver.stack_config('simple-production')[:parameters]['a'])
+    deploy(:application => 'simple',
+           :environment => "production",
+           :skip_resource_stack_update => true,
+           :resources => {
+             :template => cf_template,
+             :parameters => {'a' => 3 }
+           })
+    assert_equal(2, @cf_driver.stack_config('simple-production')[:parameters]['a'])
+  end
+
+
   def test_set_s3_bucket_name_on_deployment
     deploy(:application => 'simple',
            :environment => "production",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Low friction deployments should be a breeze. Elastic Beanstalk provides a
@@ -117,3 +117,4 @@ test_files:
 - test/deploy_test.rb
 - test/smoke_test_test.rb
 - test/test_helper.rb
+has_rdoc: