aws-cfn-decompiler 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aeb28a3e087cf7ada2d2842283f27c34076fa70
-  data.tar.gz: 756e2950012c76c57c6ade2965096d5fe25b265b
+  metadata.gz: db417aafff50d73c42de66f4c80097d530653369
+  data.tar.gz: 833fa918eeabce35b42a09e2bce5a523d0b0c864
 SHA512:
-  metadata.gz: 2bc4574d3bcbfaaef555a4b6ae54862508f83fe33c0ea25b7235abb399e5b7a1b59d5f967cb1fb7a5928cd6b9dd9cab360217ce43ad876800c7b37290a79ce32
-  data.tar.gz: 9a7d623cf3adfd4f88aeae49a43abe388e1c3a9fa520e37daf05b41d842ff34b3825cccf814e0a3eab896c79d51b1de2dee99e54dcdb42c7775f38c437b4b9d6
+  metadata.gz: 48d6d134e7fa7f1aad5452a44c1fdad1173ec2c9005fdb127673aa405223993abee503f3c9695b0832973917ab64bc8e6e1c690da9c5ac50c61840089d9f1a9c
+  data.tar.gz: c280a5cc7784e25fcc2568b530bbfb050429fe3a54887453caae78a4b84e55e8bca8cb3484e9a6b7e75fbb331df02a3fc49fc3e12e6edfb93bc3898aef80e6da

data/Gemfile

@@ -8,10 +8,10 @@ gem 'cloudformation-ruby-dsl', :path => '../cloudformation-ruby-dsl', :group =>
 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 'json_pure', :group => :development
 gem 'bundler', "~> 1.6", :group => :development
 gem 'rake', :group => :development

data/aws-cfn-decompiler.gemspec

@@ -18,10 +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", '~> 1.2', '>= 1.2.0'
-  spec.add_dependency "psych"
-  spec.add_dependency "json"
-  spec.add_dependency "slop"
-  spec.add_dependency 'aws-cfn-compiler', '>= 0.5.0', '~> 0.5'
+  spec.add_dependency 'awesome_print', '~> 1.2', '>= 1.2.0'
+  spec.add_dependency 'psych'
+  spec.add_dependency 'json'
+  spec.add_dependency 'slop'
+  spec.add_dependency 'aws-cfn-compiler', '>= 0.7.0', '~> 0.7'
 
 end

data/aws-cfn-decompiler.iml

@@ -53,6 +53,7 @@
     <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" />

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

@@ -11,15 +11,18 @@ module Aws
       class Base < ::Aws::Cfn::Compiler::Base
         attr_accessor :template
 
-        def save_dsl(output_dir)
+        require "aws/cfn/decompiler/mixins/options"
+        include Aws::Cfn::DeCompiler::Options
+
+        def save_dsl(output_dir, decompiled=@items)
 
           specification = {}
-          format = @opts[:format] rescue 'yaml'
+          format = @config[:format] rescue 'yaml'
           ruby   = (not format.match(%r'^ruby|rb$').nil?)
           if ruby
-            pprint_cfn_template simplify(@items)
+            pprint_cfn_template simplify(decompiled)
           end
-          @items.each do |section, section_items|
+          decompiled.each do |section, section_items|
             case section
               when /Mappings|Parameters|Resources|Outputs/
                 specification[section] = []
@@ -44,45 +47,16 @@ module Aws
           end
 
           # Save specification
-          unless @opts[:specification].nil?
-            dir = File.dirname(@opts[:specification])
+          unless @config[:specification].nil?
+            dir = File.dirname(@config[:specification])
             dir = output_dir unless dir
-            save_section(dir, File.basename(@opts[:specification]), format, '', specification, "Specification in #{dir}/")
+            save_section(dir, File.basename(@config[:specification]), format, '', specification, '', "specification")
           end
 
         end
 
         protected
 
-        def save_section(dir, file, format, section, hash, join='/')
-          logStep "Saving section #{hash.keys[0]} to #{section}/#{file} "
-          path = File.join(dir, file)
-
-          begin
-            if i_am_maintainer(path)
-              # File.delete path if File.exists? path
-              File.open path, File::CREAT|File::TRUNC|File::RDWR, 0644 do |f|
-                case format
-                  when /ruby|rb|yaml|yml/
-                    f.write maintainer_comment('')
-                    f.write hash.to_yaml line_width: 1024, indentation: 4, canonical: false
-                  when /json|js/
-                    # You wish ... f.write maintainer_comment('')
-                    f.write JSON.pretty_generate(hash)
-                  else
-                    abort! "Internal: Unsupported format #{format}. Should have noticed this earlier!"
-                end
-                f.close
-              end
-              @logger.info "  decompiled #{section}#{join}#{file}."
-            else
-              @logger.warn "  Did not overwrite #{section}#{join}#{file}."
-            end
-          rescue
-            abort! "!!! Could not write compiled file #{path}: #{$!}"
-          end
-        end
-
       end
     end
   end

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

@@ -11,49 +11,27 @@ 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/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
-            on :O, :overwrite,      'Overwrite existing generated source files. (HINT: Think twice ...)', { as: String, optional_argument: true, default: 'off', match: %r/0|1|yes|no|on|off|enable|disable|set|unset|true|false|raw/i }
-          end
+          parse_options
 
-          @config[:overwrite] = if @opts[:overwrite].downcase.match %r'^(1|true|on|yes|enable|set)$'
-                                  true
-                                else
-                                  false
-                                end
-          @config[:functions] = if @opts[:functions]
-                                  (not @opts[:functions].downcase.match(%r'^(1|true|on|yes|enable|set)$').nil?)
-                                else
-                                  false
-                                end
-          @config[:directory] = @opts[:output]
+          set_config_options
 
-          unless @opts[:template]
-            @logger.error @opts
-            exit
-          end
-          unless @opts[:output].nil?
-            unless File.directory?(@opts[:output])
-              Dir.mkdir(@opts[:output])
+          unless @config[:directory].nil?
+            unless File.directory?(@config[:directory])
+              Dir.mkdir(@config[:directory])
             end
-            unless File.directory?(@opts[:output])
-              @logger.error "Cannot see output directory: #{@opts[:output]}"
-              @logger.error @opts.to_s
+            unless File.directory?(@config[:directory])
+              @logger.error "Cannot see output directory: #{@config[:directory]}"
+              @logger.error @config.to_s
               exit
             end
           end
 
-          load_template @opts[:template]
+          decompiled = load_template @config[:template]
 
-          validate(@items)
+          validate(decompiled)
 
-          output_dir = @opts[:output] || Dir.pwd
-          save_dsl(output_dir)
+          output_dir = @config[:directory] || Dir.pwd
+          save_dsl(output_dir,decompiled)
 
           @logger.step '*** Decompiled Successfully ***'
         end

data/lib/aws/cfn/decompiler/mixins/options.rb

@@ -0,0 +1,35 @@
+module Aws
+  module Cfn
+    module DeCompiler
+      module Options
+
+        def parse_options
+          # noinspection RubySuperCallWithoutSuperclassInspection
+          setup_options
+
+          @opts.on :F, :format=,        'The output format of the components. [JSON|YAML|Ruby]', { as: String, match: @format_regex, default: 'yaml' }
+          @opts.on :s, :specification=, 'The specification file to create.', as: String
+
+          @opts.parse!
+
+          unless @opts[:directory]
+            puts @opts
+            abort! "Missing required option --directory"
+          end
+
+          unless @opts[:template]
+            puts @opts
+            abort! "Missing required option --template"
+          end
+
+        end
+
+        def set_config_options
+          setup_config
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module DeCompiler
-      VERSION = "0.6.0"
+      VERSION = '0.7.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-decompiler
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -78,20 +78,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
 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.
@@ -129,6 +129,7 @@ files:
 - lib/aws/cfn/decompiler.rb
 - lib/aws/cfn/decompiler/base.rb
 - lib/aws/cfn/decompiler/main.rb
+- lib/aws/cfn/decompiler/mixins/options.rb
 - lib/aws/cfn/decompiler/version.rb
 homepage: https://github.com/dldinternet/aws-cfn-decompiler
 licenses: