aws-cfn-decompiler 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f180799b3fab6757e8326a52443d9ecf0606663b
-  data.tar.gz: c0580cd70f1f96a1e6a92f6f93b4e5f6c85c8eb4
+  metadata.gz: 7aeb28a3e087cf7ada2d2842283f27c34076fa70
+  data.tar.gz: 756e2950012c76c57c6ade2965096d5fe25b265b
 SHA512:
-  metadata.gz: 9707cc9a2f5b7070f30125f631d69a479a342abeba846fb011134883079f730022cc8fd9cc620eb1cb05d11294b47eaede28c902cc8f87bef80b5b6da121b27c
-  data.tar.gz: bb86570d78d67a89bb1b74496de78d1f07f969bec5e59b6b31dc65033062d1b91d8710aea71469c0f10f81cd893379a29c6aead221c3497cb1edb136532c65c6
+  metadata.gz: 2bc4574d3bcbfaaef555a4b6ae54862508f83fe33c0ea25b7235abb399e5b7a1b59d5f967cb1fb7a5928cd6b9dd9cab360217ce43ad876800c7b37290a79ce32
+  data.tar.gz: 9a7d623cf3adfd4f88aeae49a43abe388e1c3a9fa520e37daf05b41d842ff34b3825cccf814e0a3eab896c79d51b1de2dee99e54dcdb42c7775f38c437b4b9d6

data/aws-cfn-decompiler.iml

@@ -10,23 +10,7 @@
     <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-stacker" />
     <orderEntry type="module" module-name="aws-cfn-yats" />
     <orderEntry type="module" module-name="cloudformation-ruby-dsl" />
     <orderEntry type="module-library">

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

@@ -11,18 +11,20 @@ module Aws
       class Base < ::Aws::Cfn::Compiler::Base
         attr_accessor :template
 
-        def save(output_dir)
+        def save_dsl(output_dir)
 
           specification = {}
           format = @opts[:format] rescue 'yaml'
-          if format.match(%r'^ruby|rb$')
+          ruby   = (not format.match(%r'^ruby|rb$').nil?)
+          if ruby
             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|
+          end
+          @items.each do |section, section_items|
+            case section
+              when /Mappings|Parameters|Resources|Outputs/
+                specification[section] = []
+                section_items.each do |name,value|
+                  unless ruby
                     dir  = File.join(output_dir,section.to_s)
                     unless File.directory?(dir)
                       Dir.mkdir(dir)
@@ -31,82 +33,56 @@ module Aws
                     hash = {  name => value }
 
                     save_section(dir, file, format, section, hash)
-                    specification[section] << name
                   end
-                when /AWSTemplateFormatVersion|Description/
-                  specification[section] = section_items
-                else
-                  abort! "Unsupported section '#{section}' in template"
-              end
-
+                  specification[section] << name
+                end
+              when /AWSTemplateFormatVersion|Description/
+                specification[section] = section_items
+              else
+                abort! "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
+          # 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 in #{dir}/")
           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
-            # File.delete path if File.exists? path
-            File.open path, File::CREAT|File::TRUNC|File::RDWR, 0644 do |f|
-              case format
-                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!"
-              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
-            logStep "Loading #{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|js/
-                  @items = JSON.parse(File.read(abs))
-                when /yaml|yml/
-                  @items = YAML.load(File.read(abs))
-                else
-                  abort! "Unsupported file type for specification: #{file}"
+            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
-              abort! "Unable to open template: #{abs}"
+              @logger.warn "  Did not overwrite #{section}#{join}#{file}."
             end
+          rescue
+            abort! "!!! Could not write compiled file #{path}: #{$!}"
           end
         end
 
-        protected
-
       end
     end
   end

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

@@ -18,9 +18,20 @@ module Aws
             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
 
-          @config[:functions] = @opts[:functions].downcase.match %r'^(1|true|on|yes|enable|set)$'
+          @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]
 
           unless @opts[:template]
             @logger.error @opts
@@ -37,12 +48,12 @@ module Aws
             end
           end
 
-          load @opts[:template]
+          load_template @opts[:template]
 
           validate(@items)
 
           output_dir = @opts[:output] || Dir.pwd
-          save(output_dir)
+          save_dsl(output_dir)
 
           @logger.step '*** Decompiled Successfully ***'
         end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-decompiler
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Christo De Lange