ccios 4.1.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6854ecea6f4dd2478a49675e65dac4f292ddd1e2cae94d526b5903ea507efaf0
-  data.tar.gz: eeaa057288fe8c0d0c6d02e0a94453e967e8c1d904a068d5c185f0d49224c252
+  metadata.gz: dc6f5c81e7b9f2abf46e0f373717896e51762b3565f616205bd6a666d888fc65
+  data.tar.gz: 0f8661b91001f98ebe5e6435e8572bf1d671d871a22c120d85d29783d294cb36
 SHA512:
-  metadata.gz: 34837239dd73f4e62f167a078a48fb3083b49296c9970032f86ba768128af08b991c5f46adc72b032fbc909d4937e82487fcdea65d0cb6b9eaaa9049c2261580
-  data.tar.gz: a480d7df1ee5dc7a9d595ec6fcb4c68ad968ca2b62e9c57065ff7a3e3ad5528f2ffd0e3d76dfe01f6f6ba2cad71fab65ffafc5148b2fbbf202e978b0a65c1f61
+  metadata.gz: 7113bdee060f5d5808bb43951a0e0485b45cc058d857ccd0c64e36702a6418ed893e62a6a1dc9695ffa2c770c177931b9705a533cf2f2f8727bbabbbe0c25244
+  data.tar.gz: b0d3109396e17b9d8d3b4979901b3c2b6183de19da7df9f60ad784d6e0c7b26b6da9a730f6f0c607f4fd344634d8ca9f1ae505207f86131e677261fee451a4a1

data/.ruby-version

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

data/CHANGELOG.md

@@ -4,6 +4,41 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [5.1.0]
+
+### 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.
+
+### Added
+
+- 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 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`
+
+### 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 have been renamed:
+    - `name` is now `filename`
+    - `lowercased_name` is now `lowercased_filename`
+
 ## [4.1.0]
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ccios (4.1.0)
+    ccios (5.1.0)
       activesupport (> 4)
       mustache (~> 1.0)
       xcodeproj (~> 1.4)
@@ -9,33 +9,52 @@ 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
@@ -43,7 +62,7 @@ PLATFORMS
 DEPENDENCIES
   ccios!
   minitest (~> 5.11)
-  rake (~> 12.3)
+  rake (~> 13.2)
 
 BUNDLED WITH
    2.4.10

data/MAINTAINER.md

@@ -0,0 +1,8 @@
+
+## How to release a new version
+
+- Create the release branch `release/vA.B.C`
+- Complete the changelog and add the new vertion title
+- Update the version in ccios.gemspec & run `bundle install`
+- Create a Pull Request
+- Once merged, create a tag `A.B.C` on the merged commit

data/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,177 @@ 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
+  target: SomeDefaultTarget
+
+# 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"
+    # 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.
+  - 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: "Description for the long_name flag"
+    # When present, the argument will be usable in templates under the provided name. [Optional]
+    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:
+  # 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 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:
+    # Path from the `base_path` variable where the file will be generated
+  - file: "{{ name }}/{{ name }}File.swift"
+    # This name identifies this generated file to allow variable overrides in config file. [Required]
+    name: "file"
+    # 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 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 printed by the CLI after the generation of files. [Optional]
+code_snippets:
+    # 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.
+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

data/ccios.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ccios'
-  s.version     = '4.1.0'
+  s.version     = '5.1.0'
   s.executables << 'ccios'
   s.date        = '2016-08-03'
   s.summary     = "Clean Code iOS Generator"
@@ -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

data/lib/ccios/argument_template_parameter.rb

@@ -0,0 +1,33 @@
+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
+    @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 update_context(context)
+    if !@removeSuffix.empty?
+      value = context[@template_variable_name]
+      context[@template_variable_name] = value.gsub(@removeSuffix, "")
+    end
+    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

data/lib/ccios/code_templater.rb

@@ -2,15 +2,31 @@ require 'mustache'
 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({filename: filename, lowercased_filename: 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["filename", "lowercased_filename"])
+    tags
   end
 end