aws-cfn-decompiler 0.2.5 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2I5ZjkyZGMzMGRjYTRmZDMxNTg0OGQ0ZjVkY2VmNGZlZDY2ZDFlNQ==
+    ZWU4ODg1ZTFhZjYyNGYxZjE3ODA0YjNiYjVhZWMyZmRjYTIxODE0Yw==
   data.tar.gz: !binary |-
-    NjBmNmQ2NGZhNTQ1NGZkZjBhNjhjMzFlODhlOGM5NmRiZjJlNzNiYg==
+    YjUzZGE4NjhhZDQ1Y2UyZGIyN2Q2NjkwYzE0NWYxODc1YTg1YmMyZA==
 SHA512:
   metadata.gz: !binary |-
-    NDMyODkyZmYzZjc5ODI2ZWMzYWZmZWY5NDlkNTNkOWNiNWRhZWEyZTg2Zjlh
-    YTAyZDY0ODAyNTQxNTdjMjQ5YzIyMTJlNjhhZWE4M2E1NDE2NGNjMjJmMGM0
-    M2NlOTViNDg3ZWEyOWRjNjM4MGI4MzE5MDY4YzBlYWVjZTJhOWY=
+    NDM3ZTBlNzAyYzhiYTRhMGMyYjA3NTUxOTYwMWUxYzc3NDlkN2ZmZTU2ZTQ1
+    OGU4ZWFkNzljZTJhNmViYjhkZjFmMmRmZTdmOTY4NDM0OGU5OTQ3NTk3MjVj
+    NjFiZTk5YTMyY2I0YTc3ODZiYTFmYjEwZDZiNmJhYjUzMDU3MWQ=
   data.tar.gz: !binary |-
-    NTIxNTFlMTdlMjRlMGRjZGUzYWRmYjhkODRiOTRlYjJjOTQyMGNjNjk5NWIy
-    YWZhN2FmNmI1YTlhOWM1NjMwMDI5MzNhZGViMmVkM2IwMDFkYThiYTZlMTg3
-    ZjE4MzQ3ZjgyODc5OTFhMjRkYWI4MGY1NWUwODY3OTkwNmZlYzQ=
+    ZGQ4NjFmYjVmZDZlMWUwYjM4ZDM5ODA2NDljOGU1MjlhNjI2YWE2NzM3MDlk
+    OWM2NzE3ZWZmNTg5MzhlMmNkYzUyZWU3ZDJhODQ3MjVjYzJlNjgzZjU2MzRj
+    MTVkNWJlNjA3ODFlOWVmYmQzMjlmZjM4ODk3ZDQ4MzdkNzM3OTE=

data/aws-cfn-decompiler.gemspec

@@ -18,13 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "awesome_print"
+  spec.add_dependency "awesome_print", '~> 1.2', '>= 1.2.0'
   spec.add_dependency "psych"
   spec.add_dependency "json"
-  spec.add_dependency 'aws-cfn-compiler', '>= 0.3.1', '~> 0.2'
   spec.add_dependency "slop"
+  spec.add_dependency 'aws-cfn-compiler', '>= 0.5.0', '~> 0.5'
 
-  spec.add_development_dependency "json_pure"
-  spec.add_development_dependency 'bundler', "~> 1.6"
-  spec.add_development_dependency 'rake'
 end

data/aws-cfn-decompiler.iml

@@ -3,24 +3,12 @@
   <component name="CompassSettings">
     <option name="compassSupportEnabled" value="true" />
   </component>
-  <component name="FacetManager">
-    <facet type="gem" name="Ruby Gem">
-      <configuration>
-        <option name="GEM_APP_ROOT_PATH" value="$MODULE_DIR$" />
-        <option name="GEM_APP_TEST_PATH" value="$MODULE_DIR$/test" />
-        <option name="GEM_APP_LIB_PATH" value="$MODULE_DIR$/lib" />
-      </configuration>
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
+    <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="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-compiler (v0.3.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" />

data/bin/cfn-decompiler

@@ -2,27 +2,30 @@
 
 require 'rubygems'
 
-# require 'safe_yaml'
-# SafeYAML::OPTIONS[:default_mode] = :safe
-
+path = File.dirname(__FILE__)
+if File.exists?("#{path}/../.gitignore")
+  %w(aws-cfn-dsl aws-cfn-compiler cloudformation-ruby-dsl).each do |mod|
+    add_path = File.expand_path(File.join(path, "../../#{mod}", "lib"))
+    $:.unshift(add_path)
+  end
+else
 # Borrowing from "whiches" gem ...
-cmd  = File.basename(__FILE__, '.rb')
-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
+  cmd  = File.basename(__FILE__, '.rb')
+  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
+  if exes.size > 0
+    path = File.dirname(exes[0])
+  end
 
+end
 add_path = File.expand_path(File.join(path, "..", "lib"))
 $:.unshift(add_path)
 
 require 'aws/cfn/decompiler'
-Aws::Cfn::DeCompiler::Main.new().run
+Aws::Cfn::DeCompiler::Main.new.run

data/lib/aws/cfn/decompiler.rb

@@ -1,142 +1,4 @@
 require "aws/cfn/decompiler/version"
-require "aws/cfn/compiler"
+require "aws/cfn/decompiler/base"
+require "aws/cfn/decompiler/main"
 
-require 'json'
-require 'ap'
-require 'yaml'
-require 'slop'
-
-module Aws
-  module Cfn
-    module DeCompiler
-      class Main < Aws::Cfn::Compiler::Main
-        attr_accessor :template
-
-        def run
-
-          @opts = Slop.parse(help: true, strict: true) do
-            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]', as: String, match: %r/yaml|json/i
-            on :s, :specification=, 'The specification file to create.', as: String
-          end
-
-          unless @opts[:template]
-            puts @opts
-            exit
-          end
-          unless @opts[:output].nil?
-            unless File.directory?(@opts[:output])
-              puts @opts
-              exit
-            end
-          end
-
-          load @opts[:template]
-
-          puts
-          puts 'Validating decompiled file...'
-
-          validate(@items)
-
-          output_dir = @opts[:output] || Dir.pwd
-          puts
-          puts "Writing decompiled parts to #{output_dir}..."
-          save(output_dir)
-
-          puts
-          puts '*** Decompiled Successfully ***'
-        end
-
-        def save(output_dir)
-
-          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)
-                  end
-                  file = "#{name}.#{format}"
-                  hash = {  name => value }
-
-                  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}/")
-          end
-
-        end
-
-        def save_section(dir, file, format, section, hash, join='/')
-          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/
-                  f.write hash.to_yaml line_width: 1024, indentation: 4, canonical: false
-                else
-                  raise "Unsupported format #{format}. Should have noticed this earlier!"
-              end
-              f.close
-            end
-            puts "  decompiled #{section}#{join}#{file}."
-          rescue
-            puts "!!! Could not write compiled file #{path}: #{$!}"
-            abort!
-          end
-        end
-
-        def load(file=nil)
-          if file
-            begin
-              abs = File.absolute_path(File.expand_path(file))
-              unless File.exists?(abs) or @opts[:output].nil?
-                abs = File.absolute_path(File.expand_path(File.join(@opts[:output],file)))
-              end
-            rescue
-              # pass
-            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))
-                else
-                  raise "Unsupported file type for specification: #{file}"
-              end
-              @items = template
-            else
-              raise "Unable to open template: #{abs}"
-            end
-          end
-        end
-
-        protected
-
-
-      end
-    end
-  end
-end

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

@@ -0,0 +1,114 @@
+require "aws/cfn/decompiler/version"
+require "aws/cfn/compiler"
+
+require 'json'
+require 'ap'
+require 'yaml'
+
+module Aws
+  module Cfn
+    module DeCompiler
+      class Base < ::Aws::Cfn::Compiler::Base
+        attr_accessor :template
+
+        def save(output_dir)
+
+          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)
+                  end
+                  file = "#{name}.#{format}"
+                  hash = {  name => value }
+
+                  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}/")
+          end
+
+        end
+
+        def save_section(dir, file, format, section, hash, join='/')
+          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/
+                  f.write hash.to_yaml line_width: 1024, indentation: 4, canonical: false
+                else
+                  raise "Unsupported format #{format}. Should have noticed this earlier!"
+              end
+              f.close
+            end
+            puts "  decompiled #{section}#{join}#{file}."
+          rescue
+            puts "!!! Could not write compiled file #{path}: #{$!}"
+            abort!
+          end
+        end
+
+        def decompile(file=nil)
+          load file
+
+          puts
+          puts 'Validating decompiled file...'
+
+          validate(@items)
+
+        end
+
+        def load(file=nil)
+          if file
+            begin
+              abs = File.absolute_path(File.expand_path(file))
+              unless File.exists?(abs) or @opts[:output].nil?
+                abs = File.absolute_path(File.expand_path(File.join(@opts[:output],file)))
+              end
+            rescue
+              # pass
+            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))
+                else
+                  raise "Unsupported file type for specification: #{file}"
+              end
+              @items = template
+            else
+              raise "Unable to open template: #{abs}"
+            end
+          end
+        end
+
+        protected
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+require "aws/cfn/decompiler/version"
+require "aws/cfn/decompiler/base"
+
+require 'slop'
+
+module Aws
+  module Cfn
+    module DeCompiler
+      class Main < Base
+        attr_accessor :template
+
+        def run
+
+          @opts = Slop.parse(help: true, strict: true) do
+            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 :s, :specification=, 'The specification file to create.', as: String
+          end
+
+          unless @opts[:template]
+            puts @opts
+            exit
+          end
+          unless @opts[:output].nil?
+            unless File.directory?(@opts[:output])
+              puts @opts
+              exit
+            end
+          end
+
+          decompile @opts[:template]
+
+          output_dir = @opts[:output] || Dir.pwd
+          puts
+          puts "Writing decompiled parts to #{output_dir}..."
+          save(output_dir)
+
+          puts
+          puts '*** Decompiled Successfully ***'
+        end
+
+        protected
+
+
+      end
+    end
+  end
+end

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

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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-decompiler
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-06-27 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: '0'
+        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: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -52,26 +58,6 @@ dependencies:
     - - ! '>='
       - !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.3.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.3.1
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -87,47 +73,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: aws-cfn-compiler
   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'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: 0.5.0
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '0.5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !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:
-    - - ! '>='
+        version: 0.5.0
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description: The idea is to extract a big CloudFormation template into a folder structure
   to better manage pieces of a CloudFormation deployment. Additionally, writing in
   JSON is hard, so the decompiler can create YAML files as well.
@@ -163,6 +127,8 @@ files:
 - example/resources/subnets.json
 - example/resources/vpc.json
 - lib/aws/cfn/decompiler.rb
+- lib/aws/cfn/decompiler/base.rb
+- lib/aws/cfn/decompiler/main.rb
 - lib/aws/cfn/decompiler/version.rb
 homepage: https://github.com/dldinternet/aws-cfn-decompiler
 licenses: