aws-cfn-compiler 0.8.10 → 0.9.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmJlYzZjZDIwYzc4YzhiZWYxYjA4ZjgwZGI2NjIzNTBhNWEyNjdhNg==
+    MjUzMDEzY2Q4MDYwNjZkYzZmZWYyOTZmNTYxNTQxOTAyNzdiOTU3Yw==
   data.tar.gz: !binary |-
-    MzEyNzI0NDI2YWQwYzViYzhiM2M2MzFiZjAyMjE5MGZhMzFhMDA4Yg==
+    MmE3YmQ0MmFkZTI2ZmZjOTJhNjM0ZGZlMjI0YzUyZTAyMmRhMTdiMw==
 SHA512:
   metadata.gz: !binary |-
-    ZDY0NzZjMWE0YzNmMjZkZDk4ZjFhMmY3YzFkYmJjYTA5ZTQwNzkwZmM4YTRk
-    YTc1Zjk0ODdiZmM2YjBhNDEyN2M1NGZiOWFlZDgyNGE3NWYzNWYzYjgwODU2
-    ZTkzMzkyOWFjMzI4OTAzZTMzNDFhNjQ1ZjQwY2IwMDY5MTU5YjA=
+    MmNiMDAyMDBmNzIzNWRiNGExODZhMzY5NjQ4NzRhMjBiYmFkNTlkOWJhNTc0
+    ODc2YTk3NzA5ZWI2MmUzNDg0M2I3ODVlNmE3ZTljZWZlMDgxMGY5YzU0ZTE3
+    MTdhZjFlMjJjMGNlNTljZjFiYTRhOGE1MTY4ODhhMDRlYzg4MTI=
   data.tar.gz: !binary |-
-    ZTc1Y2VmMzAxOWMwZTZiNzUzMTk2OWY3ZTRiNjQxZGVkYjUxZTBiYjA0NTFi
-    MTgzNDRmOTNjM2I5YmE0ODYxMmEyYmU5OTEyNjE2ZWRlMmQ3ZDI2ZjRlZGJm
-    ODZmNjVhZWEwMThiN2EwY2I3YjBiMjlhNmFiYjFlYmE2YmQ3OTQ=
+    MmRkNDU0Zjk5ODYwMjE1YTcwZjllYThmMWYwNDRlYmUyODNjZGE4NzEzYTgy
+    ZTA2OWEyMzI3YjAwNzQxZWRjYjRjMzVhMzk3NjM3MzgxNjVhMGVjZjc2NjNk
+    MThjYTliMDk3NmNjMjc3ZjdkOTQzMDFlMDk5MDM5MTIxZGUwZmM=

data/aws-cfn-compiler.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json'
   spec.add_dependency 'slop'
   spec.add_dependency 'inifile'
-  spec.add_dependency 'aws-cfn-dsl', '>= 0.8.0'
-  spec.add_dependency 'dldinternet-mixlib-cli', '>= 0.1.0'
-  spec.add_dependency 'dldinternet-mixlib-logging', '>= 0.3.0'
+  spec.add_dependency 'aws-cfn-dsl', '>= 0.9.0'
+  spec.add_dependency 'dldinternet-mixlib-cli', '>= 0.2.0'
+  spec.add_dependency 'dldinternet-mixlib-logging', '>= 0.4.0'
 
 end

data/bin/cfn-compiler

@@ -4,7 +4,7 @@ require 'rubygems'
 
 path = File.dirname(__FILE__)
 if File.exists?("#{path}/../.gitignore")
-  %w(aws-cfn-decompiler aws-cfn-compiler aws-cfn-dsl cloudformation-ruby-dsl dldinternet-mixlib-logging).each do |mod|
+  %w(aws-cfn-decompiler aws-cfn-compiler aws-cfn-dsl cloudformation-ruby-dsl dldinternet-mixlib-logging dldinternet-mixlib-cli).each do |mod|
     add_path = File.expand_path(File.join(path, "../../#{mod}", "lib"))
     $:.unshift(add_path)
   end

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

@@ -116,7 +116,7 @@ module Aws
         def load_spec(spec=nil)
           if spec
             abs = nil
-            [spec, File.join(@config[:directory],spec)].each do |p|
+            [spec, File.join(@config[:brick_path_list],spec)].flatten.each do |p|
               begin
                 abs = File.realpath(File.absolute_path(File.expand_path(p)))
                 break if File.exists?(abs)
@@ -143,7 +143,7 @@ module Aws
                   abort! "Unsupported file type for specification: #{spec}"
               end
             else
-              abort! 'Unable to open specification'+ (abs.nil? ? " or {,#{@config[:directory]}/}#{spec} not found" : ": #{abs}")
+              abort! 'Unable to open specification'+ (abs.nil? ? " or {.,#{@config[:brick_path_list].join(',')}/}#{spec} not found" : ": #{abs}")
             end
           else
             abort! 'No specification provided'

data/lib/aws/cfn/compiler/mixins/compile.rb

@@ -134,11 +134,22 @@ module Aws
             ref = match[2]
             # noinspection RubyParenthesesAroundConditionInspection
             if (subm = match[1].match(%r'^(.+?)/(.+)$'))
-              path = File.join(File.dirname(@config[:directory]),subm[1])
+              @config[:brick_path_list].each do |p|
+                path = File.join(p,subm[1]) # File.dirname(@config[:directory])
+                unless File.directory?(path)
+                  path = nil
+                end
+              end
               sub = subm[2]
             else
               # sub = nil
-              path = File.join(File.dirname(@config[:directory]),match[1])
+              # path = File.join(File.dirname(@config[:directory]),match[1])
+              @config[:brick_path_list].each do |p|
+                path = File.join(p,match[1]) # File.dirname(@config[:directory])
+                unless File.directory?(path)
+                  path = nil
+                end
+              end
             end
           else
             # Otherwise it is what it seems ;)

data/lib/aws/cfn/compiler/mixins/load.rb

@@ -55,26 +55,40 @@ module Aws
         end
 
         def vet_path(dir,base=nil,rel=false)
-          if rel
-            base = File.realpath(File.expand_path(File.join(@config[:directory], base)))
-          else
-            base = @config[:directory] unless base
-          end
           path = nil
-          [dir, dir.downcase].each do |d|
-            path = File.join(base, dir)
+          @config[:brick_path_list].each do |p|
+            if rel
+              # base = File.realpath(File.expand_path(File.join(@config[:directory], base)))
+              base = File.realpath(File.expand_path(File.join(p, base)))
+            else
+              base = p unless base
+            end
+            [dir, dir.downcase].each do |d|
+              path = File.join(base, dir)
+              if File.directory?(path)
+                break
+              end
+            end
             if File.directory?(path)
               break
             end
           end
+          patn = path
+          unless @config[:expandedpaths]
+            patn = short_path(path)
+          end
+
           unless File.directory?(path)
-            @logger.error "  !! error: Cannot load bricks from #{path} (started with #{File.join(base, dir)}')"
+            @logger.error "  !! error: Cannot load bricks from #{patn} with brick path: \n\t#{@config[:brick_path_list].join("\n\t")} \n(started with #{File.join(base, dir)}')"
             abort!
           end
           path
         end
 
-
+        def short_path(path,n=2)
+          patn = path.split(File::SEPARATOR)[0-n..-1]
+          patn = patn.join(File::SEPARATOR)
+        end
       end
     end
   end

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

@@ -8,6 +8,7 @@ module Aws
 
           setup_options
 
+          @opts.on :b, :brick_path=,    'A list of paths to template components (bricks). May also set as the BRICK_PATH environment variable.', as: String
           @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 to use when selecting components. A JSON or YAML file', { as: String
           }
@@ -39,8 +40,75 @@ module Aws
 
           @config[:precedence]    = @opts[:precedence].split(%r',+\s*').reverse
 
+          @optional             ||= {}
+          @optional[:directory]   = true
           setup_config
 
+          if @config[:brick_path]
+            brick_path = @config[:brick_path]
+          elsif ENV['BRICK_PATH']
+            brick_path = ENV['BRICK_PATH']
+          else
+            brick_path = @config[:directory]
+          end
+          if brick_path
+            @config[:brick_path_list] = parseList(brick_path,':','parsePath')
+
+            mia = []
+            @config[:brick_path_list].each do |path|
+              unless File.directory? path
+                mia << path
+              end
+            end
+
+            if mia.size > 0
+              hints = []
+              mia.each do |p|
+                hints << hint_paths(p,Dir.pwd)
+              end
+              hints.flatten!
+              abort! "Invalid brick path: #{brick_path}! #{mia.size > 1 ? 'These' : 'This'} path#{mia.size > 1 ? 's' : ''} does not exist or cannot be read!\n #{mia.join("\n\t")}
+Did you mean one of these? #{@config[:expandedpaths] ? "(Above #{Dir.pwd})" : ""}
+\t#{hints.join("\n\t")}\n"
+            end
+          end
+
+        end
+
+        def hint_paths(p,pwd,n=0,rel='',f=nil)
+          hints = []
+          d = p
+          until File.directory?(d)
+            if d == '.'
+              return hints
+            end
+            d = File.dirname(d)
+          end
+          unless f
+            q = d
+            Range.new(1,n).each do
+              d = File.dirname(d)
+            end
+            f = File.basename(p)
+            r = pwd.gsub(%r'^#{q}','').split(File::SEPARATOR)
+            if r.size > 0
+              r = r[1..-1]
+            end
+            if r.size > 0
+              rel = r.map{|_| '..'}.join(File::SEPARATOR)
+            end
+            pwd = d
+          end
+          Dir.glob("#{d}/*").each do |path|
+            if File.directory?(path)
+              if path.match %r'/#{f}'
+                hints << File.join(rel,path.gsub(%r'^#{File.dirname(d)}',''))
+              else
+                hints << hint_paths(path,pwd,n,rel,f)
+              end
+            end
+          end
+          hints.flatten
         end
 
       end

data/lib/aws/cfn/compiler/mixins/parse.rb

@@ -15,7 +15,6 @@ module Aws
           logStep "Parsing #{section}..."
 
           if spec and spec[section]
-            abort! "No such directory: #{@config[:directory]} (I am here: #{Dir.pwd})" unless File.directory?(@config[:directory])
             @items          ||= {}
             @items[section] ||= {}
             get  = {}
@@ -28,6 +27,7 @@ module Aws
               else
                 path = vet_path(sub ? sub : section, refp, rel)
               end
+              abort! "No such directory: #{path} (I am here: #{Dir.pwd})" unless File.directory?(path)
               unless get[path]
                 get[path] = get_file_set([".*"], path, @config[:precedence])
               end
@@ -84,10 +84,11 @@ module Aws
           Aws::Cfn::Compiler.binding ||= {}
           Aws::Cfn::Compiler.binding[section] ||= {}
           Aws::Cfn::Compiler.binding[section][base] ||= {
-              brick_path: @config[:directory],
-              template:   @dsl,
-              logger:     @logger,
-              compiler:   self
+              brick_path:       @config[:brick_path],
+              brick_path_list:  @config[:brick_path_list],
+              template:         @dsl,
+              logger:           @logger,
+              compiler:         self
           }
           source_file = File.expand_path(filename)
           begin

data/lib/aws/cfn/compiler/mixins/save.rb

@@ -72,7 +72,7 @@ module Aws
               end
               @logger.info "  saved #{filn}."
             rescue
-              abort! "!!! Could not write file #{path}: #{$!}"
+              abort! "!!! Could not write file #{path}: \nException: #{$!}\nParent directory exists? #{File.directory?(File.dirname(path))}\n"
             end
           else
             @logger.warn "  Did not overwrite #{filn}."

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = '0.8.10'
+      VERSION = '0.9.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.9.1
 platform: ruby
 authors:
 - PKinney
@@ -92,42 +92,42 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: dldinternet-mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: dldinternet-mixlib-logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 description: The idea is to create a folder structure to better manage pieces of a
   CloudFormation deployment. Additionally, writing in JSON is hard, so the compiler
   takes YAML files as well.