aws-cfn-decompiler 0.5.0 → 0.5.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWU4ODg1ZTFhZjYyNGYxZjE3ODA0YjNiYjVhZWMyZmRjYTIxODE0Yw==
-  data.tar.gz: !binary |-
-    YjUzZGE4NjhhZDQ1Y2UyZGIyN2Q2NjkwYzE0NWYxODc1YTg1YmMyZA==
+SHA1:
+  metadata.gz: f180799b3fab6757e8326a52443d9ecf0606663b
+  data.tar.gz: c0580cd70f1f96a1e6a92f6f93b4e5f6c85c8eb4
 SHA512:
-  metadata.gz: !binary |-
-    NDM3ZTBlNzAyYzhiYTRhMGMyYjA3NTUxOTYwMWUxYzc3NDlkN2ZmZTU2ZTQ1
-    OGU4ZWFkNzljZTJhNmViYjhkZjFmMmRmZTdmOTY4NDM0OGU5OTQ3NTk3MjVj
-    NjFiZTk5YTMyY2I0YTc3ODZiYTFmYjEwZDZiNmJhYjUzMDU3MWQ=
-  data.tar.gz: !binary |-
-    ZGQ4NjFmYjVmZDZlMWUwYjM4ZDM5ODA2NDljOGU1MjlhNjI2YWE2NzM3MDlk
-    OWM2NzE3ZWZmNTg5MzhlMmNkYzUyZWU3ZDJhODQ3MjVjYzJlNjgzZjU2MzRj
-    MTVkNWJlNjA3ODFlOWVmYmQzMjlmZjM4ODk3ZDQ4MzdkNzM3OTE=
+  metadata.gz: 9707cc9a2f5b7070f30125f631d69a479a342abeba846fb011134883079f730022cc8fd9cc620eb1cb05d11294b47eaede28c902cc8f87bef80b5b6da121b27c
+  data.tar.gz: bb86570d78d67a89bb1b74496de78d1f07f969bec5e59b6b31dc65033062d1b91d8710aea71469c0f10f81cd893379a29c6aead221c3497cb1edb136532c65c6

data/Gemfile

@@ -2,3 +2,16 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in aws-cfn-decompiler.gemspec
 gemspec
+
+gem 'cloudformation-ruby-dsl', :path => '../cloudformation-ruby-dsl', :group => :development
+
+gem 'dldinternet-mixlib-logging', :path => '../dldinternet-mixlib-logging', :group => :development
+gem 'dldinternet-mixlib-cli', :path => '../dldinternet-mixlib-cli', :group => :development
+gem 'aws-cfn-dsl', :path => '../aws-cfn-dsl', :group => :development
+gem 'aws-cfn-decompiler', :path => '../aws-cfn-decompiler', :group => :development
+gem 'aws-cfn-compiler', :path => '../aws-cfn-compiler', :group => :development
+gem 'aws-cfn-yats', :path => '../aws-cfn-yats', :group => :development
+gem 'aws-cfn-stacker', :path => '../aws-cfn-stacker', :group => :development
+
+gem 'bundler', "~> 1.6", :group => :development
+gem 'rake', :group => :development

data/aws-cfn-decompiler.iml

@@ -8,13 +8,71 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="aws-cfn-compiler" />
+    <orderEntry type="module" module-name="aws-cfn-dsl" />
+    <orderEntry type="module-library">
+      <library name="aws-cfn-stacker (v[path], /Users/cdelange/Dropbox/DLDInternet/ws/gems-ws/aws-cfn-stacker) [path][gem]">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/bin" />
+          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/lib" />
+          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/pkg" />
+          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/.idea" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/bin" />
+          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/lib" />
+          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/pkg" />
+          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/.idea" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module" module-name="aws-cfn-yats" />
+    <orderEntry type="module" module-name="cloudformation-ruby-dsl" />
+    <orderEntry type="module-library">
+      <library name="dldinternet-mixlib-cli (v0.1.0, /Users/cdelange/Dropbox/DLDInternet/ws/gems-ws/dldinternet-mixlib-cli) [path][gem]">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/bin" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/lib" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/pkg" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/.idea" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/bin" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/lib" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/pkg" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/.idea" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="dldinternet-mixlib-logging (v0.2.0, /Users/cdelange/Dropbox/DLDInternet/ws/gems-ws/dldinternet-mixlib-logging) [path][gem]">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/bin" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/lib" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/pkg" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/.idea" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/bin" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/lib" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/pkg" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/.idea" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="library" scope="PROVIDED" name="awesome_print (v1.2.0, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="aws-cfn-dsl (v0.0.4, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.6.2, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cloudformation-ruby-dsl (v0.4.3, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="colorize (v0.7.3, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="detabulator (v0.1.0, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="inifile (v2.0.2, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json_pure (v1.8.1, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="little-plugger (v1.1.3, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="logging (v1.8.2, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mixlib-cli (v1.5.0, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.10.1, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="psych (v2.0.5, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.3.2, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="slop (v3.5.0, RVM: ruby-1.9.3-p547 [aws-cfn-decompiler]) [gem]" level="application" />

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

@@ -15,48 +15,57 @@ module Aws
 
           specification = {}
           format = @opts[:format] rescue 'yaml'
-          @items.each do |section, section_items|
-            case section
-              when /Mappings|Parameters|Resources|Outputs/
-                specification[section] = []
-                section_items.each do |name,value|
-                  dir  = File.join(output_dir,section.to_s)
-                  unless File.directory?(dir)
-                    Dir.mkdir(dir)
+          if format.match(%r'^ruby|rb$')
+            pprint_cfn_template simplify(@items)
+          else
+            @items.each do |section, section_items|
+              case section
+                when /Mappings|Parameters|Resources|Outputs/
+                  specification[section] = []
+                  section_items.each do |name,value|
+                    dir  = File.join(output_dir,section.to_s)
+                    unless File.directory?(dir)
+                      Dir.mkdir(dir)
+                    end
+                    file = "#{name}.#{format}"
+                    hash = {  name => value }
+
+                    save_section(dir, file, format, section, hash)
+                    specification[section] << name
                   end
-                  file = "#{name}.#{format}"
-                  hash = {  name => value }
+                when /AWSTemplateFormatVersion|Description/
+                  specification[section] = section_items
+                else
+                  abort! "Unsupported section '#{section}' in template"
+              end
 
-                  save_section(dir, file, format, section, hash)
-                  specification[section] << name
-                end
-              when /AWSTemplateFormatVersion|Description/
-                specification[section] = section_items
-              else
-                raise "ERROR: Unsupported section '#{section}' in template"
             end
 
-          end
-
-          # Save specification
-          unless @opts[:specification].nil?
-            dir = File.dirname(@opts[:specification])
-            dir = output_dir unless dir
-            save_section(dir, File.basename(@opts[:specification]), format, '', specification, "Specification to #{dir}/")
+            # Save specification
+            unless @opts[:specification].nil?
+              dir = File.dirname(@opts[:specification])
+              dir = output_dir unless dir
+              save_section(dir, File.basename(@opts[:specification]), format, '', specification, "Specification to #{dir}/")
+            end
           end
 
         end
 
         def save_section(dir, file, format, section, hash, join='/')
+          logStep "Saving section #{hash.keys[0]} to #{section}/#{file} "
           path = File.join(dir, file)
 
           begin
             # File.delete path if File.exists? path
             File.open path, File::CREAT|File::TRUNC|File::RDWR, 0644 do |f|
               case format
-                when /json/
-                  f.write JSON.pretty_generate(compiled)
-                when /yaml/
+                when /ruby|rb/
+                  @output.unshift f
+                  pprint(hash)
+                  @output.shift
+                when /json|js/
+                  f.write JSON.pretty_generate(hash)
+                when /yaml|yml/
                   f.write hash.to_yaml line_width: 1024, indentation: 4, canonical: false
                 else
                   raise "Unsupported format #{format}. Should have noticed this earlier!"
@@ -70,18 +79,9 @@ module Aws
           end
         end
 
-        def decompile(file=nil)
-          load file
-
-          puts
-          puts 'Validating decompiled file...'
-
-          validate(@items)
-
-        end
-
         def load(file=nil)
           if file
+            logStep "Loading #{file}"
             begin
               abs = File.absolute_path(File.expand_path(file))
               unless File.exists?(abs) or @opts[:output].nil?
@@ -92,16 +92,15 @@ module Aws
             end
             if File.exists?(abs)
               case File.extname(File.basename(abs)).downcase
-                when /json/
-                  template = JSON.parse(File.read(abs))
-                when /yaml/
-                  template = YAML.load(File.read(abs))
+                when /json|js/
+                  @items = JSON.parse(File.read(abs))
+                when /yaml|yml/
+                  @items = YAML.load(File.read(abs))
                 else
-                  raise "Unsupported file type for specification: #{file}"
+                  abort! "Unsupported file type for specification: #{file}"
               end
-              @items = template
             else
-              raise "Unable to open template: #{abs}"
+              abort! "Unable to open template: #{abs}"
             end
           end
         end

data/lib/aws/cfn/decompiler/main.rb

@@ -12,32 +12,39 @@ module Aws
         def run
 
           @opts = Slop.parse(help: true, strict: true) do
+            # command File.basename(__FILE__,'.rb')
             on :j, :template=,      'The template to decompile', as: String
             on :o, :output=,        'The directory to output the components to.', as: String
-            on :f, :format=,        'The output format of the components. [JSON|YAML|Ruby]', as: String, match: %r/yaml|json|ruby/i
+            on :f, :format=,        'The output format of the components. [JSON|YAML|Ruby]', as: String, match: %r/ruby|rb|yaml|yml|json|js/i
             on :s, :specification=, 'The specification file to create.', as: String
+            on :n, :functions=,     'Enable function use.', as: String, match: %r/0|1|yes|no|on|off|enable|disable|set|unset|true|false|raw/i
           end
 
+          @config[:functions] = @opts[:functions].downcase.match %r'^(1|true|on|yes|enable|set)$'
+
           unless @opts[:template]
-            puts @opts
+            @logger.error @opts
             exit
           end
           unless @opts[:output].nil?
             unless File.directory?(@opts[:output])
-              puts @opts
+              Dir.mkdir(@opts[:output])
+            end
+            unless File.directory?(@opts[:output])
+              @logger.error "Cannot see output directory: #{@opts[:output]}"
+              @logger.error @opts.to_s
               exit
             end
           end
 
-          decompile @opts[:template]
+          load @opts[:template]
+
+          validate(@items)
 
           output_dir = @opts[:output] || Dir.pwd
-          puts
-          puts "Writing decompiled parts to #{output_dir}..."
           save(output_dir)
 
-          puts
-          puts '*** Decompiled Successfully ***'
+          @logger.step '*** Decompiled Successfully ***'
         end
 
         protected

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module DeCompiler
-      VERSION = "0.5.0"
+      VERSION = "0.5.2"
     end
   end
 end

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-decompiler
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: psych
   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: json
   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: slop
   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-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 description: The idea is to extract a big CloudFormation template into a folder structure
@@ -102,9 +102,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -140,12 +140,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: []