cfhighlander 0.2.1.alpha.32 → 0.2.1.alpha.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8270727d240fc67a59aee1024d65559ba511a6e4fc8cddcbb92cfbca8f596d5d
-  data.tar.gz: 9ef339afe459632b9f894f064f1f008e202d0572329009e762e385939e0e2a76
+  metadata.gz: 57345cb7494a630f82ccc0be2eab077f1362a5d5bf3bea22619ad17e43f7297c
+  data.tar.gz: aefc4bebf4b709dd299c5f7a79c266674a4697f9ef64bd1b87d11ea0c031ec30
 SHA512:
-  metadata.gz: 0e083c0ba93e947c211de515119588558e70c6308b495fed0f3513a5fada0b359a0fac540ea02a180a0fca3526be5997fc05983bdc2c0af3720e0c15e4ed22af
-  data.tar.gz: 5971ab0b2b99eb615f923a39bbee02656cbed12b6cbc3f22df91dc83ac2d8fdfef56c559bef8ff3935cd4b1331395cf3b9c0ceb4f212f0db38f8bc513a11052f
+  metadata.gz: cea97fa74dcf7bec3d87d559499a674cc1a4546502c7a14f589f6bbfef73dbe74a1f8d2ebb21d7f0ee69438fd35b222590d01f3e35d95e922430ea2d2f09ccc0
+  data.tar.gz: d16b3eaab44a8a08754768106de95c7d412c8a449902f4ca9279e536422f164c9667deb95f74fcb5c012f4b34e8a2a46bdc435cfe6db9ead84830c89fb3b702b

data/bin/cfhighlander.rb

@@ -9,10 +9,10 @@
 
 require 'thor'
 require 'rubygems'
-require_relative '../lib/highlander.compiler'
-require_relative '../lib/highlander.factory'
-require_relative '../lib/highlander.publisher'
-require_relative '../lib/highlander.validator'
+require_relative '../lib/cfhighlander.compiler'
+require_relative '../lib/cfhighlander.factory'
+require_relative '../lib/cfhighlander.publisher'
+require_relative '../lib/cfhighlander.validator'
 
 class HighlanderCli < Thor
 
@@ -25,12 +25,12 @@ class HighlanderCli < Thor
   def configcompile(template_name)
 
     # find and load component
-    component_loader = Highlander::Factory::ComponentFactory.new
+    component_loader = Cfhighlander::Factory::ComponentFactory.new
     component = component_loader.loadComponentFromTemplate(template_name)
     component.load
 
     # compile cfndsl template
-    component_compiler = Highlander::Compiler::ComponentCompiler.new(component)
+    component_compiler = Cfhighlander::Compiler::ComponentCompiler.new(component)
     component_compiler.writeConfig(true)
   end
 
@@ -50,7 +50,7 @@ class HighlanderCli < Thor
     component = build_component(options, component_name)
 
     # compile cfndsl template
-    component_compiler = Highlander::Compiler::ComponentCompiler.new(component)
+    component_compiler = Cfhighlander::Compiler::ComponentCompiler.new(component)
     component_compiler.silent_mode = options[:quiet]
     out_format = options[:format]
     component_compiler.compileCfnDsl out_format
@@ -75,12 +75,12 @@ class HighlanderCli < Thor
     component = build_component(options, component_name)
 
     # compile cloud formation
-    component_compiler = Highlander::Compiler::ComponentCompiler.new(component)
+    component_compiler = Cfhighlander::Compiler::ComponentCompiler.new(component)
     component_compiler.silent_mode = options[:quiet]
     out_format = options[:format]
     component_compiler.compileCloudFormation out_format
     if options[:validate]
-      component_validator = Highlander::Cloudformation::Validator.new(component)
+      component_validator = Cfhighlander::Cloudformation::Validator.new(component)
       component_validator.validate(component_compiler.cfn_template_paths, out_format)
     end
     component_compiler
@@ -103,7 +103,7 @@ class HighlanderCli < Thor
 
   def cfpublish(component_name)
     compiler = cfcompile(component_name)
-    publisher = Highlander::Publisher::ComponentPublisher.new(compiler.component, false)
+    publisher = Cfhighlander::Publisher::ComponentPublisher.new(compiler.component, false)
     publisher.publishFiles(compiler.cfn_template_paths + compiler.lambda_src_paths)
   end
 
@@ -123,14 +123,14 @@ class HighlanderCli < Thor
     distribution_prefix = options[:dstprefix]
 
     # find and load component
-    component_loader = Highlander::Factory::ComponentFactory.new
+    component_loader = Cfhighlander::Factory::ComponentFactory.new
     component = component_loader.loadComponentFromTemplate(template_name)
     component.version = component_version
     component.distribution_bucket = distribution_bucket unless distribution_bucket.nil?
     component.distribution_prefix = distribution_prefix unless distribution_prefix.nil?
     component.load
 
-    publisher = Highlander::Publisher::ComponentPublisher.new(component, true)
+    publisher = Cfhighlander::Publisher::ComponentPublisher.new(component, true)
     publisher.publishComponent
   end
 
@@ -144,7 +144,7 @@ def build_component(options, template_name)
   distribution_prefix = options[:dstprefix]
 
   # find and load component
-  component_loader = Highlander::Factory::ComponentFactory.new
+  component_loader = Cfhighlander::Factory::ComponentFactory.new
   component = component_loader.loadComponentFromTemplate(template_name)
   component.version = component_version unless component_version.nil?
   component.distribution_bucket = distribution_bucket unless distribution_bucket.nil?

data/hl_ext/mapping_helper.rb

@@ -1,14 +1,16 @@
-require_relative '../lib/highlander.mapproviders'
+require_relative '../lib/cfhighlander.mapproviders'
 
 # Return mapping provider as class
-def mappings_provider(provider_name)
+def mappings_provider(provider_name, is_legacy = false)
   return nil if provider_name.nil?
   provider = nil
-  providers = Object.const_get('Highlander').const_get('MapProviders')
+  module_name = is_legacy ? 'Highlander': 'Cfhighlander'
+  providers = Object.const_get(module_name).const_get('MapProviders')
   begin
     providers.const_get(provider_name)
   rescue NameError => e
-    if e.to_s.include? 'uninitialized constant Highlander::MapProviders::'
+    if e.to_s.include? "uninitialized constant #{module_name}::MapProviders::"
+      return mappings_provider(provider_name, true) unless is_legacy
       return nil
     end
     STDERR.puts(e.to_s)

data/lib/{highlander.compiler.rb → cfhighlander.compiler.rb}

@@ -12,7 +12,7 @@ require 'highline/import'
 require 'zip'
 require_relative './util/zip.util'
 
-module Highlander
+module Cfhighlander
 
   module Compiler
 
@@ -50,7 +50,7 @@ module Highlander
         end
 
         @component.highlander_dsl.components.each do |sub_component|
-          sub_component_compiler = Highlander::Compiler::ComponentCompiler.new(sub_component.component_loaded)
+          sub_component_compiler = Cfhighlander::Compiler::ComponentCompiler.new(sub_component.component_loaded)
           sub_component_compiler.component_name = sub_component.name
           @sub_components << sub_component_compiler
         end
@@ -281,7 +281,7 @@ module Highlander
               end
             end
             File.delete full_destination_path if File.exist? full_destination_path
-            zip_generator = Highlander::Util::ZipFileGenerator.new(lambda_source_dir, full_destination_path)
+            zip_generator = Cfhighlander::Util::ZipFileGenerator.new(lambda_source_dir, full_destination_path)
             zip_generator.write
 
           end

data/lib/{highlander.dsl.base.rb → cfhighlander.dsl.base.rb}

@@ -1,5 +1,5 @@
 
-module Highlander
+module Cfhighlander
 
   module Dsl
     class DslBase
@@ -15,7 +15,7 @@ module Highlander
           raise StandardError, "#{self} no config!"
         end
         return @config["#{method}"] unless @config["#{method}"].nil?
-        raise StandardError, "#{self}Unknown method or variable #{method} in Highlander template"
+        raise StandardError, "#{self} Unknown method or variable #{method} in Cfhighlander template"
       end
 
     end

data/lib/{highlander.dsl.component.rb → cfhighlander.dsl.component.rb}

@@ -1,8 +1,8 @@
-require_relative './highlander.helper'
-require_relative './highlander.dsl.base'
-require_relative './highlander.factory'
+require_relative './cfhighlander.helper'
+require_relative './cfhighlander.dsl.base'
+require_relative './cfhighlander.factory'
 
-module Highlander
+module Cfhighlander
 
   module Dsl
 
@@ -65,7 +65,7 @@ module Highlander
         build_distribution_url
 
         # load component
-        factory = Highlander::Factory::ComponentFactory.new(@component_sources)
+        factory = Cfhighlander::Factory::ComponentFactory.new(@component_sources)
         @component_loaded = factory.loadComponentFromTemplate(
             @template,
             @template_version,
@@ -116,7 +116,7 @@ module Highlander
       def load_parameters
         component_dsl = @component_loaded.highlander_dsl
         component_dsl.parameters.param_list.each do |component_param|
-          param = Highlander::Dsl::SubcomponentParameter.new
+          param = Cfhighlander::Dsl::SubcomponentParameter.new
           param.name = component_param.name
           param.cfndsl_value = SubcomponentParamValueResolver.resolveValue(
               @parent,
@@ -135,16 +135,16 @@ module Highlander
 
         # check if there are values defined on component itself
         if sub_component.param_values.key?(param.name)
-          return Highlander::Helper.parameter_cfndsl_value(sub_component.param_values[param.name])
+          return Cfhighlander::Helper.parameter_cfndsl_value(sub_component.param_values[param.name])
         end
 
-        if param.class == Highlander::Dsl::StackParam
+        if param.class == Cfhighlander::Dsl::StackParam
           return self.resolveStackParamValue(component, sub_component, param)
-        elsif param.class == Highlander::Dsl::ComponentParam
+        elsif param.class == Cfhighlander::Dsl::ComponentParam
           return self.resolveComponentParamValue(component, sub_component, param)
-        elsif param.class == Highlander::Dsl::MappingParam
+        elsif param.class == Cfhighlander::Dsl::MappingParam
           return self.resolveMappingParamValue(component, sub_component, param)
-        elsif param.class == Highlander::Dsl::OutputParam
+        elsif param.class == Cfhighlander::Dsl::OutputParam
           return self.resolveOutputParamValue(component, sub_component, param)
         else
           raise "#{param.class} not resolvable to parameter value"

data/lib/{highlander.dsl.params.rb → cfhighlander.dsl.params.rb}

@@ -1,6 +1,6 @@
-require_relative './highlander.dsl.base'
+require_relative './cfhighlander.dsl.base'
 
-module Highlander
+module Cfhighlander
 
   module Dsl
     class Parameters < DslBase

data/lib/{highlander.dsl.rb → cfhighlander.dsl.rb}

@@ -8,11 +8,11 @@ Dir["#{extensions_folder}/*.rb"].each { |f|
 
 # require libraries
 
-require_relative './highlander.dsl.base'
-require_relative './highlander.dsl.params'
-require_relative './highlander.dsl.component'
+require_relative './cfhighlander.dsl.base'
+require_relative './cfhighlander.dsl.params'
+require_relative './cfhighlander.dsl.component'
 
-module Highlander
+module Cfhighlander
 
   module Dsl
 
@@ -83,10 +83,10 @@ module Highlander
 
 
       def Component(template:, name: template, param_values: {}, config: {}, export_config: {}, &block)
-        puts "Initialize #{name} with template #{template}"
+        puts "INFO: Requested subcomponent #{name} with template #{template}"
 
         # load component
-        component = Highlander::Dsl::Subcomponent.new(self,
+        component = Cfhighlander::Dsl::Subcomponent.new(self,
             name,
             template,
             param_values,
@@ -185,10 +185,10 @@ module Highlander
               .param_list.each do |param|
 
             # add stack parameters
-            if param.class == Highlander::Dsl::StackParam
+            if param.class == Cfhighlander::Dsl::StackParam
               # sub-component stack param becomes top-level component param
               param_name = param.is_global ? param.name : "#{component.name}#{param.name}"
-              stack_param = Highlander::Dsl::ComponentParam.new(
+              stack_param = Cfhighlander::Dsl::ComponentParam.new(
                   param_name,
                   param.type,
                   param.default_value,
@@ -198,7 +198,7 @@ module Highlander
             end unless component.param_values.key? param.name
 
             # for map parameters add maps
-            if param.class == Highlander::Dsl::MappingParam
+            if param.class == Cfhighlander::Dsl::MappingParam
               if not param.mapProvider.nil?
                 maps = param.mapProvider.getMaps(component.component_loaded.config)
                 maps.each do |name, map|
@@ -220,7 +220,7 @@ module Highlander
         }
 
         @dependson_components_templates.each do |template|
-          component = Highlander::Dsl::Subcomponent.new(self,
+          component = Cfhighlander::Dsl::Subcomponent.new(self,
               template,
               template,
               {},
@@ -303,11 +303,11 @@ module Highlander
                       if (not config_receiver_component.export_config.nil?) and (config_receiver_component.export_config.key? component.template)
                         allow_from_component_name = config_receiver_component.export_config[component.template]
                         if allow_from_component_name == component.name
-                          puts("Exporting key #{global_export_key} from component #{component.name} to #{cname}")
+                          puts("INFO: Exporting key #{global_export_key} from component #{component.name} to #{cname}")
                           co[global_export_key] = cl.config[global_export_key]
                         end
                       else
-                        puts("Exporting key #{global_export_key} from component #{component.name} to #{cname}")
+                        puts("INFO: Exporting key #{global_export_key} from component #{component.name} to #{cname}")
                         co[global_export_key] = cl.config[global_export_key]
                       end
                     end
@@ -400,7 +400,7 @@ module Highlander
 end
 
 def HighlanderComponent(&block)
-  instance = Highlander::Dsl::HighlanderTemplate.new
+  instance = Cfhighlander::Dsl::HighlanderTemplate.new
 
   puts "Processing higlander component #{@name}\n\tLocation:#{@highlander_dsl_path}" +
       "\n\tConfig:#{@config}"

data/lib/{highlander.factory.rb → cfhighlander.factory.rb}

@@ -1,11 +1,11 @@
-require_relative './highlander.dsl'
-require_relative './highlander.factory.templatefinder'
-require_relative './highlander.model.component'
+require_relative './cfhighlander.dsl'
+require_relative './cfhighlander.factory.templatefinder'
+require_relative './cfhighlander.model.component'
 require 'fileutils'
 require 'git'
 
 
-module Highlander
+module Cfhighlander
 
   module Factory
 
@@ -14,18 +14,20 @@ module Highlander
       attr_accessor :component_sources
 
       def initialize(component_sources = [])
-        @template_finder = Highlander::Factory::TemplateFinder.new(component_sources)
+        @template_finder = Cfhighlander::Factory::TemplateFinder.new(component_sources)
+        @component_sources = component_sources
       end
 
       # Find component and given list of sources
-      # @return [Highlander::Factory::Component]
+      # @return [Cfhighlander::Factory::Component]
       def loadComponentFromTemplate(template_name, template_version = nil, component_name = nil)
 
         template_meta = @template_finder.findTemplate(template_name, template_version)
 
-        raise StandardError, "highlander template #{template_name}@#{component_version_s} not located" +
+        raise StandardError, "highlander template #{template_name}@#{template_version} not located" +
             " in sources #{@component_sources}" if template_meta.nil?
 
+        component_name = template_name if component_name.nil?
         return buildComponentFromLocation(template_meta, component_name)
 
       end

data/lib/{highlander.factory.templatefinder.rb → cfhighlander.factory.templatefinder.rb}

@@ -1,8 +1,8 @@
-LOCAL_HIGHLANDER_CACHE_LOCATION = "#{ENV['HOME']}/.cfhighlander/components"
+LOCAL_CFHIGHLANDER_CACHE_LOCATION = "#{ENV['HOME']}/.cfhighlander/components"
 
-require_relative './highlander.model.templatemeta'
+require_relative './cfhighlander.model.templatemeta'
 
-module Highlander
+module Cfhighlander
 
   module Factory
 
@@ -13,7 +13,7 @@ module Highlander
         ## Then search for cached $HOME/.highlander/components
         ## Then search in sources given by dsl
         default_locations = [
-            LOCAL_HIGHLANDER_CACHE_LOCATION,
+            LOCAL_CFHIGHLANDER_CACHE_LOCATION,
             File.expand_path('components'),
             File.expand_path('.')
         ]
@@ -27,6 +27,7 @@ module Highlander
       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'
+        default_lookup_url = ENV['CFHIGHLANDER_DEFAULT_COMPONENT_GIT_LOOKUP'] if ENV.key? 'CFHIGHLANDER_DEFAULT_COMPONENT_GIT_LOOKUP'
 
         git_url = "#{default_lookup_url}/hl-component-#{template_name}"
 
@@ -35,7 +36,7 @@ module Highlander
         else
           branch = component_version
         end
-        local_path = "#{LOCAL_HIGHLANDER_CACHE_LOCATION}/#{template_name}/#{component_version}"
+        local_path = "#{LOCAL_CFHIGHLANDER_CACHE_LOCATION}/#{template_name}/#{component_version}"
         return findTemplateGit(local_path, template_name, component_version, git_url, branch)
 
       end
@@ -53,6 +54,13 @@ module Highlander
           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', '')
+            STDERR.puts("DEPRECATED: #{component_name}: Use *.cfhighlander.rb template file name pattern")
+            return component_name, cache_path
+          end
+
+          if not Dir.glob("#{cache_path}*.cfhighlander.rb").empty?
+            # if cache exists, just return from cache
+            component_name = Dir.glob("#{cache_path}*.cfhighlander.rb")[0].gsub(cache_path, '').gsub('.highlander.rb', '')
             return component_name, cache_path
           end
 
@@ -71,20 +79,20 @@ module Highlander
         end
       end
 
-      def findTemplateS3(s3_location, component_name, component_version)
+      def findTemplateS3(s3_location, component_name, component_version, use_legacy_extension = true)
         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}"
+        local_destination = "#{LOCAL_CFHIGHLANDER_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"
+              response_target: "#{local_destination}/#{component_name}.#{use_legacy_extension ? 'highlander' : 'cfhighlander'}.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 })
@@ -98,9 +106,15 @@ module Highlander
             s3.get_object({ bucket: bucket, key: s3_object.key, response_target: destination_file })
             print " [OK] \n"
           }
+          if use_legacy_extension
+            STDERR.puts "DEPRECATED: s3 load #{component_name} with *.highlander.rb template file name pattern"
+          end
           return local_destination
         rescue => e
           # this handles both nonexisting key and bucket
+          if use_legacy_extension
+            return findTemplateS3(s3_location, component_name, component_version, false)
+          end
           puts("#{component_name} not found in s3://#{bucket}/#{prefix}")
           STDERR.puts(e.to_s) unless e.message.include? 'does not exist'
           return nil
@@ -134,7 +148,7 @@ module Highlander
 
 
         if not git_url.nil?
-          local_path = "#{LOCAL_HIGHLANDER_CACHE_LOCATION}/#{template_location.gsub(':', '_').gsub(/\/+/, '/')}/#{template_version}"
+          local_path = "#{LOCAL_CFHIGHLANDER_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}"
@@ -196,15 +210,18 @@ module Highlander
             candidate = "#{source}/#{template_name}"
             candidate = "#{candidate}/#{template_version}" unless template_version.nil?
             candidate_hl_path = "#{candidate}/#{template_name}.highlander.rb"
+            candidate_cfhl_path = "#{candidate}/#{template_name}.cfhighlander.rb"
             candidate2_hl_path = "#{source}/#{template_name}.highlander.rb"
+            candidate2_cfhl_path = "#{source}/#{template_name}.cfhighlander.rb"
             puts "TRACE: Trying to load #{template_full_name} from #{candidate} ... "
-            if File.exist?(candidate_hl_path)
+            if (File.exist?(candidate_hl_path) or File.exist?(candidate_cfhl_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)
+            if (File.exist?(candidate2_hl_path) or File.exist?(candidate2_cfhl_path))
               return build_meta(template_name, 'latest', source)
             end unless template_version_s != 'latest'
           end
@@ -218,7 +235,7 @@ module Highlander
       end
 
       def build_meta(template_name, template_version, template_location)
-        return Highlander::Model::TemplateMetadata.new(
+        return Cfhighlander::Model::TemplateMetadata.new(
             template_name: template_name,
             template_version: template_version,
             template_location: template_location)

data/lib/{highlander.helper.rb → cfhighlander.helper.rb}

@@ -1,4 +1,4 @@
-module Highlander
+module Cfhighlander
 
 
   module Helper

data/lib/{highlander.mapproviders.rb → cfhighlander.mapproviders.rb}

@@ -1,4 +1,4 @@
-module Highlander
+module Cfhighlander
 
   ### Map Providers provide predefined maps or list of maps
   ### Aside from predefined mappings from providers

data/lib/{highlander.model.component.rb → cfhighlander.model.component.rb}

@@ -1,6 +1,6 @@
 require 'yaml'
 
-module Highlander
+module Cfhighlander
 
   module Model
 
@@ -39,7 +39,7 @@ module Highlander
       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} "
+          puts "INFO Loading config for #{@name}: read file:#{config_file} "
           partial_config = YAML.load(File.read(config_file))
           unless partial_config.nil?
             @config.extend(partial_config)
@@ -64,8 +64,14 @@ module Highlander
           raise StandardError, 'http(s) sources not supported yet'
         end
 
+        legacy_cfhighlander_path = "#{@component_dir}/#{@template.template_name}.highlander.rb"
+        if File.exist? legacy_cfhighlander_path
+          STDERR.puts "DEPRECATED: #{legacy_cfhighlander_path} - Use *.cfhiglander.rb"
+          @highlander_dsl_path = legacy_cfhighlander_path
+        else
+          @highlander_dsl_path =  "#{@component_dir}/#{@template.template_name}.cfhighlander.rb"
+        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"

data/lib/{highlander.model.templatemeta.rb → cfhighlander.model.templatemeta.rb}

@@ -1,4 +1,4 @@
-module Highlander
+module Cfhighlander
 
   module Model
 

data/lib/{highlander.publisher.rb → cfhighlander.publisher.rb}

@@ -1,7 +1,7 @@
-require_relative './highlander.compiler'
+require_relative './cfhighlander.compiler'
 require 'aws-sdk-s3'
 
-module Highlander
+module Cfhighlander
 
   module Publisher
 

data/lib/{highlander.validator.rb → cfhighlander.validator.rb}

@@ -2,7 +2,7 @@ require 'aws-sdk-cloudformation'
 require 'aws-sdk-s3'
 require 'digest/md5'
 
-module Highlander
+module Cfhighlander
 
   module Cloudformation
 

data/lib/util/zip.util.rb

@@ -1,7 +1,7 @@
 require 'zip'
 
 
-module Highlander
+module Cfhighlander
   module Util
     ###
     ### taken from https://github.com/rubyzip/rubyzip/tree/master/samples

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.2.1.alpha.32
+  version: 0.2.1.alpha.34
 platform: ruby
 authors:
 - Nikola Tosic
@@ -243,19 +243,19 @@ files:
 - hl_ext/common_helper.rb
 - hl_ext/mapping_helper.rb
 - hl_ext/vpc.rb
-- lib/highlander.compiler.rb
-- lib/highlander.dsl.base.rb
-- lib/highlander.dsl.component.rb
-- 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/cfhighlander.compiler.rb
+- lib/cfhighlander.dsl.base.rb
+- lib/cfhighlander.dsl.component.rb
+- lib/cfhighlander.dsl.params.rb
+- lib/cfhighlander.dsl.rb
+- lib/cfhighlander.factory.rb
+- lib/cfhighlander.factory.templatefinder.rb
+- lib/cfhighlander.helper.rb
+- lib/cfhighlander.mapproviders.rb
+- lib/cfhighlander.model.component.rb
+- lib/cfhighlander.model.templatemeta.rb
+- lib/cfhighlander.publisher.rb
+- lib/cfhighlander.validator.rb
 - lib/util/zip.util.rb
 - templates/cfndsl.component.template.erb
 homepage: https://github.com/theonestack/cfhighlander/blob/master/README.md