stackup 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20ef7c568fc7e9522f584971713e2785e26628d7
-  data.tar.gz: ddc63cb469f6749a0880f9a048b2a35f110b6971
+  metadata.gz: 8d9136bd380d1644176d3b65c7ee93315016d455
+  data.tar.gz: ea8bdd9c6766e6f581557073a2afb5134efd3902
 SHA512:
-  metadata.gz: 8d4f8835951cdbb655038217a10abb3fb1ae590341efd4bd9ee07e2cdb1108d00251752773fc951e32f6b99ae7b59e8c144e53a14b54452c42f815f716fbf5da
-  data.tar.gz: f745669e927ef53ffe51855a84b63ecd58b7428761db198b4a1508016ed81bcb2b2fe40e7358e2d364ed5fc8a99ba665581278ca6c7e7d646be9f9ed1d9d6284
+  metadata.gz: 3f9a13acc03300f01506f109ae336c794e49753ef592e630462faa89fa39f6e858e43fe56c33c3c03c59ded1132e063a1eb7c2431005b674ee6f43d39a6749d4
+  data.tar.gz: 48b38607b8e0ee0015ab1fd81e049e62c9b53ab7338b005be51e15a9fcf8e573bbde69cd9352fec2688111ae2c1b60492234dacaed56d25cfdab9bfaa2610dde

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 1.1.3 (2017-05-01)
+
+* Fix #39: parse error when JSON-like text is embedded in YAML.
+
 ## 1.1.1 (2017-02-23)
 
 * The `stackup` CLI now allows stack template and policy documents to be specified as URLs.

data/lib/stackup/source.rb

@@ -29,6 +29,8 @@ module Stackup
 
     private
 
+    LOOKS_LIKE_JSON = /\A\s*[\{\[]/
+
     def uri
       URI(location)
     end
@@ -50,11 +52,13 @@ module Stackup
     end
 
     def parse_body
-        begin
-            MultiJson.load(body)
-          rescue MultiJson::ParseError
-            Stackup::YAML.load(body)
-        end
+      if body =~ LOOKS_LIKE_JSON
+        # Psych has issues parsing some JSON, so let's use a JSON parser.
+        # (see https://github.com/realestate-com-au/stackup/issues/35)
+        MultiJson.load(body)
+      else
+        Stackup::YAML.load(body)
+      end
     end
 
     class ReadError < StandardError

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Mike Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-resources