aws-cfn-yats 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGUyNmI0YjgwMWY3ZDJkNDQxMjdlNjRkMzBlZWUzNDI5YmNmNDQ1Yg==
-  data.tar.gz: !binary |-
-    OWYwYWIwYWVjNzI4YzVhNjYxMTk4ZTUxNzZjNTkzYzU1N2Y0YmY5ZA==
+SHA1:
+  metadata.gz: fda00bef545348a75a1f0174c6326191849f52c0
+  data.tar.gz: b8a994c8177d43ccb3851431ef539fd00c50875f
 SHA512:
-  metadata.gz: !binary |-
-    NjYxMmExYjUwZWJkYjFlNTVmMWJlNTc3MmUwODAzZWU4YWRiMTZlM2I0MjEx
-    NTg3MGZhNWEyNTIyMzhlYWZiMzY2NGQ1YjdlYzIwOWJkNTlmZTk0MTM2MGM4
-    MjczYWNkMmQwNzUwMTI5ODZlOTIwOTc2NGI0N2UyNWI3MjQ2YzQ=
-  data.tar.gz: !binary |-
-    NTc2MDFmNDY4N2Q0YzZhYmU4NWIwZDJiNDk3MTRlNWUwMTY3MzU2MjhhY2Y0
-    MzUxNWViNDk4ZDgyZjAwM2Y2OWEyNDU3M2JjYTBlZjViNjM5ZTE0ZGI0ODgx
-    MzZiM2Q0ZjY5ODRjZDhjYmIxMTc4ZmIyMzk4OTdhMTE0NGE0MjU=
+  metadata.gz: bfe62e3061e0501f7aea69dfdf07af1907d49385eabf9029c2b0b74b4509b959a96d469c89a1cb96c0d11bb73cfe2ae0adfea9868be610ff5a78b8cfab70ce3d
+  data.tar.gz: 3d7bf59a237f67fa825cfc513d84511bb14d55bf1a2bf46966c6cbae8e9df3d841ad9ee7f60f366f08aaa287aa9fd2b3281afd1cb94a0033b240d436247a717e

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 'aws-cfn-dsl', '>=0.0.2'
   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

@@ -21,14 +21,13 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.1.1, RVM: ruby-2.1.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="awesome_print (v1.2.0, RVM: ruby-2.1.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="aws-cfn-dsl (v0.0.2, RVM: ruby-2.1.2) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="aws-cfn-compiler (v0.2.1, RVM: ruby-2.1.2) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="aws-cfn-decompiler (v0.0.3, RVM: ruby-2.1.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v1.43.2, RVM: ruby-2.1.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.6.2, RVM: ruby-2.1.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="clamp (v0.6.3, RVM: ruby-2.1.2) [gem]" level="application" />
     <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="cloudformation-ruby-dsl (v0.4.3, 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="detabulator (v0.1.0, 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="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" />

data/bin/cfn-yaml2json

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+
+# Borrowing from "whiches" gem ...
+cmd  = File.basename(__FILE__)
+exes = []
+exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+  exts.each { |ext|
+    exe = File.join(path, "#{cmd}#{ext}")
+    exes << exe if File.executable? exe
+  }
+end
+path = if exes.size > 0
+         File.dirname(exes[0])
+       else
+         File.dirname(__FILE__)
+       end
+
+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"
+usage: #{$PROGRAM_NAME} [cloudformation-template.json] ...
+
+Converts the specified CloudFormation JSON template or template fragment to
+Ruby DSL syntax.  Reads from stdin or from the specified json files.  Note
+that the input must be valid JSON.
+
+Examples:
+
+  # Convert a JSON CloudFormation template to Ruby DSL syntax
+  #{$PROGRAM_NAME} my-template.json > my-template.rb
+  chmod +x my-template.rb
+
+  # Convert the JSON fragment in the clipboard to Ruby DSL syntax
+  pbpaste | #{$PROGRAM_NAME} | less
+
+EOF
+  exit(2)
+end
+
+y2j = Aws::Cfn::Yats::Yaml2Json.new
+
+if ARGV.empty?
+  template = $stdin.read
+  y2j.transform(template)
+else
+  ARGV.each do |filename|
+    template = File.read(filename)
+    y2j.transform(template)
+  end
+end
+# The user should make the resulting template executable w/chmod +x

data/bin/cfn-yats

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+
+# Borrowing from "whiches" gem ...
+cmd  = File.basename(__FILE__)
+exes = []
+exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+  exts.each { |ext|
+    exe = File.join(path, "#{cmd}#{ext}")
+    exes << exe if File.executable? exe
+  }
+end
+path = if exes.size > 0
+         File.dirname(exes[0])
+       else
+         File.dirname(__FILE__)
+       end
+
+add_path = File.expand_path(File.join(path, "..", "lib"))
+$:.unshift(add_path)
+
+require 'aws/cfn/yats'

data/bin/yats

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+
+# Borrowing from "whiches" gem ...
+cmd  = File.basename(__FILE__)
+exes = []
+exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+  exts.each { |ext|
+    exe = File.join(path, "#{cmd}#{ext}")
+    exes << exe if File.executable? exe
+  }
+end
+path = if exes.size > 0
+         File.dirname(exes[0])
+       else
+         File.dirname(__FILE__)
+       end
+
+add_path = File.expand_path(File.join(path, "..", "lib"))
+$:.unshift(add_path)
+
+require 'aws/cfn/yats'

data/lib/aws/cfn/yats.rb

@@ -3,3 +3,4 @@ require "aws/cfn/yats/base"
 require "aws/cfn/yats/fncall"
 require "aws/cfn/yats/json2rb"
 require "aws/cfn/yats/json2yaml"
+require "aws/cfn/yats/yaml2json"

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

@@ -9,7 +9,7 @@ module Aws
 
         def pprint_cfn_template(tpl)
 
-          yml = YAML::dump(@json)
+          yml = YAML::dump(tpl)
 
           puts yml
         end

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

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

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

@@ -0,0 +1,28 @@
+require "aws/cfn/yats/base"
+require 'yaml'
+
+module Aws
+  module Cfn
+    module Yats
+
+      class Yaml2Json < Base
+        attr_accessor :yaml
+
+        def transform(template)
+          @template = template
+          @yaml     = YAML.load(template)
+          @simple   = simplify(@yaml)
+          pprint(@simple)
+        end
+
+        def pprint_cfn_template(tpl)
+
+          @json = JSON.pretty_generate(tpl)
+
+          puts @json
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-yats
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Christo De Lange
@@ -10,100 +10,86 @@ bindir: bin
 cert_chain: []
 date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: aws-cfn-dsl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: aws-cfn-decompiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: aws-cfn-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: cloud_builder
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: AWS Cloudformation templates expressed with a Ruby DSL, YAML or JSON
@@ -113,10 +99,13 @@ email:
 executables:
 - cfn-json2rb
 - cfn-json2yaml
+- cfn-yaml2json
+- cfn-yats
+- yats
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -126,12 +115,16 @@ files:
 - aws-cfn-yats.iml
 - bin/cfn-json2rb
 - bin/cfn-json2yaml
+- bin/cfn-yaml2json
+- bin/cfn-yats
+- bin/yats
 - lib/aws/cfn/yats.rb
 - lib/aws/cfn/yats/base.rb
 - lib/aws/cfn/yats/fncall.rb
 - lib/aws/cfn/yats/json2rb.rb
 - lib/aws/cfn/yats/json2yaml.rb
 - lib/aws/cfn/yats/version.rb
+- lib/aws/cfn/yats/yaml2json.rb
 homepage: ''
 licenses:
 - MIT
@@ -142,12 +135,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []