ccios 4.0.2 → 5.0.0

data/lib/ccios.rb

@@ -2,67 +2,89 @@ require 'date'
 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'
+require 'ccios/templates_loader'
 
+config = Config.parse ".ccios.yml"
+source_path = Dir.pwd
+
+templates = TemplatesLoader.new.get_templates(config)
+
+subcommands = {}
 options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: ccios [options]"
+
+templates.values.each do |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} #{arguments_line} [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 |v|
-    options[:presenter] = v
-  end
-  opts.on("-cName", "--coordinator=Name", "Generate NameCoordinator") do |v|
-    options[:coordinator] = v
-  end
-  opts.on("-iName", "--interactor=Name", "Generate NameInteractor and NameInteractorImplementation") do |v|
-    options[:interactor] = v
-  end
-  opts.on("-rName", "--repository=Name", "Generate NameRepository and NameRepositoryImplementation") do |v|
-    options[:repository] = v
-  end
-  opts.on("-d", "--delegate", "Add delegate for curent generation") do |v|
-    options[:generate_delegate] = v
-  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.template_variable_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
 
+parser = PBXProjParser.new(source_path, config)
+
+template.validate(parser, options, config)
+template.generate(parser, options, config)
+
 parser.save

data/templates_library/async/Coordinator/coordinator.mustache

@@ -0,0 +1,41 @@
+//
+//  {{name}}Coordinator.swift
+//  {{project_name}}
+//
+//  Created by {{full_username}} on {{date}}.
+//
+//
+
+import Foundation
+import ADCoordinator
+
+{{#generate_delegate}}
+@MainActor
+protocol {{name}}CoordinatorDelegate: AnyObject {
+
+}
+
+{{/generate_delegate}}
+@MainActor
+class {{name}}Coordinator: Coordinator {
+
+    {{#generate_delegate}}
+    weak var delegate: {{name}}CoordinatorDelegate?
+    {{/generate_delegate}}
+    private let dependencyProvider: ApplicationDependencyProvider
+    private unowned var navigationController: UINavigationController
+
+    nonisolated 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)
+    }
+}

data/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"

data/templates_library/async/Presenter/dependency_provider.mustache

@@ -0,0 +1,14 @@
+{{#generate_delegate}}
+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_name}}Presenter(viewContract: {{name}}ViewContract) -> {{name}}Presenter? {
+    return presenterAssembler
+        .resolver
+        .resolve({{name}}Presenter.self, argument: viewContract)
+}
+{{/generate_delegate}}

data/templates_library/async/Presenter/presenter.mustache

@@ -0,0 +1,21 @@
+//
+//  {{name}}Presenter.swift
+//  {{project_name}}
+//
+//  Created by {{full_username}} on {{date}}.
+//
+//
+
+import Foundation
+
+@MainActor
+protocol {{name}}Presenter {
+    func start()
+}
+{{#generate_delegate}}
+
+@MainActor
+protocol {{name}}PresenterDelegate: AnyObject {
+
+}
+{{/generate_delegate}}

data/templates_library/async/Presenter/presenter_assembly.mustache

@@ -0,0 +1,15 @@
+{{#generate_delegate}}
+container.register({{name}}Presenter.self) { _, viewContract, delegate in
+    {{name}}PresenterImplementation(
+        viewContract: viewContract,
+        delegate: delegate
+    )
+}
+{{/generate_delegate}}
+{{^generate_delegate}}
+container.register({{name}}Presenter.self) { _, viewContract in
+    {{name}}PresenterImplementation(
+        viewContract: viewContract
+    )
+}
+{{/generate_delegate}}

data/templates_library/async/Presenter/presenter_implementation.mustache

@@ -0,0 +1,35 @@
+//
+//  {{name}}PresenterImplementation.swift
+//  {{project_name}}
+//
+//  Created by {{full_username}} on {{date}}.
+//
+//
+
+import Foundation
+
+class {{name}}PresenterImplementation: {{name}}Presenter {
+
+    private weak var viewContract: {{name}}ViewContract?
+    {{#generate_delegate}}
+    private weak var delegate: {{name}}PresenterDelegate?
+    {{/generate_delegate}}
+
+    {{#generate_delegate}}
+    nonisolated init(viewContract: {{name}}ViewContract, delegate: {{name}}PresenterDelegate) {
+        self.viewContract = viewContract
+        self.delegate = delegate
+    }
+    {{/generate_delegate}}
+    {{^generate_delegate}}
+    nonisolated init(viewContract: {{name}}ViewContract) {
+        self.viewContract = viewContract
+    }
+    {{/generate_delegate}}
+
+    // MARK: - {{name}}Presenter
+
+    func start() {
+
+    }
+}

data/templates_library/async/Presenter/template.yml

@@ -0,0 +1,49 @@
+name: "presenter"
+description: "Generate NamePresenter, NamePresenterImplementation, NameViewContract and NameViewController"
+parameters:
+  - argument: "name"
+    removeSuffix: "Presenter"
+    lowercased_variable_name: "lowercased_name"
+  - 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: "view_controller"
+    variables: {}
+  - name: "view_contract"
+    file: "{{ name }}/UI/{{ name }}ViewContract.swift"
+    template: "view_contract"
+    variables: {}
+  - name: "presenter"
+    file: "{{ name }}/Presenter/{{ name }}Presenter.swift"
+    template: "presenter"
+    variables: {}
+  - name: "presenter_implementation"
+    file: "{{ name }}/Presenter/{{ name }}PresenterImplementation.swift"
+    template: "presenter_implementation"
+    variables: {}
+  - name: "model_group"
+    group: "{{ name }}/Model"
+    variables: {}
+code_snippets:
+  - name: DependencyProvider
+    template: "dependency_provider"
+  - name: PresenterAssembly
+    template: "presenter_assembly"
+template_file_source:
+  view_controller: "view_controller.mustache"
+  view_contract: "view_contract.mustache"
+  presenter: "presenter.mustache"
+  presenter_implementation: "presenter_implementation.mustache"
+  dependency_provider: "dependency_provider.mustache"
+  presenter_assembly: "presenter_assembly.mustache"

data/templates_library/async/Presenter/view_contract.mustache

@@ -0,0 +1,14 @@
+//
+//  {{name}}ViewContract.swift
+//  {{project_name}}
+//
+//  Created by {{full_username}} on {{date}}.
+//
+//
+
+import Foundation
+
+@MainActor
+protocol {{name}}ViewContract: AnyObject {
+
+}

data/templates_library/async/Presenter/view_controller.mustache

@@ -0,0 +1,23 @@
+//
+//  {{name}}ViewController.swift
+//  {{project_name}}
+//
+//  Created by {{full_username}} on {{date}}.
+//
+//
+
+import Foundation
+import UIKit
+
+@MainActor
+class {{name}}ViewController: SharedViewController, {{name}}ViewContract {
+    var presenter: {{name}}Presenter?
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        presenter?.start()
+    }
+
+    // MARK: - {{name}}ViewContract
+
+}

data/templates_library/default/README.md

@@ -0,0 +1 @@
+Default templates are in <root>/lib/ccios/templates

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: ccios
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Pierre Felgines
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-08-03 00:00:00.000000000 Z
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -98,32 +99,49 @@ files:
 - bin/ccios
 - ccios.gemspec
 - lib/ccios.rb
+- lib/ccios/argument_template_parameter.rb
 - lib/ccios/code_templater.rb
 - lib/ccios/config.rb
-- lib/ccios/coordinator_generator.rb
 - lib/ccios/file_creator.rb
-- lib/ccios/interactor_generator.rb
+- lib/ccios/file_template_definition.rb
+- lib/ccios/flag_template_parameter.rb
+- lib/ccios/group_template_definition.rb
 - lib/ccios/pbxproj_parser.rb
-- lib/ccios/presenter_generator.rb
-- lib/ccios/repository_generator.rb
-- lib/ccios/templates/coordinator.mustache
-- lib/ccios/templates/dependency_provider.mustache
-- lib/ccios/templates/interactor.mustache
-- lib/ccios/templates/interactor_assembly.mustache
-- lib/ccios/templates/interactor_implementation.mustache
-- lib/ccios/templates/presenter.mustache
-- lib/ccios/templates/presenter_assembly.mustache
-- lib/ccios/templates/presenter_implementation.mustache
-- lib/ccios/templates/repository.mustache
-- lib/ccios/templates/repository_assembly.mustache
-- lib/ccios/templates/repository_implementation.mustache
-- lib/ccios/templates/view_contract.mustache
-- lib/ccios/templates/view_controller.mustache
+- lib/ccios/snippet_template_definition.rb
+- lib/ccios/template_definition.rb
+- lib/ccios/templates/Coordinator/coordinator.mustache
+- lib/ccios/templates/Coordinator/template.yml
+- lib/ccios/templates/Interactor/interactor.mustache
+- lib/ccios/templates/Interactor/interactor_assembly.mustache
+- lib/ccios/templates/Interactor/interactor_implementation.mustache
+- lib/ccios/templates/Interactor/template.yml
+- lib/ccios/templates/Presenter/dependency_provider.mustache
+- lib/ccios/templates/Presenter/presenter.mustache
+- lib/ccios/templates/Presenter/presenter_assembly.mustache
+- lib/ccios/templates/Presenter/presenter_implementation.mustache
+- lib/ccios/templates/Presenter/template.yml
+- lib/ccios/templates/Presenter/view_contract.mustache
+- lib/ccios/templates/Presenter/view_controller.mustache
+- lib/ccios/templates/Repository/repository.mustache
+- lib/ccios/templates/Repository/repository_assembly.mustache
+- lib/ccios/templates/Repository/repository_implementation.mustache
+- lib/ccios/templates/Repository/template.yml
+- lib/ccios/templates_loader.rb
+- templates_library/async/Coordinator/coordinator.mustache
+- templates_library/async/Coordinator/template.yml
+- templates_library/async/Presenter/dependency_provider.mustache
+- templates_library/async/Presenter/presenter.mustache
+- templates_library/async/Presenter/presenter_assembly.mustache
+- templates_library/async/Presenter/presenter_implementation.mustache
+- templates_library/async/Presenter/template.yml
+- templates_library/async/Presenter/view_contract.mustache
+- templates_library/async/Presenter/view_controller.mustache
+- templates_library/default/README.md
 homepage: http://rubygems.org/gems/hola
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
 summary: Clean Code iOS Generator
 test_files: []

data/lib/ccios/coordinator_generator.rb

@@ -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)
-    target = @parser.app_target
-    coordinator_name = coordinator_name.gsub("Coordinator", "")
-    file_creator.create_file(coordinator_name, 'Coordinator', coordinator_group, target)
-  end
-end

data/lib/ccios/interactor_generator.rb

@@ -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)
-    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

data/lib/ccios/presenter_generator.rb

@@ -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)
-    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

data/lib/ccios/repository_generator.rb

@@ -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)
-    core_target = @parser.core_target
-    file_creator.create_file(repository_name, 'Repository', core_data_new_group, core_target)
-
-    file_creator = FileCreator.new(options)
-    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