From 333bf612e27ca55af9b6ba034c8518cbfbdc26a2 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 13 Feb 2024 15:14:32 +0100
Subject: [PATCH 01/38] Implement new templating system to provide more
 customization of templates

---
 lib/ccios.rb                             | 116 ++++++++++++++---------
 lib/ccios/argument_template_parameter.rb |  12 +++
 lib/ccios/code_templater.rb              |  32 +++++--
 lib/ccios/coordinator_generator.rb       |  18 ----
 lib/ccios/file_creator.rb                |  41 ++++----
 lib/ccios/file_template_definition.rb    |  66 +++++++++++++
 lib/ccios/flag_template_parameter.rb     |  13 +++
 lib/ccios/group_template_definition.rb   |  46 +++++++++
 lib/ccios/interactor_generator.rb        |  33 -------
 lib/ccios/pbxproj_parser.rb              |  57 +----------
 lib/ccios/presenter_generator.rb         |  71 --------------
 lib/ccios/repository_generator.rb        |  44 ---------
 lib/ccios/snippet_template_definition.rb |  27 ++++++
 lib/ccios/template_definition.rb         |  98 +++++++++++++++++++
 14 files changed, 382 insertions(+), 292 deletions(-)
 create mode 100644 lib/ccios/argument_template_parameter.rb
 delete mode 100644 lib/ccios/coordinator_generator.rb
 create mode 100644 lib/ccios/file_template_definition.rb
 create mode 100644 lib/ccios/flag_template_parameter.rb
 create mode 100644 lib/ccios/group_template_definition.rb
 delete mode 100644 lib/ccios/interactor_generator.rb
 delete mode 100644 lib/ccios/presenter_generator.rb
 delete mode 100644 lib/ccios/repository_generator.rb
 create mode 100644 lib/ccios/snippet_template_definition.rb
 create mode 100644 lib/ccios/template_definition.rb

diff --git a/lib/ccios.rb b/lib/ccios.rb
index 0f4174c..28cacf5 100644
--- a/lib/ccios.rb
+++ b/lib/ccios.rb
@@ -2,67 +2,97 @@
 require 'xcodeproj'
 require 'optparse'
 require 'active_support'
-require 'ccios/presenter_generator'
-require 'ccios/coordinator_generator'
-require 'ccios/interactor_generator'
-require 'ccios/repository_generator'
 require 'ccios/config'
+require 'ccios/template_definition'
+
+config = Config.parse ".ccios.yml"
+source_path = Dir.pwd
+
+default_template_folder = File.join(File.dirname(__FILE__), "ccios", "templates")
+default_templates = Dir.children(default_template_folder)
+    .map { |name| File.join(default_template_folder, name) }
+    .select { |path| File.directory? path }
+    .map { |template_path| TemplateDefinition.parse(template_path) }
+    .compact
+
+templates = {}
+subcommands = {}
 
 options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: ccios [options]"
+
+default_templates.each do |template|
+  templates[template.name] = template
+  subcommands[template.name] = OptionParser.new do |opts|
+
+    arguments = template.parameters.select { |p| p.is_a?(ArgumentTemplateParameter) }
+    flags = template.parameters.select { |p| p.is_a?(FlagTemplateParameter) }
+
+    arguments_line = arguments.map { |argument| "<#{argument.name}>" }.join(" ")
+
+    opts.banner = "Usage: ccios #{template.name} <name> [options]"
+
+    flags.each do |flagParameter|
+      if flagParameter.short_name != nil
+        opts.on("-#{flagParameter.short_name}", "--#{flagParameter.name}", flagParameter.description) do |v|
+          options[flagParameter.template_variable_name] = v
+        end
+      else
+        opts.on("--#{flagParameter.name}", flagParameter.description) do |v|
+          options[flagParameter.template_variable_name] = v
+        end
+      end
+    end
+  end
+end
+
+global_cli = OptionParser.new do |opts|
+  opts.banner = "Usage: ccios <template> [options]"
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     options[:verbose] = v
   end
-  opts.on("-pName", "--presenter=Name", "Generate NamePresenter, NamePresenterImplementation, NameViewContract and NameViewController") do |name|
-    options[:presenter] = name
-  end
-  opts.on("-cName", "--coordinator=Name", "Generate NameCoordinator") do |name|
-    options[:coordinator] = name
-  end
-  opts.on("-iName", "--interactor=Name", "Generate NameInteractor and NameInteractorImplementation") do |name|
-    options[:interactor] = name
-  end
-  opts.on("-rName", "--repository=Name", "Generate NameRepository and NameRepositoryImplementation") do |name|
-    options[:repository] = name
-  end
-  opts.on("-d", "--delegate", "Add delegate for curent generation") do |add_delegate|
-    options[:generate_delegate] = add_delegate
-  end
   opts.on("-h", "--help", "Print this help") do
     puts opts
+    puts "Available templates: #{subcommands.keys.sort.join(", ")}"
     exit
   end
-end.parse!
+end
 
-source_path = Dir.pwd
-config = Config.parse ".ccios.yml"
-parser = PBXProjParser.new(source_path, config)
+global_cli.order!
+template_name = ARGV.shift
 
-if options[:presenter]
-  presenter_name = options[:presenter]
-  presenter_generator = PresenterGenerator.new(parser, config)
-  generator_options = {generate_delegate: options[:generate_delegate]}
-  presenter_generator.generate(presenter_name, generator_options)
+if template_name.nil?
+  puts "Error: Missing template name"
+  puts global_cli
+  exit(1)
 end
 
-if options[:coordinator]
-  coordinator_name = options[:coordinator]
-  coordinator_generator = CoordinatorGenerator.new(parser, config)
-  generator_options = {generate_delegate: options[:generate_delegate]}
-  coordinator_generator.generate(coordinator_name, generator_options)
+if subcommands[template_name].nil?
+  puts "Error: Unknown template \"#{template_name}\""
+  puts global_cli
+  exit(1)
 end
 
-if options[:interactor]
-  interactor_name = options[:interactor]
-  interactor_generator = InteractorGenerator.new(parser, config)
-  interactor_generator.generate(interactor_name)
+template = templates[template_name]
+expected_remaining_arguments = template.parameters.select { |p| p.is_a?(ArgumentTemplateParameter) }
+
+subcommands[template_name].order! do |argument|
+  expected_argument = expected_remaining_arguments.shift
+  if expected_argument.nil?
+    puts "Unexpected argument: #{argument}"
+    exit 1
+  end
+  options[expected_argument.name] = argument
 end
 
-if options[:repository]
-  repository_name = options[:repository]
-  repository_generator = RepositoryGenerator.new(parser, config)
-  repository_generator.generate(repository_name)
+if !expected_remaining_arguments.empty?
+  puts "Missing arguments: #{expected_remaining_arguments.map { |p| p.name }.join(", ")}"
+  exit 1
 end
 
+# TODO: use template.project
+parser = PBXProjParser.new(source_path, config)
+
+template.validate(parser, options)
+template.generate(parser, options)
+
 parser.save
diff --git a/lib/ccios/argument_template_parameter.rb b/lib/ccios/argument_template_parameter.rb
new file mode 100644
index 0000000..840ac61
--- /dev/null
+++ b/lib/ccios/argument_template_parameter.rb
@@ -0,0 +1,12 @@
+class ArgumentTemplateParameter
+  attr_reader :name, :description, :template_variable_name
+
+  def initialize(parameter_template_definition_hash)
+    @name = parameter_template_definition_hash["argument"]
+    @description = parameter_template_definition_hash["description"] || ""
+    @template_variable_name = parameter_template_definition_hash["template_variable_name"] || @name
+
+    raise "Missing argument name" if @name.nil? || @name.empty?
+    raise "Invalid argument template_variable_name for #{@name}" if @template_variable_name.nil? || template_variable_name.empty?
+  end
+end
diff --git a/lib/ccios/code_templater.rb b/lib/ccios/code_templater.rb
index fd624ae..86ab55c 100644
--- a/lib/ccios/code_templater.rb
+++ b/lib/ccios/code_templater.rb
@@ -2,15 +2,31 @@
 require 'active_support/core_ext/string'
 
 class CodeTemplater
-  def initialize(options = {}, templates_path)
-    @options = options
-    @templates_path = templates_path
+
+  def render_string(template, context)
+    Mustache.render(template, context)
+  end
+
+  def get_unknown_context_keys_for_string(template)
+    stringView = Mustache.new
+    stringView.template = template
+    tags = stringView.template.tags || []
+    tags = tags.map { |t| t.split(".")[-1] }.to_set
+    tags
+  end
+
+  def render_file_content_from_template(template_path, filename, context)
+    filename = File.basename(filename, File.extname(filename))
+    context = context.merge({name: filename, lowercased_name: filename.camelize(:lower)})
+    Mustache.render(File.read(template_path), context)
   end
 
-  def content_for_suffix(prefix, suffix)
-    template_name = suffix.underscore
-    options = @options.merge({name: prefix, lowercased_name: prefix.camelize(:lower)})
-    template_file = File.join(@templates_path, "#{template_name}.mustache")
-    Mustache.render(File.read(template_file), options)
+  def get_unknown_context_keys_for_template(template_path)
+    templateView = Mustache.new
+    templateView.template_file = template_path
+    tags = (templateView.template.tags || [])
+    tags = tags.map { |t| t.split(".")[-1] }.to_set
+    tags.subtract(Set["name", "lowercased_name"])
+    tags
   end
 end
diff --git a/lib/ccios/coordinator_generator.rb b/lib/ccios/coordinator_generator.rb
deleted file mode 100644
index 94095d3..0000000
--- a/lib/ccios/coordinator_generator.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require_relative 'file_creator'
-require_relative "pbxproj_parser"
-
-class CoordinatorGenerator
-
-  def initialize(parser, config)
-    @parser = parser
-    @config = config
-  end
-
-  def generate(coordinator_name, options = {})
-    coordinator_group = @parser.coordinator_group
-    file_creator = FileCreator.new(options, @config)
-    target = @parser.app_target
-    coordinator_name = coordinator_name.gsub("Coordinator", "")
-    file_creator.create_file(coordinator_name, 'Coordinator', coordinator_group, target)
-  end
-end
diff --git a/lib/ccios/file_creator.rb b/lib/ccios/file_creator.rb
index 0602ef3..ac51f44 100644
--- a/lib/ccios/file_creator.rb
+++ b/lib/ccios/file_creator.rb
@@ -24,35 +24,36 @@ def logger
     FileCreator.logger
   end
 
-  def initialize(options = {}, config)
-    @options = options
-    @config = config
-  end
-
   def templater_options(target)
     defaults = {
       project_name: target.display_name,
       full_username: git_username,
       date: DateTime.now.strftime("%d/%m/%Y"),
     }
-    defaults.merge(@options)
+    defaults
   end
 
   def git_username
     `git config user.name`.strip
   end
 
-  def create_file(prefix, suffix, group, target)
-    file_path = File.join(group.real_path, prefix + suffix + '.swift')
+  def get_unknown_template_tags_for(template_path)
+    tags = CodeTemplater.new.get_unknown_context_keys_for_template(template_path)
+    tags.subtract(Set["project_name", "full_username", "date"])
+    tags
+  end
+
+  def create_file_using_template_path(template_path, generated_filename, group, target, context)
+    file_path = File.join(group.real_path, generated_filename)
 
     raise "File #{file_path} already exists" if File.exist?(file_path)
     dirname = File.dirname(file_path)
     FileUtils.mkdir_p dirname unless File.directory?(dirname)
     file = File.new(file_path, 'w')
 
-    templater_options = templater_options(target)
-    code_templater = CodeTemplater.new(templater_options, @config.templates.path)
-    file_content = code_templater.content_for_suffix(prefix, suffix)
+    context = context.merge(templater_options(target))
+    file_content = CodeTemplater.new.render_file_content_from_template(template_path, generated_filename, context)
+
     file.puts(file_content)
 
     file.close
@@ -60,6 +61,14 @@ def create_file(prefix, suffix, group, target)
     target.add_file_references([file_ref])
   end
 
+  def print_file_content_using_template(filename, template_path, context)
+    file_content = CodeTemplater.new.render_file_content_from_template(template_path, filename, context)
+    Mustache.render(File.read(template_path), context)
+
+    logger.info "Add this snippet to #{filename}"
+    logger.info file_content
+  end
+
   def create_empty_directory(group)
     dirname = group.real_path
     FileUtils.mkdir_p dirname unless File.directory?(dirname)
@@ -68,16 +77,6 @@ def create_empty_directory(group)
     FileUtils.touch(git_keep_path) if Dir.empty?(dirname)
   end
 
-  def print_file_content(prefix, suffix)
-    file_name = suffix + '.swift'
-
-    code_templater = CodeTemplater.new(@options, @config.templates.path)
-    template = code_templater.content_for_suffix(prefix, suffix)
-
-    logger.info "Add this snippet to #{file_name}"
-    logger.info template
-  end
-
   private
 
   def self.create_logger
diff --git a/lib/ccios/file_template_definition.rb b/lib/ccios/file_template_definition.rb
new file mode 100644
index 0000000..d608caf
--- /dev/null
+++ b/lib/ccios/file_template_definition.rb
@@ -0,0 +1,66 @@
+require_relative 'code_templater'
+require_relative 'file_creator'
+require_relative 'pbxproj_parser'
+
+class FileTemplateDefinition
+  def initialize(file_template_definition_hash)
+    @base_path = file_template_definition_hash["base_path"]
+    @path = file_template_definition_hash["file"]
+    @template = file_template_definition_hash["template"]
+    @target = file_template_definition_hash["target"]
+  end
+
+  def validate(parser, project, context, template_definition)
+    code_templater = CodeTemplater.new
+    expected_context_keys = template_definition.provided_context_keys
+    pathTags = code_templater.get_unknown_context_keys_for_string(@path)
+    pathTags.each do |tag|
+      raise "Unknown parameter \"#{tag}\" in path \"#{@path}\"" unless expected_context_keys.include?(tag)
+    end
+
+    file_path = code_templater.render_string(@path, context)
+    raise "File #{file_path} already exists" if File.exist?(file_path)
+
+    file_creator = FileCreator.new
+    contentTags = file_creator.get_unknown_template_tags_for(template_definition.template_source_file(@template))
+    contentTags.each do |tag|
+      raise "Unknown parameter \"#{tag}\" in template \"#{@template}\"" unless expected_context_keys.include?(tag)
+    end
+
+    base_group = project[@base_path]
+    raise "Base path \"#{@base_path}\" is missing" if base_group.nil?
+
+    target = parser.target_for(project, @target)
+    raise "Unable to find target \"#{@target}\"" if target.nil?
+  end
+
+  def generate(parser, project, context, template_definition)
+    base_group = project[@base_path]
+    file_path = CodeTemplater.new.render_string(@path, context)
+
+    intermediates_groups = file_path.split("/")[0...-1]
+    generated_filename = file_path.split("/")[-1]
+
+    group = base_group
+    associate_path_to_group = !base_group.path.nil?
+
+    intermediates_groups.each do |group_name|
+      new_group_path = File.join(group.real_path, group_name)
+      existing_group = group.groups.find { |g| g.display_name == group_name }
+      group = existing_group || group.pf_new_group(
+        associate_path_to_group: associate_path_to_group,
+        name: group_name,
+        path: new_group_path
+      )
+    end
+
+    target = parser.target_for(project, @target)
+    FileCreator.new.create_file_using_template_path(
+      template_definition.template_source_file(@template),
+      generated_filename,
+      group,
+      target,
+      context
+    )
+  end
+end
\ No newline at end of file
diff --git a/lib/ccios/flag_template_parameter.rb b/lib/ccios/flag_template_parameter.rb
new file mode 100644
index 0000000..d7d8699
--- /dev/null
+++ b/lib/ccios/flag_template_parameter.rb
@@ -0,0 +1,13 @@
+class FlagTemplateParameter
+  attr_reader :name, :short_name, :description, :template_variable_name
+
+  def initialize(parameter_template_definition_hash)
+    @name = parameter_template_definition_hash["flag"]
+    @short_name = parameter_template_definition_hash["short_name"]
+    @description = parameter_template_definition_hash["description"] || ""
+    @template_variable_name = parameter_template_definition_hash["template_variable_name"] || @name
+
+    raise "Missing flag name" if @name.nil? || @name.empty?
+    raise "Invalid flag template_variable_name for #{@name}" if @template_variable_name.nil? || template_variable_name.empty?
+  end
+end
diff --git a/lib/ccios/group_template_definition.rb b/lib/ccios/group_template_definition.rb
new file mode 100644
index 0000000..f074f91
--- /dev/null
+++ b/lib/ccios/group_template_definition.rb
@@ -0,0 +1,46 @@
+require_relative 'code_templater'
+require_relative 'file_creator'
+require_relative 'pbxproj_parser'
+
+class GroupTemplateDefinition
+  def initialize(group_template_definition_hash)
+    @base_path = group_template_definition_hash["base_path"]
+    @path = group_template_definition_hash["group"]
+    @template = group_template_definition_hash["path"]
+    @target = group_template_definition_hash["target"]
+  end
+
+  def validate(parser, project, context, template_definition)
+    code_templater = CodeTemplater.new
+    pathTags = code_templater.get_unknown_context_keys_for_string(@path)
+    pathTags.each do |tag|
+      raise "Unknown parameter \"#{tag}\" in path \"#{@path}\"" if context[tag].nil?
+    end
+
+    base_group = project[@base_path]
+    raise "Base path \"#{@base_path}\" is missing" if base_group.nil?
+  end
+
+  def generate(parser, project, context, template_definition)
+    base_group = project[@base_path]
+    group_path = CodeTemplater.new.render_string(@path, context)
+
+    group_path = group_path.split("/")
+
+    group = base_group
+    associate_path_to_group = !base_group.path.nil?
+
+    group_path.each do |group_name|
+      new_group_path = File.join(group.real_path, group_name)
+      existing_group = group.groups.find { |g| g.display_name == group_name }
+      group = existing_group || group.pf_new_group(
+        associate_path_to_group: associate_path_to_group,
+        name: group_name,
+        path: new_group_path
+      )
+    end
+
+    file_creator = FileCreator.new
+    file_creator.create_empty_directory(group)
+  end
+end
\ No newline at end of file
diff --git a/lib/ccios/interactor_generator.rb b/lib/ccios/interactor_generator.rb
deleted file mode 100644
index 3b2205e..0000000
--- a/lib/ccios/interactor_generator.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require_relative 'file_creator'
-require_relative "pbxproj_parser"
-
-class InteractorGenerator
-
-  def initialize(parser, config)
-    @parser = parser
-    @config = config
-  end
-
-  def generate(interactor_name, options = {})
-    interactor_group = @parser.interactor_group
-    interactor_name = interactor_name.gsub("Interactor", "")
-    new_group_name = "#{interactor_name}Interactor"
-
-    associate_path_to_group = !interactor_group.path.nil?
-
-    raise "[Error] Group #{new_group_name} already exists in #{app_group.display_name}" if interactor_group[new_group_name]
-    new_group_path = File.join(interactor_group.real_path, new_group_name)
-    new_group = interactor_group.pf_new_group(
-      associate_path_to_group: associate_path_to_group,
-      name: new_group_name,
-      path: new_group_path
-    )
-
-    file_creator = FileCreator.new(options, @config)
-    target = @parser.core_target
-    file_creator.create_file(interactor_name, 'Interactor', new_group, target)
-    file_creator.create_file(interactor_name, 'InteractorImplementation', new_group, target)
-
-    file_creator.print_file_content(interactor_name, 'InteractorAssembly')
-  end
-end
diff --git a/lib/ccios/pbxproj_parser.rb b/lib/ccios/pbxproj_parser.rb
index 24e633a..a88e9f2 100644
--- a/lib/ccios/pbxproj_parser.rb
+++ b/lib/ccios/pbxproj_parser.rb
@@ -11,63 +11,12 @@ def initialize(source_path, config)
     @projects = {}
   end
 
-  def app_project
-    project_for(@config.app.project)
-  end
-
-  def core_project
-    project_for(@config.core.project)
-  end
-
-  def data_project
-    project_for(@config.data.project)
-  end
-
-  def presenter_group
-    path = @config.app.presenter.group
-    app_project[path]
-  end
-
-  def coordinator_group
-    path = @config.app.coordinator.group
-    app_project[path]
-  end
-
-  def interactor_group
-    path = @config.core.interactor.group
-    core_project[path]
-  end
-
-  def repository_core_group
-    path = @config.core.repository.group
-    core_project[path]
-  end
-
-  def repository_data_group
-    path = @config.data.repository.group
-    data_project[path]
-  end
-
-  def app_target
-    target_for(app_project, @config.app.target)
-  end
-
-  def core_target
-    target_for(core_project, @config.core.target)
-  end
-
-  def data_target
-    target_for(data_project, @config.data.target)
-  end
-
   def save
-    app_project.save
-    core_project.save
-    data_project.save
+    @projects.each do |path, value|
+        value.save
+    end
   end
 
-  private
-
   def project_for(path)
     module_project_path = File.join(source_path, path)
     resolved_module_project_path = Dir.glob(module_project_path).first
diff --git a/lib/ccios/presenter_generator.rb b/lib/ccios/presenter_generator.rb
deleted file mode 100644
index 0c1eda1..0000000
--- a/lib/ccios/presenter_generator.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require_relative 'file_creator'
-require_relative "pbxproj_parser"
-
-class PresenterGenerator
-
-  def initialize(parser, config)
-    @parser = parser
-    @config = config
-  end
-
-  def generate(presenter_name, options = {})
-    app_group = @parser.presenter_group
-    presenter_name = presenter_name.gsub("Presenter", "")
-    associate_path_to_group = !app_group.path.nil?
-
-    raise "[Error] Group #{presenter_name} already exists in #{app_group.display_name}" if app_group[presenter_name]
-    new_group_path = File.join(app_group.real_path, presenter_name)
-    new_group = app_group.pf_new_group(
-      associate_path_to_group: associate_path_to_group,
-      name: presenter_name,
-      path: new_group_path
-    )
-
-    ui_group_path = File.join(new_group_path, "UI")
-    ui_group = new_group.pf_new_group(
-      associate_path_to_group: associate_path_to_group,
-      name: "UI",
-      path: ui_group_path
-    )
-
-    view_group_path = File.join(ui_group_path, "View")
-    view_group = ui_group.pf_new_group(
-      associate_path_to_group: associate_path_to_group,
-      name: "View",
-      path: view_group_path
-    )
-
-    view_controller_group_path = File.join(ui_group_path, "ViewController")
-    view_controller_group = ui_group.pf_new_group(
-      associate_path_to_group: associate_path_to_group,
-      name: "ViewController",
-      path: view_controller_group_path
-    )
-
-    presenter_group_path = File.join(new_group_path, "Presenter")
-    presenter_group = new_group.pf_new_group(
-      associate_path_to_group: associate_path_to_group,
-      name: "Presenter",
-      path: presenter_group_path
-    )
-
-    model_group_path = File.join(new_group_path, "Model")
-    model_group = new_group.pf_new_group(
-      associate_path_to_group: associate_path_to_group,
-      name: "Model",
-      path: model_group_path
-    )
-
-    file_creator = FileCreator.new(options, @config)
-    target = @parser.app_target
-    file_creator.create_file(presenter_name, 'ViewContract', ui_group, target)
-    file_creator.create_file(presenter_name, 'ViewController', view_controller_group, target)
-    file_creator.create_file(presenter_name, 'Presenter', presenter_group, target)
-    file_creator.create_file(presenter_name, 'PresenterImplementation', presenter_group, target)
-    file_creator.create_empty_directory(model_group)
-    file_creator.create_empty_directory(view_group)
-
-    file_creator.print_file_content(presenter_name, 'DependencyProvider')
-    file_creator.print_file_content(presenter_name, 'PresenterAssembly')
-  end
-end
diff --git a/lib/ccios/repository_generator.rb b/lib/ccios/repository_generator.rb
deleted file mode 100644
index c940e19..0000000
--- a/lib/ccios/repository_generator.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require_relative 'file_creator'
-require_relative "pbxproj_parser"
-
-class RepositoryGenerator
-
-  def initialize(parser, config)
-    @parser = parser
-    @config = config
-  end
-
-  def generate(repository_name, options = {})
-    core_group = @parser.repository_core_group
-    data_group = @parser.repository_data_group
-    repository_name = repository_name.gsub("Repository", "")
-
-    raise "[Error] Group #{repository_name} already exists in #{core_group.display_name}" if core_group[repository_name]
-    associate_path_to_group = !core_group.path.nil?
-    core_data_new_group_path = File.join(core_group.real_path, repository_name)
-    core_data_new_group = core_group.pf_new_group(
-      associate_path_to_group: associate_path_to_group,
-      name: repository_name,
-      path: core_data_new_group_path
-    )
-
-    raise "[Error] Group #{repository_name} already exists in #{data_group.display_name}" if data_group[repository_name]
-    associate_path_to_group = !data_group.path.nil?
-    data_new_group_path = File.join(data_group.real_path, repository_name)
-    data_new_group = data_group.pf_new_group(
-      associate_path_to_group: associate_path_to_group,
-      name: repository_name,
-      path: data_new_group_path
-    )
-
-    file_creator = FileCreator.new(options, @config)
-    core_target = @parser.core_target
-    file_creator.create_file(repository_name, 'Repository', core_data_new_group, core_target)
-
-    file_creator = FileCreator.new(options, @config)
-    data_target = @parser.data_target
-    file_creator.create_file(repository_name, 'RepositoryImplementation', data_new_group, data_target)
-
-    file_creator.print_file_content(repository_name, 'RepositoryAssembly')
-  end
-end
diff --git a/lib/ccios/snippet_template_definition.rb b/lib/ccios/snippet_template_definition.rb
new file mode 100644
index 0000000..9a83a53
--- /dev/null
+++ b/lib/ccios/snippet_template_definition.rb
@@ -0,0 +1,27 @@
+require_relative 'file_creator'
+
+class SnippetTemplateDefinition
+  def initialize(snippet_template_definition_hash)
+    @name = snippet_template_definition_hash["name"]
+    @template = snippet_template_definition_hash["template"]
+  end
+
+  def validate(template_definition)
+    expected_context_keys = template_definition.provided_context_keys
+    file_creator = FileCreator.new
+    contentTags = file_creator.get_unknown_template_tags_for(template_definition.template_source_file(@template))
+    contentTags.each do |tag|
+      raise "Unknown parameter \"#{tag}\" in template \"#{@template}\""  unless expected_context_keys.include?(tag)
+    end
+  end
+
+  def generate(context, template_definition)
+
+    file_creator = FileCreator.new
+    file_creator.print_file_content_using_template(
+      @name,
+      template_definition.template_source_file(@template),
+      context
+    )
+  end
+end
diff --git a/lib/ccios/template_definition.rb b/lib/ccios/template_definition.rb
new file mode 100644
index 0000000..b2b65e0
--- /dev/null
+++ b/lib/ccios/template_definition.rb
@@ -0,0 +1,98 @@
+require 'yaml'
+
+require_relative 'file_creator'
+require_relative 'pbxproj_parser'
+require_relative 'argument_template_parameter'
+require_relative 'flag_template_parameter'
+require_relative 'file_template_definition'
+require_relative 'group_template_definition'
+require_relative 'snippet_template_definition'
+
+class TemplateDefinition
+
+  attr_reader :name, :template_path, :template_file_source, :parameters
+
+  def self.parse(template_path)
+    template_definition = File.join(template_path, 'template.yml')
+    if File.exist?(template_definition)
+      template_definition = YAML.load_file(template_definition)
+      self.new template_definition, template_path
+    else
+      puts "Template #{template_path} is invalid: file #{template_definition} not found."
+      nil
+    end
+  end
+
+  def initialize(template_definition_hash, template_path)
+    @template_definition_hash = template_definition_hash
+    @template_path = template_path
+
+    @name = template_definition_hash["name"]
+    @project_path = template_definition_hash["project"] || "*.xcodeproj"
+
+    @parameters = template_definition_hash["parameters"].map { |hash|
+      next ArgumentTemplateParameter.new(hash) unless hash["argument"].nil?
+      next FlagTemplateParameter.new(hash) unless hash["flag"].nil?
+    }.compact
+
+    @generated_elements = template_definition_hash["generated_elements"].map { |hash|
+      next FileTemplateDefinition.new(hash) unless hash["file"].nil?
+      next GroupTemplateDefinition.new(hash) unless hash["group"].nil?
+      next nil
+    }.compact
+
+    @snippets = template_definition_hash["code_snippets"].map { |hash|
+      SnippetTemplateDefinition.new(hash)
+    } unless template_definition_hash["code_snippets"].nil?
+
+    @template_file_source = template_definition_hash["template_file_source"] || {}
+  end
+
+  def validate(parser, options)
+
+    raise "Error: missing name in template" if @name.nil?
+    raise "Error: invalid template name" unless @name.is_a? String
+
+    project = parser.project_for(@project_path)
+    raise "Error: Unable to find project \"#{@project_path}\"" if project.nil?
+
+    @template_file_source.each do |file_template_name, path|
+      raise "Missing template source file for \"#{file_template_name}\"" unless File.exist?(self.template_source_file(file_template_name))
+    end
+
+    @generated_elements.each do |generated_element|
+      generated_element.validate(parser, project, options, self)
+    end
+
+    @snippets.each do |snippet|
+      snippet.validate(self)
+    end
+  end
+
+  def template_source_file(name)
+    raise "Unknown template file #{name}" if @template_file_source[name].nil?
+    File.join(@template_path, @template_file_source[name])
+  end
+
+  def provided_context_keys
+    @parameters.map { |p| p.template_variable_name }.to_set
+  end
+
+  def generate(parser, options)
+
+    # TODO: Reimplement suffix strip ?
+    # interactor_name = "SampleInteractor"
+    # interactor_name = interactor_name.gsub("Interactor", "")
+
+    project = parser.project_for @project_path
+
+    @generated_elements.each do |element|
+      element.generate(parser, project, options, self)
+    end
+
+    @snippets.each do |snippet|
+      snippet.generate(options, self)
+    end
+  end
+
+end

From c55723eafabe8b88173d1800fa5b7d0dfdfe7d5b Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 13 Feb 2024 15:15:10 +0100
Subject: [PATCH 02/38] Transform existing templates to new format

---
 .../{ => Coordinator}/coordinator.mustache    |  0
 lib/ccios/templates/Coordinator/template.yml  | 15 ++++++++
 .../{ => Interactor}/interactor.mustache      |  0
 .../interactor_assembly.mustache              |  0
 .../interactor_implementation.mustache        |  0
 lib/ccios/templates/Interactor/template.yml   | 19 ++++++++++
 .../dependency_provider.mustache              |  0
 .../{ => Presenter}/presenter.mustache        |  0
 .../presenter_assembly.mustache               |  0
 .../presenter_implementation.mustache         |  0
 lib/ccios/templates/Presenter/template.yml    | 37 +++++++++++++++++++
 .../{ => Presenter}/view_contract.mustache    |  0
 .../{ => Presenter}/view_controller.mustache  |  0
 .../{ => Repository}/repository.mustache      |  0
 .../repository_assembly.mustache              |  0
 .../repository_implementation.mustache        |  0
 lib/ccios/templates/Repository/template.yml   | 19 ++++++++++
 17 files changed, 90 insertions(+)
 rename lib/ccios/templates/{ => Coordinator}/coordinator.mustache (100%)
 create mode 100644 lib/ccios/templates/Coordinator/template.yml
 rename lib/ccios/templates/{ => Interactor}/interactor.mustache (100%)
 rename lib/ccios/templates/{ => Interactor}/interactor_assembly.mustache (100%)
 rename lib/ccios/templates/{ => Interactor}/interactor_implementation.mustache (100%)
 create mode 100644 lib/ccios/templates/Interactor/template.yml
 rename lib/ccios/templates/{ => Presenter}/dependency_provider.mustache (100%)
 rename lib/ccios/templates/{ => Presenter}/presenter.mustache (100%)
 rename lib/ccios/templates/{ => Presenter}/presenter_assembly.mustache (100%)
 rename lib/ccios/templates/{ => Presenter}/presenter_implementation.mustache (100%)
 create mode 100644 lib/ccios/templates/Presenter/template.yml
 rename lib/ccios/templates/{ => Presenter}/view_contract.mustache (100%)
 rename lib/ccios/templates/{ => Presenter}/view_controller.mustache (100%)
 rename lib/ccios/templates/{ => Repository}/repository.mustache (100%)
 rename lib/ccios/templates/{ => Repository}/repository_assembly.mustache (100%)
 rename lib/ccios/templates/{ => Repository}/repository_implementation.mustache (100%)
 create mode 100644 lib/ccios/templates/Repository/template.yml

diff --git a/lib/ccios/templates/coordinator.mustache b/lib/ccios/templates/Coordinator/coordinator.mustache
similarity index 100%
rename from lib/ccios/templates/coordinator.mustache
rename to lib/ccios/templates/Coordinator/coordinator.mustache
diff --git a/lib/ccios/templates/Coordinator/template.yml b/lib/ccios/templates/Coordinator/template.yml
new file mode 100644
index 0000000..02d70b7
--- /dev/null
+++ b/lib/ccios/templates/Coordinator/template.yml
@@ -0,0 +1,15 @@
+name: "coordinator"
+project: "*.xcodeproj"
+description: "Generate NameCoordinator"
+parameters:
+  - argument: "name"
+  - flag: "delegate"
+    short_name: "d"
+    template_variable_name: "generate_delegate"
+    description: "Generate delegate protocols when provided"
+generated_elements:
+  - file: "{{ name }}Coordinator.swift"
+    base_path: "Coordinator"
+    template: "coordinator"
+template_file_source:
+  coordinator: "coordinator.mustache"
diff --git a/lib/ccios/templates/interactor.mustache b/lib/ccios/templates/Interactor/interactor.mustache
similarity index 100%
rename from lib/ccios/templates/interactor.mustache
rename to lib/ccios/templates/Interactor/interactor.mustache
diff --git a/lib/ccios/templates/interactor_assembly.mustache b/lib/ccios/templates/Interactor/interactor_assembly.mustache
similarity index 100%
rename from lib/ccios/templates/interactor_assembly.mustache
rename to lib/ccios/templates/Interactor/interactor_assembly.mustache
diff --git a/lib/ccios/templates/interactor_implementation.mustache b/lib/ccios/templates/Interactor/interactor_implementation.mustache
similarity index 100%
rename from lib/ccios/templates/interactor_implementation.mustache
rename to lib/ccios/templates/Interactor/interactor_implementation.mustache
diff --git a/lib/ccios/templates/Interactor/template.yml b/lib/ccios/templates/Interactor/template.yml
new file mode 100644
index 0000000..8f9b5fa
--- /dev/null
+++ b/lib/ccios/templates/Interactor/template.yml
@@ -0,0 +1,19 @@
+name: "interactor"
+description: "Generate NameInteractor and NameInteractorImplementation"
+project: "*.xcodeproj"
+parameters:
+  - argument: "name"
+generated_elements:
+  - file: "{{ name }}Interactor/{{ name }}Interactor.swift"
+    base_path: "Core/Interactor"
+    template: "interactor"
+  - file: "{{ name }}Interactor/{{ name }}InteractorImplementation.swift"
+    base_path: "Core/Interactor"
+    template: "interactor_implementation"
+code_snippets:
+  - name: InteractorAssembly
+    template: "interactor_assembly"
+template_file_source:
+  interactor: "interactor.mustache"
+  interactor_implementation: "interactor_implementation.mustache"
+  interactor_assembly: "interactor_assembly.mustache"
diff --git a/lib/ccios/templates/dependency_provider.mustache b/lib/ccios/templates/Presenter/dependency_provider.mustache
similarity index 100%
rename from lib/ccios/templates/dependency_provider.mustache
rename to lib/ccios/templates/Presenter/dependency_provider.mustache
diff --git a/lib/ccios/templates/presenter.mustache b/lib/ccios/templates/Presenter/presenter.mustache
similarity index 100%
rename from lib/ccios/templates/presenter.mustache
rename to lib/ccios/templates/Presenter/presenter.mustache
diff --git a/lib/ccios/templates/presenter_assembly.mustache b/lib/ccios/templates/Presenter/presenter_assembly.mustache
similarity index 100%
rename from lib/ccios/templates/presenter_assembly.mustache
rename to lib/ccios/templates/Presenter/presenter_assembly.mustache
diff --git a/lib/ccios/templates/presenter_implementation.mustache b/lib/ccios/templates/Presenter/presenter_implementation.mustache
similarity index 100%
rename from lib/ccios/templates/presenter_implementation.mustache
rename to lib/ccios/templates/Presenter/presenter_implementation.mustache
diff --git a/lib/ccios/templates/Presenter/template.yml b/lib/ccios/templates/Presenter/template.yml
new file mode 100644
index 0000000..95e2b54
--- /dev/null
+++ b/lib/ccios/templates/Presenter/template.yml
@@ -0,0 +1,37 @@
+name: "presenter"
+description: "Generate NamePresenter, NamePresenterImplementation, NameViewContract and NameViewController"
+project: "*.xcodeproj"
+parameters:
+  - argument: "name"
+  - flag: "delegate"
+    short_name: "d"
+    template_variable_name: "generate_delegate"
+    description: "Generate delegate protocols when provided"
+generated_elements:
+  - group: "{{ name }}/UI/View"
+    base_path: "App"
+  - file: "{{ name }}/UI/ViewController/{{ name }}ViewController.swift"
+    base_path: "App"
+    template: "viewController"
+  - file: "{{ name }}/UI/{{ name }}ViewContract.swift"
+    base_path: "App"
+    template: "viewContract"
+  - file: "{{ name }}/Presenter/{{ name }}Presenter.swift"
+    base_path: "App"
+    template: "presenter"
+  - file: "{{ name }}/Presenter/{{ name }}PresenterImplementation.swift"
+    base_path: "App"
+    template: "presenterImplementation"
+  - group: "{{ name }}/Model"
+    base_path: "App"
+code_snippets:
+  - name: DependencyProvider
+    template: "dependency_provider"
+  - name: DependencyProvider
+    template: "dependency_provider"
+template_file_source:
+  viewController: "view_controller.mustache"
+  viewContract: "view_contract.mustache"
+  presenter: "presenter.mustache"
+  presenterImplementation: "presenter_implementation.mustache"
+  dependency_provider: "dependency_provider.mustache"
diff --git a/lib/ccios/templates/view_contract.mustache b/lib/ccios/templates/Presenter/view_contract.mustache
similarity index 100%
rename from lib/ccios/templates/view_contract.mustache
rename to lib/ccios/templates/Presenter/view_contract.mustache
diff --git a/lib/ccios/templates/view_controller.mustache b/lib/ccios/templates/Presenter/view_controller.mustache
similarity index 100%
rename from lib/ccios/templates/view_controller.mustache
rename to lib/ccios/templates/Presenter/view_controller.mustache
diff --git a/lib/ccios/templates/repository.mustache b/lib/ccios/templates/Repository/repository.mustache
similarity index 100%
rename from lib/ccios/templates/repository.mustache
rename to lib/ccios/templates/Repository/repository.mustache
diff --git a/lib/ccios/templates/repository_assembly.mustache b/lib/ccios/templates/Repository/repository_assembly.mustache
similarity index 100%
rename from lib/ccios/templates/repository_assembly.mustache
rename to lib/ccios/templates/Repository/repository_assembly.mustache
diff --git a/lib/ccios/templates/repository_implementation.mustache b/lib/ccios/templates/Repository/repository_implementation.mustache
similarity index 100%
rename from lib/ccios/templates/repository_implementation.mustache
rename to lib/ccios/templates/Repository/repository_implementation.mustache
diff --git a/lib/ccios/templates/Repository/template.yml b/lib/ccios/templates/Repository/template.yml
new file mode 100644
index 0000000..50c3bc0
--- /dev/null
+++ b/lib/ccios/templates/Repository/template.yml
@@ -0,0 +1,19 @@
+name: "repository"
+description: "Generate NameRepository and NameRepositoryImplementation"
+project: "*.xcodeproj"
+parameters:
+  - argument: "name"
+generated_elements:
+  - file: "{{ name }}/{{ name }}Repository.swift"
+    base_path: "Core/Data"
+    template: "repository"
+  - file: "{{ name }}/{{ name }}RepositoryImplementation.swift"
+    base_path: "Data"
+    template: "repository_implementation"
+code_snippets:
+  - name: RepositoryAssembly
+    template: "repository_assembly"
+template_file_source:
+  repository: "repository.mustache"
+  repository_implementation: "repository_implementation.mustache"
+  repository_assembly: "repository_assembly.mustache"

From f55e1aca7732dbf4a9d0edb51732dfd2204e4332 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 6 Feb 2024 15:58:25 +0100
Subject: [PATCH 03/38] Allow configuration of which project is used through
 ccios config file

---
 lib/ccios.rb                                 |   4 +-
 lib/ccios/config.rb                          | 113 +------------------
 lib/ccios/template_definition.rb             |  18 ++-
 lib/ccios/templates/Coordinator/template.yml |   3 +-
 lib/ccios/templates/Interactor/template.yml  |   3 +-
 lib/ccios/templates/Presenter/template.yml   |   3 +-
 lib/ccios/templates/Repository/template.yml  |   3 +-
 7 files changed, 26 insertions(+), 121 deletions(-)

diff --git a/lib/ccios.rb b/lib/ccios.rb
index 28cacf5..91ac71d 100644
--- a/lib/ccios.rb
+++ b/lib/ccios.rb
@@ -92,7 +92,7 @@
 # TODO: use template.project
 parser = PBXProjParser.new(source_path, config)
 
-template.validate(parser, options)
-template.generate(parser, options)
+template.validate(parser, options, config)
+template.generate(parser, options, config)
 
 parser.save
diff --git a/lib/ccios/config.rb b/lib/ccios/config.rb
index 47cb5a6..c6d30d3 100644
--- a/lib/ccios/config.rb
+++ b/lib/ccios/config.rb
@@ -2,7 +2,7 @@
 
 class Config
 
-  attr_reader :app, :core, :data, :templates
+  attr_reader :variables
 
   def self.parse(source_path)
     if File.exist?(source_path)
@@ -14,120 +14,15 @@ def self.parse(source_path)
     end
   end
 
-  def self.default_config_hash
-    project = "*.xcodeproj"
-    {
-      "app" => {
-        "project" => project,
-        "presenter" => {"group" => "Classes/App"},
-        "coordinator" => {"group" => "Classes/Coordinator"}
-      },
-      "core" => {
-        "project" => project,
-        "interactor" => {"group" => "Classes/Core/Interactor"},
-        "repository" => {"group" => "Classes/Core/Data"}
-      },
-      "data" => {
-        "project" => project,
-        "repository" => {"group" => "Classes/Data"}
-      },
-      "templates" => self.default_templates_hash
-    }
-  end
-
   def self.default
     self.new default_config_hash
   end
 
-  def self.default_templates_hash
-    { "path" => File.join(File.dirname(__FILE__), "templates") }
+  def self.default_config_hash
+    {}
   end
 
   def initialize(config_hash, source_path = nil)
-    @source_path = source_path
-    validate config_hash
-    @app = AppConfig.new config_hash["app"]
-    @core = CoreConfig.new config_hash["core"]
-    @data = DataConfig.new config_hash["data"]
-    if config_hash["templates"].nil?
-      @templates = TemplatesConfig.new Config.default_templates_hash
-    else
-      @templates = TemplatesConfig.new config_hash["templates"]
-    end
-  end
-
-  def validate(hash)
-    validate_path hash, "app.project"
-    validate_path hash, "app.presenter.group"
-    validate_path hash, "app.coordinator.group"
-
-    validate_path hash, "core.project"
-    validate_path hash, "core.interactor.group"
-    validate_path hash, "core.repository.group"
-
-    validate_path hash, "data.project"
-    validate_path hash, "data.repository.group"
-  end
-
-  def validate_path(hash, path)
-    components = path.split(".")
-    keys = []
-    components.each do |component|
-      hash = hash[component]
-      keys << component
-      if hash.nil?
-        message = "Key \"#{keys.join(".")}\" is missing"
-        message += " in #{@source_path}" unless @source_path.nil?
-        raise message
-      end
-    end
-  end
-end
-
-class AppConfig
-  attr_reader :project, :target, :presenter, :coordinator
-
-  def initialize(hash)
-    @project = hash["project"]
-    @target = hash["target"]
-    @presenter = ObjectConfig.new hash["presenter"]
-    @coordinator = ObjectConfig.new hash["coordinator"]
-  end
-end
-
-class CoreConfig
-  attr_reader :project, :target, :interactor, :repository
-
-  def initialize(hash)
-    @project = hash["project"]
-    @target = hash["target"]
-    @interactor = ObjectConfig.new hash["interactor"]
-    @repository = ObjectConfig.new hash["repository"]
-  end
-end
-
-class DataConfig
-  attr_reader :project, :target, :repository
-
-  def initialize(hash)
-    @project = hash["project"]
-    @target = hash["target"]
-    @repository = ObjectConfig.new hash["repository"]
-  end
-end
-
-class ObjectConfig
-  attr_reader :group
-
-  def initialize(hash)
-    @group = hash["group"]
-  end
-end
-
-class TemplatesConfig
-  attr_reader :path
-
-  def initialize(hash)
-    @path = hash["path"]
+    @variables = config_hash["variables"] || {}
   end
 end
diff --git a/lib/ccios/template_definition.rb b/lib/ccios/template_definition.rb
index b2b65e0..40547ef 100644
--- a/lib/ccios/template_definition.rb
+++ b/lib/ccios/template_definition.rb
@@ -28,7 +28,7 @@ def initialize(template_definition_hash, template_path)
     @template_path = template_path
 
     @name = template_definition_hash["name"]
-    @project_path = template_definition_hash["project"] || "*.xcodeproj"
+    @variables = template_definition_hash["variables"] || {}
 
     @parameters = template_definition_hash["parameters"].map { |hash|
       next ArgumentTemplateParameter.new(hash) unless hash["argument"].nil?
@@ -48,13 +48,16 @@ def initialize(template_definition_hash, template_path)
     @template_file_source = template_definition_hash["template_file_source"] || {}
   end
 
-  def validate(parser, options)
+  def validate(parser, options, config)
 
     raise "Error: missing name in template" if @name.nil?
     raise "Error: invalid template name" unless @name.is_a? String
 
-    project = parser.project_for(@project_path)
-    raise "Error: Unable to find project \"#{@project_path}\"" if project.nil?
+    merged_variables = @variables.merge(config.variables)
+    project_path = merged_variables["project"]
+
+    project = parser.project_for(project_path)
+    raise "Error: Unable to find project \"#{project_path}\"" if project.nil?
 
     @template_file_source.each do |file_template_name, path|
       raise "Missing template source file for \"#{file_template_name}\"" unless File.exist?(self.template_source_file(file_template_name))
@@ -78,13 +81,16 @@ def provided_context_keys
     @parameters.map { |p| p.template_variable_name }.to_set
   end
 
-  def generate(parser, options)
+  def generate(parser, options, config)
 
     # TODO: Reimplement suffix strip ?
     # interactor_name = "SampleInteractor"
     # interactor_name = interactor_name.gsub("Interactor", "")
 
-    project = parser.project_for @project_path
+    merged_variables = @variables.merge(config.variables)
+    project_path = merged_variables["project"]
+
+    project = parser.project_for project_path
 
     @generated_elements.each do |element|
       element.generate(parser, project, options, self)
diff --git a/lib/ccios/templates/Coordinator/template.yml b/lib/ccios/templates/Coordinator/template.yml
index 02d70b7..ebd731f 100644
--- a/lib/ccios/templates/Coordinator/template.yml
+++ b/lib/ccios/templates/Coordinator/template.yml
@@ -1,6 +1,7 @@
 name: "coordinator"
-project: "*.xcodeproj"
 description: "Generate NameCoordinator"
+variables:
+  project: "*.xcodeproj"
 parameters:
   - argument: "name"
   - flag: "delegate"
diff --git a/lib/ccios/templates/Interactor/template.yml b/lib/ccios/templates/Interactor/template.yml
index 8f9b5fa..21c1f3a 100644
--- a/lib/ccios/templates/Interactor/template.yml
+++ b/lib/ccios/templates/Interactor/template.yml
@@ -1,8 +1,9 @@
 name: "interactor"
 description: "Generate NameInteractor and NameInteractorImplementation"
-project: "*.xcodeproj"
 parameters:
   - argument: "name"
+variables:
+  project: "*.xcodeproj"
 generated_elements:
   - file: "{{ name }}Interactor/{{ name }}Interactor.swift"
     base_path: "Core/Interactor"
diff --git a/lib/ccios/templates/Presenter/template.yml b/lib/ccios/templates/Presenter/template.yml
index 95e2b54..d531d97 100644
--- a/lib/ccios/templates/Presenter/template.yml
+++ b/lib/ccios/templates/Presenter/template.yml
@@ -1,12 +1,13 @@
 name: "presenter"
 description: "Generate NamePresenter, NamePresenterImplementation, NameViewContract and NameViewController"
-project: "*.xcodeproj"
 parameters:
   - argument: "name"
   - flag: "delegate"
     short_name: "d"
     template_variable_name: "generate_delegate"
     description: "Generate delegate protocols when provided"
+variables:
+  project: "*.xcodeproj"
 generated_elements:
   - group: "{{ name }}/UI/View"
     base_path: "App"
diff --git a/lib/ccios/templates/Repository/template.yml b/lib/ccios/templates/Repository/template.yml
index 50c3bc0..0bf5353 100644
--- a/lib/ccios/templates/Repository/template.yml
+++ b/lib/ccios/templates/Repository/template.yml
@@ -1,8 +1,9 @@
 name: "repository"
 description: "Generate NameRepository and NameRepositoryImplementation"
-project: "*.xcodeproj"
 parameters:
   - argument: "name"
+variables:
+  project: "*.xcodeproj"
 generated_elements:
   - file: "{{ name }}/{{ name }}Repository.swift"
     base_path: "Core/Data"

From 04a15af9b39973ffd7db2ea28751d1c8fff4e127 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 6 Feb 2024 16:33:13 +0100
Subject: [PATCH 04/38] Use variables hierarchy for generated element base_path

---
 lib/ccios/file_template_definition.rb        | 22 ++++++++++++++------
 lib/ccios/group_template_definition.rb       | 22 ++++++++++++++------
 lib/ccios/template_definition.rb             |  6 +++---
 lib/ccios/templates/Coordinator/template.yml |  3 ++-
 lib/ccios/templates/Interactor/template.yml  |  5 +++--
 lib/ccios/templates/Presenter/template.yml   | 13 ++++++------
 lib/ccios/templates/Repository/template.yml  |  6 ++++--
 7 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/lib/ccios/file_template_definition.rb b/lib/ccios/file_template_definition.rb
index d608caf..1f596fc 100644
--- a/lib/ccios/file_template_definition.rb
+++ b/lib/ccios/file_template_definition.rb
@@ -4,13 +4,16 @@
 
 class FileTemplateDefinition
   def initialize(file_template_definition_hash)
-    @base_path = file_template_definition_hash["base_path"]
     @path = file_template_definition_hash["file"]
     @template = file_template_definition_hash["template"]
     @target = file_template_definition_hash["target"]
+    @variables = file_template_definition_hash["variables"] || {}
   end
 
-  def validate(parser, project, context, template_definition)
+  def validate(parser, project, context, template_definition, config)
+    merged_variables = template_definition.variables.merged(@variables)
+    merged_variables = merged_variables.merge(config.variables)
+
     code_templater = CodeTemplater.new
     expected_context_keys = template_definition.provided_context_keys
     pathTags = code_templater.get_unknown_context_keys_for_string(@path)
@@ -27,15 +30,22 @@ def validate(parser, project, context, template_definition)
       raise "Unknown parameter \"#{tag}\" in template \"#{@template}\"" unless expected_context_keys.include?(tag)
     end
 
-    base_group = project[@base_path]
-    raise "Base path \"#{@base_path}\" is missing" if base_group.nil?
+    base_path = merged_variables["base_path"]
+    raise "Missing base_path variable" if base_path.nil?
+
+    base_group = project[base_path]
+    raise "Base path \"#{base_path}\" is missing" if base_group.nil?
 
     target = parser.target_for(project, @target)
     raise "Unable to find target \"#{@target}\"" if target.nil?
   end
 
-  def generate(parser, project, context, template_definition)
-    base_group = project[@base_path]
+  def generate(parser, project, context, template_definition, config)
+    merged_variables = template_definition.variables.merged(@variables)
+    merged_variables = merged_variables.merge(config.variables)
+
+    base_path = merged_variables["base_path"]
+    base_group = project[base_path]
     file_path = CodeTemplater.new.render_string(@path, context)
 
     intermediates_groups = file_path.split("/")[0...-1]
diff --git a/lib/ccios/group_template_definition.rb b/lib/ccios/group_template_definition.rb
index f074f91..4b1f303 100644
--- a/lib/ccios/group_template_definition.rb
+++ b/lib/ccios/group_template_definition.rb
@@ -4,25 +4,35 @@
 
 class GroupTemplateDefinition
   def initialize(group_template_definition_hash)
-    @base_path = group_template_definition_hash["base_path"]
     @path = group_template_definition_hash["group"]
     @template = group_template_definition_hash["path"]
     @target = group_template_definition_hash["target"]
+    @variables = group_template_definition_hash["variables"] || {}
   end
 
-  def validate(parser, project, context, template_definition)
+  def validate(parser, project, context, template_definition, config)
+    merged_variables = template_definition.variables.merged(@variables)
+    merged_variables = merged_variables.merge(config.variables)
+
     code_templater = CodeTemplater.new
     pathTags = code_templater.get_unknown_context_keys_for_string(@path)
     pathTags.each do |tag|
       raise "Unknown parameter \"#{tag}\" in path \"#{@path}\"" if context[tag].nil?
     end
 
-    base_group = project[@base_path]
-    raise "Base path \"#{@base_path}\" is missing" if base_group.nil?
+    base_path = merged_variables["base_path"]
+    raise "Missing base_path variable" if base_path.nil?
+
+    base_group = project[base_path]
+    raise "Base path \"#{base_path}\" is missing" if base_group.nil?
   end
 
-  def generate(parser, project, context, template_definition)
-    base_group = project[@base_path]
+  def generate(parser, project, context, template_definition, config)
+    merged_variables = template_definition.variables.merged(@variables)
+    merged_variables = merged_variables.merge(config.variables)
+
+    base_path = merged_variables["base_path"]
+    base_group = project[base_path]
     group_path = CodeTemplater.new.render_string(@path, context)
 
     group_path = group_path.split("/")
diff --git a/lib/ccios/template_definition.rb b/lib/ccios/template_definition.rb
index 40547ef..88ccd32 100644
--- a/lib/ccios/template_definition.rb
+++ b/lib/ccios/template_definition.rb
@@ -10,7 +10,7 @@
 
 class TemplateDefinition
 
-  attr_reader :name, :template_path, :template_file_source, :parameters
+  attr_reader :name, :template_path, :template_file_source, :parameters, :variables
 
   def self.parse(template_path)
     template_definition = File.join(template_path, 'template.yml')
@@ -64,7 +64,7 @@ def validate(parser, options, config)
     end
 
     @generated_elements.each do |generated_element|
-      generated_element.validate(parser, project, options, self)
+      generated_element.validate(parser, project, options, self, config)
     end
 
     @snippets.each do |snippet|
@@ -93,7 +93,7 @@ def generate(parser, options, config)
     project = parser.project_for project_path
 
     @generated_elements.each do |element|
-      element.generate(parser, project, options, self)
+      element.generate(parser, project, options, self, config)
     end
 
     @snippets.each do |snippet|
diff --git a/lib/ccios/templates/Coordinator/template.yml b/lib/ccios/templates/Coordinator/template.yml
index ebd731f..4cb66f4 100644
--- a/lib/ccios/templates/Coordinator/template.yml
+++ b/lib/ccios/templates/Coordinator/template.yml
@@ -2,6 +2,7 @@ name: "coordinator"
 description: "Generate NameCoordinator"
 variables:
   project: "*.xcodeproj"
+  base_path: "Coordinator"
 parameters:
   - argument: "name"
   - flag: "delegate"
@@ -10,7 +11,7 @@ parameters:
     description: "Generate delegate protocols when provided"
 generated_elements:
   - file: "{{ name }}Coordinator.swift"
-    base_path: "Coordinator"
     template: "coordinator"
+    variables: {}
 template_file_source:
   coordinator: "coordinator.mustache"
diff --git a/lib/ccios/templates/Interactor/template.yml b/lib/ccios/templates/Interactor/template.yml
index 21c1f3a..e7ebca6 100644
--- a/lib/ccios/templates/Interactor/template.yml
+++ b/lib/ccios/templates/Interactor/template.yml
@@ -4,13 +4,14 @@ parameters:
   - argument: "name"
 variables:
   project: "*.xcodeproj"
+  base_path: "Core/Interactor"
 generated_elements:
   - file: "{{ name }}Interactor/{{ name }}Interactor.swift"
-    base_path: "Core/Interactor"
     template: "interactor"
+    variables: {}
   - file: "{{ name }}Interactor/{{ name }}InteractorImplementation.swift"
-    base_path: "Core/Interactor"
     template: "interactor_implementation"
+    variables: {}
 code_snippets:
   - name: InteractorAssembly
     template: "interactor_assembly"
diff --git a/lib/ccios/templates/Presenter/template.yml b/lib/ccios/templates/Presenter/template.yml
index d531d97..ac0b279 100644
--- a/lib/ccios/templates/Presenter/template.yml
+++ b/lib/ccios/templates/Presenter/template.yml
@@ -8,23 +8,24 @@ parameters:
     description: "Generate delegate protocols when provided"
 variables:
   project: "*.xcodeproj"
+  base_path: "App"
 generated_elements:
   - group: "{{ name }}/UI/View"
-    base_path: "App"
+    variables: {}
   - file: "{{ name }}/UI/ViewController/{{ name }}ViewController.swift"
-    base_path: "App"
     template: "viewController"
+    variables: {}
   - file: "{{ name }}/UI/{{ name }}ViewContract.swift"
-    base_path: "App"
     template: "viewContract"
+    variables: {}
   - file: "{{ name }}/Presenter/{{ name }}Presenter.swift"
-    base_path: "App"
     template: "presenter"
+    variables: {}
   - file: "{{ name }}/Presenter/{{ name }}PresenterImplementation.swift"
-    base_path: "App"
     template: "presenterImplementation"
+    variables: {}
   - group: "{{ name }}/Model"
-    base_path: "App"
+    variables: {}
 code_snippets:
   - name: DependencyProvider
     template: "dependency_provider"
diff --git a/lib/ccios/templates/Repository/template.yml b/lib/ccios/templates/Repository/template.yml
index 0bf5353..219c980 100644
--- a/lib/ccios/templates/Repository/template.yml
+++ b/lib/ccios/templates/Repository/template.yml
@@ -6,11 +6,13 @@ variables:
   project: "*.xcodeproj"
 generated_elements:
   - file: "{{ name }}/{{ name }}Repository.swift"
-    base_path: "Core/Data"
     template: "repository"
+    variables:
+      base_path: "Core/Data"
   - file: "{{ name }}/{{ name }}RepositoryImplementation.swift"
-    base_path: "Data"
     template: "repository_implementation"
+    variables:
+      base_path: "Data"
 code_snippets:
   - name: RepositoryAssembly
     template: "repository_assembly"

From 3f01270eafdb3640117740c38e092ef1a8c77d85 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 6 Feb 2024 17:04:37 +0100
Subject: [PATCH 05/38] Update config to support overrides of variables
 globally, for a template, or for a specific element

---
 lib/ccios/config.rb | 51 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/lib/ccios/config.rb b/lib/ccios/config.rb
index c6d30d3..085fb97 100644
--- a/lib/ccios/config.rb
+++ b/lib/ccios/config.rb
@@ -24,5 +24,56 @@ def self.default_config_hash
 
   def initialize(config_hash, source_path = nil)
     @variables = config_hash["variables"] || {}
+    @templates_config = {}
+
+    templates_config = config_hash["templates_config"] || {}
+    raise "Invalid \"templates_config\" in configuration, it should be a dictionary" unless templates_config.is_a?(Hash)
+    templates_config.each do |key, hash|
+      raise "Invalid template configuration for \"#{key}\"" unless hash.is_a?(Hash)
+      template_config = TemplateConfig.new(hash)
+      @templates_config[key] = template_config
+    end
+  end
+
+  def variables_for_template(template)
+    template_config = @templates_config[template.name] || TemplateConfig.new({})
+    @variables.merge(template.variables).merge(template_config.variables)
+  end
+
+  def variables_for_template_element(template, element_name, element_default_variables = {})
+    template_config = @templates_config[template.name] || TemplateConfig.new({})
+    element_config = template_config.element_configuration_for(element_name)
+    template_variables = @variables.merge(template.variables).merge(template_config.variables)
+    template_variables.merge(element_default_variables).merge(element_config.variables)
   end
 end
+
+class TemplateConfig
+
+  attr_reader :variables
+
+  def initialize(hash)
+    @variables = hash["variables"] || {}
+    @template_element_config = {}
+
+    elements_variables = hash["elements_variables"] || {}
+    raise "Invalid configuration, \"elements_variables\" should be a dictionary" unless elements_variables.is_a?(Hash)
+    elements_variables.each do |key, hash|
+      raise "Invalid element variable configuration for \"#{key}\"" unless hash.is_a?(Hash)
+      @template_element_config[key] = TemplateElementConfig.new(hash)
+    end
+  end
+
+  def element_configuration_for(element)
+    @template_element_config[element] || TemplateConfig.new({})
+  end
+end
+
+class TemplateElementConfig
+
+  attr_reader :variables
+
+  def initialize(hash)
+    @variables = hash
+  end
+end
\ No newline at end of file

From f7046ffe47f0eb52c0f06973e12d4a94374330a1 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 6 Feb 2024 17:33:10 +0100
Subject: [PATCH 06/38] WIP support hierarchical variable management

---
 lib/ccios/file_template_definition.rb        |  8 ++++----
 lib/ccios/group_template_definition.rb       |  7 +++----
 lib/ccios/template_definition.rb             |  4 ++--
 lib/ccios/templates/Coordinator/template.yml |  3 ++-
 lib/ccios/templates/Interactor/template.yml  |  6 ++++--
 lib/ccios/templates/Presenter/template.yml   | 18 ++++++++++++------
 lib/ccios/templates/Repository/template.yml  |  6 ++++--
 7 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/lib/ccios/file_template_definition.rb b/lib/ccios/file_template_definition.rb
index 1f596fc..086b470 100644
--- a/lib/ccios/file_template_definition.rb
+++ b/lib/ccios/file_template_definition.rb
@@ -4,6 +4,7 @@
 
 class FileTemplateDefinition
   def initialize(file_template_definition_hash)
+    @name = file_template_definition_hash["name"]
     @path = file_template_definition_hash["file"]
     @template = file_template_definition_hash["template"]
     @target = file_template_definition_hash["target"]
@@ -11,8 +12,8 @@ def initialize(file_template_definition_hash)
   end
 
   def validate(parser, project, context, template_definition, config)
-    merged_variables = template_definition.variables.merged(@variables)
-    merged_variables = merged_variables.merge(config.variables)
+
+    merged_variables = config.variables_for_template_element(template_definition, @name, @variables)
 
     code_templater = CodeTemplater.new
     expected_context_keys = template_definition.provided_context_keys
@@ -41,8 +42,7 @@ def validate(parser, project, context, template_definition, config)
   end
 
   def generate(parser, project, context, template_definition, config)
-    merged_variables = template_definition.variables.merged(@variables)
-    merged_variables = merged_variables.merge(config.variables)
+    merged_variables = config.variables_for_template_element(template_definition, @name, @variables)
 
     base_path = merged_variables["base_path"]
     base_group = project[base_path]
diff --git a/lib/ccios/group_template_definition.rb b/lib/ccios/group_template_definition.rb
index 4b1f303..1c96826 100644
--- a/lib/ccios/group_template_definition.rb
+++ b/lib/ccios/group_template_definition.rb
@@ -4,6 +4,7 @@
 
 class GroupTemplateDefinition
   def initialize(group_template_definition_hash)
+    @name = group_template_definition_hash["name"]
     @path = group_template_definition_hash["group"]
     @template = group_template_definition_hash["path"]
     @target = group_template_definition_hash["target"]
@@ -11,8 +12,7 @@ def initialize(group_template_definition_hash)
   end
 
   def validate(parser, project, context, template_definition, config)
-    merged_variables = template_definition.variables.merged(@variables)
-    merged_variables = merged_variables.merge(config.variables)
+    merged_variables = config.variables_for_template_element(template_definition, @name, @variables)
 
     code_templater = CodeTemplater.new
     pathTags = code_templater.get_unknown_context_keys_for_string(@path)
@@ -28,8 +28,7 @@ def validate(parser, project, context, template_definition, config)
   end
 
   def generate(parser, project, context, template_definition, config)
-    merged_variables = template_definition.variables.merged(@variables)
-    merged_variables = merged_variables.merge(config.variables)
+    merged_variables = config.variables_for_template_element(template_definition, @name, @variables)
 
     base_path = merged_variables["base_path"]
     base_group = project[base_path]
diff --git a/lib/ccios/template_definition.rb b/lib/ccios/template_definition.rb
index 88ccd32..983419b 100644
--- a/lib/ccios/template_definition.rb
+++ b/lib/ccios/template_definition.rb
@@ -53,7 +53,7 @@ def validate(parser, options, config)
     raise "Error: missing name in template" if @name.nil?
     raise "Error: invalid template name" unless @name.is_a? String
 
-    merged_variables = @variables.merge(config.variables)
+    merged_variables = config.variables_for_template(self)
     project_path = merged_variables["project"]
 
     project = parser.project_for(project_path)
@@ -87,7 +87,7 @@ def generate(parser, options, config)
     # interactor_name = "SampleInteractor"
     # interactor_name = interactor_name.gsub("Interactor", "")
 
-    merged_variables = @variables.merge(config.variables)
+    merged_variables = config.variables_for_template(self)
     project_path = merged_variables["project"]
 
     project = parser.project_for project_path
diff --git a/lib/ccios/templates/Coordinator/template.yml b/lib/ccios/templates/Coordinator/template.yml
index 4cb66f4..8d1630f 100644
--- a/lib/ccios/templates/Coordinator/template.yml
+++ b/lib/ccios/templates/Coordinator/template.yml
@@ -10,7 +10,8 @@ parameters:
     template_variable_name: "generate_delegate"
     description: "Generate delegate protocols when provided"
 generated_elements:
-  - file: "{{ name }}Coordinator.swift"
+  - name: "coordinator"
+    file: "{{ name }}Coordinator.swift"
     template: "coordinator"
     variables: {}
 template_file_source:
diff --git a/lib/ccios/templates/Interactor/template.yml b/lib/ccios/templates/Interactor/template.yml
index e7ebca6..e8bffb8 100644
--- a/lib/ccios/templates/Interactor/template.yml
+++ b/lib/ccios/templates/Interactor/template.yml
@@ -6,10 +6,12 @@ variables:
   project: "*.xcodeproj"
   base_path: "Core/Interactor"
 generated_elements:
-  - file: "{{ name }}Interactor/{{ name }}Interactor.swift"
+  - name: "interactor"
+    file: "{{ name }}Interactor/{{ name }}Interactor.swift"
     template: "interactor"
     variables: {}
-  - file: "{{ name }}Interactor/{{ name }}InteractorImplementation.swift"
+  - name: "interactor_implementation"
+    file: "{{ name }}Interactor/{{ name }}InteractorImplementation.swift"
     template: "interactor_implementation"
     variables: {}
 code_snippets:
diff --git a/lib/ccios/templates/Presenter/template.yml b/lib/ccios/templates/Presenter/template.yml
index ac0b279..ef0ae2e 100644
--- a/lib/ccios/templates/Presenter/template.yml
+++ b/lib/ccios/templates/Presenter/template.yml
@@ -10,21 +10,27 @@ variables:
   project: "*.xcodeproj"
   base_path: "App"
 generated_elements:
-  - group: "{{ name }}/UI/View"
+  - name: "ui_view_group"
+    group: "{{ name }}/UI/View"
     variables: {}
-  - file: "{{ name }}/UI/ViewController/{{ name }}ViewController.swift"
+  - name: "view_controller"
+    file: "{{ name }}/UI/ViewController/{{ name }}ViewController.swift"
     template: "viewController"
     variables: {}
-  - file: "{{ name }}/UI/{{ name }}ViewContract.swift"
+  - name: "view_contract"
+    file: "{{ name }}/UI/{{ name }}ViewContract.swift"
     template: "viewContract"
     variables: {}
-  - file: "{{ name }}/Presenter/{{ name }}Presenter.swift"
+  - name: "presenter"
+    file: "{{ name }}/Presenter/{{ name }}Presenter.swift"
     template: "presenter"
     variables: {}
-  - file: "{{ name }}/Presenter/{{ name }}PresenterImplementation.swift"
+  - name: "presenter_implementation"
+    file: "{{ name }}/Presenter/{{ name }}PresenterImplementation.swift"
     template: "presenterImplementation"
     variables: {}
-  - group: "{{ name }}/Model"
+  - name: "model_group"
+    group: "{{ name }}/Model"
     variables: {}
 code_snippets:
   - name: DependencyProvider
diff --git a/lib/ccios/templates/Repository/template.yml b/lib/ccios/templates/Repository/template.yml
index 219c980..ef94c63 100644
--- a/lib/ccios/templates/Repository/template.yml
+++ b/lib/ccios/templates/Repository/template.yml
@@ -5,11 +5,13 @@ parameters:
 variables:
   project: "*.xcodeproj"
 generated_elements:
-  - file: "{{ name }}/{{ name }}Repository.swift"
+  - name: "repository"
+    file: "{{ name }}/{{ name }}Repository.swift"
     template: "repository"
     variables:
       base_path: "Core/Data"
-  - file: "{{ name }}/{{ name }}RepositoryImplementation.swift"
+  - name: "repository_implementation"
+    file: "{{ name }}/{{ name }}RepositoryImplementation.swift"
     template: "repository_implementation"
     variables:
       base_path: "Data"

From 0e0db9c12dd43b49c21c79d74ce5e572ebe83460 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 6 Feb 2024 17:41:01 +0100
Subject: [PATCH 07/38] Use variables mecanism to choose target to use for each
 file

---
 lib/ccios/file_template_definition.rb       | 9 +++++----
 lib/ccios/group_template_definition.rb      | 1 -
 lib/ccios/templates/Interactor/template.yml | 1 +
 lib/ccios/templates/Presenter/template.yml  | 1 +
 lib/ccios/templates/Repository/template.yml | 1 +
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/ccios/file_template_definition.rb b/lib/ccios/file_template_definition.rb
index 086b470..963ce63 100644
--- a/lib/ccios/file_template_definition.rb
+++ b/lib/ccios/file_template_definition.rb
@@ -7,7 +7,6 @@ def initialize(file_template_definition_hash)
     @name = file_template_definition_hash["name"]
     @path = file_template_definition_hash["file"]
     @template = file_template_definition_hash["template"]
-    @target = file_template_definition_hash["target"]
     @variables = file_template_definition_hash["variables"] || {}
   end
 
@@ -37,8 +36,9 @@ def validate(parser, project, context, template_definition, config)
     base_group = project[base_path]
     raise "Base path \"#{base_path}\" is missing" if base_group.nil?
 
-    target = parser.target_for(project, @target)
-    raise "Unable to find target \"#{@target}\"" if target.nil?
+    target_name = merged_variables["target"]
+    target = parser.target_for(project, target_name)
+    raise "Unable to find target \"#{target_name}\"" if target.nil?
   end
 
   def generate(parser, project, context, template_definition, config)
@@ -64,7 +64,8 @@ def generate(parser, project, context, template_definition, config)
       )
     end
 
-    target = parser.target_for(project, @target)
+    target_name = merged_variables["target"]
+    target = parser.target_for(project, target_name)
     FileCreator.new.create_file_using_template_path(
       template_definition.template_source_file(@template),
       generated_filename,
diff --git a/lib/ccios/group_template_definition.rb b/lib/ccios/group_template_definition.rb
index 1c96826..a49c567 100644
--- a/lib/ccios/group_template_definition.rb
+++ b/lib/ccios/group_template_definition.rb
@@ -7,7 +7,6 @@ def initialize(group_template_definition_hash)
     @name = group_template_definition_hash["name"]
     @path = group_template_definition_hash["group"]
     @template = group_template_definition_hash["path"]
-    @target = group_template_definition_hash["target"]
     @variables = group_template_definition_hash["variables"] || {}
   end
 
diff --git a/lib/ccios/templates/Interactor/template.yml b/lib/ccios/templates/Interactor/template.yml
index e8bffb8..e11c55c 100644
--- a/lib/ccios/templates/Interactor/template.yml
+++ b/lib/ccios/templates/Interactor/template.yml
@@ -5,6 +5,7 @@ parameters:
 variables:
   project: "*.xcodeproj"
   base_path: "Core/Interactor"
+  target: ""
 generated_elements:
   - name: "interactor"
     file: "{{ name }}Interactor/{{ name }}Interactor.swift"
diff --git a/lib/ccios/templates/Presenter/template.yml b/lib/ccios/templates/Presenter/template.yml
index ef0ae2e..eae4129 100644
--- a/lib/ccios/templates/Presenter/template.yml
+++ b/lib/ccios/templates/Presenter/template.yml
@@ -9,6 +9,7 @@ parameters:
 variables:
   project: "*.xcodeproj"
   base_path: "App"
+  target: ""
 generated_elements:
   - name: "ui_view_group"
     group: "{{ name }}/UI/View"
diff --git a/lib/ccios/templates/Repository/template.yml b/lib/ccios/templates/Repository/template.yml
index ef94c63..3366bac 100644
--- a/lib/ccios/templates/Repository/template.yml
+++ b/lib/ccios/templates/Repository/template.yml
@@ -4,6 +4,7 @@ parameters:
   - argument: "name"
 variables:
   project: "*.xcodeproj"
+  target: ""
 generated_elements:
   - name: "repository"
     file: "{{ name }}/{{ name }}Repository.swift"

From aa45481e49e16c713b63ceb13f7ed9c27279b030 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 6 Feb 2024 18:11:18 +0100
Subject: [PATCH 08/38] Add support for custom collections

---
 lib/ccios.rb        | 12 +++++++++++-
 lib/ccios/config.rb |  5 ++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lib/ccios.rb b/lib/ccios.rb
index 91ac71d..8330887 100644
--- a/lib/ccios.rb
+++ b/lib/ccios.rb
@@ -14,13 +14,23 @@
     .select { |path| File.directory? path }
     .map { |template_path| TemplateDefinition.parse(template_path) }
     .compact
+custom_templates = []
+if !config.templates_collection.nil?
+    custom_templates = Dir.children(config.templates_collection)
+    .map { |name| File.join(config.templates_collection, name) }
+    .select { |path| File.directory? path }
+    .map { |template_path| TemplateDefinition.parse(template_path) }
+    .compact
+end
 
 templates = {}
 subcommands = {}
 
 options = {}
 
-default_templates.each do |template|
+all_templates = default_templates + custom_templates
+
+all_templates.each do |template|
   templates[template.name] = template
   subcommands[template.name] = OptionParser.new do |opts|
 
diff --git a/lib/ccios/config.rb b/lib/ccios/config.rb
index 085fb97..2b938f1 100644
--- a/lib/ccios/config.rb
+++ b/lib/ccios/config.rb
@@ -2,7 +2,7 @@
 
 class Config
 
-  attr_reader :variables
+  attr_reader :variables, :templates_collection
 
   def self.parse(source_path)
     if File.exist?(source_path)
@@ -24,8 +24,11 @@ def self.default_config_hash
 
   def initialize(config_hash, source_path = nil)
     @variables = config_hash["variables"] || {}
+    @templates_collection = config_hash["templates_collection"] || nil
     @templates_config = {}
 
+    raise "Invalid \"templates_collection\" in config, should be a string" unless @templates_collection.is_a?(String) || @templates_collection.nil?
+
     templates_config = config_hash["templates_config"] || {}
     raise "Invalid \"templates_config\" in configuration, it should be a dictionary" unless templates_config.is_a?(Hash)
     templates_config.each do |key, hash|

From 44250aea4ae89d57251d7c29c2ceeafcb7c89125 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Wed, 7 Feb 2024 00:54:41 +0100
Subject: [PATCH 09/38] Fix name conflict in code_templater

---
 lib/ccios/code_templater.rb                                | 4 ++--
 lib/ccios/templates/Presenter/dependency_provider.mustache | 4 ++--
 templates_library/async/dependency_provider.mustache       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ccios/code_templater.rb b/lib/ccios/code_templater.rb
index 86ab55c..81e3660 100644
--- a/lib/ccios/code_templater.rb
+++ b/lib/ccios/code_templater.rb
@@ -17,7 +17,7 @@ def get_unknown_context_keys_for_string(template)
 
   def render_file_content_from_template(template_path, filename, context)
     filename = File.basename(filename, File.extname(filename))
-    context = context.merge({name: filename, lowercased_name: filename.camelize(:lower)})
+    context = context.merge({filename: filename, lowercased_filename: filename.camelize(:lower)})
     Mustache.render(File.read(template_path), context)
   end
 
@@ -26,7 +26,7 @@ def get_unknown_context_keys_for_template(template_path)
     templateView.template_file = template_path
     tags = (templateView.template.tags || [])
     tags = tags.map { |t| t.split(".")[-1] }.to_set
-    tags.subtract(Set["name", "lowercased_name"])
+    tags.subtract(Set["filename", "lowercased_filename"])
     tags
   end
 end
diff --git a/lib/ccios/templates/Presenter/dependency_provider.mustache b/lib/ccios/templates/Presenter/dependency_provider.mustache
index d70e8e4..d86a9ab 100644
--- a/lib/ccios/templates/Presenter/dependency_provider.mustache
+++ b/lib/ccios/templates/Presenter/dependency_provider.mustache
@@ -1,12 +1,12 @@
 {{#generate_delegate}}
-func {{lowercased_name}}Presenter(viewContract: {{name}}ViewContract, presenterDelegate: {{name}}PresenterDelegate) -> {{name}}Presenter? {
+func {{lowercased_filename}}Presenter(viewContract: {{name}}ViewContract, presenterDelegate: {{name}}PresenterDelegate) -> {{name}}Presenter? {
     return presenterAssembler
         .resolver
         .resolve({{name}}Presenter.self, arguments: viewContract, presenterDelegate)
 }
 {{/generate_delegate}}
 {{^generate_delegate}}
-func {{lowercased_name}}Presenter(viewContract: {{name}}ViewContract) -> {{name}}Presenter? {
+func {{lowercased_filename}}Presenter(viewContract: {{name}}ViewContract) -> {{name}}Presenter? {
     return presenterAssembler
         .resolver
         .resolve({{name}}Presenter.self, argument: viewContract)
diff --git a/templates_library/async/dependency_provider.mustache b/templates_library/async/dependency_provider.mustache
index d70e8e4..d86a9ab 100644
--- a/templates_library/async/dependency_provider.mustache
+++ b/templates_library/async/dependency_provider.mustache
@@ -1,12 +1,12 @@
 {{#generate_delegate}}
-func {{lowercased_name}}Presenter(viewContract: {{name}}ViewContract, presenterDelegate: {{name}}PresenterDelegate) -> {{name}}Presenter? {
+func {{lowercased_filename}}Presenter(viewContract: {{name}}ViewContract, presenterDelegate: {{name}}PresenterDelegate) -> {{name}}Presenter? {
     return presenterAssembler
         .resolver
         .resolve({{name}}Presenter.self, arguments: viewContract, presenterDelegate)
 }
 {{/generate_delegate}}
 {{^generate_delegate}}
-func {{lowercased_name}}Presenter(viewContract: {{name}}ViewContract) -> {{name}}Presenter? {
+func {{lowercased_filename}}Presenter(viewContract: {{name}}ViewContract) -> {{name}}Presenter? {
     return presenterAssembler
         .resolver
         .resolve({{name}}Presenter.self, argument: viewContract)

From cd23ec9b1be028275989f034aa9b0f2f832101e2 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Wed, 7 Feb 2024 00:56:17 +0100
Subject: [PATCH 10/38] Make file creator capable of adding file to multiple
 targets

---
 lib/ccios/file_creator.rb             |  8 +++++---
 lib/ccios/file_template_definition.rb | 25 +++++++++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/lib/ccios/file_creator.rb b/lib/ccios/file_creator.rb
index ac51f44..2d4923c 100644
--- a/lib/ccios/file_creator.rb
+++ b/lib/ccios/file_creator.rb
@@ -43,7 +43,7 @@ def get_unknown_template_tags_for(template_path)
     tags
   end
 
-  def create_file_using_template_path(template_path, generated_filename, group, target, context)
+  def create_file_using_template_path(template_path, generated_filename, group, targets, context)
     file_path = File.join(group.real_path, generated_filename)
 
     raise "File #{file_path} already exists" if File.exist?(file_path)
@@ -51,14 +51,16 @@ def create_file_using_template_path(template_path, generated_filename, group, ta
     FileUtils.mkdir_p dirname unless File.directory?(dirname)
     file = File.new(file_path, 'w')
 
-    context = context.merge(templater_options(target))
+    context = context.merge(templater_options(targets[0]))
     file_content = CodeTemplater.new.render_file_content_from_template(template_path, generated_filename, context)
 
     file.puts(file_content)
 
     file.close
     file_ref = group.new_reference(file_path)
-    target.add_file_references([file_ref])
+    targets.each do |target|
+      target.add_file_references([file_ref])
+    end
   end
 
   def print_file_content_using_template(filename, template_path, context)
diff --git a/lib/ccios/file_template_definition.rb b/lib/ccios/file_template_definition.rb
index 963ce63..970134d 100644
--- a/lib/ccios/file_template_definition.rb
+++ b/lib/ccios/file_template_definition.rb
@@ -37,8 +37,18 @@ def validate(parser, project, context, template_definition, config)
     raise "Base path \"#{base_path}\" is missing" if base_group.nil?
 
     target_name = merged_variables["target"]
-    target = parser.target_for(project, target_name)
-    raise "Unable to find target \"#{target_name}\"" if target.nil?
+    if target_name.is_a?(String)
+      target = parser.target_for(project, target_name)
+      raise "Unable to find target \"#{target_name}\"" if target.nil?
+    elsif target_name.is_a?(Array)
+      target_name.each do |target_name|
+        target = parser.target_for(project, target_name)
+        raise "Unable to find target \"#{target_name}\"" if target.nil?
+      end
+    else
+      raise "Invalid target in template #{@name}"
+    end
+
   end
 
   def generate(parser, project, context, template_definition, config)
@@ -65,12 +75,19 @@ def generate(parser, project, context, template_definition, config)
     end
 
     target_name = merged_variables["target"]
-    target = parser.target_for(project, target_name)
+
+    targets = []
+    if target_name.is_a?(String)
+      targets = [parser.target_for(project, target_name)]
+    elsif target_name.is_a?(Array)
+      targets = target_name.map { |name| parser.target_for(project, name) }
+    end
+
     FileCreator.new.create_file_using_template_path(
       template_definition.template_source_file(@template),
       generated_filename,
       group,
-      target,
+      targets,
       context
     )
   end

From 11ffa638ea990ed170508aedee140078d81e30f6 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 13 Feb 2024 17:23:51 +0100
Subject: [PATCH 11/38] Update README.md

---
 README.md | 236 +++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 180 insertions(+), 56 deletions(-)

diff --git a/README.md b/README.md
index cb5f278..b8c3c2b 100644
--- a/README.md
+++ b/README.md
@@ -21,14 +21,24 @@ To run the tests run:
 Go to your `.xcodeproj` folder `cd /paht/to/my/xcodeproj`.
 Then generate files with prefix `Example`:
 
+```bash
+ccios <template_name> [template_arguments...] [template_options]
 ```
-ccios [-p|-i|-r|-c] Example [-d]
+
+The list of known templates is visible using the following command:
+```bash
+ccios --help
 ```
 
-Generated templates can be found [here](https://github.com/felginep/ccios/tree/master/lib/ccios/templates)
+Generated templates can be found [here](https://github.com/fabernovel/ccios/tree/master/lib/ccios/templates)
+
+## Default templates
+
+### `presenter`
 
-### `-p`
-`-p` stands for `presenter`
+```bash
+ccios presenter Example [-d]
+```
 
 This generates 4 files: `ExampleViewController`, `ExampleViewContract`, `ExamplePresenter`, `ExamplePresenterImplementation`. If the `-d` option is supplied the protocol `ExamplePresenterDelegate` will be generated.
 
@@ -51,8 +61,11 @@ The following structure is created for you in the Xcode project:
 |   |   +-- Model/
 ```
 
-### `-i`
-`-i` stands for `interactor`
+### `interactor`
+
+```bash
+ccios interactor Example
+```
 
 This generates 2 files: `ExampleInteractor` and `ExampleInteractorImplementation`.
 
@@ -69,8 +82,11 @@ The following structure is created for you in the Xcode project:
 |   |   |   +-- ExampleInteractorImplementation
 ```
 
-### `-r`
-`-r` stands for `repository`
+### `repository`
+
+```bash
+ccios repository Example
+```
 
 This generates 2 files: `ExampleRepository` and `ExampleRepositoryImplementation`.
 
@@ -89,8 +105,11 @@ The following structure is created for you in the Xcode project:
 |   |   +-- ExampleRepositoryImplementation
 ```
 
-### `-c`
-`-c` stands for `coordinator`
+### `coordinator`
+
+```bash
+ccios coordinator Example [-d]
+```
 
 This generates one file: `ExampleCoordinator`. If the `-d` option is supplied the protocol `ExampleCoordinatorDelegate` will be generated.
 
@@ -104,64 +123,169 @@ The following structure is created for you in the Xcode project:
 
 ## Configuration
 
-
-Each project is different. You can configure the groups to use in the xcodeproj for the new files.
+Each project is different. You can configure the available templates that can be used 
+You can configure the groups to use in the xcodeproj for the new files.
 
 Create a file `.ccios.yml` at the root of your project.
 
-By default, if no file is present, the following configuration will be used:
-```
-app:
-  project: MyProject.xcodeproj
+An empty config file is valid as all properties are optional.
+
+```yml
+# Path to an additional collection of templates. [Optional]
+# Templates present in this folder will be available. If the collection use the same name as a default template, it will override it.
+templates_collection: ccios/templates
+
+# Global overrides of variables [Optional]
+variables:
+  project: Project.xcodeproj
+
+# Per template variables override
+templates_config:
+  # Use the template name (in template.yml) to specify overrides on this template:
+  TEMPLATE_NAME:
+    # This overrides the default template variables
+    variables:
+      project: "Project.pbxproj"
+      # You can specify multiple target for generated files.
+      target: 
+        - SomeTarget
+        - SomeOtherTarget
+        - ThirdTarget
+    # Per element variable override
+    elements_variables:
+      # This overrides the default variables for the element named "ELEMENT_NAME_1"
+      ELEMENT_NAME_1:
+        base_path: Core/Data
+        target: Core
+      ELEMENT_NAME_2:
+        base_path: Data
+        target: Data
+  # Another template variable override
   presenter:
-    group: Classes/App
+    variables:
+      base_path: MyProject/App
+    elements_variables:
+      repository:
+        base_path: "Core/Data"
   coordinator:
-    group: Classes/Coordinator
-
-core:
-  project: MyProject.xcodeproj
-  interactor:
-    group: Classes/Core/Interactor
-  repository:
-    group: Classes/Core/Data
-
-data:
-  project: MyProject.xcodeproj
-  repository:
-    group: Classes/Data
+    variables:
+      base_path: MyProject/Coordinator
 ```
 
-But you could imagine more complex project structures with multiple xcodeproj:
-```
-app:
-  project: MyProject/MyProject.xcodeproj
-  target: MyProject # optional
-  presenter:
-    group: Classes/App
-  coordinator:
-    group: Classes/Coordinator
+*Note*: The path of the new files will be infered from the path of the group. It works with *Group with folder* and *Group without folder* in Xcode.
 
-core:
-  project: MyProjectCore/MyProjectCore.xcodeproj
-  target: MyProjectCore # optional
-  interactor:
-    group: MyProjectCore/Interactors
-  repository:
-    group: MyProjectCore/Repository
+## Template definition
 
-data:
-  project: MyProjectData/MyProjectData.xcodeproj
-  target: MyProjectData # optional
-  repository:
-    group: MyProjectData/Sources/Repositories
-```
+Default templates can be found [here](https://github.com/fabernovel/ccios/tree/master/lib/ccios/templates), and can be used to see what is possible.
 
-*Note*: The path of the new files will be infered from the path of the group. It works with *Group with folder* and *Group without folder* in Xcode.
+A template is a folder containing a file `template.yml` next to all templating files that will be used during generation.
+Example for the default Interactor template:
+```
+Interactor/
+    template.yml
+    interactor.mustache
+    interactor_assembly.mustache
+    interactor_implementation.mustache
+```
 
-And lastly you may want to use your own templates, by adding this parameter to the file:
+### `template.yml` format
+
+```yml
+# name of the template to use in the CLI. [required]
+name: "custom_template"
+# description of the template. [optional]
+description: "Custom template definition"
+# List of the parameters that will be given to the file templates. [required]
+# The parameters can be used in template files, and in file path.
+parameters:
+  # Use this to represent a string argument parameter in the CLI
+  # By default the argument will be passed to template renderer under the name "name", to use another name, specify a `template_variable_name`
+  - argument: "name" 
+    # Description used in the help command. [Optional]
+    description: "name argument description"
+    # When present, the argument will be usable in templates under the provided name. [Optional]
+    template_variable_name: "in_template_variable_name"
+  # Use this to represent a flag parameter in the CLI, the flag will be provided to templates as `true` when present in the executed command.
+  - flag: "long_name"
+    # The short name of this flag to use on CLI. [optional]
+    short_name: "n"
+    # Description used in the help command. [Optional]
+    description: "Generate delegate protocols when provided"
+    # When present, the argument will be usable in templates under the provided name. [Optional]
+    template_variable_name: "generate_delegate"
+# List of templates variables that is used to generate files in an xcode project. [Optional]
+# Those variables can be overridden in config file, see section "Variable hierarchy" for more informations.
+variables:
+  # The name of the xcode project. "*.xcodeproj" will use the first it finds. [required]
+  project: "*.xcodeproj"
+  # The base path used to generate an element. This variable must be defined once here, or on each elements below.
+  base_path: "path/to/base_group"
+  # The target in which files are added. Can be a string, a list of strings, or an empty string. This variable must be defined once here, or on each elements below. If an empty string is provided, it will use the first target found in the Xcode project.
+  target: ""
+# List of generated elements. [Required]
+# Each element can be a file (using `file`), or an empty folder (using `group`)
+generated_elements:
+    # Path from the `base_path` variable where the file will be generated
+  - file: "{{ name }}/{{ name }}File.swift"
+    # This name identify this generated file to allow variable overrides in config file. [Required]
+    name: "file"
+    # The template specify the name of template that will be used from `template_file_source`
+    template: "file"
+    # List of default element variable. [Optional]
+    variables: {}
+    # Path from the `base_path` variable where the directory will be generated
+  - group: "{{ name }}/group"
+    # This name identify this generated file to allow variable overrides in config file. [Required]
+    name: "group"
+    # List of default element variable. [Optional]
+    variables:
+      - base_path: "path/override/to/base_group"
+# List of code snippets that will be printer by the CLI after the generation of files. [Optional]
+code_snippets:
+  - name: InteractorAssembly
+    template: "file_snippets"
+# List of templating files used for element generation or code snippets. [Required]
+# The key is used as an identifier in `generated_elements` or `code_snippets`, the value is the path from the template directory.
+template_file_source: 
+  file: "file.mustache"
+  file_snippets: "file_snippets.mustache"
 ```
-templates:
-  path: Path/To/Users/Templates
+
+### Variable hierarchy
+
+In `template.yml`
+```yml
+# [...]
+variables:
+  # -> Default templates variables
+generated_elements:
+  - name: element_name
+    # [...]
+    variables:
+      # -> Default Element variables
 ```
 
+In `.ccios.yml`
+```yml
+variables:
+  # -> Config Global variables
+templates_config:
+ repository:
+   variables:
+     # -> Config Template variables
+   element_variables:
+     element_name:
+       # -> Config Element variables
+```
 
+Templates will use variables in this order (first in this list is used):
+- Config Template variables
+- Default templates variables
+- Config Global variables
+
+Element will use variables in this order (first in this list is used): (For files, groups and code snippets)
+- Config Element variables
+- Default Element variables
+- Config Template variables
+- Default templates variables
+- Config Global variables

From 4dfe6bb6cc3d3a4aeaee68491677016621d2b50b Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 13 Feb 2024 17:47:51 +0100
Subject: [PATCH 12/38] Update Changelog

---
 CHANGELOG.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71a3dac..82a3939 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,34 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+This release is an entire rewrite of the templating system, allowing customization of template and settings.
+
+### Added
+
+- New templating system that allow definition of custom templates per project
+- A template can now declare multiple CLI arguments and flags
+- Generated files can be added to multiple targets
+- The base_path group and target nan be configured independently for each generated file if needed.
+- Add validation that each variable present in a mustache file is provided by the template. The default provided variables are: `filename`, `lowercase_filename`, `project_name`, `full_username` and `date`
+- List of known templates is available using `ccios --help`
+
+### Removed
+
+- There is no longer an automatic suffix removal from the argument passed in the CLI. Example: `ccios presenter ExamplePresenter` will generate a file named: `ExamplePresenterPresenter`
+
+### Changed
+
+- Default templates has been migrated to the new format
+- Configuration file (`.ccios`) format has been changed
+- Command line invocation has changed:
+    - `ccios -p Example [-d]` is now `ccios presenter Example [-d]`
+    - `ccios -c Example [-d]` is now `ccios coordinator Example [-d]`
+    - `ccios -i Example [-d]` is now `ccios interactor Example`
+    - `ccios -r Example [-d]` is now `ccios repository Example`
+- Some default provided mustache variables has been renamed:
+    - `name` is now `filename`
+    - `lowercased_name` is now `lowercased_filename`
+
 ## [4.1.0]
 
 ### Added

From 9ff445229ddfaae0cefdd49686ebcbebf0af3f57 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 14:26:59 +0100
Subject: [PATCH 13/38] Fix changelog

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82a3939..447fc6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,11 @@ This release is an entire rewrite of the templating system, allowing customizati
 
 ### Added
 
-- New templating system that allow definition of custom templates per project
+- New templating system that allows definition of custom templates per project
 - A template can now declare multiple CLI arguments and flags
 - Generated files can be added to multiple targets
-- The base_path group and target nan be configured independently for each generated file if needed.
-- Add validation that each variable present in a mustache file is provided by the template. The default provided variables are: `filename`, `lowercase_filename`, `project_name`, `full_username` and `date`
+- The base_path group and target can be configured independently for each generated file if needed.
+- Add validation that each variable used in a mustache file is provided by the template. The default provided variables are: `filename`, `lowercase_filename`, `project_name`, `full_username` and `date`
 - List of known templates is available using `ccios --help`
 
 ### Removed

From 9804664dde65c3f120777f41436e3cb0d78315d2 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 15:32:44 +0100
Subject: [PATCH 14/38] Create TemplatesLoader

---
 lib/ccios.rb                  | 23 +++--------------------
 lib/ccios/templates_loader.rb | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 20 deletions(-)
 create mode 100644 lib/ccios/templates_loader.rb

diff --git a/lib/ccios.rb b/lib/ccios.rb
index 8330887..1f331e0 100644
--- a/lib/ccios.rb
+++ b/lib/ccios.rb
@@ -4,34 +4,17 @@
 require 'active_support'
 require 'ccios/config'
 require 'ccios/template_definition'
+require 'ccios/templates_loader'
 
 config = Config.parse ".ccios.yml"
 source_path = Dir.pwd
 
-default_template_folder = File.join(File.dirname(__FILE__), "ccios", "templates")
-default_templates = Dir.children(default_template_folder)
-    .map { |name| File.join(default_template_folder, name) }
-    .select { |path| File.directory? path }
-    .map { |template_path| TemplateDefinition.parse(template_path) }
-    .compact
-custom_templates = []
-if !config.templates_collection.nil?
-    custom_templates = Dir.children(config.templates_collection)
-    .map { |name| File.join(config.templates_collection, name) }
-    .select { |path| File.directory? path }
-    .map { |template_path| TemplateDefinition.parse(template_path) }
-    .compact
-end
+templates = TemplatesLoader.new.get_templates(config)
 
-templates = {}
 subcommands = {}
-
 options = {}
 
-all_templates = default_templates + custom_templates
-
-all_templates.each do |template|
-  templates[template.name] = template
+templates.values.each do |template|
   subcommands[template.name] = OptionParser.new do |opts|
 
     arguments = template.parameters.select { |p| p.is_a?(ArgumentTemplateParameter) }
diff --git a/lib/ccios/templates_loader.rb b/lib/ccios/templates_loader.rb
new file mode 100644
index 0000000..839f083
--- /dev/null
+++ b/lib/ccios/templates_loader.rb
@@ -0,0 +1,31 @@
+require_relative 'config'
+require_relative 'template_definition'
+
+class TemplatesLoader
+
+  def get_templates(config)
+    default_template_folder = File.join(File.dirname(__FILE__), "templates")
+    default_templates = load_templates_from_collection(default_template_folder)
+    custom_templates = []
+    if !config.templates_collection.nil?
+      custom_templates = load_templates_from_collection(config.templates_collection)
+    end
+    templates = {}
+    all_templates = default_templates + custom_templates
+    all_templates.each do |template|
+      templates[template.name] = template
+    end
+    Hash[templates.sort_by{|k,v| k}]
+  end
+
+  private
+
+  def load_templates_from_collection(collection_path)
+    template_paths = Dir.children(collection_path)
+      .map { |name| File.join(collection_path, name) }
+      .select { |path| File.directory? path }
+    template_paths
+      .map { |template_path| TemplateDefinition.parse(template_path) }
+      .compact
+  end
+end

From e7464ebebecaee165b2f68da071acadaf386bd62 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 15:32:53 +0100
Subject: [PATCH 15/38] Add missing require

---
 lib/ccios/file_creator.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ccios/file_creator.rb b/lib/ccios/file_creator.rb
index 2d4923c..3310757 100644
--- a/lib/ccios/file_creator.rb
+++ b/lib/ccios/file_creator.rb
@@ -1,6 +1,7 @@
 require_relative 'code_templater'
 require 'fileutils'
 require 'logger'
+require 'xcodeproj'
 
 class Xcodeproj::Project::Object::PBXGroup
 

From e2080ff3d75032e09658fde0d03fb91a5d3d5576 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 16:07:04 +0100
Subject: [PATCH 16/38] Add missing description field to TemplateDefinition

---
 lib/ccios/template_definition.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ccios/template_definition.rb b/lib/ccios/template_definition.rb
index 983419b..4d75a80 100644
--- a/lib/ccios/template_definition.rb
+++ b/lib/ccios/template_definition.rb
@@ -10,7 +10,7 @@
 
 class TemplateDefinition
 
-  attr_reader :name, :template_path, :template_file_source, :parameters, :variables
+  attr_reader :name, :description, :template_path, :template_file_source, :parameters, :variables
 
   def self.parse(template_path)
     template_definition = File.join(template_path, 'template.yml')
@@ -28,6 +28,7 @@ def initialize(template_definition_hash, template_path)
     @template_path = template_path
 
     @name = template_definition_hash["name"]
+    @description = template_definition_hash["description"] || ""
     @variables = template_definition_hash["variables"] || {}
 
     @parameters = template_definition_hash["parameters"].map { |hash|

From 0a9f16b5cc4dcfd36789441d05b9f7de7ba33306 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 16:07:44 +0100
Subject: [PATCH 17/38] Add tests for templates_loader

---
 .../Simple/template.mustache                  |  5 ++
 .../additional_templates/Simple/template.yml  | 13 +++++
 .../Coordinator/coordinator.mustache          | 39 ++++++++++++++
 .../Coordinator/template.yml                  | 18 +++++++
 test/test_templates_loader.rb                 | 51 +++++++++++++++++++
 5 files changed, 126 insertions(+)
 create mode 100644 test/templates_collections/additional_templates/Simple/template.mustache
 create mode 100644 test/templates_collections/additional_templates/Simple/template.yml
 create mode 100644 test/templates_collections/overriding_templates/Coordinator/coordinator.mustache
 create mode 100644 test/templates_collections/overriding_templates/Coordinator/template.yml
 create mode 100644 test/test_templates_loader.rb

diff --git a/test/templates_collections/additional_templates/Simple/template.mustache b/test/templates_collections/additional_templates/Simple/template.mustache
new file mode 100644
index 0000000..22eec57
--- /dev/null
+++ b/test/templates_collections/additional_templates/Simple/template.mustache
@@ -0,0 +1,5 @@
+Variables:
+- {{name}}
+- {{project_name}}
+- {{full_username}}
+- {{date}}
diff --git a/test/templates_collections/additional_templates/Simple/template.yml b/test/templates_collections/additional_templates/Simple/template.yml
new file mode 100644
index 0000000..56c0855
--- /dev/null
+++ b/test/templates_collections/additional_templates/Simple/template.yml
@@ -0,0 +1,13 @@
+name: "simple"
+variables:
+  project: "*.xcodeproj"
+  base_path: "Group"
+parameters:
+  - argument: "name"
+generated_elements:
+  - name: "file"
+    file: "{{ name }}.txt"
+    template: "template"
+    variables: {}
+template_file_source:
+  template: "template.mustache"
diff --git a/test/templates_collections/overriding_templates/Coordinator/coordinator.mustache b/test/templates_collections/overriding_templates/Coordinator/coordinator.mustache
new file mode 100644
index 0000000..b1d83b3
--- /dev/null
+++ b/test/templates_collections/overriding_templates/Coordinator/coordinator.mustache
@@ -0,0 +1,39 @@
+//
+//  {{name}}Coordinator.swift
+//  {{project_name}}
+//
+//  Created by {{full_username}} on {{date}}.
+//
+//
+
+import Foundation
+import ADCoordinator
+
+{{#generate_delegate}}
+protocol {{name}}CoordinatorDelegate: AnyObject {
+
+}
+
+{{/generate_delegate}}
+class {{name}}Coordinator: Coordinator {
+
+    {{#generate_delegate}}
+    weak var delegate: {{name}}CoordinatorDelegate?
+    {{/generate_delegate}}
+    private let dependencyProvider: ApplicationDependencyProvider
+    private unowned var navigationController: UINavigationController
+
+    init(navigationController: UINavigationController,
+         dependencyProvider: ApplicationDependencyProvider) {
+        self.navigationController = navigationController
+        self.dependencyProvider = dependencyProvider
+    }
+
+    // MARK: - Public
+
+    func start() {
+        let viewController = UIViewController()
+        navigationController.pushViewController(viewController, animated: false)
+        bindToLifecycle(of: viewController)
+    }
+}
diff --git a/test/templates_collections/overriding_templates/Coordinator/template.yml b/test/templates_collections/overriding_templates/Coordinator/template.yml
new file mode 100644
index 0000000..16cf981
--- /dev/null
+++ b/test/templates_collections/overriding_templates/Coordinator/template.yml
@@ -0,0 +1,18 @@
+name: "coordinator"
+description: "My custom Coordinator template"
+variables:
+  project: "*.xcodeproj"
+  base_path: "Coordinator"
+parameters:
+  - argument: "name"
+  - flag: "delegate"
+    short_name: "d"
+    template_variable_name: "generate_delegate"
+    description: "Generate delegate protocols when provided"
+generated_elements:
+  - name: "coordinator"
+    file: "{{ name }}Coordinator.swift"
+    template: "coordinator"
+    variables: {}
+template_file_source:
+  coordinator: "coordinator.mustache"
diff --git a/test/test_templates_loader.rb b/test/test_templates_loader.rb
new file mode 100644
index 0000000..015abbd
--- /dev/null
+++ b/test/test_templates_loader.rb
@@ -0,0 +1,51 @@
+require 'minitest/autorun'
+require_relative '../lib/ccios/templates_loader'
+require_relative '../lib/ccios/template_definition'
+require_relative '../lib/ccios/config'
+require 'xcodeproj'
+
+class TemplatesLoaderTest < Minitest::Test
+
+  def test_default_templates_are_found
+    config = Config.default
+
+    templates = TemplatesLoader.new.get_templates(config)
+
+    assert_equal templates.count, 4
+    assert templates["coordinator"]
+    assert templates["interactor"]
+    assert templates["presenter"]
+    assert templates["repository"]
+  end
+
+  def test_additional_collection_templates_are_found
+
+    config_hash = {}
+    config_hash["templates_collection"] = File.join(Dir.pwd, "test", "templates_collections", "additional_templates")
+    config = Config.new(config_hash)
+
+    templates = TemplatesLoader.new.get_templates(config)
+
+    assert_equal templates.count, 5
+    # Added templates
+    assert templates["simple"]
+    # Default templates
+    assert templates["coordinator"]
+    assert templates["interactor"]
+    assert templates["presenter"]
+    assert templates["repository"]
+  end
+
+  def test_additional_collection_templates_overrides_ddefault_templates
+
+    config_hash = {}
+    config_hash["templates_collection"] = File.join(Dir.pwd, "test", "templates_collections", "overriding_templates")
+    config = Config.new(config_hash)
+
+    templates = TemplatesLoader.new.get_templates(config)
+
+    assert templates["coordinator"]
+    overridden_template = templates["coordinator"]
+    assert_equal overridden_template.description, "My custom Coordinator template"
+  end
+end

From b10968a83ec91ac5faf9317ef19c14b9bdfef296 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 16:24:56 +0100
Subject: [PATCH 18/38] Update tests for config

---
 lib/ccios/config.rb |  1 +
 test/test_config.rb | 94 ++++++++++-----------------------------------
 2 files changed, 21 insertions(+), 74 deletions(-)

diff --git a/lib/ccios/config.rb b/lib/ccios/config.rb
index 2b938f1..2e648fc 100644
--- a/lib/ccios/config.rb
+++ b/lib/ccios/config.rb
@@ -7,6 +7,7 @@ class Config
   def self.parse(source_path)
     if File.exist?(source_path)
       config = YAML.load_file(source_path)
+      raise "Invalid config file" unless config.is_a?(Hash)
       self.new config, source_path
     else
       puts "File #{source_path} does not exist. Using default config."
diff --git a/test/test_config.rb b/test/test_config.rb
index 7711bdc..36051a4 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -4,29 +4,13 @@
 
 class ConfigTest < Minitest::Test
 
-  def test_default_config
-    config = Config.default
-    assert_config_is_ok config
-  end
-
-  def test_file_config_no_templates
+  def test_file_config_with_templates_collection
     Tempfile.create do |f|
-      f << file_config_content_no_templates
+      f << file_config_content_templates_collection
       f.rewind
 
       config = Config.parse f.path
-      assert_config_is_ok config
-    end
-  end
-
-  def test_file_config_with_templates
-    Tempfile.create do |f|
-      f << file_config_content_with_templates
-      f.rewind
-
-      config = Config.parse f.path
-      assert_config_is_ok config
-      assert_equal config.templates.path, "ccios/templates"
+      assert_equal config.templates_collection, "ccios/templates"
     end
   end
 
@@ -43,69 +27,31 @@ def test_file_not_valid
 
   private
 
-  def assert_config_is_ok(config)
-    refute_nil config
-
-    refute_nil config.app.project
-    refute_nil config.app.presenter.group
-    refute_nil config.app.coordinator.group
-
-    refute_nil config.core.project
-    refute_nil config.core.interactor.group
-    refute_nil config.core.repository.group
-
-    refute_nil config.data.project
-    refute_nil config.data.repository.group
-
-    refute_nil config.templates.path
-  end
-
-  def file_config_content_no_templates
+  def file_config_content_templates_collection
     <<-eos
-app:
-  project: MyProject.xcodeproj
-  presenter:
-    group: Classes/App
-  coordinator:
-    group: Classes/Coordinator
-
-core:
-  project: MyProject.xcodeproj
-  interactor:
-    group: Classes/Core/Interactor
-  repository:
-    group: Classes/Core/Data
-
-data:
-  project: MyProject.xcodeproj
-  repository:
-    group: Classes/Data
+templates_collection: ccios/templates
 eos
   end
 
-  def file_config_content_with_templates
+  def file_config_content_with_variables
     <<-eos
-app:
+variables:
   project: MyProject.xcodeproj
-  presenter:
-    group: Classes/App
-  coordinator:
-    group: Classes/Coordinator
 
-core:
-  project: MyProject.xcodeproj
-  interactor:
-    group: Classes/Core/Interactor
+templates_config:
   repository:
-    group: Classes/Core/Data
-
-data:
-  project: MyProject.xcodeproj
-  repository:
-    group: Classes/Data
-
-templates:
-  path: ccios/templates
+    variables: {}
+    elements_variables:
+      repository:
+        base_path: Core/Data
+        target: Core
+      repository_implementation:
+        base_path: "Data"
+        target: Data
+  presenter:
+    variables:
+      target: MyProject
+      base_path: MyProject/App
 eos
   end
 end

From 8c224e8ede685db139e01fd20726993408a4227c Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 16:47:18 +0100
Subject: [PATCH 19/38] Update test for CodeTemplater

---
 test/test_code_templater.rb | 93 ++++++++++++++++++++++++++-----------
 1 file changed, 66 insertions(+), 27 deletions(-)

diff --git a/test/test_code_templater.rb b/test/test_code_templater.rb
index 6e7f755..0ce686d 100644
--- a/test/test_code_templater.rb
+++ b/test/test_code_templater.rb
@@ -2,42 +2,81 @@
 require_relative '../lib/ccios/code_templater'
 
 class CodeTemplaterTest < Minitest::Test
-  def test_all_templates
-    templates_files.each do |template_path|
-      basename = basename_for_path template_path
-      generate_delegate = !basename.slice!("_delegate").nil? # Removes _delegate from basename as well
-
-      templates_dir = Config.default.templates.path
-      templater = CodeTemplater.new(options(generate_delegate), templates_dir)
-      template_content = templater.content_for_suffix("Test", basename)
-      assert_equal_content_of_file(template_path, template_content)
+
+  def test_string_rendering
+    result = CodeTemplater.new.render_string(
+      string_template_with_one_parameter,
+      {value: "42"}
+    )
+    assert_equal result, "String with parameter: 42."
+
+    result = CodeTemplater.new.render_string(
+      string_template_with_multiple_parameter,
+      {param1: "param1", param2: "param2"}
+    )
+    assert_equal result, "String with parameters: param1, param2, param2."
+  end
+
+  def test_get_string_template_variables
+    result = CodeTemplater.new.get_unknown_context_keys_for_string(string_template_with_one_parameter)
+    assert_equal result, ["value"].to_set
+
+    result = CodeTemplater.new.get_unknown_context_keys_for_string(string_template_with_multiple_parameter)
+    assert_equal result, ["param1", "param2"].to_set
+  end
+
+  def test_render_file_content_from_template
+    Tempfile.create do |f|
+      f << test_template_content
+      f.rewind
+      result = CodeTemplater.new.render_file_content_from_template(
+        f.path,
+        "Sample.swift",
+        {
+          name: "Sample",
+          project_name: "ProjectName",
+          full_username: "Georges Abitbol",
+          date: "01/01/1970",
+          generate_delegate: true
+        }
+      )
+      assert_equal result, test_template_content_expected_result
     end
   end
 
-  # Private
+  private
 
-  def templates_files
-    templates_path = File.join(File.dirname(__FILE__), "templates")
-    Dir[templates_path + "/*"]
+  def string_template_with_one_parameter
+    "String with parameter: {{ value }}."
   end
 
-  def basename_for_path(path)
-    ext = File.extname path
-    File.basename path, ext
+  def string_template_with_multiple_parameter
+    "String with parameters: {{ param1 }}, {{ param2 }}, {{ param2 }}."
   end
 
-  def assert_equal_content_of_file(path, template)
-    file = File.open(path, "rb")
-    correct_template = file.read
-    assert_equal template, correct_template
+  def test_template_content
+    <<-eos
+//  {{ name }}.swift
+//  {{project_name}}
+//  Created by {{full_username}} on {{date}}.
+
+{{#generate_delegate}}
+// Generated with delegates
+
+{{/generate_delegate}}
+class {{ name }} {}
+eos
   end
 
-  def options(generate_delegate)
-    {
-      project_name: "ProjectName",
-      full_username: "Georges Abitbol",
-      date: "01/01/1970",
-      generate_delegate: generate_delegate,
-    }
+  def test_template_content_expected_result
+    <<-eos
+//  Sample.swift
+//  ProjectName
+//  Created by Georges Abitbol on 01/01/1970.
+
+// Generated with delegates
+
+class Sample {}
+eos
   end
 end

From f7e81d34025ef94b92d79f15bee7182646bff500 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 17:15:30 +0100
Subject: [PATCH 20/38] Update test for PBXProjParser

---
 test/test_parser.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/test_parser.rb b/test/test_parser.rb
index d117711..479907e 100644
--- a/test/test_parser.rb
+++ b/test/test_parser.rb
@@ -4,22 +4,22 @@
 
 class ParserTest < Minitest::Test
 
-  def test_projects_are_equal
+  def test_project_query
     dir = File.join(File.dirname(__FILE__), "project")
     config = Config.default
     parser = PBXProjParser.new(dir, config)
 
-    assert parser.app_project.equal? parser.core_project
-    assert parser.app_project.equal? parser.data_project
+    assert parser.project_for("MyProject.xcodeproj")
   end
 
-  def test_targets_are_equal
+  def test_target_query
     dir = File.join(File.dirname(__FILE__), "project")
     config = Config.default
     parser = PBXProjParser.new(dir, config)
 
-    assert parser.app_target.equal? parser.core_target
-    assert parser.app_target.equal? parser.data_target
+    project = parser.project_for("MyProject.xcodeproj")
+    assert project
+    assert parser.target_for(project, "MyProject")
   end
 
 end

From 5e679fcf5c957e60d18ae93f9e9241521f61c1c1 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 18:03:44 +0100
Subject: [PATCH 21/38] Update tests of generated files with or without groups

---
 test/test_xcodeproj_with_folder.rb    | 109 +++++++++++++++++---------
 test/test_xcodeproj_without_folder.rb |  94 ++++++++++++++--------
 2 files changed, 132 insertions(+), 71 deletions(-)

diff --git a/test/test_xcodeproj_with_folder.rb b/test/test_xcodeproj_with_folder.rb
index 51efdd9..b708ca8 100644
--- a/test/test_xcodeproj_with_folder.rb
+++ b/test/test_xcodeproj_with_folder.rb
@@ -1,9 +1,6 @@
 require 'minitest/autorun'
-require_relative '../lib/ccios/coordinator_generator'
-require_relative '../lib/ccios/interactor_generator'
-require_relative '../lib/ccios/presenter_generator'
-require_relative '../lib/ccios/repository_generator'
-require_relative '../lib/ccios/pbxproj_parser'
+require_relative '../lib/ccios/templates_loader'
+require_relative '../lib/ccios/file_creator'
 require 'tempfile'
 require 'tmpdir'
 require 'xcodeproj'
@@ -19,28 +16,40 @@ def teardown
     FileUtils.remove_entry(@test_dir)
   end
 
-  [false, true].each do |use_suffix|
+  # [false, true].each do |use_suffix|
+  [false].each do |use_suffix|
     method_suffix = use_suffix ? "_with_suffix" : ""
     name = use_suffix ? "CotestCoordinator" : "Cotest"
     define_method "test_coordinator_folders#{method_suffix}" do
       generate_and_assert(
-        xcodeproj_group: Proc.new { |parser| parser.coordinator_group },
+        xcodeproj_group: Proc.new { |parser, template, config|
+          template_config = config.variables_for_template(template)
+          project = parser.project_for template_config["project"]
+          group = project[template_config["base_path"]]
+          group
+        },
         source_path: "MyProject/GroupWithFolder/Coordinator",
-        generator_class: CoordinatorGenerator,
+        template_name: "coordinator",
         name: name,
         expected_files: ["CotestCoordinator.swift"]
       )
     end
   end
 
-  [false, true].each do |use_suffix|
+  # [false, true].each do |use_suffix|
+  [false].each do |use_suffix|
     method_suffix = use_suffix ? "_with_suffix" : ""
     name = use_suffix ? "IntestInteractor" : "Intest"
     define_method "test_interactor_folders#{method_suffix}" do
       generate_and_assert(
-        xcodeproj_group: Proc.new { |parser| parser.interactor_group },
+        xcodeproj_group: Proc.new { |parser, template, config|
+          template_config = config.variables_for_template(template)
+          project = parser.project_for template_config["project"]
+          group = project[template_config["base_path"]]
+          group
+        },
         source_path: "MyProject/GroupWithFolder/Interactor",
-        generator_class: InteractorGenerator,
+        template_name: "interactor",
         name: name,
         expected_files: [
           "IntestInteractor/IntestInteractor.swift",
@@ -50,14 +59,20 @@ def teardown
     end
   end
 
-  [false, true].each do |use_suffix|
+  # [false, true].each do |use_suffix|
+  [false].each do |use_suffix|
     method_suffix = use_suffix ? "_with_suffix" : ""
     name = use_suffix ? "PretestPresenter" : "Pretest"
     define_method "test_presenter_folders#{method_suffix}" do
       generate_and_assert(
-        xcodeproj_group: Proc.new { |parser| parser.presenter_group },
+        xcodeproj_group: Proc.new { |parser, template, config|
+          template_config = config.variables_for_template(template)
+          project = parser.project_for template_config["project"]
+          group = project[template_config["base_path"]]
+          group
+        },
         source_path: "MyProject/GroupWithFolder/Presenter",
-        generator_class: PresenterGenerator,
+        template_name: "presenter",
         name: name,
         expected_files: [
           "Pretest/UI/View",
@@ -71,28 +86,42 @@ def teardown
     end
   end
 
-  [false, true].each do |use_suffix|
+  # [false, true].each do |use_suffix|
+  [false].each do |use_suffix|
     method_suffix = use_suffix ? "_with_suffix" : ""
     name = use_suffix ? "RetestRepository" : "Retest"
     define_method "test_repository_data_folders#{method_suffix}" do
       generate_and_assert(
-        xcodeproj_group: Proc.new { |parser| parser.repository_data_group },
+        xcodeproj_group: Proc.new { |parser, template, config|
+          template_config = config.variables_for_template(template)
+          project = parser.project_for template_config["project"]
+          element_config = config.variables_for_template_element(template, "repository_implementation")
+          group = project[element_config["base_path"]]
+          group
+        },
         source_path: "MyProject/GroupWithFolder/Repository",
-        generator_class: RepositoryGenerator,
+        template_name: "repository",
         name: name,
         expected_files: ["Retest/RetestRepositoryImplementation.swift"]
       )
     end
   end
 
-  [false, true].each do |use_suffix|
+  # [false, true].each do |use_suffix|
+  [false].each do |use_suffix|
     method_suffix = use_suffix ? "_with_suffix" : ""
     name = use_suffix ? "RetestRepository" : "Retest"
     define_method "test_repository_core_folders#{method_suffix}" do
       generate_and_assert(
-        xcodeproj_group: Proc.new { |parser| parser.repository_core_group },
+        xcodeproj_group: Proc.new { |parser, template, config|
+          template_config = config.variables_for_template(template)
+          project = parser.project_for template_config["project"]
+          element_config = config.variables_for_template_element(template, "repository")
+          group = project[element_config["base_path"]]
+          group
+        },
         source_path: "MyProject/GroupWithFolder/Interactor",
-        generator_class: RepositoryGenerator,
+        template_name: "repository",
         name: name,
         expected_files: ["Retest/RetestRepository.swift"]
       )
@@ -112,13 +141,15 @@ def setup_parser
     yield(config, parser)
   end
 
-  def generate_and_assert(xcodeproj_group:, source_path:, generator_class:, name:, expected_files:)
+  def generate_and_assert(xcodeproj_group:, source_path:, template_name:, name:, expected_files:)
     setup_parser do |config, parser|
-      group = xcodeproj_group.call(parser)
+      template = TemplatesLoader.new.get_templates(config)[template_name]
+      raise "Template not found #{template_name}" if template.nil?
+
+      group = xcodeproj_group.call(parser, template, config)
       assert_empty group.children, "#{group.display_name} group should not contain anything #{group.children}"
 
-      generator = generator_class.new(parser, config)
-      generator.generate(name)
+      template.generate(parser, {"name" => name}, config)
 
       assert_group_and_subgroups_have_no_name(group)
 
@@ -149,24 +180,26 @@ def set_up_project_in_temporary_directory
 
   def ccios_yml_with_folders_content
     <<-eos
-app:
+variables:
   project: MyProject.xcodeproj
+
+templates_config:
+  repository:
+    variables: {}
+    elements_variables:
+      repository:
+        base_path: MyProject/GroupWithFolder/Interactor
+      repository_implementation:
+        base_path: MyProject/GroupWithFolder/Repository
   presenter:
-    group: MyProject/GroupWithFolder/Presenter
+    variables:
+      base_path: MyProject/GroupWithFolder/Presenter
   coordinator:
-    group: MyProject/GroupWithFolder/Coordinator
-
-core:
-  project: MyProject.xcodeproj
+    variables:
+      base_path: MyProject/GroupWithFolder/Coordinator
   interactor:
-    group: MyProject/GroupWithFolder/Interactor
-  repository:
-    group: MyProject/GroupWithFolder/Interactor
-
-data:
-  project: MyProject.xcodeproj
-  repository:
-    group: MyProject/GroupWithFolder/Repository
+    variables:
+      base_path: MyProject/GroupWithFolder/Interactor
 eos
   end
 
diff --git a/test/test_xcodeproj_without_folder.rb b/test/test_xcodeproj_without_folder.rb
index 33ec651..e171a94 100644
--- a/test/test_xcodeproj_without_folder.rb
+++ b/test/test_xcodeproj_without_folder.rb
@@ -1,9 +1,6 @@
 require 'minitest/autorun'
-require_relative '../lib/ccios/coordinator_generator'
-require_relative '../lib/ccios/interactor_generator'
-require_relative '../lib/ccios/presenter_generator'
-require_relative '../lib/ccios/repository_generator'
-require_relative '../lib/ccios/pbxproj_parser'
+require_relative '../lib/ccios/templates_loader'
+require_relative '../lib/ccios/file_creator'
 require 'tempfile'
 require 'tmpdir'
 require 'xcodeproj'
@@ -21,9 +18,14 @@ def teardown
 
   def test_coordinator_without_folders
     generate_and_assert(
-      xcodeproj_group: Proc.new { |parser| parser.coordinator_group },
+      xcodeproj_group: Proc.new { |parser, template, config|
+        template_config = config.variables_for_template(template)
+        project = parser.project_for template_config["project"]
+        group = project[template_config["base_path"]]
+        group
+      },
       source_path: "MyProject",
-      generator_class: CoordinatorGenerator,
+      template_name: "coordinator",
       name: "Cotest",
       expected_files: ["CotestCoordinator.swift"]
     )
@@ -31,9 +33,14 @@ def test_coordinator_without_folders
 
   def test_interactor_without_folders
     generate_and_assert(
-      xcodeproj_group: Proc.new { |parser| parser.interactor_group },
+      xcodeproj_group: Proc.new { |parser, template, config|
+        template_config = config.variables_for_template(template)
+        project = parser.project_for template_config["project"]
+        group = project[template_config["base_path"]]
+        group
+      },
       source_path: "MyProject",
-      generator_class: InteractorGenerator,
+      template_name: "interactor",
       name: "Intest",
       expected_files: [
         "IntestInteractor/IntestInteractor.swift",
@@ -44,9 +51,14 @@ def test_interactor_without_folders
 
   def test_presenter_without_folders
     generate_and_assert(
-      xcodeproj_group: Proc.new { |parser| parser.presenter_group },
+      xcodeproj_group: Proc.new { |parser, template, config|
+        template_config = config.variables_for_template(template)
+        project = parser.project_for template_config["project"]
+        group = project[template_config["base_path"]]
+        group
+      },
       source_path: "MyProject",
-      generator_class: PresenterGenerator,
+      template_name: "presenter",
       name: "Pretest",
       expected_files: [
         "Pretest/UI/View",
@@ -61,9 +73,15 @@ def test_presenter_without_folders
 
   def test_repository_data_folders
     generate_and_assert(
-      xcodeproj_group: Proc.new { |parser| parser.repository_data_group },
+      xcodeproj_group: Proc.new { |parser, template, config|
+        template_config = config.variables_for_template(template)
+        project = parser.project_for template_config["project"]
+        element_config = config.variables_for_template_element(template, "repository_implementation")
+        group = project[element_config["base_path"]]
+        group
+      },
       source_path: "MyProject",
-      generator_class: RepositoryGenerator,
+      template_name: "repository",
       name: "Retest",
       expected_files: ["Retest/RetestRepositoryImplementation.swift"]
     )
@@ -71,9 +89,15 @@ def test_repository_data_folders
 
   def test_repository_core_folders
     generate_and_assert(
-      xcodeproj_group: Proc.new { |parser| parser.repository_core_group },
+      xcodeproj_group: Proc.new { |parser, template, config|
+        template_config = config.variables_for_template(template)
+        project = parser.project_for template_config["project"]
+        element_config = config.variables_for_template_element(template, "repository")
+        group = project[element_config["base_path"]]
+        group
+      },
       source_path: "MyProject",
-      generator_class: RepositoryGenerator,
+      template_name: "repository",
       name: "Retest",
       expected_files: ["Retest/RetestRepository.swift"]
     )
@@ -92,13 +116,15 @@ def setup_parser
     yield(config, parser)
   end
 
-  def generate_and_assert(xcodeproj_group:, source_path:, generator_class:, name:, expected_files:)
+  def generate_and_assert(xcodeproj_group:, source_path:, template_name:, name:, expected_files:)
     setup_parser do |config, parser|
-      group = xcodeproj_group.call(parser)
+      template = TemplatesLoader.new.get_templates(config)[template_name]
+      raise "Template not found #{template_name}" if template.nil?
+
+      group = xcodeproj_group.call(parser, template, config)
       assert_empty group.children, "#{group.display_name} group should not contain anything #{group.children}"
 
-      generator = generator_class.new(parser, config)
-      generator.generate(name)
+      template.generate(parser, {"name" => name}, config)
 
       assert_group_and_subgroups_have_no_path(group)
 
@@ -131,24 +157,26 @@ def set_up_project_in_temporary_directory
 
   def ccios_yml_without_folders_content
     <<-eos
-app:
+variables:
   project: MyProject.xcodeproj
+
+templates_config:
+  repository:
+    variables: {}
+    elements_variables:
+      repository:
+        base_path: MyProject/GroupWithoutFolder/Interactor
+      repository_implementation:
+        base_path: MyProject/GroupWithoutFolder/Repository
   presenter:
-    group: MyProject/GroupWithoutFolder/Presenter
+    variables:
+      base_path: MyProject/GroupWithoutFolder/Presenter
   coordinator:
-    group: MyProject/GroupWithoutFolder/Coordinator
-
-core:
-  project: MyProject.xcodeproj
+    variables:
+      base_path: MyProject/GroupWithoutFolder/Coordinator
   interactor:
-    group: MyProject/GroupWithoutFolder/Interactor
-  repository:
-    group: MyProject/GroupWithoutFolder/Interactor
-
-data:
-  project: MyProject.xcodeproj
-  repository:
-    group: MyProject/GroupWithoutFolder/Repository
+    variables:
+      base_path: MyProject/GroupWithoutFolder/Interactor
 eos
   end
 end

From 2d49779733ec83223f5897f56f85c82689536fdf Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 18:04:12 +0100
Subject: [PATCH 22/38] Fix template definition parser when no snippets are
 given

---
 lib/ccios/template_definition.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/ccios/template_definition.rb b/lib/ccios/template_definition.rb
index 4d75a80..2bf90d2 100644
--- a/lib/ccios/template_definition.rb
+++ b/lib/ccios/template_definition.rb
@@ -42,9 +42,13 @@ def initialize(template_definition_hash, template_path)
       next nil
     }.compact
 
+    if template_definition_hash["code_snippets"].nil?
+        @snippets = []
+    else
     @snippets = template_definition_hash["code_snippets"].map { |hash|
       SnippetTemplateDefinition.new(hash)
-    } unless template_definition_hash["code_snippets"].nil?
+    }
+    end
 
     @template_file_source = template_definition_hash["template_file_source"] || {}
   end

From ff27fc52baf00a5d653ed09a89bf72b4939d11c3 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 18:05:31 +0100
Subject: [PATCH 23/38] Add missing target definition to Coordinator template

---
 lib/ccios/templates/Coordinator/template.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ccios/templates/Coordinator/template.yml b/lib/ccios/templates/Coordinator/template.yml
index 8d1630f..bd0694b 100644
--- a/lib/ccios/templates/Coordinator/template.yml
+++ b/lib/ccios/templates/Coordinator/template.yml
@@ -3,6 +3,7 @@ description: "Generate NameCoordinator"
 variables:
   project: "*.xcodeproj"
   base_path: "Coordinator"
+  target: ""
 parameters:
   - argument: "name"
   - flag: "delegate"

From e49ff6439570102d19316559b89c2f4c6e164ac1 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 18:15:27 +0100
Subject: [PATCH 24/38] Fix snippets for default presenter template

---
 lib/ccios/templates/Presenter/template.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/ccios/templates/Presenter/template.yml b/lib/ccios/templates/Presenter/template.yml
index eae4129..3a5b2c0 100644
--- a/lib/ccios/templates/Presenter/template.yml
+++ b/lib/ccios/templates/Presenter/template.yml
@@ -36,11 +36,12 @@ generated_elements:
 code_snippets:
   - name: DependencyProvider
     template: "dependency_provider"
-  - name: DependencyProvider
-    template: "dependency_provider"
+  - name: PresenterAssembly
+    template: "presenter_assembly"
 template_file_source:
   viewController: "view_controller.mustache"
   viewContract: "view_contract.mustache"
   presenter: "presenter.mustache"
   presenterImplementation: "presenter_implementation.mustache"
   dependency_provider: "dependency_provider.mustache"
+  presenter_assembly: "presenter_assembly.mustache"

From cf62cb72bbda6f1e827faf4c16a841d8bd3c30ce Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 18:17:59 +0100
Subject: [PATCH 25/38] Remove old comment

---
 lib/ccios.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ccios.rb b/lib/ccios.rb
index 1f331e0..f6b8ffd 100644
--- a/lib/ccios.rb
+++ b/lib/ccios.rb
@@ -82,7 +82,6 @@
   exit 1
 end
 
-# TODO: use template.project
 parser = PBXProjParser.new(source_path, config)
 
 template.validate(parser, options, config)

From 0235946ca13753122d174a72239628ca42fa833d Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 18:24:56 +0100
Subject: [PATCH 26/38] Remove old test snapshots

---
 test/templates/coordinator.swift              | 30 ----------------
 test/templates/coordinator_delegate.swift     | 35 -------------------
 test/templates/dependency_provider.swift      |  5 ---
 .../dependency_provider_delegate.swift        |  5 ---
 test/templates/interactor.swift               | 13 -------
 test/templates/interactor_assembly.swift      |  5 ---
 .../templates/interactor_implementation.swift | 22 ------------
 test/templates/presenter.swift                | 13 -------
 test/templates/presenter_assembly.swift       |  5 ---
 .../presenter_assembly_delegate.swift         |  6 ----
 test/templates/presenter_delegate.swift       | 17 ---------
 test/templates/presenter_implementation.swift | 24 -------------
 .../presenter_implementation_delegate.swift   | 26 --------------
 test/templates/repository.swift               | 13 -------
 test/templates/repository_assembly.swift      |  6 ----
 .../templates/repository_implementation.swift | 20 -----------
 test/templates/view_contract.swift            | 13 -------
 test/templates/view_controller.swift          | 22 ------------
 18 files changed, 280 deletions(-)
 delete mode 100644 test/templates/coordinator.swift
 delete mode 100644 test/templates/coordinator_delegate.swift
 delete mode 100644 test/templates/dependency_provider.swift
 delete mode 100644 test/templates/dependency_provider_delegate.swift
 delete mode 100644 test/templates/interactor.swift
 delete mode 100644 test/templates/interactor_assembly.swift
 delete mode 100644 test/templates/interactor_implementation.swift
 delete mode 100644 test/templates/presenter.swift
 delete mode 100644 test/templates/presenter_assembly.swift
 delete mode 100644 test/templates/presenter_assembly_delegate.swift
 delete mode 100644 test/templates/presenter_delegate.swift
 delete mode 100644 test/templates/presenter_implementation.swift
 delete mode 100644 test/templates/presenter_implementation_delegate.swift
 delete mode 100644 test/templates/repository.swift
 delete mode 100644 test/templates/repository_assembly.swift
 delete mode 100644 test/templates/repository_implementation.swift
 delete mode 100644 test/templates/view_contract.swift
 delete mode 100644 test/templates/view_controller.swift

diff --git a/test/templates/coordinator.swift b/test/templates/coordinator.swift
deleted file mode 100644
index dd13a67..0000000
--- a/test/templates/coordinator.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  TestCoordinator.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-import ADCoordinator
-
-class TestCoordinator: Coordinator {
-
-    private let dependencyProvider: ApplicationDependencyProvider
-    private unowned var navigationController: UINavigationController
-
-    init(navigationController: UINavigationController,
-         dependencyProvider: ApplicationDependencyProvider) {
-        self.navigationController = navigationController
-        self.dependencyProvider = dependencyProvider
-    }
-
-    // MARK: - Public
-
-    func start() {
-        let viewController = UIViewController()
-        navigationController.pushViewController(viewController, animated: false)
-        bindToLifecycle(of: viewController)
-    }
-}
diff --git a/test/templates/coordinator_delegate.swift b/test/templates/coordinator_delegate.swift
deleted file mode 100644
index 184f94f..0000000
--- a/test/templates/coordinator_delegate.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  TestCoordinator.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-import ADCoordinator
-
-protocol TestCoordinatorDelegate: AnyObject {
-
-}
-
-class TestCoordinator: Coordinator {
-
-    weak var delegate: TestCoordinatorDelegate?
-    private let dependencyProvider: ApplicationDependencyProvider
-    private unowned var navigationController: UINavigationController
-
-    init(navigationController: UINavigationController,
-         dependencyProvider: ApplicationDependencyProvider) {
-        self.navigationController = navigationController
-        self.dependencyProvider = dependencyProvider
-    }
-
-    // MARK: - Public
-
-    func start() {
-        let viewController = UIViewController()
-        navigationController.pushViewController(viewController, animated: false)
-        bindToLifecycle(of: viewController)
-    }
-}
diff --git a/test/templates/dependency_provider.swift b/test/templates/dependency_provider.swift
deleted file mode 100644
index c78eb42..0000000
--- a/test/templates/dependency_provider.swift
+++ /dev/null
@@ -1,5 +0,0 @@
-func testPresenter(viewContract: TestViewContract) -> TestPresenter? {
-    return presenterAssembler
-        .resolver
-        .resolve(TestPresenter.self, argument: viewContract)
-}
diff --git a/test/templates/dependency_provider_delegate.swift b/test/templates/dependency_provider_delegate.swift
deleted file mode 100644
index 11e87ec..0000000
--- a/test/templates/dependency_provider_delegate.swift
+++ /dev/null
@@ -1,5 +0,0 @@
-func testPresenter(viewContract: TestViewContract, presenterDelegate: TestPresenterDelegate) -> TestPresenter? {
-    return presenterAssembler
-        .resolver
-        .resolve(TestPresenter.self, arguments: viewContract, presenterDelegate)
-}
diff --git a/test/templates/interactor.swift b/test/templates/interactor.swift
deleted file mode 100644
index 3a817a5..0000000
--- a/test/templates/interactor.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  TestInteractor.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-
-public protocol TestInteractor {
-    func execute()
-}
diff --git a/test/templates/interactor_assembly.swift b/test/templates/interactor_assembly.swift
deleted file mode 100644
index 3c8b079..0000000
--- a/test/templates/interactor_assembly.swift
+++ /dev/null
@@ -1,5 +0,0 @@
-container.register(TestInteractor.self) { _ in
-    TestInteractorImplementation(
-
-    )
-}
diff --git a/test/templates/interactor_implementation.swift b/test/templates/interactor_implementation.swift
deleted file mode 100644
index 4a7916b..0000000
--- a/test/templates/interactor_implementation.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  TestInteractorImplementation.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-
-public class TestInteractorImplementation: TestInteractor {
-
-	public init() {
-
-	}
-
-    // MARK: - TestInteractor
-
-    public func execute() {
-
-    }
-}
diff --git a/test/templates/presenter.swift b/test/templates/presenter.swift
deleted file mode 100644
index f5f4e41..0000000
--- a/test/templates/presenter.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  TestPresenter.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-
-protocol TestPresenter {
-    func start()
-}
diff --git a/test/templates/presenter_assembly.swift b/test/templates/presenter_assembly.swift
deleted file mode 100644
index ed1e4ab..0000000
--- a/test/templates/presenter_assembly.swift
+++ /dev/null
@@ -1,5 +0,0 @@
-container.register(TestPresenter.self) { _, viewContract in
-    TestPresenterImplementation(
-        viewContract: viewContract
-    )
-}
diff --git a/test/templates/presenter_assembly_delegate.swift b/test/templates/presenter_assembly_delegate.swift
deleted file mode 100644
index a79b141..0000000
--- a/test/templates/presenter_assembly_delegate.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-container.register(TestPresenter.self) { _, viewContract, delegate in
-    TestPresenterImplementation(
-        viewContract: viewContract,
-        delegate: delegate
-    )
-}
diff --git a/test/templates/presenter_delegate.swift b/test/templates/presenter_delegate.swift
deleted file mode 100644
index 57482c8..0000000
--- a/test/templates/presenter_delegate.swift
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  TestPresenter.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-
-protocol TestPresenter {
-    func start()
-}
-
-protocol TestPresenterDelegate: AnyObject {
-
-}
diff --git a/test/templates/presenter_implementation.swift b/test/templates/presenter_implementation.swift
deleted file mode 100644
index 55eb3ed..0000000
--- a/test/templates/presenter_implementation.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  TestPresenterImplementation.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-
-class TestPresenterImplementation: TestPresenter {
-
-    private weak var viewContract: TestViewContract?
-
-    init(viewContract: TestViewContract) {
-        self.viewContract = viewContract
-    }
-
-    // MARK: - TestPresenter
-
-    func start() {
-
-    }
-}
diff --git a/test/templates/presenter_implementation_delegate.swift b/test/templates/presenter_implementation_delegate.swift
deleted file mode 100644
index fc45f12..0000000
--- a/test/templates/presenter_implementation_delegate.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  TestPresenterImplementation.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-
-class TestPresenterImplementation: TestPresenter {
-
-    private weak var viewContract: TestViewContract?
-    private weak var delegate: TestPresenterDelegate?
-
-    init(viewContract: TestViewContract, delegate: TestPresenterDelegate) {
-        self.viewContract = viewContract
-        self.delegate = delegate
-    }
-
-    // MARK: - TestPresenter
-
-    func start() {
-
-    }
-}
diff --git a/test/templates/repository.swift b/test/templates/repository.swift
deleted file mode 100644
index 1dc7b97..0000000
--- a/test/templates/repository.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  TestRepository.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-
-public protocol TestRepository {
-
-}
diff --git a/test/templates/repository_assembly.swift b/test/templates/repository_assembly.swift
deleted file mode 100644
index 9a69040..0000000
--- a/test/templates/repository_assembly.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-container.register(TestRepository.self) { _ in
-    TestRepositoryImplementation(
-
-    )
-}
-.inObjectScope(.container)
diff --git a/test/templates/repository_implementation.swift b/test/templates/repository_implementation.swift
deleted file mode 100644
index 04dd512..0000000
--- a/test/templates/repository_implementation.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  TestRepositoryImplementation.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-import Core
-
-public class TestRepositoryImplementation: TestRepository {
-
-    public init() {
-
-    }
-
-    // MARK: - TestRepository
-
-}
diff --git a/test/templates/view_contract.swift b/test/templates/view_contract.swift
deleted file mode 100644
index d298afc..0000000
--- a/test/templates/view_contract.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  TestViewContract.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-
-protocol TestViewContract: AnyObject {
-
-}
diff --git a/test/templates/view_controller.swift b/test/templates/view_controller.swift
deleted file mode 100644
index 4307992..0000000
--- a/test/templates/view_controller.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  TestViewController.swift
-//  ProjectName
-//
-//  Created by Georges Abitbol on 01/01/1970.
-//
-//
-
-import Foundation
-import UIKit
-
-class TestViewController: SharedViewController, TestViewContract {
-    var presenter: TestPresenter?
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        presenter?.start()
-    }
-
-    // MARK: - TestViewContract
-
-}

From d9ef67e60d1c9dbda1d2ec5e74dfa55043dfe5ad Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 18:45:24 +0100
Subject: [PATCH 27/38] Reimplement argument suffix removal

---
 lib/ccios.rb                                 |  2 +-
 lib/ccios/argument_template_parameter.rb     |  8 ++++++++
 lib/ccios/template_definition.rb             | 13 ++++++++++---
 lib/ccios/templates/Coordinator/template.yml |  1 +
 lib/ccios/templates/Interactor/template.yml  |  1 +
 lib/ccios/templates/Presenter/template.yml   |  1 +
 lib/ccios/templates/Repository/template.yml  |  1 +
 7 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/lib/ccios.rb b/lib/ccios.rb
index f6b8ffd..8d91c07 100644
--- a/lib/ccios.rb
+++ b/lib/ccios.rb
@@ -74,7 +74,7 @@
     puts "Unexpected argument: #{argument}"
     exit 1
   end
-  options[expected_argument.name] = argument
+  options[expected_argument.template_variable_name] = argument
 end
 
 if !expected_remaining_arguments.empty?
diff --git a/lib/ccios/argument_template_parameter.rb b/lib/ccios/argument_template_parameter.rb
index 840ac61..dc226f2 100644
--- a/lib/ccios/argument_template_parameter.rb
+++ b/lib/ccios/argument_template_parameter.rb
@@ -5,8 +5,16 @@ def initialize(parameter_template_definition_hash)
     @name = parameter_template_definition_hash["argument"]
     @description = parameter_template_definition_hash["description"] || ""
     @template_variable_name = parameter_template_definition_hash["template_variable_name"] || @name
+    @removeSuffix = parameter_template_definition_hash["removeSuffix"] || ""
 
     raise "Missing argument name" if @name.nil? || @name.empty?
     raise "Invalid argument template_variable_name for #{@name}" if @template_variable_name.nil? || template_variable_name.empty?
   end
+
+  def transformed_value(value)
+    if !@removeSuffix.empty?
+      value = value.gsub(@removeSuffix, "")
+    end
+    value
+  end
 end
diff --git a/lib/ccios/template_definition.rb b/lib/ccios/template_definition.rb
index 2bf90d2..1f3f669 100644
--- a/lib/ccios/template_definition.rb
+++ b/lib/ccios/template_definition.rb
@@ -68,6 +68,8 @@ def validate(parser, options, config)
       raise "Missing template source file for \"#{file_template_name}\"" unless File.exist?(self.template_source_file(file_template_name))
     end
 
+    options = agrument_transformed_options(options)
+
     @generated_elements.each do |generated_element|
       generated_element.validate(parser, project, options, self, config)
     end
@@ -88,9 +90,7 @@ def provided_context_keys
 
   def generate(parser, options, config)
 
-    # TODO: Reimplement suffix strip ?
-    # interactor_name = "SampleInteractor"
-    # interactor_name = interactor_name.gsub("Interactor", "")
+    options = agrument_transformed_options(options)
 
     merged_variables = config.variables_for_template(self)
     project_path = merged_variables["project"]
@@ -106,4 +106,11 @@ def generate(parser, options, config)
     end
   end
 
+  def agrument_transformed_options(options)
+    @parameters.select { |p| p.is_a? ArgumentTemplateParameter }.each do |argument|
+      options[argument.template_variable_name] = argument.transformed_value(options[argument.template_variable_name])
+    end
+    options
+  end
+
 end
diff --git a/lib/ccios/templates/Coordinator/template.yml b/lib/ccios/templates/Coordinator/template.yml
index bd0694b..ca063b6 100644
--- a/lib/ccios/templates/Coordinator/template.yml
+++ b/lib/ccios/templates/Coordinator/template.yml
@@ -6,6 +6,7 @@ variables:
   target: ""
 parameters:
   - argument: "name"
+    removeSuffix: "Coordinator"
   - flag: "delegate"
     short_name: "d"
     template_variable_name: "generate_delegate"
diff --git a/lib/ccios/templates/Interactor/template.yml b/lib/ccios/templates/Interactor/template.yml
index e11c55c..314ecec 100644
--- a/lib/ccios/templates/Interactor/template.yml
+++ b/lib/ccios/templates/Interactor/template.yml
@@ -2,6 +2,7 @@ name: "interactor"
 description: "Generate NameInteractor and NameInteractorImplementation"
 parameters:
   - argument: "name"
+    removeSuffix: "Interactor"
 variables:
   project: "*.xcodeproj"
   base_path: "Core/Interactor"
diff --git a/lib/ccios/templates/Presenter/template.yml b/lib/ccios/templates/Presenter/template.yml
index 3a5b2c0..467758d 100644
--- a/lib/ccios/templates/Presenter/template.yml
+++ b/lib/ccios/templates/Presenter/template.yml
@@ -2,6 +2,7 @@ name: "presenter"
 description: "Generate NamePresenter, NamePresenterImplementation, NameViewContract and NameViewController"
 parameters:
   - argument: "name"
+    removeSuffix: "Presenter"
   - flag: "delegate"
     short_name: "d"
     template_variable_name: "generate_delegate"
diff --git a/lib/ccios/templates/Repository/template.yml b/lib/ccios/templates/Repository/template.yml
index 3366bac..cba40f3 100644
--- a/lib/ccios/templates/Repository/template.yml
+++ b/lib/ccios/templates/Repository/template.yml
@@ -2,6 +2,7 @@ name: "repository"
 description: "Generate NameRepository and NameRepositoryImplementation"
 parameters:
   - argument: "name"
+    removeSuffix: "Repository"
 variables:
   project: "*.xcodeproj"
   target: ""

From b39cfda1237b374318a6c34aaf3c03406e6c9021 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 18:46:03 +0100
Subject: [PATCH 28/38] Test auto suffix removal

---
 test/test_xcodeproj_with_folder.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/test/test_xcodeproj_with_folder.rb b/test/test_xcodeproj_with_folder.rb
index b708ca8..df064eb 100644
--- a/test/test_xcodeproj_with_folder.rb
+++ b/test/test_xcodeproj_with_folder.rb
@@ -16,8 +16,7 @@ def teardown
     FileUtils.remove_entry(@test_dir)
   end
 
-  # [false, true].each do |use_suffix|
-  [false].each do |use_suffix|
+  [false, true].each do |use_suffix|
     method_suffix = use_suffix ? "_with_suffix" : ""
     name = use_suffix ? "CotestCoordinator" : "Cotest"
     define_method "test_coordinator_folders#{method_suffix}" do
@@ -36,8 +35,7 @@ def teardown
     end
   end
 
-  # [false, true].each do |use_suffix|
-  [false].each do |use_suffix|
+  [false, true].each do |use_suffix|
     method_suffix = use_suffix ? "_with_suffix" : ""
     name = use_suffix ? "IntestInteractor" : "Intest"
     define_method "test_interactor_folders#{method_suffix}" do
@@ -59,8 +57,7 @@ def teardown
     end
   end
 
-  # [false, true].each do |use_suffix|
-  [false].each do |use_suffix|
+  [false, true].each do |use_suffix|
     method_suffix = use_suffix ? "_with_suffix" : ""
     name = use_suffix ? "PretestPresenter" : "Pretest"
     define_method "test_presenter_folders#{method_suffix}" do
@@ -86,8 +83,7 @@ def teardown
     end
   end
 
-  # [false, true].each do |use_suffix|
-  [false].each do |use_suffix|
+  [false, true].each do |use_suffix|
     method_suffix = use_suffix ? "_with_suffix" : ""
     name = use_suffix ? "RetestRepository" : "Retest"
     define_method "test_repository_data_folders#{method_suffix}" do
@@ -107,8 +103,7 @@ def teardown
     end
   end
 
-  # [false, true].each do |use_suffix|
-  [false].each do |use_suffix|
+  [false, true].each do |use_suffix|
     method_suffix = use_suffix ? "_with_suffix" : ""
     name = use_suffix ? "RetestRepository" : "Retest"
     define_method "test_repository_core_folders#{method_suffix}" do

From f548b172b33ea5383fe266eb61ad4b6099b42d61 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 18:52:32 +0100
Subject: [PATCH 29/38] Update changelog

---
 CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 447fc6c..5df595b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,10 +15,6 @@ This release is an entire rewrite of the templating system, allowing customizati
 - Add validation that each variable used in a mustache file is provided by the template. The default provided variables are: `filename`, `lowercase_filename`, `project_name`, `full_username` and `date`
 - List of known templates is available using `ccios --help`
 
-### Removed
-
-- There is no longer an automatic suffix removal from the argument passed in the CLI. Example: `ccios presenter ExamplePresenter` will generate a file named: `ExamplePresenterPresenter`
-
 ### Changed
 
 - Default templates has been migrated to the new format

From 927edf84c42d9c605146d7216c657747fdbbbd37 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 20 Feb 2024 18:57:39 +0100
Subject: [PATCH 30/38] Migrate sample async templates to new template system

---
 .../{ => Coordinator}/coordinator.mustache    |  0
 .../async/Coordinator/template.yml            | 20 ++++++++
 .../dependency_provider.mustache              |  0
 .../async/{ => Presenter}/presenter.mustache  |  0
 .../presenter_assembly.mustache               |  0
 .../presenter_implementation.mustache         |  0
 .../async/Presenter/template.yml              | 48 +++++++++++++++++++
 .../{ => Presenter}/view_contract.mustache    |  0
 .../{ => Presenter}/view_controller.mustache  |  0
 templates_library/async/interactor.mustache   | 13 -----
 .../async/interactor_assembly.mustache        |  5 --
 .../async/interactor_implementation.mustache  | 22 ---------
 templates_library/async/repository.mustache   | 13 -----
 .../async/repository_assembly.mustache        |  6 ---
 .../async/repository_implementation.mustache  | 20 --------
 15 files changed, 68 insertions(+), 79 deletions(-)
 rename templates_library/async/{ => Coordinator}/coordinator.mustache (100%)
 create mode 100644 templates_library/async/Coordinator/template.yml
 rename templates_library/async/{ => Presenter}/dependency_provider.mustache (100%)
 rename templates_library/async/{ => Presenter}/presenter.mustache (100%)
 rename templates_library/async/{ => Presenter}/presenter_assembly.mustache (100%)
 rename templates_library/async/{ => Presenter}/presenter_implementation.mustache (100%)
 create mode 100644 templates_library/async/Presenter/template.yml
 rename templates_library/async/{ => Presenter}/view_contract.mustache (100%)
 rename templates_library/async/{ => Presenter}/view_controller.mustache (100%)
 delete mode 100644 templates_library/async/interactor.mustache
 delete mode 100644 templates_library/async/interactor_assembly.mustache
 delete mode 100644 templates_library/async/interactor_implementation.mustache
 delete mode 100644 templates_library/async/repository.mustache
 delete mode 100644 templates_library/async/repository_assembly.mustache
 delete mode 100644 templates_library/async/repository_implementation.mustache

diff --git a/templates_library/async/coordinator.mustache b/templates_library/async/Coordinator/coordinator.mustache
similarity index 100%
rename from templates_library/async/coordinator.mustache
rename to templates_library/async/Coordinator/coordinator.mustache
diff --git a/templates_library/async/Coordinator/template.yml b/templates_library/async/Coordinator/template.yml
new file mode 100644
index 0000000..ca063b6
--- /dev/null
+++ b/templates_library/async/Coordinator/template.yml
@@ -0,0 +1,20 @@
+name: "coordinator"
+description: "Generate NameCoordinator"
+variables:
+  project: "*.xcodeproj"
+  base_path: "Coordinator"
+  target: ""
+parameters:
+  - argument: "name"
+    removeSuffix: "Coordinator"
+  - flag: "delegate"
+    short_name: "d"
+    template_variable_name: "generate_delegate"
+    description: "Generate delegate protocols when provided"
+generated_elements:
+  - name: "coordinator"
+    file: "{{ name }}Coordinator.swift"
+    template: "coordinator"
+    variables: {}
+template_file_source:
+  coordinator: "coordinator.mustache"
diff --git a/templates_library/async/dependency_provider.mustache b/templates_library/async/Presenter/dependency_provider.mustache
similarity index 100%
rename from templates_library/async/dependency_provider.mustache
rename to templates_library/async/Presenter/dependency_provider.mustache
diff --git a/templates_library/async/presenter.mustache b/templates_library/async/Presenter/presenter.mustache
similarity index 100%
rename from templates_library/async/presenter.mustache
rename to templates_library/async/Presenter/presenter.mustache
diff --git a/templates_library/async/presenter_assembly.mustache b/templates_library/async/Presenter/presenter_assembly.mustache
similarity index 100%
rename from templates_library/async/presenter_assembly.mustache
rename to templates_library/async/Presenter/presenter_assembly.mustache
diff --git a/templates_library/async/presenter_implementation.mustache b/templates_library/async/Presenter/presenter_implementation.mustache
similarity index 100%
rename from templates_library/async/presenter_implementation.mustache
rename to templates_library/async/Presenter/presenter_implementation.mustache
diff --git a/templates_library/async/Presenter/template.yml b/templates_library/async/Presenter/template.yml
new file mode 100644
index 0000000..467758d
--- /dev/null
+++ b/templates_library/async/Presenter/template.yml
@@ -0,0 +1,48 @@
+name: "presenter"
+description: "Generate NamePresenter, NamePresenterImplementation, NameViewContract and NameViewController"
+parameters:
+  - argument: "name"
+    removeSuffix: "Presenter"
+  - flag: "delegate"
+    short_name: "d"
+    template_variable_name: "generate_delegate"
+    description: "Generate delegate protocols when provided"
+variables:
+  project: "*.xcodeproj"
+  base_path: "App"
+  target: ""
+generated_elements:
+  - name: "ui_view_group"
+    group: "{{ name }}/UI/View"
+    variables: {}
+  - name: "view_controller"
+    file: "{{ name }}/UI/ViewController/{{ name }}ViewController.swift"
+    template: "viewController"
+    variables: {}
+  - name: "view_contract"
+    file: "{{ name }}/UI/{{ name }}ViewContract.swift"
+    template: "viewContract"
+    variables: {}
+  - name: "presenter"
+    file: "{{ name }}/Presenter/{{ name }}Presenter.swift"
+    template: "presenter"
+    variables: {}
+  - name: "presenter_implementation"
+    file: "{{ name }}/Presenter/{{ name }}PresenterImplementation.swift"
+    template: "presenterImplementation"
+    variables: {}
+  - name: "model_group"
+    group: "{{ name }}/Model"
+    variables: {}
+code_snippets:
+  - name: DependencyProvider
+    template: "dependency_provider"
+  - name: PresenterAssembly
+    template: "presenter_assembly"
+template_file_source:
+  viewController: "view_controller.mustache"
+  viewContract: "view_contract.mustache"
+  presenter: "presenter.mustache"
+  presenterImplementation: "presenter_implementation.mustache"
+  dependency_provider: "dependency_provider.mustache"
+  presenter_assembly: "presenter_assembly.mustache"
diff --git a/templates_library/async/view_contract.mustache b/templates_library/async/Presenter/view_contract.mustache
similarity index 100%
rename from templates_library/async/view_contract.mustache
rename to templates_library/async/Presenter/view_contract.mustache
diff --git a/templates_library/async/view_controller.mustache b/templates_library/async/Presenter/view_controller.mustache
similarity index 100%
rename from templates_library/async/view_controller.mustache
rename to templates_library/async/Presenter/view_controller.mustache
diff --git a/templates_library/async/interactor.mustache b/templates_library/async/interactor.mustache
deleted file mode 100644
index 3130bd9..0000000
--- a/templates_library/async/interactor.mustache
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  {{name}}Interactor.swift
-//  {{project_name}}
-//
-//  Created by {{full_username}} on {{date}}.
-//
-//
-
-import Foundation
-
-public protocol {{name}}Interactor {
-    func execute() async throws
-}
diff --git a/templates_library/async/interactor_assembly.mustache b/templates_library/async/interactor_assembly.mustache
deleted file mode 100644
index ec6e684..0000000
--- a/templates_library/async/interactor_assembly.mustache
+++ /dev/null
@@ -1,5 +0,0 @@
-container.register({{name}}Interactor.self) { _ in
-    {{name}}InteractorImplementation(
-
-    )
-}
diff --git a/templates_library/async/interactor_implementation.mustache b/templates_library/async/interactor_implementation.mustache
deleted file mode 100644
index ab8e084..0000000
--- a/templates_library/async/interactor_implementation.mustache
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  {{name}}InteractorImplementation.swift
-//  {{project_name}}
-//
-//  Created by {{full_username}} on {{date}}.
-//
-//
-
-import Foundation
-
-public class {{name}}InteractorImplementation: {{name}}Interactor {
-
-    public init() {
-
-    }
-
-    // MARK: - {{name}}Interactor
-
-    public func execute() async throws {
-
-    }
-}
diff --git a/templates_library/async/repository.mustache b/templates_library/async/repository.mustache
deleted file mode 100644
index bdd8bc9..0000000
--- a/templates_library/async/repository.mustache
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  {{name}}Repository.swift
-//  {{project_name}}
-//
-//  Created by {{full_username}} on {{date}}.
-//
-//
-
-import Foundation
-
-public protocol {{name}}Repository {
-
-}
diff --git a/templates_library/async/repository_assembly.mustache b/templates_library/async/repository_assembly.mustache
deleted file mode 100644
index a7769f2..0000000
--- a/templates_library/async/repository_assembly.mustache
+++ /dev/null
@@ -1,6 +0,0 @@
-container.register({{name}}Repository.self) { _ in
-    {{name}}RepositoryImplementation(
-
-    )
-}
-.inObjectScope(.container)
diff --git a/templates_library/async/repository_implementation.mustache b/templates_library/async/repository_implementation.mustache
deleted file mode 100644
index cbf6bd0..0000000
--- a/templates_library/async/repository_implementation.mustache
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  {{name}}RepositoryImplementation.swift
-//  {{project_name}}
-//
-//  Created by {{full_username}} on {{date}}.
-//
-//
-
-import Foundation
-import Core
-
-public class {{name}}RepositoryImplementation: {{name}}Repository {
-
-    public init() {
-
-    }
-
-    // MARK: - {{name}}Repository
-
-}

From 623e87d6461f20e828ab6de53769a8484c34b020 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Fri, 23 Feb 2024 18:17:31 +0100
Subject: [PATCH 31/38] Fix presenter snippet for dependency provider

---
 README.md                                     |  2 ++
 lib/ccios/argument_template_parameter.rb      | 19 ++++++++++++++++---
 lib/ccios/flag_template_parameter.rb          |  4 ++++
 lib/ccios/template_definition.rb              |  4 ++--
 .../Presenter/dependency_provider.mustache    |  4 ++--
 lib/ccios/templates/Presenter/template.yml    |  1 +
 .../Presenter/dependency_provider.mustache    |  4 ++--
 .../async/Presenter/template.yml              |  1 +
 8 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index b8c3c2b..425748b 100644
--- a/README.md
+++ b/README.md
@@ -205,6 +205,8 @@ parameters:
     description: "name argument description"
     # When present, the argument will be usable in templates under the provided name. [Optional]
     template_variable_name: "in_template_variable_name"
+    # When present, the lowercased argument will be usable in templates under the provided name. [Optional]
+    lowercased_variable_name: "name_of_the_lowercased_variable"
   # Use this to represent a flag parameter in the CLI, the flag will be provided to templates as `true` when present in the executed command.
   - flag: "long_name"
     # The short name of this flag to use on CLI. [optional]
diff --git a/lib/ccios/argument_template_parameter.rb b/lib/ccios/argument_template_parameter.rb
index dc226f2..ae54ac9 100644
--- a/lib/ccios/argument_template_parameter.rb
+++ b/lib/ccios/argument_template_parameter.rb
@@ -6,15 +6,28 @@ def initialize(parameter_template_definition_hash)
     @description = parameter_template_definition_hash["description"] || ""
     @template_variable_name = parameter_template_definition_hash["template_variable_name"] || @name
     @removeSuffix = parameter_template_definition_hash["removeSuffix"] || ""
+    @lowercased_name = parameter_template_definition_hash["lowercased_variable_name"] || ""
 
     raise "Missing argument name" if @name.nil? || @name.empty?
     raise "Invalid argument template_variable_name for #{@name}" if @template_variable_name.nil? || template_variable_name.empty?
   end
 
-  def transformed_value(value)
+  def update_context(context)
     if !@removeSuffix.empty?
-      value = value.gsub(@removeSuffix, "")
+      value = context[@template_variable_name]
+      context[@template_variable_name] = value.gsub(@removeSuffix, "")
     end
-    value
+    if !@lowercased_name.empty? && !context[@lowercased_name]
+      context[@lowercased_name] = context[@template_variable_name].camelize(:lower)
+    end
+    context
+  end
+
+  def provided_context_keys
+    context_keys = [@template_variable_name]
+    if !@lowercased_name.empty?
+      context_keys.append(@lowercased_name)
+    end
+    context_keys
   end
 end
diff --git a/lib/ccios/flag_template_parameter.rb b/lib/ccios/flag_template_parameter.rb
index d7d8699..bb10aae 100644
--- a/lib/ccios/flag_template_parameter.rb
+++ b/lib/ccios/flag_template_parameter.rb
@@ -10,4 +10,8 @@ def initialize(parameter_template_definition_hash)
     raise "Missing flag name" if @name.nil? || @name.empty?
     raise "Invalid flag template_variable_name for #{@name}" if @template_variable_name.nil? || template_variable_name.empty?
   end
+
+  def provided_context_keys
+    [@template_variable_name]
+  end
 end
diff --git a/lib/ccios/template_definition.rb b/lib/ccios/template_definition.rb
index 1f3f669..a0fc83f 100644
--- a/lib/ccios/template_definition.rb
+++ b/lib/ccios/template_definition.rb
@@ -85,7 +85,7 @@ def template_source_file(name)
   end
 
   def provided_context_keys
-    @parameters.map { |p| p.template_variable_name }.to_set
+    @parameters.flat_map { |p| p.provided_context_keys }.to_set
   end
 
   def generate(parser, options, config)
@@ -108,7 +108,7 @@ def generate(parser, options, config)
 
   def agrument_transformed_options(options)
     @parameters.select { |p| p.is_a? ArgumentTemplateParameter }.each do |argument|
-      options[argument.template_variable_name] = argument.transformed_value(options[argument.template_variable_name])
+      options = argument.update_context(options)
     end
     options
   end
diff --git a/lib/ccios/templates/Presenter/dependency_provider.mustache b/lib/ccios/templates/Presenter/dependency_provider.mustache
index d86a9ab..d70e8e4 100644
--- a/lib/ccios/templates/Presenter/dependency_provider.mustache
+++ b/lib/ccios/templates/Presenter/dependency_provider.mustache
@@ -1,12 +1,12 @@
 {{#generate_delegate}}
-func {{lowercased_filename}}Presenter(viewContract: {{name}}ViewContract, presenterDelegate: {{name}}PresenterDelegate) -> {{name}}Presenter? {
+func {{lowercased_name}}Presenter(viewContract: {{name}}ViewContract, presenterDelegate: {{name}}PresenterDelegate) -> {{name}}Presenter? {
     return presenterAssembler
         .resolver
         .resolve({{name}}Presenter.self, arguments: viewContract, presenterDelegate)
 }
 {{/generate_delegate}}
 {{^generate_delegate}}
-func {{lowercased_filename}}Presenter(viewContract: {{name}}ViewContract) -> {{name}}Presenter? {
+func {{lowercased_name}}Presenter(viewContract: {{name}}ViewContract) -> {{name}}Presenter? {
     return presenterAssembler
         .resolver
         .resolve({{name}}Presenter.self, argument: viewContract)
diff --git a/lib/ccios/templates/Presenter/template.yml b/lib/ccios/templates/Presenter/template.yml
index 467758d..0832c19 100644
--- a/lib/ccios/templates/Presenter/template.yml
+++ b/lib/ccios/templates/Presenter/template.yml
@@ -3,6 +3,7 @@ description: "Generate NamePresenter, NamePresenterImplementation, NameViewContr
 parameters:
   - argument: "name"
     removeSuffix: "Presenter"
+    lowercased_variable_name: "lowercased_name"
   - flag: "delegate"
     short_name: "d"
     template_variable_name: "generate_delegate"
diff --git a/templates_library/async/Presenter/dependency_provider.mustache b/templates_library/async/Presenter/dependency_provider.mustache
index d86a9ab..d70e8e4 100644
--- a/templates_library/async/Presenter/dependency_provider.mustache
+++ b/templates_library/async/Presenter/dependency_provider.mustache
@@ -1,12 +1,12 @@
 {{#generate_delegate}}
-func {{lowercased_filename}}Presenter(viewContract: {{name}}ViewContract, presenterDelegate: {{name}}PresenterDelegate) -> {{name}}Presenter? {
+func {{lowercased_name}}Presenter(viewContract: {{name}}ViewContract, presenterDelegate: {{name}}PresenterDelegate) -> {{name}}Presenter? {
     return presenterAssembler
         .resolver
         .resolve({{name}}Presenter.self, arguments: viewContract, presenterDelegate)
 }
 {{/generate_delegate}}
 {{^generate_delegate}}
-func {{lowercased_filename}}Presenter(viewContract: {{name}}ViewContract) -> {{name}}Presenter? {
+func {{lowercased_name}}Presenter(viewContract: {{name}}ViewContract) -> {{name}}Presenter? {
     return presenterAssembler
         .resolver
         .resolve({{name}}Presenter.self, argument: viewContract)
diff --git a/templates_library/async/Presenter/template.yml b/templates_library/async/Presenter/template.yml
index 467758d..0832c19 100644
--- a/templates_library/async/Presenter/template.yml
+++ b/templates_library/async/Presenter/template.yml
@@ -3,6 +3,7 @@ description: "Generate NamePresenter, NamePresenterImplementation, NameViewContr
 parameters:
   - argument: "name"
     removeSuffix: "Presenter"
+    lowercased_variable_name: "lowercased_name"
   - flag: "delegate"
     short_name: "d"
     template_variable_name: "generate_delegate"

From 6ed096f1504715ca1313c4508c92ec40bf3906e3 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Fri, 23 Feb 2024 18:27:21 +0100
Subject: [PATCH 32/38] Add missing documentation

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 425748b..fc1aa91 100644
--- a/README.md
+++ b/README.md
@@ -205,6 +205,8 @@ parameters:
     description: "name argument description"
     # When present, the argument will be usable in templates under the provided name. [Optional]
     template_variable_name: "in_template_variable_name"
+    # When present, will remove the provided suffix from the argument given. Example "MySuffix" will be tranformed into "My". [Optional]
+    removeSuffix: "Suffix"
     # When present, the lowercased argument will be usable in templates under the provided name. [Optional]
     lowercased_variable_name: "name_of_the_lowercased_variable"
   # Use this to represent a flag parameter in the CLI, the flag will be provided to templates as `true` when present in the executed command.

From 1dce7841ce2bc516bf4dc6172c55d973b26f23cb Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 5 Mar 2024 13:27:52 +0100
Subject: [PATCH 33/38] Use generic description and names in readme instead of
 values used in default templates

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fc1aa91..3775727 100644
--- a/README.md
+++ b/README.md
@@ -214,9 +214,9 @@ parameters:
     # The short name of this flag to use on CLI. [optional]
     short_name: "n"
     # Description used in the help command. [Optional]
-    description: "Generate delegate protocols when provided"
+    description: "Description for the long_name flag"
     # When present, the argument will be usable in templates under the provided name. [Optional]
-    template_variable_name: "generate_delegate"
+    template_variable_name: "in_template_flag_name"
 # List of templates variables that is used to generate files in an xcode project. [Optional]
 # Those variables can be overridden in config file, see section "Variable hierarchy" for more informations.
 variables:

From 83cf23880b5ebe71f85741c2e4a2de64dd13c7a4 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 5 Mar 2024 13:29:06 +0100
Subject: [PATCH 34/38] Fix typos in Readme and Changelog

---
 CHANGELOG.md | 2 +-
 README.md    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5df595b..011c555 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@ This release is an entire rewrite of the templating system, allowing customizati
     - `ccios -c Example [-d]` is now `ccios coordinator Example [-d]`
     - `ccios -i Example [-d]` is now `ccios interactor Example`
     - `ccios -r Example [-d]` is now `ccios repository Example`
-- Some default provided mustache variables has been renamed:
+- Some default provided mustache variables have been renamed:
     - `name` is now `filename`
     - `lowercased_name` is now `lowercased_filename`
 
diff --git a/README.md b/README.md
index 3775727..19de4d1 100644
--- a/README.md
+++ b/README.md
@@ -231,20 +231,20 @@ variables:
 generated_elements:
     # Path from the `base_path` variable where the file will be generated
   - file: "{{ name }}/{{ name }}File.swift"
-    # This name identify this generated file to allow variable overrides in config file. [Required]
+    # This name identifies this generated file to allow variable overrides in config file. [Required]
     name: "file"
-    # The template specify the name of template that will be used from `template_file_source`
+    # The template specifies the name of template that will be used from `template_file_source`
     template: "file"
     # List of default element variable. [Optional]
     variables: {}
     # Path from the `base_path` variable where the directory will be generated
   - group: "{{ name }}/group"
-    # This name identify this generated file to allow variable overrides in config file. [Required]
+    # This name identifies this generated file to allow variable overrides in config file. [Required]
     name: "group"
     # List of default element variable. [Optional]
     variables:
       - base_path: "path/override/to/base_group"
-# List of code snippets that will be printer by the CLI after the generation of files. [Optional]
+# List of code snippets that will be printed by the CLI after the generation of files. [Optional]
 code_snippets:
   - name: InteractorAssembly
     template: "file_snippets"

From fe80bd22c089c21114d051daf31595de6236ecf6 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 5 Mar 2024 13:35:47 +0100
Subject: [PATCH 35/38] Fix inconsistent naming in presenter template

---
 lib/ccios/templates/Presenter/template.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ccios/templates/Presenter/template.yml b/lib/ccios/templates/Presenter/template.yml
index 0832c19..cadfdf4 100644
--- a/lib/ccios/templates/Presenter/template.yml
+++ b/lib/ccios/templates/Presenter/template.yml
@@ -18,11 +18,11 @@ generated_elements:
     variables: {}
   - name: "view_controller"
     file: "{{ name }}/UI/ViewController/{{ name }}ViewController.swift"
-    template: "viewController"
+    template: "view_controller"
     variables: {}
   - name: "view_contract"
     file: "{{ name }}/UI/{{ name }}ViewContract.swift"
-    template: "viewContract"
+    template: "view_contract"
     variables: {}
   - name: "presenter"
     file: "{{ name }}/Presenter/{{ name }}Presenter.swift"
@@ -30,7 +30,7 @@ generated_elements:
     variables: {}
   - name: "presenter_implementation"
     file: "{{ name }}/Presenter/{{ name }}PresenterImplementation.swift"
-    template: "presenterImplementation"
+    template: "presenter_implementation"
     variables: {}
   - name: "model_group"
     group: "{{ name }}/Model"
@@ -41,9 +41,9 @@ code_snippets:
   - name: PresenterAssembly
     template: "presenter_assembly"
 template_file_source:
-  viewController: "view_controller.mustache"
-  viewContract: "view_contract.mustache"
+  view_controller: "view_controller.mustache"
+  view_contract: "view_contract.mustache"
   presenter: "presenter.mustache"
-  presenterImplementation: "presenter_implementation.mustache"
+  presenter_implementation: "presenter_implementation.mustache"
   dependency_provider: "dependency_provider.mustache"
   presenter_assembly: "presenter_assembly.mustache"

From 22bfc07b6d554570ff86d36ae0702420d19b1495 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 5 Mar 2024 13:52:18 +0100
Subject: [PATCH 36/38] Add missing documentation for code_snippets

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 19de4d1..eb0c212 100644
--- a/README.md
+++ b/README.md
@@ -246,7 +246,10 @@ generated_elements:
       - base_path: "path/override/to/base_group"
 # List of code snippets that will be printed by the CLI after the generation of files. [Optional]
 code_snippets:
-  - name: InteractorAssembly
+    # The name will be used in the printed line "Add this snippet to FilenameInWhichTheSnippetIsExpected" before the generated code snippet.
+    # This name will also be given to the snippet template under the variable `filename` and `lowercased_filename`. [Required]
+  - name: FilenameInWhichTheSnippetIsExpected
+    # The template specifies the name of template that will be used from `template_file_source`. [Required]
     template: "file_snippets"
 # List of templating files used for element generation or code snippets. [Required]
 # The key is used as an identifier in `generated_elements` or `code_snippets`, the value is the path from the template directory.

From ec0c2bff2aa8fb9eb8700cbdb9860cbd8b29615b Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Tue, 5 Mar 2024 14:17:28 +0100
Subject: [PATCH 37/38] Fix inconsistent naming in async presenter template

---
 templates_library/async/Presenter/template.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates_library/async/Presenter/template.yml b/templates_library/async/Presenter/template.yml
index 0832c19..cadfdf4 100644
--- a/templates_library/async/Presenter/template.yml
+++ b/templates_library/async/Presenter/template.yml
@@ -18,11 +18,11 @@ generated_elements:
     variables: {}
   - name: "view_controller"
     file: "{{ name }}/UI/ViewController/{{ name }}ViewController.swift"
-    template: "viewController"
+    template: "view_controller"
     variables: {}
   - name: "view_contract"
     file: "{{ name }}/UI/{{ name }}ViewContract.swift"
-    template: "viewContract"
+    template: "view_contract"
     variables: {}
   - name: "presenter"
     file: "{{ name }}/Presenter/{{ name }}Presenter.swift"
@@ -30,7 +30,7 @@ generated_elements:
     variables: {}
   - name: "presenter_implementation"
     file: "{{ name }}/Presenter/{{ name }}PresenterImplementation.swift"
-    template: "presenterImplementation"
+    template: "presenter_implementation"
     variables: {}
   - name: "model_group"
     group: "{{ name }}/Model"
@@ -41,9 +41,9 @@ code_snippets:
   - name: PresenterAssembly
     template: "presenter_assembly"
 template_file_source:
-  viewController: "view_controller.mustache"
-  viewContract: "view_contract.mustache"
+  view_controller: "view_controller.mustache"
+  view_contract: "view_contract.mustache"
   presenter: "presenter.mustache"
-  presenterImplementation: "presenter_implementation.mustache"
+  presenter_implementation: "presenter_implementation.mustache"
   dependency_provider: "dependency_provider.mustache"
   presenter_assembly: "presenter_assembly.mustache"

From 117d4fcd29260bb55b8a573056b8f8fc11fbb6d9 Mon Sep 17 00:00:00 2001
From: Alexandre Podlewski <alexandre.podlewski@fabernovel.com>
Date: Wed, 20 Mar 2024 14:53:16 +0100
Subject: [PATCH 38/38] Fix help message for templates with multiple argument
 parameters

---
 lib/ccios.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ccios.rb b/lib/ccios.rb
index 8d91c07..1d4f453 100644
--- a/lib/ccios.rb
+++ b/lib/ccios.rb
@@ -22,7 +22,7 @@
 
     arguments_line = arguments.map { |argument| "<#{argument.name}>" }.join(" ")
 
-    opts.banner = "Usage: ccios #{template.name} <name> [options]"
+    opts.banner = "Usage: ccios #{template.name} #{arguments_line} [options]"
 
     flags.each do |flagParameter|
       if flagParameter.short_name != nil