cfhighlander 0.2.1.alpha.29 → 0.2.1.alpha.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243c9e2f57eb637952b598302942a48d166a3189e0a4a7698d918224cd3193ce
-  data.tar.gz: d20c212d3b8a47a6f64e530ec412644a49f5c6ea3d0c93e506b7aa87cc6347f8
+  metadata.gz: 8270727d240fc67a59aee1024d65559ba511a6e4fc8cddcbb92cfbca8f596d5d
+  data.tar.gz: 9ef339afe459632b9f894f064f1f008e202d0572329009e762e385939e0e2a76
 SHA512:
-  metadata.gz: afbb5e1be2f09e04e577f335a6f3e1155a7ef1688064966253b594199cbe48491e7fb5d49c8efcc9780b736471f51d290b2c510b1718efc3f40f479b94e16648
-  data.tar.gz: 23d771ecf5399a83d25bfd77f3ac3d1c6d5d0989f1f455d54c23a0f04b11015726446f38b1e0645339465735efdfe09d2ccb5cefae9a7f63817598aa56af33d7
+  metadata.gz: 0e083c0ba93e947c211de515119588558e70c6308b495fed0f3513a5fada0b359a0fac540ea02a180a0fca3526be5997fc05983bdc2c0af3720e0c15e4ed22af
+  data.tar.gz: 5971ab0b2b99eb615f923a39bbee02656cbed12b6cbc3f22df91dc83ac2d8fdfef56c559bef8ff3935cd4b1331395cf3b9c0ceb4f212f0db38f8bc513a11052f

data/bin/cfhighlander.rb

@@ -103,7 +103,7 @@ class HighlanderCli < Thor
 
   def cfpublish(component_name)
     compiler = cfcompile(component_name)
-    publisher = Highlander::Publisher::Component.new(compiler.component, false)
+    publisher = Highlander::Publisher::ComponentPublisher.new(compiler.component, false)
     publisher.publishFiles(compiler.cfn_template_paths + compiler.lambda_src_paths)
   end
 
@@ -130,7 +130,7 @@ class HighlanderCli < Thor
     component.distribution_prefix = distribution_prefix unless distribution_prefix.nil?
     component.load
 
-    publisher = Highlander::Publisher::Component.new(component, true)
+    publisher = Highlander::Publisher::ComponentPublisher.new(component, true)
     publisher.publishComponent
   end
 

data/lib/highlander.dsl.component.rb

@@ -16,7 +16,7 @@ module Highlander
     end
 
 
-    class Component < DslBase
+    class Subcomponent < DslBase
 
       attr_accessor :name,
           :template,

data/lib/highlander.dsl.rb

@@ -16,7 +16,7 @@ module Highlander
 
   module Dsl
 
-    class Template < DslBase
+    class HighlanderTemplate < DslBase
 
       attr_accessor :mappings,
           :parameters,
@@ -86,7 +86,7 @@ module Highlander
         puts "Initialize #{name} with template #{template}"
 
         # load component
-        component = Highlander::Dsl::Component.new(self,
+        component = Highlander::Dsl::Subcomponent.new(self,
             name,
             template,
             param_values,
@@ -220,7 +220,7 @@ module Highlander
         }
 
         @dependson_components_templates.each do |template|
-          component = Highlander::Dsl::Component.new(self,
+          component = Highlander::Dsl::Subcomponent.new(self,
               template,
               template,
               {},
@@ -400,7 +400,7 @@ module Highlander
 end
 
 def HighlanderComponent(&block)
-  instance = Highlander::Dsl::Template.new
+  instance = Highlander::Dsl::HighlanderTemplate.new
 
   puts "Processing higlander component #{@name}\n\tLocation:#{@highlander_dsl_path}" +
       "\n\tConfig:#{@config}"
@@ -424,7 +424,7 @@ def HighlanderComponent(&block)
     instance.DistributionPrefix(@distribution_prefix)
   end
 
-  instance.name = @template
+  instance.name = @template.template_name
   instance.instance_eval(&block)
 
 

data/lib/highlander.factory.rb

@@ -1,359 +1,38 @@
 require_relative './highlander.dsl'
+require_relative './highlander.factory.templatefinder'
+require_relative './highlander.model.component'
 require 'fileutils'
 require 'git'
 
-LOCAL_HIGHLANDER_CACHE_LOCATION = "#{ENV['HOME']}/.cfhighlander/components"
 
 module Highlander
 
   module Factory
 
-    class Component
-
-      attr_accessor :component_dir,
-          :config,
-          :highlander_dsl_path,
-          :cfndsl_path,
-          :highlander_dsl,
-          :cfndsl_content,
-          :mappings,
-          :name,
-          :template,
-          :version,
-          :distribution_bucket,
-          :distribution_prefix,
-          :component_files,
-          :cfndsl_ext_files,
-          :lambda_src_files
-
-      def initialize(component_template_name,
-          component_template_version,
-          component_name, component_dir)
-        @template = component_template_name
-        @name = component_name
-        @component_dir = component_dir
-        @mappings = {}
-        @version = component_template_version
-        @distribution_bucket = nil
-        @distribution_prefix = nil
-        @component_files = []
-        @cfndsl_ext_files = []
-        @lambda_src_files = []
-      end
-
-      def load_config()
-        @config = {} if @config.nil?
-        Dir["#{@component_dir}/*.config.yaml"].each do |config_file|
-          puts "Loading config for #{@name}:\n\tread #{config_file} "
-          partial_config = YAML.load(File.read(config_file))
-          unless partial_config.nil?
-            @config.extend(partial_config)
-            @component_files << config_file
-          end
-        end
-      end
-
-
-      def loadDepandantExt()
-        @highlander_dsl.dependson_components.each do |requirement|
-          requirement.component_loaded.cfndsl_ext_files.each do |file|
-            cfndsl_ext_files << file
-          end
-        end
-      end
-
-      # @param [Hash] config_override
-      def load(config_override = nil)
-        if @component_dir.start_with? 'http'
-          raise StandardError, 'http(s) sources not supported yet'
-        end
-
-
-        @highlander_dsl_path = "#{@component_dir}/#{@template}.highlander.rb"
-        @cfndsl_path = "#{@component_dir}/#{@template}.cfndsl.rb"
-        candidate_mappings_path = "#{@component_dir}/*.mappings.yaml"
-        candidate_dynamic_mappings_path = "#{@component_dir}/#{@template}.mappings.rb"
-
-        @cfndsl_ext_files += Dir["#{@component_dir}/ext/cfndsl/*.rb"]
-        @lambda_src_files += Dir["#{@component_dir}/lambdas/**/*"].find_all {|p| not File.directory? p}
-        @component_files += @cfndsl_ext_files
-        @component_files += @lambda_src_files
-
-        @config = {} if @config.nil?
-
-        @config.extend config_override unless config_override.nil?
-        @config['component_version'] = @version unless @version.nil?
-        @config['component_name'] = @name
-        # allow override of components
-        # config_override.each do |key, value|
-        #   @config[key] = value
-        # end unless config_override.nil?
-
-        Dir[candidate_mappings_path].each do |mapping_file|
-          mappings = YAML.load(File.read(mapping_file))
-          @component_files << mapping_file
-          mappings.each do |name, map|
-            @mappings[name] = map
-          end unless mappings.nil?
-        end
-
-        if File.exist? candidate_dynamic_mappings_path
-          require candidate_dynamic_mappings_path
-          @component_files << candidate_dynamic_mappings_path
-        end
-
-        # 1st pass - parse the file
-        @component_files << @highlander_dsl_path
-        @highlander_dsl = eval(File.read(@highlander_dsl_path), binding)
-        # set version if not defined
-        @highlander_dsl.ComponentVersion(@version) unless @version.nil?
-
-
-        if @highlander_dsl.description.nil?
-          @highlander_dsl.Description("#{@highlander_dsl.name} - #{@highlander_dsl.version}")
-        end
-
-        # set (override) distribution options
-        @highlander_dsl.DistributionBucket(@distribution_bucket) unless @distribution_bucket.nil?
-        @highlander_dsl.DistributionPrefix(@distribution_prefix) unless @distribution_prefix.nil?
-
-        if File.exist? @cfndsl_path
-          @component_files << @cfndsl_path
-          @cfndsl_content = File.read(@cfndsl_path)
-          @cfndsl_content.strip!
-          # if there is CloudFormation do [content] end extract only contents
-          ### Regex \s is whitespace
-          match_data = /^CloudFormation do\s(.*)end\s?$/m.match(@cfndsl_content)
-          if not match_data.nil?
-            @cfndsl_content = match_data[1]
-          end
-
-        else
-          @cfndsl_content = ''
-        end
-
-        loadDepandantExt()
-      end
-    end
-
     class ComponentFactory
 
       attr_accessor :component_sources
 
-
       def initialize(component_sources = [])
-        ## First look in local $PWD/components folder
-        ## Then search for cached $HOME/.highlander/components
-        ## Then search in sources given by dsl
-        default_locations = [
-            LOCAL_HIGHLANDER_CACHE_LOCATION,
-            File.expand_path('components'),
-            File.expand_path('.')
-        ]
-        default_locations.each do |predefined_path|
-          component_sources.unshift(predefined_path)
-        end
-
-        @component_sources = component_sources
-      end
-
-      def findTemplateDefault(template_name, component_version)
-        default_lookup_url = 'https://github.com/theonestack'
-        default_lookup_url = ENV['HIGHLANDER_DEFAULT_COMPONENT_GIT_LOOKUP'] if ENV.key? 'HIGHLANDER_DEFAULT_COMPONENT_GIT_LOOKUP'
-
-        git_url = "#{default_lookup_url}/hl-component-#{template_name}"
-
-        if component_version.nil? or component_version.empty? or component_version == 'latest'
-          branch = 'master'
-        else
-          branch = component_version
-        end
-        local_path = "#{LOCAL_HIGHLANDER_CACHE_LOCATION}/#{template_name}/#{component_version}"
-        return findTemplateGit(local_path, template_name, component_version, git_url, branch)
-
-      end
-
-      def findTemplateGit(cache_path, component_name, component_version, git_url, branch)
-        begin
-          cache_path = "#{cache_path}/" unless cache_path.end_with? '/'
-          # if this is snapshot, clean local cache
-          if branch.end_with? '.snapshot'
-            branch = branch.gsub('.snapshot', '')
-            FileUtils.rmtree cache_path if File.exist? cache_path and File.directory? cache_path
-          end
-
-          # if local cache exists, return from cache
-          if not Dir.glob("#{cache_path}*.highlander.rb").empty?
-            # if cache exists, just return from cache
-            component_name = Dir.glob("#{cache_path}*.highlander.rb")[0].gsub(cache_path, '').gsub('.highlander.rb', '')
-            return component_name, cache_path
-          end
-
-          # shallow clone
-          puts "Trying to load #{component_name}/#{component_version} from #{git_url}##{branch} ... "
-          clone_opts = { depth: 1 }
-          clone_opts[:branch] = branch if not (branch.nil? or branch.empty?)
-          Git.clone git_url, cache_path, clone_opts
-          puts "\t .. cached in #{cache_path}\n"
-          # return from cache once it's cloned
-          return findTemplateGit(cache_path, component_name, component_version, git_url, branch)
-        rescue Exception => e
-          STDERR.puts "Failed to resolve component #{component_name}@#{component_version} from #{git_url}"
-          STDERR.puts e
-          return nil
-        end
-      end
-
-      def findTemplateS3(s3_location, component_name, component_version)
-        parts = s3_location.split('/')
-        bucket = parts[2]
-        prefix = parts[3]
-        s3_key = "#{prefix}/#{component_name}/#{component_version}/#{component_name}.highlander.rb"
-        s3_prefix = "#{prefix}/#{component_name}/#{component_version}/"
-        local_destination = "#{LOCAL_HIGHLANDER_CACHE_LOCATION}/#{component_name}/#{component_version}"
-        begin
-          s3 = Aws::S3::Client.new({ region: s3_bucket_region(bucket) })
-          FileUtils.mkdir_p local_destination unless Dir.exist? local_destination
-
-          hl_content = s3.get_object({ bucket: bucket,
-              key: s3_key,
-              response_target: "#{local_destination}/#{component_name}.highlander.rb"
-          })
-          # if code execution got so far we consider file exists and download it locally
-          component_files = s3.list_objects_v2({ bucket: bucket, prefix: s3_prefix })
-          component_files.contents.each {|s3_object|
-            file_name = s3_object.key.gsub(s3_prefix, '')
-            destination_file = "#{local_destination}/#{file_name}"
-            destination_dir = File.dirname(destination_file)
-            print "Caching #{file_name} of #{component_name}@#{component_version} in #{destination_dir} ... "
-
-            FileUtils.mkpath(destination_dir) unless File.exists?(destination_dir)
-            s3.get_object({ bucket: bucket, key: s3_object.key, response_target: destination_file })
-            print " [OK] \n"
-          }
-          return local_destination
-        rescue => e
-          # this handles both nonexisting key and bucket
-          puts("#{component_name} not found in s3://#{bucket}/#{prefix}")
-          STDERR.puts(e.to_s) unless e.message.include? 'does not exist'
-          return nil
-        end
-      end
-
-      # will try and locate template based on git template location
-      # if template location is not git repo, returns nil
-      def tryFindTemplateGit(template_location, template_version)
-        if template_location.include? '#'
-          parts = template_location.split('#')
-          template_location = parts[0]
-          template_version = parts[1]
-        end
-
-        # avoid any nres
-        template_version = '' if template_version.nil?
-
-        # if empty or latest branch is empty
-        if template_version.empty? or template_version == 'latest' or template_version == 'latest.snapshot'
-          branch = ''
-        else
-          # otherwise component version is actual branch
-          branch = template_version
-        end
-
-
-        git_url = nil
-        if template_location.start_with? 'git:'
-          git_url = template_location.gsub('git:', '')
-        elsif template_location.start_with? 'github:'
-          git_url = "https://github.com/#{template_location.gsub('github:', '')}"
-        elsif template_location.start_with? 'github.com:'
-          git_url = "https://github.com/#{template_location.gsub('github.com:', '')}"
-        end
-
-        local_path = "#{LOCAL_HIGHLANDER_CACHE_LOCATION}/#{template_location}/#{template_version}"
-
-        if not git_url.nil?
-          template_name, location = findTemplateGit(local_path, template_location, template_version, git_url, branch)
-          if location.nil?
-            raise "Could not resolve component #{template_location}@#{template_version}"
-          else
-            return template_name, template_version, location
-          end
-        end
-
-        return nil
+        @template_finder = Highlander::Factory::TemplateFinder.new(component_sources)
       end
 
       # Find component and given list of sources
       # @return [Highlander::Factory::Component]
       def loadComponentFromTemplate(template_name, template_version = nil, component_name = nil)
 
-        component_version_s = template_version.nil? ? 'latest' : template_version
-        template_version = nil if template_version == 'latest'
-        component_name = template_name if component_name.nil?
-
-        if template_name.include? '@' and (not template_name.start_with? 'git')
-          parts = template_name.split('@')
-          template_name = parts[0]
-          template_version = parts[1]
-          component_version_s = template_version
-        end
+        template_meta = @template_finder.findTemplate(template_name, template_version)
 
-        # if component specified as git location
-        new_template_name, new_version, candidate_git = tryFindTemplateGit(template_name, component_version_s)
-        return buildComponentFromLocation(new_template_name, new_version, component_name, candidate_git) unless candidate_git.nil?
-
-        # if not git but has .snapshot lookup in default
-        if (not template_version.nil?) and template_version.end_with? '.snapshot'
-          new_template_name, default_candidate = findTemplateDefault(template_name, component_version_s)
-          return buildComponentFromLocation(new_template_name, template_version, component_name, default_candidate) unless default_candidate.nil?
-        end
-
-        # try in all of the component source
-        @component_sources.each do |source|
-          component_full_name = "#{template_name}@#{template_version.nil? ? 'latest' : template_version}"
-          # TODO handle http(s) sources and their download to local
-          if source.start_with?('http')
-            raise StandardError, 'http(s) sources not supported yet'
-          elsif source.start_with?('s3://')
-            # s3 candidate
-
-            s3_candidate = findTemplateS3(source, template_name, component_version_s)
-            if not s3_candidate.nil?
-              # at this point all component files are download to local file system and consumed from there
-              return buildComponentFromLocation(template_name, template_version, component_name, s3_candidate)
-            end
-
-          else
-            # file system candidate
-            candidate = "#{source}/#{template_name}"
-            candidate = "#{candidate}/#{template_version}" unless template_version.nil?
-            candidate_hl_path = "#{candidate}/#{template_name}.highlander.rb"
-            candidate2_hl_path = "#{source}/#{template_name}.highlander.rb"
-            puts "Trying to load #{component_full_name} from #{candidate} ... "
-            if File.exist?(candidate_hl_path)
-              return buildComponentFromLocation(template_name, template_version, component_name, candidate)
-            end
-            puts "Trying to load #{component_full_name} from #{source} ... "
-            if File.exist?(candidate2_hl_path)
-              return buildComponentFromLocation(template_name, template_version, component_name, source)
-            end unless component_version_s != 'latest'
-          end
-        end
+        raise StandardError, "highlander template #{template_name}@#{component_version_s} not located" +
+            " in sources #{@component_sources}" if template_meta.nil?
 
-        # try default component source on github
-        template_name, default_candidate = findTemplateDefault(template_name, component_version_s)
-        return buildComponentFromLocation(template_name, template_version, component_name, default_candidate) unless default_candidate.nil?
+        return buildComponentFromLocation(template_meta, component_name)
 
-        raise StandardError, "highlander template #{template_name}@#{component_version_s} not located" +
-            " in sources #{@component_sources}"
       end
 
-      def buildComponentFromLocation(template_name,
-          template_version,
-          component_name,
-          template_location)
-        component = Component.new(template_name, template_version,  component_name, template_location)
+
+      def buildComponentFromLocation(template_meta, component_name)
+        component = Model::Component.new(template_meta, component_name)
         component.load_config
         return component
       end

data/lib/highlander.factory.templatefinder.rb

@@ -0,0 +1,231 @@
+LOCAL_HIGHLANDER_CACHE_LOCATION = "#{ENV['HOME']}/.cfhighlander/components"
+
+require_relative './highlander.model.templatemeta'
+
+module Highlander
+
+  module Factory
+
+    class TemplateFinder
+
+      def initialize(component_sources = [])
+        ## First look in local $PWD/components folder
+        ## Then search for cached $HOME/.highlander/components
+        ## Then search in sources given by dsl
+        default_locations = [
+            LOCAL_HIGHLANDER_CACHE_LOCATION,
+            File.expand_path('components'),
+            File.expand_path('.')
+        ]
+        default_locations.each do |predefined_path|
+          component_sources.unshift(predefined_path)
+        end
+
+        @component_sources = component_sources
+      end
+
+      def findTemplateDefault(template_name, component_version)
+        default_lookup_url = 'https://github.com/theonestack'
+        default_lookup_url = ENV['HIGHLANDER_DEFAULT_COMPONENT_GIT_LOOKUP'] if ENV.key? 'HIGHLANDER_DEFAULT_COMPONENT_GIT_LOOKUP'
+
+        git_url = "#{default_lookup_url}/hl-component-#{template_name}"
+
+        if component_version.nil? or component_version.empty? or component_version == 'latest'
+          branch = 'master'
+        else
+          branch = component_version
+        end
+        local_path = "#{LOCAL_HIGHLANDER_CACHE_LOCATION}/#{template_name}/#{component_version}"
+        return findTemplateGit(local_path, template_name, component_version, git_url, branch)
+
+      end
+
+      def findTemplateGit(cache_path, component_name, component_version, git_url, branch)
+        begin
+          cache_path = "#{cache_path}/" unless cache_path.end_with? '/'
+          # if this is snapshot, clean local cache
+          if branch.end_with? '.snapshot'
+            branch = branch.gsub('.snapshot', '')
+            FileUtils.rmtree cache_path if File.exist? cache_path and File.directory? cache_path
+          end
+
+          # if local cache exists, return from cache
+          if not Dir.glob("#{cache_path}*.highlander.rb").empty?
+            # if cache exists, just return from cache
+            component_name = Dir.glob("#{cache_path}*.highlander.rb")[0].gsub(cache_path, '').gsub('.highlander.rb', '')
+            return component_name, cache_path
+          end
+
+          # shallow clone
+          puts "Trying to load #{component_name}/#{component_version} from #{git_url}##{branch} ... "
+          clone_opts = { depth: 1 }
+          clone_opts[:branch] = branch if not (branch.nil? or branch.empty?)
+          Git.clone git_url, cache_path, clone_opts
+          puts "\t .. cached in #{cache_path}\n"
+          # return from cache once it's cloned
+          return findTemplateGit(cache_path, component_name, component_version, git_url, branch)
+        rescue Exception => e
+          STDERR.puts "Failed to resolve component #{component_name}@#{component_version} from #{git_url}"
+          STDERR.puts e
+          return nil
+        end
+      end
+
+      def findTemplateS3(s3_location, component_name, component_version)
+        parts = s3_location.split('/')
+        bucket = parts[2]
+        prefix = parts[3]
+        s3_key = "#{prefix}/#{component_name}/#{component_version}/#{component_name}.highlander.rb"
+        s3_prefix = "#{prefix}/#{component_name}/#{component_version}/"
+        local_destination = "#{LOCAL_HIGHLANDER_CACHE_LOCATION}/#{component_name}/#{component_version}"
+        begin
+          s3 = Aws::S3::Client.new({ region: s3_bucket_region(bucket) })
+          FileUtils.mkdir_p local_destination unless Dir.exist? local_destination
+
+          hl_content = s3.get_object({ bucket: bucket,
+              key: s3_key,
+              response_target: "#{local_destination}/#{component_name}.highlander.rb"
+          })
+          # if code execution got so far we consider file exists and download it locally
+          component_files = s3.list_objects_v2({ bucket: bucket, prefix: s3_prefix })
+          component_files.contents.each {|s3_object|
+            file_name = s3_object.key.gsub(s3_prefix, '')
+            destination_file = "#{local_destination}/#{file_name}"
+            destination_dir = File.dirname(destination_file)
+            print "Caching #{file_name} of #{component_name}@#{component_version} in #{destination_dir} ... "
+
+            FileUtils.mkpath(destination_dir) unless File.exists?(destination_dir)
+            s3.get_object({ bucket: bucket, key: s3_object.key, response_target: destination_file })
+            print " [OK] \n"
+          }
+          return local_destination
+        rescue => e
+          # this handles both nonexisting key and bucket
+          puts("#{component_name} not found in s3://#{bucket}/#{prefix}")
+          STDERR.puts(e.to_s) unless e.message.include? 'does not exist'
+          return nil
+        end
+      end
+
+      # will try and locate template based on git template location
+      # if template location is not git repo, returns nil
+      def tryFindTemplateGit(template_location, template_version)
+
+        # avoid any nres
+        template_version = '' if template_version.nil?
+
+        # if empty or latest branch is empty
+        if template_version.empty? or template_version == 'latest' or template_version == 'latest.snapshot'
+          branch = ''
+        else
+          # otherwise component version is actual branch
+          branch = template_version
+        end
+
+
+        git_url = nil
+        if template_location.start_with? 'git:'
+          git_url = template_location.gsub('git:', '')
+        elsif template_location.start_with? 'github:'
+          git_url = "https://github.com/#{template_location.gsub('github:', '')}"
+        elsif template_location.start_with? 'github.com:'
+          git_url = "https://github.com/#{template_location.gsub('github.com:', '')}"
+        end
+
+
+        if not git_url.nil?
+          local_path = "#{LOCAL_HIGHLANDER_CACHE_LOCATION}/#{template_location.gsub(':', '_').gsub(/\/+/, '/')}/#{template_version}"
+          template_name, location = findTemplateGit(local_path, template_location, template_version, git_url, branch)
+          if location.nil?
+            raise "Could not resolve component #{template_location}@#{template_version}"
+          else
+            return template_name, template_version, location
+          end
+        end
+
+        return nil
+      end
+
+      def findTemplate(template_name, template_version)
+        template_version_s = template_version.nil? ? 'latest' : template_version
+        template_version = nil if template_version == 'latest'
+        is_git_template = template_name.start_with? 'git'
+
+        if template_name.include? '@' and (not template_name.start_with? 'git')
+          parts = template_name.split('@')
+          template_name = parts[0]
+          template_version = parts[1]
+          template_version_s = template_version
+        end
+
+        if template_name.include? '#' and (is_git_template)
+          parts = template_name.split('#')
+          template_name = parts[0]
+          template_version = parts[1]
+          template_version_s = template_version
+        end
+
+        # if component specified as git location
+        if is_git_template
+          new_template_name, new_version, candidate_git = tryFindTemplateGit(template_name, template_version_s)
+          return build_meta(new_template_name, new_version, candidate_git) unless candidate_git.nil?
+        end
+
+        # if not git but has .snapshot lookup in default, it is allowed to reference default
+        # snapshots
+        if (not template_version.nil?) and template_version.end_with? '.snapshot'
+          new_template_name, snapshot_candidate_location = findTemplateDefault(template_name, template_version_s)
+          return build_meta(new_template_name, template_version, snapshot_candidate_location) unless snapshot_candidate_location.nil?
+        end
+
+        # try in all of the component sources
+        @component_sources.each do |source|
+          template_full_name = "#{template_name}@#{template_version.nil? ? 'latest' : template_version}"
+          # TODO handle http(s) sources and their download to local
+          if source.start_with?('http')
+            raise StandardError, 'http(s) sources not supported yet'
+          elsif source.start_with?('s3://')
+            # s3 candidate
+
+            s3_candidate = findTemplateS3(source, template_name, template_version_s)
+            # at this point all component files are download to local file system and consumed from there
+            return build_meta(template_name, template_version_s, s3_candidate) unless s3_candidate.nil?
+
+          else
+            # file system candidate
+            candidate = "#{source}/#{template_name}"
+            candidate = "#{candidate}/#{template_version}" unless template_version.nil?
+            candidate_hl_path = "#{candidate}/#{template_name}.highlander.rb"
+            candidate2_hl_path = "#{source}/#{template_name}.highlander.rb"
+            puts "TRACE: Trying to load #{template_full_name} from #{candidate} ... "
+            if File.exist?(candidate_hl_path)
+              return build_meta(template_name, template_version_s, candidate)
+            end
+            puts "TRACE: Trying to load #{template_full_name} from #{source} ... "
+            # if component version is latest it is allowed to search in path
+            # with no version component in it
+            if File.exist?(candidate2_hl_path)
+              return build_meta(template_name, 'latest', source)
+            end unless template_version_s != 'latest'
+          end
+        end
+
+        # try default component source on github
+        template_name, default_candidate = findTemplateDefault(template_name, template_version_s)
+        return build_meta(template_name, template_version_s, default_candidate) unless default_candidate.nil?
+
+        return nil
+      end
+
+      def build_meta(template_name, template_version, template_location)
+        return Highlander::Model::TemplateMetadata.new(
+            template_name: template_name,
+            template_version: template_version,
+            template_location: template_location)
+      end
+
+    end
+
+  end
+
+end

data/lib/highlander.model.component.rb

@@ -0,0 +1,147 @@
+require 'yaml'
+
+module Highlander
+
+  module Model
+
+    class Component
+
+      attr_accessor :component_dir,
+          :config,
+          :highlander_dsl_path,
+          :cfndsl_path,
+          :highlander_dsl,
+          :cfndsl_content,
+          :mappings,
+          :name,
+          :template,
+          :version,
+          :distribution_bucket,
+          :distribution_prefix,
+          :component_files,
+          :cfndsl_ext_files,
+          :lambda_src_files
+
+      def initialize(template_meta, component_name)
+        @template = template_meta
+        @name = component_name
+        @component_dir = template_meta.template_location
+        @mappings = {}
+        @version = template_meta.template_version
+        @distribution_bucket = nil
+        @distribution_prefix = nil
+        @component_files = []
+        @cfndsl_ext_files = []
+        @lambda_src_files = []
+      end
+
+      # load component configuration files
+      def load_config()
+        @config = {} if @config.nil?
+        Dir["#{@component_dir}/*.config.yaml"].each do |config_file|
+          puts "Loading config for #{@name}:\n\tread #{config_file} "
+          partial_config = YAML.load(File.read(config_file))
+          unless partial_config.nil?
+            @config.extend(partial_config)
+            @component_files << config_file
+          end
+        end
+      end
+
+      # load extensions
+      def loadDepandantExt()
+        @highlander_dsl.dependson_components.each do |requirement|
+          requirement.component_loaded.cfndsl_ext_files.each do |file|
+            cfndsl_ext_files << file
+          end
+        end
+      end
+
+      # evaluate components template
+      # @param [Hash] config_override
+      def load(config_override = nil)
+        if @component_dir.start_with? 'http'
+          raise StandardError, 'http(s) sources not supported yet'
+        end
+
+
+        @highlander_dsl_path = "#{@component_dir}/#{@template.template_name}.highlander.rb"
+        @cfndsl_path = "#{@component_dir}/#{@template.template_name}.cfndsl.rb"
+        candidate_mappings_path = "#{@component_dir}/*.mappings.yaml"
+        candidate_dynamic_mappings_path = "#{@component_dir}/#{@template.template_name}.mappings.rb"
+
+        @cfndsl_ext_files += Dir["#{@component_dir}/ext/cfndsl/*.rb"]
+        @lambda_src_files += Dir["#{@component_dir}/lambdas/**/*"].find_all {|p| not File.directory? p}
+        @component_files += @cfndsl_ext_files
+        @component_files += @lambda_src_files
+
+        @config = {} if @config.nil?
+
+        @config.extend config_override unless config_override.nil?
+        @config['component_version'] = @version unless @version.nil?
+        @config['component_name'] = @name
+        @config['template_name'] = @template.template_name
+        @config['template_version'] = @template.template_version
+        # allow override of components
+        # config_override.each do |key, value|
+        #   @config[key] = value
+        # end unless config_override.nil?
+
+        Dir[candidate_mappings_path].each do |mapping_file|
+          mappings = YAML.load(File.read(mapping_file))
+          @component_files << mapping_file
+          mappings.each do |name, map|
+            @mappings[name] = map
+          end unless mappings.nil?
+        end
+
+        if File.exist? candidate_dynamic_mappings_path
+          require candidate_dynamic_mappings_path
+          @component_files << candidate_dynamic_mappings_path
+        end
+
+        # 1st pass - parse the file
+        @component_files << @highlander_dsl_path
+        @highlander_dsl = eval(File.read(@highlander_dsl_path), binding)
+        # set version if not defined
+        @highlander_dsl.ComponentVersion(@version) unless @version.nil?
+
+
+        if @highlander_dsl.description.nil?
+          if template.template_name == @name
+            description = "#{@name}@#{template.template_version} - v#{@highlander_dsl.version}"
+          else
+            description = "#{@name} - v#{@highlander_dsl.version}"
+            description += " (#{template.template_name}@#{template.template_version})"
+          end
+
+          @highlander_dsl.Description(description)
+        end
+
+        # set (override) distribution options
+        @highlander_dsl.DistributionBucket(@distribution_bucket) unless @distribution_bucket.nil?
+        @highlander_dsl.DistributionPrefix(@distribution_prefix) unless @distribution_prefix.nil?
+
+        if File.exist? @cfndsl_path
+          @component_files << @cfndsl_path
+          @cfndsl_content = File.read(@cfndsl_path)
+          @cfndsl_content.strip!
+          # if there is CloudFormation do [content] end extract only contents
+          ### Regex \s is whitespace
+          match_data = /^CloudFormation do\s(.*)end\s?$/m.match(@cfndsl_content)
+          if not match_data.nil?
+            @cfndsl_content = match_data[1]
+          end
+
+        else
+          @cfndsl_content = ''
+        end
+
+        loadDepandantExt()
+      end
+    end
+
+  end
+
+end
+

data/lib/highlander.model.templatemeta.rb

@@ -0,0 +1,25 @@
+module Highlander
+
+  module Model
+
+    class TemplateMetadata
+
+      @template_name
+      @template_version
+      @template_location
+
+      attr_reader :template_location,
+          :template_version,
+          :template_name
+
+      def initialize(template_name:, template_version:, template_location:)
+        @template_name = template_name
+        @template_version = template_version
+        @template_location = template_location
+      end
+
+    end
+
+  end
+
+end

data/lib/highlander.publisher.rb

@@ -5,7 +5,7 @@ module Highlander
 
   module Publisher
 
-    class Component
+    class ComponentPublisher
 
       def initialize(component, cleanup)
         @component = component

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.2.1.alpha.29
+  version: 0.2.1.alpha.32
 platform: ruby
 authors:
 - Nikola Tosic
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -249,8 +249,11 @@ files:
 - lib/highlander.dsl.params.rb
 - lib/highlander.dsl.rb
 - lib/highlander.factory.rb
+- lib/highlander.factory.templatefinder.rb
 - lib/highlander.helper.rb
 - lib/highlander.mapproviders.rb
+- lib/highlander.model.component.rb
+- lib/highlander.model.templatemeta.rb
 - lib/highlander.publisher.rb
 - lib/highlander.validator.rb
 - lib/util/zip.util.rb