aws-cfn-compiler 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e475a82e8e4ec0c15474b19670a80d0248cdb438
-  data.tar.gz: 68511f24b75c51d805292ca3a3843944d064c0d0
+  metadata.gz: 673fc4ca1fb32bdf4d0cd901c871f90ac7ad5190
+  data.tar.gz: 279e4d973d987754067c8cd953bacb94a692d220
 SHA512:
-  metadata.gz: 9f34e56e832af14e2153713f10d2e2b7193aa68f75b416100141c40214f59ae4fc48fdd1a1cca06996e9a51f43118594055baebbb964740ae22e466bd86757b6
-  data.tar.gz: 46dfbb1fde0098468d40778996324c8a5b7a734ad94be1d3e8044784f33e65c72bd12599978eea50943ee91fe145803cc0b146da3ee7239591f0ef5d2b5d6ec4
+  metadata.gz: 7b2f4148f025221973449b2023b47288245ac36628cc67cc87a83f2fbd618f06668184813d868b515ce52c2094817ef8552f797f7b73bc3f357d9508839fa09a
+  data.tar.gz: 824819dad7a1c603df967fd082eb1e8d58a6a1d8f4bbba95ff3c0d4b98bfaef87ddaccff7487aa3bfa7b4787cc992ae21a30d0de2411e81d4add7db6bcc74b08

data/aws-cfn-compiler.iml

@@ -6,20 +6,23 @@
   <component name="FacetManager">
     <facet type="gem" name="Ruby Gem">
       <configuration>
-        <option name="GEM_APP_ROOT_PATH" value="" />
+        <option name="GEM_APP_ROOT_PATH" value="$MODULE_DIR$" />
         <option name="GEM_APP_TEST_PATH" value="" />
-        <option name="GEM_APP_LIB_PATH" value="" />
+        <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$" />
-    <orderEntry type="jdk" jdkName="RVM: ruby-2.1.2" jdkType="RUBY_SDK" />
+    <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p547 [aws-cfn-compile]" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <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="bundler (v1.6.2, RVM: ruby-2.1.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="slop (v3.5.0, RVM: ruby-2.1.2) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="awesome_print (v1.2.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.6.2, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="psych (v2.0.5, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.1.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="slop (v3.5.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
   </component>
 </module>
 

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

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

data/lib/aws/cfn/compiler.rb

@@ -11,6 +11,7 @@ module Aws
       class Main
         attr_accessor :items
         attr_accessor :opts
+        attr_accessor :spec
 
         def initialize
           @items = {}
@@ -21,6 +22,7 @@ module Aws
           @opts = Slop.parse(help: true) do
             on :d, :directory=, 'The directory to look in', as: String
             on :o, :output=, 'The JSON file to output', as: String
+            on :s, :specification=, 'The specification to use when selecting components. A JSON or YAML file or JSON object', as: String
           end
 
           unless @opts[:directory]
@@ -28,43 +30,45 @@ module Aws
             exit
           end
 
-          load
+          load @opts[:specification]
 
           compiled = {
-              AWSTemplateFormatVersion: "2010-09-09",
-              Description:              "Description goes here",
+              AWSTemplateFormatVersion: '2010-09-09',
+              Description:              'Description goes here',
               Parameters:               @items['params'],
               Mappings:                 @items['mappings'],
               Resources:                @items['resources'],
               Outputs:                  @items['outputs'],
           }
 
-          output_file = @opts[:output] || "compiled.json"
+          output_file = @opts[:output] || 'compiled.json'
           puts
           puts "Writing compiled file to #{output_file}..."
           save(compiled, output_file)
 
           puts
-          puts "Validating compiled file..."
+          puts 'Validating compiled file...'
 
           validate(compiled)
 
           puts
-          puts "*** Compiled Successfully ***"
+          puts '*** Compiled Successfully ***'
         end
 
         def validate(compiled)
-          names = compiled["Resources"].keys + compiled["Parameters"].keys
+          raise 'No resources!?' unless compiled[:Resources]
+          raise 'No parameters!?' unless compiled[:Parameters]
+          names = compiled[:Resources].keys + compiled[:Parameters].keys
           refs = find_refs(compiled).select { |a| !(a =~ /^AWS::/) }
 
           unless (refs-names).empty?
-            puts "!!! Unknown references !!!"
+            puts '!!! Unknown references !!!'
             (refs-names).each do |name|
               puts "  #{name}"
             end
             abort!
           end
-          puts "  References validated"
+          puts '  References validated'
         end
 
         def save(compiled, output_file)
@@ -72,23 +76,50 @@ module Aws
             File.open output_file, 'w' do |f|
               f.write JSON.pretty_generate(compiled)
             end
-            puts "  Compiled file written."
+            puts '  Compiled file written.'
           rescue
             puts "!!! Could not write compiled file: #{$!}"
             abort!
           end
         end
 
-        def load
+        def load(spec=nil)
+          if spec
+            begin
+              abs = File.absolute_path(File.expand_path(spec))
+              unless File.exists?(abs)
+                abs = File.absolute_path(File.expand_path(File.join(@opts[:directory],spec)))
+              end
+            rescue
+              # pass
+            end
+            if File.exists?(abs)
+              raise "Unsupported specification file type" unless abs =~ /\.(json|ya?ml)\z/i
+
+              puts "Loading specification #{abs}..."
+              spec = File.read(abs)
+
+              case File.extname(File.basename(abs)).downcase
+                when /json/
+                  spec = JSON.parse(spec)
+                when /yaml/
+                  spec = YAML.load(spec)
+                else
+                  raise "Unsupported file type for specification: #{spec}"
+              end
+            else
+              raise "Unable to open specification: #{abs}"
+            end
+          end
           %w{params mappings resources outputs}.each do |dir|
-            load_dir(dir)
+            load_dir(dir,spec)
           end
         end
 
         protected
 
         def abort!
-          puts "!!! Aborting !!!"
+          puts '!!! Aborting !!!'
           exit
         end
 
@@ -98,7 +129,7 @@ module Aws
             hash.keys.collect do |key|
               if %w{Ref SourceSecurityGroupName CacheSecurityGroupNames SecurityGroupNames}.include? key
                 hash[key]
-              elsif "Fn::GetAtt" == key
+              elsif 'Fn::GetAtt' == key
                 hash[key].first
               else
                 find_refs(hash[key])
@@ -109,11 +140,17 @@ module Aws
           end
         end
 
-        def load_dir(dir)
+        def load_dir(dir,spec=nil)
           puts "Loading #{dir}..."
           @items[dir] = {}
+          raise "No such directory: #{@opts[:directory]}" unless File.directory?(@opts[:directory])
           (Dir[File.join(@opts[:directory], "#{dir}.*")] | Dir[File.join(@opts[:directory], dir, "**", "*")]).collect do |filename|
             next unless filename =~ /\.(json|ya?ml)\z/i
+            if spec and spec[dir]
+              base = File.basename(filename).gsub(%r/\.(rb|yaml)/, '')
+              next unless spec[dir].include?(base)
+              puts "\tUsing #{dir}/#{base}"
+            end
             begin
               puts "  reading #{filename}"
               content = File.read(filename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - PKinney