ccios 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c88ba12634db23d2c4e956b6f03b721a127dbbc49897c49cd2b9fe15a295704b
-  data.tar.gz: eadb6778ddd52ce31071e3f3addc37c523fcfb1272a00f212bad6eb73d0e089d
+  metadata.gz: 17e45b6aa153c86b30ee9975a172b6a9e010c796633936310497a4d7eafea7e4
+  data.tar.gz: 61769b9cdd9d07510d855ccbbbdcace5a79fb171391872db91d93778bfbc0448
 SHA512:
-  metadata.gz: 8cf76e8f0ed4b932cf9d653bc0e30fe970806025b48ae6490232b37f3cc62cd2ce756f4e1a9560603f9d06338e3ffb85c388797c975a80b3b54974f8205b6431
-  data.tar.gz: 9753729e4574c4f30a047168590b77195cb3f51566179b1c98cadc97320b47e3b7d3dd3547d8c082b64b01419c5be2cd329a1ebd01e2dcfc45cefadf3857e5e7
+  metadata.gz: d0782622ea52267f207de88a45a60fdcffe93629b3c6fcb8542c2ee256dccc7fd44e1aeb4b2dc1b2e4fb5514b836fbe561968e18bda962d50b4d5b23884cad34
+  data.tar.gz: a744aaa03b197360105b3656580dfecc9675138269a9bf7116093b1daa208919ac5cf77ece3ca735b92906a303b2e79dbe95df22f12653b631c4cb0d53c842ee

data/.github/workflows/ruby.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake

data/.gitignore

@@ -1 +1,3 @@
-ccios-*.gem
+ccios-*.gem
+xcuserdata
+.DS_Store

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+`ADUtils` adheres to [Semantic Versioning](http://semver.org/).
+
+## [2.2.0]
+
+### Added
+- Create configuration with optional `.ccios.yml` file

data/Gemfile.lock

@@ -1,122 +1,133 @@
 PATH
   remote: .
   specs:
-    ccios (1.0.3)
+    ccios (2.2.0)
       mustache (~> 1.0)
-      rails
+      rails (~> 5.1)
       xcodeproj (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.5)
-    actioncable (5.1.3)
-      actionpack (= 5.1.3)
+    CFPropertyList (3.0.2)
+    actioncable (5.2.4.2)
+      actionpack (= 5.2.4.2)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.3)
-      actionpack (= 5.1.3)
-      actionview (= 5.1.3)
-      activejob (= 5.1.3)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      actionview (= 5.2.4.2)
+      activejob (= 5.2.4.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.3)
-      actionview (= 5.1.3)
-      activesupport (= 5.1.3)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
+    actionpack (5.2.4.2)
+      actionview (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.3)
-      activesupport (= 5.1.3)
+    actionview (5.2.4.2)
+      activesupport (= 5.2.4.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.3)
-      activesupport (= 5.1.3)
+    activejob (5.2.4.2)
+      activesupport (= 5.2.4.2)
       globalid (>= 0.3.6)
-    activemodel (5.1.3)
-      activesupport (= 5.1.3)
-    activerecord (5.1.3)
-      activemodel (= 5.1.3)
-      activesupport (= 5.1.3)
-      arel (~> 8.0)
-    activesupport (5.1.3)
+    activemodel (5.2.4.2)
+      activesupport (= 5.2.4.2)
+    activerecord (5.2.4.2)
+      activemodel (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
+      arel (>= 9.0)
+    activestorage (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      activerecord (= 5.2.4.2)
+      marcel (~> 0.3.1)
+    activesupport (5.2.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (8.0.0)
-    builder (3.2.3)
-    claide (1.0.2)
+    arel (9.0.0)
+    atomos (0.1.3)
+    builder (3.2.4)
+    claide (1.0.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.0.5)
-    erubi (1.6.1)
-    globalid (0.4.0)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    erubi (1.9.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.8.6)
-    loofah (2.0.3)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    loofah (2.5.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    mustache (1.0.5)
-    nanaimo (0.2.3)
-    nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.1.3)
-      actioncable (= 5.1.3)
-      actionmailer (= 5.1.3)
-      actionpack (= 5.1.3)
-      actionview (= 5.1.3)
-      activejob (= 5.1.3)
-      activemodel (= 5.1.3)
-      activerecord (= 5.1.3)
-      activesupport (= 5.1.3)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (1.0.0)
+    mimemagic (0.3.4)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    mustache (1.1.1)
+    nanaimo (0.2.6)
+    nio4r (2.5.2)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    rack (2.2.2)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.4.2)
+      actioncable (= 5.2.4.2)
+      actionmailer (= 5.2.4.2)
+      actionpack (= 5.2.4.2)
+      actionview (= 5.2.4.2)
+      activejob (= 5.2.4.2)
+      activemodel (= 5.2.4.2)
+      activerecord (= 5.2.4.2)
+      activestorage (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       bundler (>= 1.3.0)
-      railties (= 5.1.3)
+      railties (= 5.2.4.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.3)
-      actionpack (= 5.1.3)
-      activesupport (= 5.1.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    sprockets (3.7.1)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.0.1)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    xcodeproj (1.5.1)
-      CFPropertyList (~> 2.3.3)
+    websocket-extensions (0.1.4)
+    xcodeproj (1.16.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.2.6)
 
 PLATFORMS
   ruby
@@ -125,4 +136,4 @@ DEPENDENCIES
   ccios!
 
 BUNDLED WITH
-   1.12.3
+   1.17.3

data/Makefile

@@ -0,0 +1,11 @@
+build:
+	gem build ccios.gemspec
+
+install: clean build
+	gem install ccios-*.gem
+
+clean:
+	rm -f ccios-*.gem
+
+tests:
+	rake test

data/README.md

@@ -101,3 +101,58 @@ The following structure is created for you in the Xcode project:
 +-- Coordinator/
 |   +-- ExampleCoordinator
 ```
+
+## Configuration
+
+
+Each project is different. 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
+  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
+```
+
+But you could imagine more complex project structures with multiple xcodeproj:
+```
+app:
+  project: MyProject/MyProject.xcodeproj
+  presenter:
+    group: Classes/App
+  coordinator:
+    group: Classes/Coordinator
+
+core:
+  project: MyProjectCore/MyProjectCore.xcodeproj
+  interactor:
+    group: MyProjectCore/Interactors
+  repository:
+    group: MyProjectCore/Repository
+
+data:
+  project: MyProjectData/MyProjectData.xcodeproj
+  repository:
+    group: MyProjectData/Sources/Repositories
+
+```
+
+*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.
+

data/ccios.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ccios'
-  s.version     = '2.1.0'
+  s.version     = '2.2.0'
   s.executables << 'ccios'
   s.date        = '2016-08-03'
   s.summary     = "Clean Code iOS Generator"

data/lib/ccios.rb

@@ -6,6 +6,7 @@ require 'ccios/presenter_generator'
 require 'ccios/coordinator_generator'
 require 'ccios/interactor_generator'
 require 'ccios/repository_generator'
+require 'ccios/config'
 
 options = {}
 OptionParser.new do |opts|
@@ -35,31 +36,32 @@ OptionParser.new do |opts|
 end.parse!
 
 source_path = Dir.pwd
-parser = PBXProjParser.new source_path
+config = Config.parse ".ccios.yml"
+parser = PBXProjParser.new(source_path, config)
 
 if options[:presenter]
   presenter_name = options[:presenter]
-  presenter_generator = PresenterGenerator.new parser
+  presenter_generator = PresenterGenerator.new(parser, config)
   generator_options = {generate_delegate: options[:generate_delegate]}
   presenter_generator.generate(presenter_name, generator_options)
 end
 
 if options[:coordinator]
   coordinator_name = options[:coordinator]
-  coordinator_generator = CoordinatorGenerator.new parser
+  coordinator_generator = CoordinatorGenerator.new(parser, config)
   generator_options = {generate_delegate: options[:generate_delegate]}
   coordinator_generator.generate(coordinator_name, generator_options)
 end
 
 if options[:interactor]
   interactor_name = options[:interactor]
-  interactor_generator = InteractorGenerator.new parser
+  interactor_generator = InteractorGenerator.new(parser, config)
   interactor_generator.generate(interactor_name)
 end
 
 if options[:repository]
   repository_name = options[:repository]
-  repository_generator = RepositoryGenerator.new parser
+  repository_generator = RepositoryGenerator.new(parser, config)
   repository_generator.generate(repository_name)
 end
 

data/lib/ccios/config.rb

@@ -0,0 +1,113 @@
+require 'yaml'
+
+class Config
+
+  attr_reader :app, :core, :data
+
+  def self.parse(source_path)
+    if File.exist?(source_path)
+      config = YAML.load_file(source_path)
+      self.new config, source_path
+    else
+      puts "File #{source_path} does not exists. Using default config."
+      self.default
+    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"}
+      }
+    }
+  end
+
+  def self.default
+    self.new 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"]
+  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, :presenter, :coordinator
+
+  def initialize(hash)
+    @project = hash["project"]
+    @presenter = ObjectConfig.new hash["presenter"]
+    @coordinator = ObjectConfig.new hash["coordinator"]
+  end
+end
+
+class CoreConfig
+  attr_reader :project, :interactor, :repository
+
+  def initialize(hash)
+    @project = hash["project"]
+    @interactor = ObjectConfig.new hash["interactor"]
+    @repository = ObjectConfig.new hash["repository"]
+  end
+end
+
+class DataConfig
+  attr_reader :project, :repository
+
+  def initialize(hash)
+    @project = hash["project"]
+    @repository = ObjectConfig.new hash["repository"]
+  end
+end
+
+class ObjectConfig
+
+  attr_reader :group
+
+  def initialize(hash)
+    @group = hash["group"]
+  end
+end

data/lib/ccios/coordinator_generator.rb

@@ -3,14 +3,15 @@ require_relative "pbxproj_parser"
 
 class CoordinatorGenerator
 
-  def initialize(parser)
+  def initialize(parser, config)
     @parser = parser
+    @config = config
   end
 
   def generate(coordinator_name, options = {})
     coordinator_group = @parser.coordinator_group
-    file_creator = FileCreator.new(@parser.source_path, options)
-    target = @parser.main_target
+    file_creator = FileCreator.new(options)
+    target = @parser.app_target
     file_creator.create_file(coordinator_name, 'Coordinator', coordinator_group, target)
   end
 end

data/lib/ccios/file_creator.rb

@@ -1,9 +1,17 @@
 require_relative 'code_templater'
+require 'fileutils'
 
 class FileCreator
-  def initialize(source_path, options = {})
-    @source_path = source_path
-    @classes_path = source_path + '/Classes'
+
+  def self.logger
+    @@logger ||= create_logger
+  end
+
+  def logger
+    FileCreator.logger
+  end
+
+  def initialize(options = {})
     @options = options
   end
 
@@ -17,13 +25,15 @@ class FileCreator
   end
 
   def git_username
-    `cd #{@source_path}; git config user.name`.strip
+    `git config user.name`.strip
   end
 
   def create_file(prefix, suffix, group, target)
-    file_path = @classes_path + '/' + prefix + suffix + '.swift'
+    file_path = File.join(group.real_path, prefix + suffix + '.swift')
 
-    raise "File #{file_path} already exists" if File.exists?(file_path)
+    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)
@@ -36,14 +46,30 @@ class FileCreator
     target.add_file_references([file_ref])
   end
 
+  def create_empty_directory(group)
+    dirname = group.real_path
+    FileUtils.mkdir_p dirname unless File.directory?(dirname)
+
+    git_keep_path = File.join(dirname, ".gitkeep")
+    FileUtils.touch(git_keep_path) if Dir.empty?(dirname)
+  end
+
   def print_file_content(prefix, suffix)
-    file_path = @classes_path + '/' + suffix + '.swift'
+    file_name = suffix + '.swift'
 
     code_templater = CodeTemplater.new(@options)
     template = code_templater.content_for_suffix(prefix, suffix)
 
-    puts "Add this snippet to #{file_path}"
-    puts template
-    puts "\n"
+    logger.info "Add this snippet to #{file_name}"
+    logger.info template
+  end
+
+  private
+
+  def self.create_logger
+    logger = Logger.new(STDOUT)
+    logger.level = Logger::DEBUG
+    logger.formatter = proc { |severity, datetime, progname, msg| msg + "\n" }
+    logger
   end
 end

data/lib/ccios/interactor_generator.rb

@@ -3,18 +3,23 @@ require_relative "pbxproj_parser"
 
 class InteractorGenerator
 
-  def initialize(parser)
+  def initialize(parser, config)
     @parser = parser
+    @config = config
   end
 
   def generate(interactor_name, options = {})
     interactor_group = @parser.interactor_group
     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 = interactor_group.new_group(new_group_name)
+    new_group_path = File.join(interactor_group.real_path, new_group_name)
+    new_group = interactor_group.new_group(new_group_name, associate_path_to_group ? new_group_path : nil)
 
-    file_creator = FileCreator.new(@parser.source_path, options)
-    target = @parser.main_target
+    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)
 

data/lib/ccios/pbxproj_parser.rb

@@ -2,49 +2,77 @@ require 'xcodeproj'
 
 class PBXProjParser
 
-  attr_accessor :source_path, :project
+  attr_accessor :source_path
 
-  def initialize(source_path)
+  def initialize(source_path, config)
     @source_path = source_path
-    if project_path.nil?
-      raise "[Error] There is no xcodeproj at path #{@source_path}"
-    end
-    @project = Xcodeproj::Project.open(project_path)
-  end
-
-  def project_path
-    Dir.glob("#{@source_path}/*.xcodeproj").first
+    @config = config
+    @projects = {}
   end
 
-  def main_target
-    @project.targets.first
+  def app_project
+    project_for(@config.app.project)
   end
 
-  def classes_group
-    @project.groups.find { |g| g.display_name === "Classes" }
+  def core_project
+    project_for(@config.core.project)
   end
 
-  def app_group
-    classes_group["App"]
+  def data_project
+    project_for(@config.data.project)
   end
 
-  def core_group
-    classes_group["Core"]
+  def presenter_group
+    path = @config.app.presenter.group
+    app_project[path]
   end
 
   def coordinator_group
-    classes_group["Coordinator"]
+    path = @config.app.coordinator.group
+    app_project[path]
   end
 
   def interactor_group
-    core_group["Interactor"]
+    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 data_group
-    classes_group["Data"]
+  def app_target
+    app_project.targets.first
+  end
+
+  def core_target
+    core_project.targets.first
+  end
+
+  def data_target
+    data_project.targets.first
   end
 
   def save
-    @project.save
+    app_project.save
+    core_project.save
+    data_project.save
+  end
+
+  private
+
+  def project_for(path)
+    module_project_path = File.join(source_path, path)
+    resolved_module_project_path = Dir.glob(module_project_path).first
+    if !File.exist?(resolved_module_project_path)
+      raise "[Error] There is no xcodeproj at path #{module_project_path}"
+    end
+    @projects[module_project_path] ||= Xcodeproj::Project.open(resolved_module_project_path)
   end
 end

data/lib/ccios/presenter_generator.rb

@@ -3,27 +3,43 @@ require_relative "pbxproj_parser"
 
 class PresenterGenerator
 
-  def initialize(parser)
+  def initialize(parser, config)
     @parser = parser
+    @config = config
   end
 
   def generate(presenter_name, options = {})
-    app_group = @parser.app_group
+    app_group = @parser.presenter_group
+
+    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 = app_group.new_group(presenter_name)
+    new_group_path = File.join(app_group.real_path, presenter_name)
+    new_group = app_group.new_group(presenter_name, associate_path_to_group ? new_group_path : nil)
+
+    ui_group_path = File.join(new_group_path, "UI")
+    ui_group = new_group.new_group("UI", associate_path_to_group ? ui_group_path : nil)
+
+    view_group_path = File.join(ui_group_path, "View")
+    view_group = ui_group.new_group("View", associate_path_to_group ? view_group_path : nil)
+
+    view_controller_group_path = File.join(ui_group_path, "ViewController")
+    view_controller_group = ui_group.new_group("ViewController", associate_path_to_group ? view_controller_group_path : nil)
+
+    presenter_group_path = File.join(new_group_path, "Presenter")
+    presenter_group = new_group.new_group("Presenter", associate_path_to_group ? presenter_group_path : nil)
 
-    ui_group = new_group.new_group("UI")
-    ui_group.new_group("View")
-    view_controller_group = ui_group.new_group("ViewController")
-    presenter_group = new_group.new_group("Presenter")
-    model_group = new_group.new_group("Model")
+    model_group_path = File.join(new_group_path, "Model")
+    model_group = new_group.new_group("Model", associate_path_to_group ? model_group_path : nil)
 
-    file_creator = FileCreator.new(@parser.source_path, options)
-    target = @parser.main_target
+    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')

data/lib/ccios/repository_generator.rb

@@ -3,24 +3,32 @@ require_relative "pbxproj_parser"
 
 class RepositoryGenerator
 
-  def initialize(parser)
+  def initialize(parser, config)
     @parser = parser
+    @config = config
   end
 
   def generate(repository_name, options = {})
-    core_group = @parser.core_group
-    core_data_group = core_group["Data"]
-    data_group = @parser.data_group
-    raise "[Error] Group #{repository_name} already exists in #{core_data_group.display_name}" if core_data_group[repository_name]
-    core_data_new_group = core_data_group.new_group(repository_name)
+    core_group = @parser.repository_core_group
+    data_group = @parser.repository_data_group
+
+    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.new_group(repository_name, associate_path_to_group ? core_data_new_group_path : nil)
 
     raise "[Error] Group #{repository_name} already exists in #{data_group.display_name}" if data_group[repository_name]
-    data_new_group = data_group.new_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.new_group(repository_name, associate_path_to_group ? data_new_group_path : nil)
+
+    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(@parser.source_path, options)
-    target = @parser.main_target
-    file_creator.create_file(repository_name, 'Repository', core_data_new_group, target)
-    file_creator.create_file(repository_name, 'RepositoryImplementation', data_new_group, 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ccios
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Pierre Felgines
@@ -59,15 +59,19 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Makefile
 - README.md
 - Rakefile
 - bin/ccios
 - ccios.gemspec
 - lib/ccios.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
@@ -106,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Clean Code iOS Generator