elastic-beanstalk 1.1.12 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2f7ad000128a315ac2e977837675b9748b2a3c8
-  data.tar.gz: b9635f456392b73eb7fc0c7e006b84762e36a042
+  metadata.gz: cd59a6abb4c4ca4065f57594fe18c82cfe5baeb9
+  data.tar.gz: 2a9c61cf2e3cc42588976de27028f674f4bd91b4
 SHA512:
-  metadata.gz: 1193ddd38c373267a2d57c0fe1818311abe45a186acad424a70206d67151f98e0ea5d6280f526ca0706053540bfa5b15b7e71533d994daad26d9df90427c061d
-  data.tar.gz: e3ac2c58fb5d4b77eda3fa319736b3f181f39509439bea46a8d594299e76d6d056d6ed3938826aae4af85125f63a9c8bc2e20013ddd315fc91d7b4314719c425
+  metadata.gz: b63bc9f1f7c88c2783604f1d56703bcfee1ee04da20f9c97b471429e0012efc44e51514559d02fcc88041851a249eb1afa5bdef48e0e0f5262543e14486ed45b
+  data.tar.gz: 31094b7cc28f368d613100fc39aa21f02172b5bed8da8a1e813950018f9c15c75f503b3e18b17350bd861ac91aebde00f763dec4366d167f6eebc8285e24490e

data/README.md

@@ -220,7 +220,10 @@ options:
 inactive:
   aws:autoscaling:asg:
     MinSize: 0
-    Cooldown: 900    
+    MaxSize: 0
+    Cooldown: 900
+  aws:autoscaling:updatepolicy:rollingupdate:
+    RollingUpdateEnabled: false    
 
 #---
 development:

data/lib/elastic/beanstalk/tasks/eb.rake

@@ -160,9 +160,17 @@ namespace :eb do
     end
     EbConfig.load!(environment, filename)
 
-    # Let's be explicit regardless of 'production' being the eb's default shall we? Set RACK_ENV and RAILS_ENV based on the given environment
-    EbConfig.set_option(:'aws:elasticbeanstalk:application:environment', 'RACK_ENV', "#{EbConfig.environment}")
-    EbConfig.set_option(:'aws:elasticbeanstalk:application:environment', 'RAILS_ENV', "#{EbConfig.environment}")
+    # Set RACK_ENV and RAILS_ENV based on the given environment or the provided configuration
+    unless EbConfig.configuration.fetch(:options, {})
+                                 .fetch(:'aws:elasticbeanstalk:application:environment',{})
+                                 .fetch(:RACK_ENV, nil)
+      EbConfig.set_option(:'aws:elasticbeanstalk:application:environment', 'RACK_ENV', "#{EbConfig.environment}")
+    end
+    unless EbConfig.configuration.fetch(:options, {})
+                                 .fetch(:'aws:elasticbeanstalk:application:environment',{})
+                                 .fetch(:RAILS_ENV, nil)
+      EbConfig.set_option(:'aws:elasticbeanstalk:application:environment', 'RAILS_ENV', "#{EbConfig.environment}")
+    end
 
     #-------------------------------------------------------------------------------
     # resolve the version and set the APP_VERSION environment variable

data/lib/elastic/beanstalk/version.rb

@@ -1,5 +1,5 @@
 module Elastic
   module Beanstalk
-    VERSION = '1.1.12'
+    VERSION = '1.1.13'
   end
 end

data/spec/lib/elastic/beanstalk/eb_spec.yml

@@ -40,6 +40,7 @@ ebextensions:
 options:
   aws:elasticbeanstalk:application:environment:
     RAILS_ENV: foobar
+    RACK_ENV: bizbaz
 
   aws:autoscaling:launchconfiguration:
     InstanceType: foo

data/spec/lib/elastic/beanstalk/tasks/eb_rake_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'rake'
+
+# The `credentials` method is called against the main ruby object.
+# We maintain a reference to it so that we can avoid setting real credentials in the test.
+# This test reaches in to set the @credentials ivar instead of stubbing a method because
+# reliably stubbing and unstubbing a global object is error prone and would affect other tests.
+$main = self
+
+describe 'eb namespace rake task' do
+  describe 'eb:config' do
+    before do
+      load 'lib/elastic/beanstalk/tasks/eb.rake'
+      Rake::Task.define_task(:environment)
+      $main.instance_variable_set(:@credentials, {})
+      allow(EbConfig).to receive(:resolve_path).and_return('spec/lib/elastic/beanstalk/eb_spec.yml')
+      # We could run eb:show_config, but it is easier to access the data directly
+      Rake::Task['eb:config'].invoke('staging')
+    end
+
+    after do
+      $main.remove_instance_variable(:@credentials)
+    end
+
+    it 'should not override the RAILS_ENV in eb.yml' do
+      rails_env = EbConfig.configuration.fetch(:options, {})
+                                        .fetch(:'aws:elasticbeanstalk:application:environment', {})
+                                        .fetch(:RAILS_ENV, nil)
+      expect(rails_env).to eq('foobar')
+    end
+
+    it 'should not override the RACK_ENV in eb.yml' do
+      rack_env = EbConfig.configuration.fetch(:options, {})
+                                       .fetch(:'aws:elasticbeanstalk:application:environment', {})
+                                       .fetch(:RACK_ENV, nil)
+      expect(rack_env).to eq('bizbaz')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-beanstalk
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.13
 platform: ruby
 authors:
 - Kevin Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,6 +209,7 @@ files:
 - spec/lib/elastic/beanstalk/eb_extensions_spec.rb
 - spec/lib/elastic/beanstalk/eb_smoke_tester_spec.rb
 - spec/lib/elastic/beanstalk/eb_spec.yml
+- spec/lib/elastic/beanstalk/tasks/eb_rake_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/alienfast/elastic-beanstalk
 licenses:
@@ -241,4 +242,5 @@ test_files:
 - spec/lib/elastic/beanstalk/eb_extensions_spec.rb
 - spec/lib/elastic/beanstalk/eb_smoke_tester_spec.rb
 - spec/lib/elastic/beanstalk/eb_spec.yml
+- spec/lib/elastic/beanstalk/tasks/eb_rake_spec.rb
 - spec/spec_helper.rb