ccios improvements

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.0

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Changed
+
+- Target variable is now optional, an empty string or an unset value will use the first target of the project. This change allows templates to not overrides global target settings in `.ccios.yml`
+- When multiple targets are provided for a file, `{{project_name}}` will now be replaced by the name of the project instead of the name of the first target
+- `@MainActor` has been added to relevent files in Coordinator and Presenter templates to improve Swift 6 support
+- dependency provider snippets has been updated to handle Swift 6 issue (see [this issue](https://github.com/Swinject/Swinject/issues/571) for why this is required)
+
 ## [5.0.0]
 
 This release is an entire rewrite of the templating system, allowing customization of template and settings.

Gemfile.lock

@@ -9,41 +9,60 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (7.0.8)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.0.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     atomos (0.1.3)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     claide (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.2)
-    i18n (1.14.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
+    drb (2.2.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    minitest (5.20.0)
+    logger (1.6.6)
+    minitest (5.25.4)
     mustache (1.1.1)
-    nanaimo (0.3.0)
-    rake (12.3.3)
-    rexml (3.2.6)
+    nanaimo (0.4.0)
+    nkf (0.2.0)
+    rake (13.2.1)
+    rexml (3.4.1)
+    securerandom (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.23.0)
+    uri (1.0.3)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ccios!
   minitest (~> 5.11)
-  rake (~> 12.3)
+  rake (~> 13.2)
 
 BUNDLED WITH
    2.4.10

README.md

@@ -138,6 +138,7 @@ templates_collection: ccios/templates
 # Global overrides of variables [Optional]
 variables:
   project: Project.xcodeproj
+  target: SomeDefaultTarget
 
 # Per template variables override
 templates_config:
@@ -224,8 +225,8 @@ variables:
   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: ""
+  # 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 this variable is not set or if an empty string is provided, it will use the first target found in the Xcode project. If present it will override the global default target. [Optional]
+  target: "SomeTarget"
 # List of generated elements. [Required]
 # Each element can be a file (using `file`), or an empty folder (using `group`)
 generated_elements:

ccios.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'xcodeproj', '~> 1.4'
   s.add_dependency "mustache", "~> 1.0"
 
-  s.add_development_dependency 'rake', '~> 12.3'
+  s.add_development_dependency 'rake', '~> 13.2'
   s.add_development_dependency 'minitest', '~> 5.11'
 end

lib/ccios/file_creator.rb

@@ -15,6 +15,13 @@ def pf_new_group(associate_path_to_group:, name:, path:)
   end
 end
 
+class Xcodeproj::Project
+
+  def project_name_from_path
+    File.basename(@path, File.extname(@path))
+  end
+end
+
 class FileCreator
 
   def self.logger
@@ -25,12 +32,16 @@ def logger
     FileCreator.logger
   end
 
-  def templater_options(target)
+  def templater_options(targets, project)
     defaults = {
-      project_name: target.display_name,
       full_username: git_username,
       date: DateTime.now.strftime("%d/%m/%Y"),
     }
+    if targets.count == 1
+      defaults["project_name"] = targets[0].display_name
+    else
+      defaults["project_name"] = project.project_name_from_path
+    end
     defaults
   end
 
@@ -44,15 +55,15 @@ def get_unknown_template_tags_for(template_path)
     tags
   end
 
-  def create_file_using_template_path(template_path, generated_filename, group, targets, context)
+  def create_file_using_template_path(template_path, generated_filename, group, targets, project, 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')
 
-    context = context.merge(templater_options(targets[0]))
+    context = context.merge(templater_options(targets, project))
     file_content = CodeTemplater.new.render_file_content_from_template(template_path, generated_filename, context)
 
     file.puts(file_content)

lib/ccios/file_template_definition.rb

@@ -37,7 +37,7 @@ def validate(parser, project, context, template_definition, config)
     raise "Base path \"#{base_path}\" is missing" if base_group.nil?
 
     target_name = merged_variables["target"]
-    if target_name.is_a?(String)
+    if target_name.is_a?(String) || target_name.nil?
       target = parser.target_for(project, target_name)
       raise "Unable to find target \"#{target_name}\"" if target.nil?
     elsif target_name.is_a?(Array)
@@ -77,7 +77,7 @@ def generate(parser, project, context, template_definition, config)
     target_name = merged_variables["target"]
 
     targets = []
-    if target_name.is_a?(String)
+    if target_name.is_a?(String) || target_name.nil?
       targets = [parser.target_for(project, target_name)]
     elsif target_name.is_a?(Array)
       targets = target_name.map { |name| parser.target_for(project, name) }
@@ -88,6 +88,7 @@ def generate(parser, project, context, template_definition, config)
       generated_filename,
       group,
       targets,
+      project,
       context
     )
   end

lib/ccios/pbxproj_parser.rb

@@ -27,7 +27,7 @@ def project_for(path)
   end
 
   def target_for(project, target_name)
-    if target_name.blank?
+    if target_name.blank? || target_name.nil?
       project.targets.find { |t| t.product_type == "com.apple.product-type.application" }
     else
       project.targets.find { |t| t.name == target_name }

lib/ccios/templates/Coordinator/coordinator.mustache

@@ -10,6 +10,7 @@ import Foundation
 import ADCoordinator
 
 {{#generate_delegate}}
+@MainActor
 protocol {{name}}CoordinatorDelegate: AnyObject {
 
 }
@@ -23,8 +24,10 @@ class {{name}}Coordinator: Coordinator {
     private let dependencyProvider: ApplicationDependencyProvider
     private unowned var navigationController: UINavigationController
 
-    init(navigationController: UINavigationController,
-         dependencyProvider: ApplicationDependencyProvider) {
+    init(
+        navigationController: UINavigationController,
+        dependencyProvider: ApplicationDependencyProvider
+    ) {
         self.navigationController = navigationController
         self.dependencyProvider = dependencyProvider
     }

lib/ccios/templates/Coordinator/template.yml

@@ -3,7 +3,6 @@ description: "Generate NameCoordinator"
 variables:
   project: "*.xcodeproj"
   base_path: "Coordinator"
-  target: ""
 parameters:
   - argument: "name"
     removeSuffix: "Coordinator"

lib/ccios/templates/Interactor/template.yml

@@ -6,7 +6,6 @@ parameters:
 variables:
   project: "*.xcodeproj"
   base_path: "Core/Interactor"
-  target: ""
 generated_elements:
   - name: "interactor"
     file: "{{ name }}Interactor/{{ name }}Interactor.swift"

lib/ccios/templates/Presenter/dependency_provider.mustache

@@ -2,13 +2,17 @@
 func {{lowercased_name}}Presenter(viewContract: {{name}}ViewContract, presenterDelegate: {{name}}PresenterDelegate) -> {{name}}Presenter? {
     return presenterAssembler
         .resolver
-        .resolve({{name}}Presenter.self, arguments: viewContract, presenterDelegate)
+        .resolve(
+            {{name}}Presenter.self,
+            arguments: viewContract as {{name}}ViewContract,
+            presenterDelegate as {{name}}PresenterDelegate
+        )
 }
 {{/generate_delegate}}
 {{^generate_delegate}}
 func {{lowercased_name}}Presenter(viewContract: {{name}}ViewContract) -> {{name}}Presenter? {
     return presenterAssembler
         .resolver
-        .resolve({{name}}Presenter.self, argument: viewContract)
+        .resolve({{name}}Presenter.self, argument: viewContract as {{name}}ViewContract)
 }
 {{/generate_delegate}}

lib/ccios/templates/Presenter/presenter.mustache

@@ -8,11 +8,13 @@
 
 import Foundation
 
+@MainActor
 protocol {{name}}Presenter {
     func start()
 }
 {{#generate_delegate}}
 
+@MainActor
 protocol {{name}}PresenterDelegate: AnyObject {
 
 }

lib/ccios/templates/Presenter/presenter_implementation.mustache

@@ -30,6 +30,7 @@ class {{name}}PresenterImplementation: {{name}}Presenter {
     // MARK: - {{name}}Presenter
 
     func start() {
-
+        let viewModel = {{name}}ViewModelMapper().map()
+        viewContract?.configure(with: viewModel)
     }
 }

lib/ccios/templates/Presenter/template.yml

@@ -11,7 +11,6 @@ parameters:
 variables:
   project: "*.xcodeproj"
   base_path: "App"
-  target: ""
 generated_elements:
   - name: "ui_view_group"
     group: "{{ name }}/UI/View"
@@ -32,8 +31,13 @@ generated_elements:
     file: "{{ name }}/Presenter/{{ name }}PresenterImplementation.swift"
     template: "presenter_implementation"
     variables: {}
-  - name: "model_group"
-    group: "{{ name }}/Model"
+  - name: "view_model"
+    file: "{{ name }}/Model/{{ name }}ViewModel.swift"
+    template: "view_model"
+    variables: {}
+  - name: "view_model_mapper"
+    file: "{{ name }}/Model/Mapper/{{ name }}ViewModelMapper.swift"
+    template: "view_model_mapper"
     variables: {}
 code_snippets:
   - name: DependencyProvider
@@ -45,5 +49,7 @@ template_file_source:
   view_contract: "view_contract.mustache"
   presenter: "presenter.mustache"
   presenter_implementation: "presenter_implementation.mustache"
+  view_model: "view_model.mustache"
+  view_model_mapper: "view_model_mapper.mustache"
   dependency_provider: "dependency_provider.mustache"
   presenter_assembly: "presenter_assembly.mustache"

lib/ccios/templates/Presenter/view_contract.mustache

@@ -8,6 +8,7 @@
 
 import Foundation
 
+@MainActor
 protocol {{name}}ViewContract: AnyObject {
-
+    func configure(with viewModel: {{name}}ViewModel)
 }

lib/ccios/templates/Presenter/view_controller.mustache

@@ -19,4 +19,7 @@ class {{name}}ViewController: SharedViewController, {{name}}ViewContract {
 
     // MARK: - {{name}}ViewContract
 
+    func configure(with viewModel: {{name}}ViewModel) {
+    }
+
 }

lib/ccios/templates/Presenter/view_model.mustache

@@ -0,0 +1,12 @@
+//
+//  {{name}}ViewModel.swift
+//  {{project_name}}
+//
+//  Created by {{full_username}} on {{date}}.
+//
+//
+
+import Foundation
+
+struct {{name}}ViewModel {
+}

lib/ccios/templates/Presenter/view_model_mapper.mustache

@@ -0,0 +1,16 @@
+//
+//  {{name}}ViewModelMapper.swift
+//  {{project_name}}
+//
+//  Created by {{full_username}} on {{date}}.
+//
+//
+
+import Foundation
+
+struct {{name}}ViewModelMapper {
+
+    func map() -> {{name}}ViewModel {
+        {{name}}ViewModel()
+    }
+}

lib/ccios/templates/Repository/template.yml

@@ -5,7 +5,6 @@ parameters:
     removeSuffix: "Repository"
 variables:
   project: "*.xcodeproj"
-  target: ""
 generated_elements:
   - name: "repository"
     file: "{{ name }}/{{ name }}Repository.swift"