humidifier 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 478eb0814ff5b1f23e2ccc3f8e1adcb9e055b28d
-  data.tar.gz: bd5d51e4187f5a0f62334b203efaa0c3b2b296bf
+  metadata.gz: ed17317e4e90ba482a45ad606fe918e99cd5361d
+  data.tar.gz: 3d7c79b5e6c4fd441480f8ce7b3f6a2a0d882875
 SHA512:
-  metadata.gz: 71c00602a3b655e5896a9778342bc0f57d857f4703470e269fed6e35986d9b2698ee17cbd38076642317918b56a6f68e2171dfe9fabc34ef8a97214cff20b30a
-  data.tar.gz: babce6c19b6c6cbca100f28d9988a72e83a9d27e6d2359972e7bfedfecb23c80a7d1f4f952b612b6f5cd9006b25a50bced4d40a0c1a7e1f6ce0f092d09b7988e
+  metadata.gz: b41b275e02e29db2c24fdf0962a156b4f4c4c0865591bb90331d44707f8c6fa4cc912e122560997e993e22d7afe1ecc948baf1b6da46b0a3d160177400f0ba92
+  data.tar.gz: ed3bdbeef33547d65878241963a6489830d7c8b1eb4abbc69a92ef687ef1e850183dd950f8b797bfc66004d976a82b3e91a2d9d18e3affb8011830ef798c8da2

data/README.md

@@ -43,6 +43,14 @@ Once stacks have the appropriate resources, you can query AWS to handle all stac
 
 Humidifier assumes you have an `aws-sdk` gem installed when you call these operations. It detects the version of the gem you have installed and uses the appropriate API depending on what is available. If Humidifier cannot find any way to use the AWS SDK, it will warn you on every API call and simply return false.
 
+You can also manually specify the version of the SDK that you want to use, in the case that you have both gems in your load path. In that case, you would specify it on the Humidifier configuration object:
+
+```ruby
+Humidifier.configure do |config|
+  config.sdk_version = 1
+end
+```
+
 #### CloudFormation functions
 
 You can use CFN intrinsic functions and references using `Humidifier.fn.[name]` and `Humidifier.ref`. Those will build appropriate structures that know how to be dumped to CFN syntax appropriately.
@@ -61,7 +69,7 @@ Resources have an `aws_name` method to see how AWS references them. They also co
 
 ### Large templates
 
-When templates are especially large (larger than 51,200 bytes), they cannot be uploaded directly through the AWS SDK. You can configure Humidifier to seemlessly upload the templates to S3 and reference them using an S3 URL instead by:
+When templates are especially large (larger than 51,200 bytes), they cannot be uploaded directly through the AWS SDK. You can configure Humidifier to seamlessly upload the templates to S3 and reference them using an S3 URL instead by:
 
 ```ruby
 Humidifier.configure do |config|

data/lib/humidifier/aws_shim.rb

@@ -20,18 +20,17 @@ module Humidifier
 
     attr_accessor :shim
 
-    # Attempt to require both aws-sdk-v1 and aws-sdk, then set the shim based on what successfully loaded
+    # Either set the SDK based on the configured option or guess the SDK
+    # version by attempting to require both aws-sdk-v1 and aws-sdk, then setting
+    # the shim based on what successfully loaded
     def initialize
-      try_require_sdk('aws-sdk-v1')
-      try_require_sdk('aws-sdk')
-
       self.shim =
-        if Object.const_defined?(:AWS)
+        if Humidifier.config.sdk_version_1?
           AwsAdapters::SDKV1.new
-        elsif Object.const_defined?(:Aws)
+        elsif Humidifier.config.sdk_version_2?
           AwsAdapters::SDKV2.new
         else
-          AwsAdapters::Noop.new
+          guess_sdk
         end
     end
 
@@ -52,6 +51,19 @@ module Humidifier
 
     private
 
+    def guess_sdk
+      try_require_sdk('aws-sdk-v1')
+      try_require_sdk('aws-sdk')
+
+      if Object.const_defined?(:Aws)
+        AwsAdapters::SDKV2.new
+      elsif Object.const_defined?(:AWS)
+        AwsAdapters::SDKV1.new
+      else
+        AwsAdapters::Noop.new
+      end
+    end
+
     def try_require_sdk(name)
       require name
     rescue LoadError # rubocop:disable Lint/HandleExceptions

data/lib/humidifier/configuration.rb

@@ -14,16 +14,27 @@ on the top-level Humidifier object like so:
     end
 MSG
 
-    attr_accessor :s3_bucket, :s3_prefix
+    attr_accessor :s3_bucket, :s3_prefix, :sdk_version
 
     def initialize(opts = {})
-      self.s3_bucket = opts[:s3_bucket]
-      self.s3_prefix = opts[:s3_prefix]
+      self.s3_bucket   = opts[:s3_bucket]
+      self.s3_prefix   = opts[:s3_prefix]
+      self.sdk_version = opts[:sdk_version]
     end
 
     # raise an error unless the s3_bucket field is set
     def ensure_upload_configured!(payload)
       raise UPLOAD_MESSAGE.gsub('%{identifier}', payload.identifier) if s3_bucket.nil?
     end
+
+    # true if the sdk_version option is set to 1 or '1'
+    def sdk_version_1?
+      sdk_version.to_s == '1'
+    end
+
+    # true if the sdk_version option is set to 2 or '2'
+    def sdk_version_2?
+      sdk_version.to_s == '2'
+    end
   end
 end

data/lib/humidifier/version.rb

@@ -1,4 +1,4 @@
 module Humidifier
   # Gem version
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: humidifier
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Localytics
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler