ccios 2.3.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29703bfd0d7ddbcbd3ab7a98bce4f6e8bd1826df86cc38085235b3396441a925
-  data.tar.gz: ccb448d02fab86e5e851f110f6692cbd2d267f430351ed1d8d2e92ed4d5e18f6
+  metadata.gz: 3f8159d13b805646ece40483ebefb21ff1294579b58e28eaafb3a353274fa554
+  data.tar.gz: 248f6b498d1b435af918bc1a8675760f426ebf52ffcd1ca7e09f8a8ea85b2b2b
 SHA512:
-  metadata.gz: dd988ebb1bf5dc9811c4f6b04a828635850f3513a7095135575359313f5f374524d122cd9ca5056526b9efc4d91bc10123d2ce10904a543f68fd3ead28985518
-  data.tar.gz: 938c34078cd51d64ddbd3af8bd5ff3e68da3e34e1659c781e5f4a3f3e598f0787bc4ee1bbbd6132ce57e5c39fe45e5fb5a145569c97166464c1456a644d54181
+  metadata.gz: 8cb1756d184f9291d86f4a4e2a6a4b57d4e43f54dd4e67c9162f209c35333f4bc5657edfb4b6c9e4df361fc6c93d3b4138b7db7a3e1efcdeeb179e4b6d1a0b64
+  data.tar.gz: 2ba3f77bb27f682a8f2d492a9f52c3a70da99db92e03633afda28b3f64c2f700c12a517731b45d2b3870a5455ef96614d57d447458ed8d074c1bbc0b4eb9fc23

data/CHANGELOG.md

@@ -2,6 +2,41 @@
 All notable changes to this project will be documented in this file.
 `ADUtils` adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+## [4.0.2]
+
+### Fixed
+
+- Do not duplicate suffix if already present in the command name
+
+## [4.0.1]
+
+### Fixed
+
+- Do not generate new groups with name if using folder references
+
+## [4.0.0]
+
+### Added
+- Use `ADCoordinator` dependency in coordinator files
+
+### Fixed
+- Use `active_support` instead of `rails` dependency
+- Add dev dependencies
+
+## [3.0.0]
+
+### Fixed
+- Use `ApplicationDependencyProvider` in Coordinator
+  - Updated by [Denis Poifol](https://github.com/denisPoifol) in Pull Request [#10](https://github.com/felginep/ccios/pull/10)
+
+## [2.3.1]
+
+### Fixed
+- Import `Core` in Repository implementations
+  - Updated by [Hervé Béranger](https://github.com/hberenger) in Pull Request [#11](https://github.com/felginep/ccios/pull/11)
+
 ## [2.3.0]
 
 ### Added

data/Gemfile.lock

@@ -1,139 +1,48 @@
 PATH
   remote: .
   specs:
-    ccios (2.3.0)
+    ccios (4.0.2)
+      activesupport (> 4)
       mustache (~> 1.0)
-      rails (~> 5.1)
       xcodeproj (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
-    actioncable (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      nio4r (~> 2.0)
-      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.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.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.2.4.2)
-      activesupport (= 5.2.4.2)
-      globalid (>= 0.3.6)
-    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)
+    CFPropertyList (3.0.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     atomos (0.1.3)
-    builder (3.2.4)
     claide (1.0.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.6)
-    crass (1.0.6)
-    erubi (1.9.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.2)
+    concurrent-ruby (1.1.8)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    loofah (2.5.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    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)
+    minitest (5.14.2)
     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.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.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.19.0, < 2.0)
-    rake (13.0.1)
-    sprockets (4.0.0)
+    nanaimo (0.3.0)
+    rake (12.3.3)
+    tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.1)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    xcodeproj (1.16.0)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ccios!
+  minitest (~> 5.11)
+  rake (~> 12.3)
 
 BUNDLED WITH
    1.17.3

data/Makefile

@@ -8,4 +8,4 @@ clean:
 	rm -f ccios-*.gem
 
 tests:
-	rake test
+	bundle exec rake test

data/README.md

@@ -14,7 +14,7 @@ gem install ./ccios-x.x.x.gem
 ```
 
 To run the tests run:
-```rake test```
+```bundle exec rake test```
 
 # How to use
 

data/ccios.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ccios'
-  s.version     = '2.3.0'
+  s.version     = '4.0.2'
   s.executables << 'ccios'
   s.date        = '2016-08-03'
   s.summary     = "Clean Code iOS Generator"
@@ -11,7 +11,10 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.homepage    = 'http://rubygems.org/gems/hola'
   s.license     = 'MIT'
+  s.add_dependency 'activesupport', '> 4'
   s.add_dependency 'xcodeproj', '~> 1.4'
-  s.add_dependency 'rails', '~> 5.1'
   s.add_dependency "mustache", "~> 1.0"
+
+  s.add_development_dependency 'rake', '~> 12.3'
+  s.add_development_dependency 'minitest', '~> 5.11'
 end

data/lib/ccios.rb

@@ -1,7 +1,7 @@
 require 'date'
 require 'xcodeproj'
 require 'optparse'
-require 'rails' # for underscore method used in code_templater.rb
+require 'active_support'
 require 'ccios/presenter_generator'
 require 'ccios/coordinator_generator'
 require 'ccios/interactor_generator'

data/lib/ccios/code_templater.rb

@@ -1,5 +1,5 @@
 require 'mustache'
-require 'rails'
+require 'active_support/core_ext/string'
 
 class CodeTemplater
   def initialize(options = {})

data/lib/ccios/coordinator_generator.rb

@@ -12,6 +12,7 @@ class CoordinatorGenerator
     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/file_creator.rb

@@ -1,5 +1,18 @@
 require_relative 'code_templater'
 require 'fileutils'
+require 'logger'
+
+class Xcodeproj::Project::Object::PBXGroup
+
+  def pf_new_group(associate_path_to_group:, name:, path:)
+    # When using "Group with folder" we only provide a path
+    # When using "Group without folder" we only provide a name
+    new_group(
+      associate_path_to_group ? nil : name,
+      associate_path_to_group ? path : nil
+    )
+  end
+end
 
 class FileCreator
 

data/lib/ccios/interactor_generator.rb

@@ -10,13 +10,18 @@ class InteractorGenerator
 
   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.new_group(new_group_name, associate_path_to_group ? new_group_path : nil)
+    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

data/lib/ccios/pbxproj_parser.rb

@@ -1,4 +1,5 @@
 require 'xcodeproj'
+require 'active_support/core_ext/object/blank'
 
 class PBXProjParser
 

data/lib/ccios/presenter_generator.rb

@@ -10,27 +10,51 @@ class PresenterGenerator
 
   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.new_group(presenter_name, associate_path_to_group ? new_group_path : nil)
+    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.new_group("UI", associate_path_to_group ? ui_group_path : nil)
+    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.new_group("View", associate_path_to_group ? view_group_path : nil)
+    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.new_group("ViewController", associate_path_to_group ? view_controller_group_path : nil)
+    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.new_group("Presenter", associate_path_to_group ? presenter_group_path : nil)
+    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.new_group("Model", associate_path_to_group ? model_group_path : nil)
+    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

data/lib/ccios/repository_generator.rb

@@ -11,16 +11,25 @@ class RepositoryGenerator
   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.new_group(repository_name, associate_path_to_group ? core_data_new_group_path : nil)
+    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.new_group(repository_name, associate_path_to_group ? data_new_group_path : nil)
+    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

data/lib/ccios/templates/coordinator.mustache

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import ADCoordinator
 
 {{#generate_delegate}}
 protocol {{name}}CoordinatorDelegate: AnyObject {
@@ -19,15 +20,20 @@ class {{name}}Coordinator: Coordinator {
     {{#generate_delegate}}
     weak var delegate: {{name}}CoordinatorDelegate?
     {{/generate_delegate}}
-    private let navigationController: UINavigationController
+    private let dependencyProvider: ApplicationDependencyProvider
+    private unowned var navigationController: UINavigationController
 
-    init(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)
     }
 }

data/lib/ccios/templates/repository_implementation.mustache

@@ -8,6 +8,7 @@
 //
 
 import Foundation
+import Core
 
 public class {{name}}RepositoryImplementation: {{name}}Repository {
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ccios
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 4.0.2
 platform: ruby
 authors:
 - Pierre Felgines
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
@@ -25,33 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mustache
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '12.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.11'
 description: Clean Code iOS Generator
 email: pierre.felgines@gmail.com
 executables: