aws-cfn-compiler 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4c8c959284b6eeb3ea842006bef5e84d757dd75
-  data.tar.gz: 5b041c03ec96962c8c91fd8cce3e665ef7f1d49d
+  metadata.gz: 592aa0b88be9d7d1ad4cf61f894ea8b4cdbe66a1
+  data.tar.gz: a13ea148dd882a2cf11352cd0ceabc4d309afe6e
 SHA512:
-  metadata.gz: e68bb6fe5d38440a517c70682a8e05d73fc1aa9eefb1f78067b90aa3c8e66056fab90aeb96a33081a2db93316e03d16f1864a4553a258c1ea4e74428dfa27a9a
-  data.tar.gz: 8a5dd7da0e46dbb32a84054324b22646a8db0742f7256f9999a93d21488dc8e9bf462188a748457f2754b6cca263340ea308f85cc204fccd5fefb30c8a08dee7
+  metadata.gz: 1a707d5598d57e097bba7ed293058f459e3e3108255a0da1a542bde2446cf4ba4cd5c5e8dccbf27740a074e57885c814fb30625ce77ebaa3344a10c37c188098
+  data.tar.gz: 0e9fe3a2e7a54d848c57dc9029a7abe569865755beb299db9e4e16f99dae0f93ec224ad5323ae068cee9c3b6a5d5334299184a1a7f0cf0c67c981ae89a532da2

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = "0.0.8"
+      VERSION = "0.1.0"
     end
   end
 end

data/lib/aws/cfn/compiler.rb

@@ -51,16 +51,16 @@ module Aws
               Outputs:                  @items['outputs'],
           }
 
-          output_file = @opts[:output] || 'compiled.json'
-          puts
-          puts "Writing compiled file to #{output_file}..."
-          save(compiled, output_file)
-
           puts
           puts 'Validating compiled file...'
 
           validate(compiled)
 
+          output_file = @opts[:output] || 'compiled.json'
+          puts
+          puts "Writing compiled file to #{output_file}..."
+          save(compiled, output_file)
+
           puts
           puts '*** Compiled Successfully ***'
         end
@@ -122,7 +122,7 @@ module Aws
               raise "Unable to open specification: #{abs}"
             end
           end
-          %w{params mappings resources outputs}.each do |dir|
+          %w{Params Mappings Resources Outputs}.each do |dir|
             load_dir(dir,spec)
           end
         end
@@ -153,9 +153,18 @@ module Aws
 
         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|
+          set = []
+          if File.directory?(File.join(@opts[:directory], dir))
+            @items[dir] = {}
+            set = get_file_set(dir)
+          else
+            if File.directory?(File.join(@opts[:directory], dir.downcase))
+              @items[dir] = {}
+              set = get_file_set(dir.downcase)
+            end
+          end
+          set.collect do |filename|
             next unless filename =~ /\.(json|ya?ml)\z/i
             if spec and spec[dir]
               base = File.basename(filename).gsub(%r/\.(rb|yaml)/, '')
@@ -183,6 +192,10 @@ module Aws
           end
         end
 
+        def get_file_set(dir)
+          Dir[File.join(@opts[:directory], "#{dir}.*")] | Dir[File.join(@opts[:directory], dir, "**", "*")]
+        end
+
       end
     end
   end

metadata

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