aws-cfn-yats 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fda00bef545348a75a1f0174c6326191849f52c0
-  data.tar.gz: b8a994c8177d43ccb3851431ef539fd00c50875f
+  metadata.gz: a8686d1353a219389116ceb376be5be49b122ba3
+  data.tar.gz: 4d5ca1a4dceb9d62817b5e40396f13bee82d22ed
 SHA512:
-  metadata.gz: bfe62e3061e0501f7aea69dfdf07af1907d49385eabf9029c2b0b74b4509b959a96d469c89a1cb96c0d11bb73cfe2ae0adfea9868be610ff5a78b8cfab70ce3d
-  data.tar.gz: 3d7bf59a237f67fa825cfc513d84511bb14d55bf1a2bf46966c6cbae8e9df3d841ad9ee7f60f366f08aaa287aa9fd2b3281afd1cb94a0033b240d436247a717e
+  metadata.gz: 13d38649e2ec100eb55fc6f9f7ce64d21f376da46f437a3cd62b286db9df30ec10c908d67b27ae7c99975ddfe5264d63c436c27ac77d80dfe0dfd21d080b03fe
+  data.tar.gz: cab66c25c8254f40a33517d583a25a5017a58b51504902ee70ee8e08757315755e943b2411022be6bcad9d6b59df3bb7cc0fd1d071d943f6418b283341e87ab6

data/aws-cfn-yats.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  # spec.add_dependency 'aws-cfn-dsl', '>=0.0.2'
+  spec.add_dependency 'json_pure', '> 0'
   spec.add_dependency 'aws-cfn-decompiler', '>= 0.0.3', '~> 0.0'
   spec.add_dependency 'aws-cfn-compiler', '>= 0.2.1', '~> 0.2'
   spec.add_dependency 'cloud_builder', '> 0'

data/aws-cfn-yats.iml

@@ -29,6 +29,7 @@
     <orderEntry type="library" scope="PROVIDED" name="cloud_builder (v0.0.11, RVM: ruby-2.1.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="cloudformer (v0.0.11, RVM: ruby-2.1.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.9, RVM: ruby-2.1.2) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json_pure (v1.8.1, RVM: ruby-2.1.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.6.0, RVM: ruby-2.1.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.3.4, RVM: ruby-2.1.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.2.1, RVM: ruby-2.1.2) [gem]" level="application" />

data/bin/cfn-json2rb

@@ -22,7 +22,6 @@ add_path = File.expand_path(File.join(path, "..", "lib"))
 $:.unshift(add_path)
 
 require 'aws/cfn/yats'
-require 'json'
 
 unless (ARGV & %w(-h --help -?)).empty?
   $stderr.puts <<"EOF"

data/bin/cfn-json2yaml

@@ -22,7 +22,6 @@ add_path = File.expand_path(File.join(path, "..", "lib"))
 $:.unshift(add_path)
 
 require 'aws/cfn/yats'
-require 'json'
 
 unless (ARGV & %w(-h --help -?)).empty?
   $stderr.puts <<"EOF"

data/bin/cfn-yaml2json

@@ -22,7 +22,6 @@ add_path = File.expand_path(File.join(path, "..", "lib"))
 $:.unshift(add_path)
 
 require 'aws/cfn/yats'
-require 'json'
 
 unless (ARGV & %w(-h --help -?)).empty?
   $stderr.puts <<"EOF"

data/lib/aws/cfn/yats/base.rb

@@ -5,6 +5,7 @@ unless RUBY_VERSION >= '1.9'
   exit(2)
 end
 
+require 'json/pure'
 require "aws/cfn/yats/version"
 
 module Aws
@@ -88,7 +89,7 @@ module Aws
             when :resources
               val.each { |k, v| pprint_cfn_resource k, v }
             else
-              pprint_value(val, '')
+              pprint_value(val)
           end
         end
 

data/lib/aws/cfn/yats/json2rb.rb

@@ -12,6 +12,23 @@ module Aws
 
         protected
 
+        def pprint(val)
+          case detect_type(val)
+            when :template
+              pprint_cfn_template(val)
+            when :parameter
+              pprint_cfn_section 'parameter', 'TODO', val
+            when :resource
+              pprint_cfn_resource 'TODO', val
+            when :parameters
+              val.each { |k, v| pprint_cfn_section 'parameter', k, v }
+            when :resources
+              val.each { |k, v| pprint_cfn_resource k, v }
+            else
+              pprint_value(val, '')
+          end
+        end
+
         def pprint_cfn_template(tpl)
            puts "#!/usr/bin/env ruby"
            puts

data/lib/aws/cfn/yats/json2yaml.rb

@@ -8,8 +8,19 @@ module Aws
       class Json2Yaml < Base
 
         def pprint_cfn_template(tpl)
+          pprint_value(tpl)
+        end
+
+        def pprint_cfn_section(section, name, options)
+          pprint_value(section)
+        end
+
+        def pprint_cfn_resource(name, options)
+          pprint_value({ name => options })
+        end
 
-          yml = YAML::dump(tpl)
+        def pprint_value(val, indent="\t")
+          yml = YAML::dump(val)
 
           puts yml
         end

data/lib/aws/cfn/yats/version.rb

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Yats
-      VERSION = "0.0.4"
+      VERSION = "0.1.0"
     end
   end
 end

data/lib/aws/cfn/yats/yaml2json.rb

@@ -1,5 +1,6 @@
 require "aws/cfn/yats/base"
 require 'yaml'
+require 'json/pure'
 
 module Aws
   module Cfn
@@ -16,8 +17,24 @@ module Aws
         end
 
         def pprint_cfn_template(tpl)
+          pprint_value(tpl)
+        end
+
+        def pprint_cfn_section(section, name, options)
+          pprint_value(section)
+        end
+
+        def pprint_cfn_resource(name, options)
+          pprint_value({ name => options })
+        end
 
-          @json = JSON.pretty_generate(tpl)
+        def pprint_value(val, indent="\t")
+          @json = JSON.pretty_generate(val, {
+              :indent         => indent,
+              :space          => ' ',
+              :object_nl      => "\n",
+              :array_nl       => "\n"
+          } )
 
           puts @json
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-yats
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Christo De Lange
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-cfn-decompiler
   requirement: !ruby/object:Gem::Requirement