elastic_beans 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661efbe2cb8fd10a68a49a3ebc7899ec3b30b61a
-  data.tar.gz: 6dee6beefb1f0dcd55f5cf7c8f7f73898c9e1432
+  metadata.gz: 70a69de3c656c7d828c6b47684f3806a8bfb54dc
+  data.tar.gz: 5e257058d7649f152d69964d6ff9c5cfcfe5c3e4
 SHA512:
-  metadata.gz: 63dc0a28f1482b67a2d96fa6edefd65f768acbbe377357acec498bc7b34dafe9242f7ef4c365c82c15d24c80ea6e81a5d6c41cc92e85d3c39002cc969e2f04fc
-  data.tar.gz: ca7b8ffd98f6218a0bb935aea9bfce0cf3d3e804467a709e20d9d0adf83f313ba606ff9057aebffdb2e7dbf80d42e360f2689f0bdc6cc07f8ac5f0ddc6e2de84
+  metadata.gz: c7f8b3ed1abc7fc073ca31cd1fa876c30081ac3365f3318e3add6631ef5740389b6a22a60ac6fa73cad3cfb2c85c28977350e7772a05484338983c06c5f28608
+  data.tar.gz: e0a78ebe606867f4dd9845f3bf5bbb476588ff2571d99f2aa7cf9f5ff6c82a1f536b10adb7ee03a15718cb907745cf4379b7d914aed7cd621e298c25fabee595

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /.elasticbeanstalk
+/.idea

data/lib/elastic_beans/command/deploy.rb

@@ -48,7 +48,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         end
         version_thread.join
 
-        progressbar.log("Deploying version #{version} to #{application.name}...")
+        progressbar.log("Deploying version '#{version}' to #{application.name}...")
         progressbar.title = "Deploying"
         deploy_threads = environments.map { |environment|
           progressbar.log("Deploying version '#{version}' to environment `#{environment.name}'...")

data/lib/elastic_beans/configuration_template.rb

@@ -125,7 +125,7 @@ module ElasticBeans
       raise MissingConfigurationError.new(cause: e)
     end
 
-    def template_option_setting(template: configuration_settings_description, namespace:, option_name:, default: nil, override: nil)
+    def template_option_setting(template: configuration_settings_description, namespace:, option_name:, default: nil, override: nil, allow_blank: true)
       option_setting = {namespace: namespace, option_name: option_name, value: default}
       if override
         return option_setting.merge!(value: override)
@@ -134,13 +134,21 @@ module ElasticBeans
       if template.nil?
         return option_setting
       end
+
       setting = template.to_h[:option_settings].find { |setting|
         setting[:namespace] == namespace && setting[:option_name] == option_name
       }
+
       if setting.nil?
         return option_setting
       end
 
+      # So, here's the thing. AWS might return NULL on items that actually DO have a value set, in which case,
+      # we should tell beans NOT to use this erroneous NULL value, and to use our specified default value.
+      if !allow_blank && (setting[:value].nil? || setting[:value].empty?)
+        return option_setting
+      end
+
       option_setting.merge!(value: setting[:value])
     end
 

data/lib/elastic_beans/configuration_template/webserver.rb

@@ -22,7 +22,7 @@ module ElasticBeans
         end
 
         super + [
-          template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTPS:443/"),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTPS:443/", allow_blank: false),
           template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_ASSET_COMPILATION", default: "false"),
           template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_MIGRATIONS", default: "false"),
           template_option_setting(namespace: "aws:elb:listener:443", option_name: "InstancePort", default: "443"),

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk