cfndsl 0.3.6 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmMzN2MxYzJjYzBjZmMwYmIxYTgxMDU4ZTk3NTM1YzJlNTI2NDg0NA==
+    Yjc5YTJlYmM0ZTQ0YTM3MmU1OWQ5Yjc4MmYwMWYyYTg5ZmE1NTdjOA==
   data.tar.gz: !binary |-
-    NGE0MzE5MjdhZWFiY2Y1OThmYzM5NzJhOTFhODA1MjY3YjU2ODIzNQ==
+    ZTU2YWQ0NjAzMzVkZjY4YjdjNmUwOGY3MDJhZjk5NTEwZTZmMDAzMA==
 SHA512:
   metadata.gz: !binary |-
-    NDU1ZGZjMDE3MDQwY2EzZDI5ODg4ZTMxMzE1MTM0YTkzYzA3ZDU3MDYyYmIz
-    OWZiOWNlZWM0NjgwOGRiYjg2ZDgwNDVjNDY0ZTQ4N2YxMjY1NjEyZWNjOGZm
-    ODA0MDcwOWU0NzVmZjkwNDNlNzc0N2M2OTFlZjJhZGNhYTU0OTQ=
+    NWQ1NmYzOTZjZWY5NGMwZGQ0NDliZDI4Y2Y0MDZmOTUyNmEzZDE2MDBmZmMy
+    MGYwNTE3MDQ5MGJjNmZkYzY3N2VhYzA3NjcwMGM3MDJjN2FiOTcwZGFkMzk1
+    N2ZmNGU3ZGRhY2RiNDRjOGIzNGZjZTAxNTM3ZThiMmYyMDg1YTI=
   data.tar.gz: !binary |-
-    ZGVkMWEyNTAzZTIwMDA2NDU1Y2NhMDJmMzYyN2ZiNzY0YmE2YzEwYTQ5MTRj
-    NDg2NTQyZTk1MGUxMjQ1ZjMzMDdkZGU4ODEyM2QyMmIwMGVmNjlkNmUwOWZh
-    YjU4NmIyNWQ2ODA5NjRlNjYwNmU5YjlmOTRhYjU1NjA2MjlmODA=
+    Y2JjODdlMTIxZWMwZWE3YWFlMzBmMjgzNTBlZTUzM2E2MWU2NDliMjA3YmQ3
+    YWI3MWRjOGVkYjgwNWFjODE4NmYxNzVlYmRhOWEyY2NkZmMxYTQ5NTc2NGI2
+    ODRkNjRmNThkNTQwYWUwN2UzOTE2ZWFhMDc1NWRiNjJkNjUzMTU=

data/README.md

@@ -101,6 +101,7 @@ Usage: cfndsl [options] FILE
     -y, --yaml FILE                  Import yaml file as local variables
     -r, --ruby FILE                  Evaluate ruby file before template
     -j, --json FILE                  Import json file as local variables
+    -p, --pretty                     Pretty-format output JSON
     -D, --define "VARIABLE=VALUE"    Directly set local VARIABLE as VALUE
     -v, --verbose                    Turn on verbose ouptut
     -h, --help                       Display this screen

data/bin/cfndsl

@@ -2,6 +2,7 @@
 
 require 'cfndsl'
 require 'optparse'
+require 'json'
 
 options = {}
 
@@ -27,6 +28,9 @@ optparse = OptionParser.new do|opts|
     options[:extras].push([:json,File.expand_path(file)])
   end
 
+  opts.on( '-p', '--pretty', 'Pretty-format output JSON') do
+    options[:pretty] = true
+  end
 
   opts.on( '-D', '--define "VARIABLE=VALUE"', 'Directly set local VARIABLE as VALUE' ) do |file|
     options[:extras].push([:raw,file])
@@ -64,4 +68,4 @@ else
   verbose.puts("Writing to STDOUT") if verbose
 end
 
-output.puts model.to_json
+output.puts options[:pretty] ? JSON.pretty_generate(model) : model.to_json

data/lib/cfndsl/rake_task.rb

@@ -21,7 +21,9 @@ module CfnDsl
 
     def generate(opts)
       log(opts)
-      outputter(opts).puts model(opts[:filename])
+      outputter(opts) do |output|
+        output.puts model(opts[:filename])
+      end
     end
 
     def log(opts)
@@ -30,7 +32,7 @@ module CfnDsl
     end
 
     def outputter(opts)
-      opts[:output].nil? ? STDOUT : file_output(opts[:output])
+      opts[:output].nil? ? yield(STDOUT) : file_output(opts[:output]) { |f| yield f }
     end
 
     def model(filename)
@@ -48,7 +50,7 @@ module CfnDsl
     end
 
     def file_output(path)
-      File.open(File.expand_path(path), "w")
+      File.open(File.expand_path(path), "w") { |f| yield f }
     end
   end
 end

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler