vipergeng 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 759e5e163fdc23b978c192c468fe0231972425e9
-  data.tar.gz: f9503621d07087f340e133762598256150dffefa
+  metadata.gz: 341bf3e61b4234ca54d323b804a0cc239180cb4c
+  data.tar.gz: b3823c34a8c2254759093c9e6630b38e680b0a44
 SHA512:
-  metadata.gz: 14522321d7671cab73287022a512cbf52fe16a843928296beb98c28bcdb3e0fc020b6e88d0cbe421b64cb0e2bd9143ed66e3e71cb7dcb4a9b5ce560645915954
-  data.tar.gz: f6a781e5121fd02fa08c464b8914f2bb84df73b393a03fbd54cf3436fd252a2f66b7badbf9bdb51dfd5dabbfd7b2b6a2920f3d6f8a4f6c4c76e7a104bc7ea026
+  metadata.gz: 1ff987fbf1e92eb0a6483c8d744dc2e6fab7b05ee3a113a0ef3e68a15f9291fd847e6cd2f8c76db713750ba42b2868558f929f0192d58265333424a837d5813f
+  data.tar.gz: 618c262b5ed0f73f54c99790b38234b168a8cef26942bfe9214f750eebb8453d829cdfcebf49756fa59783e52fe7f68ac199bb3c210883e248f6906e77726245

data/README.md

@@ -33,6 +33,10 @@ The implementation scheme returned by this generator is hardly inspired in the e
 - g command 추가.
 - generate or g 사용시 --path 인자를 지정하지 않으면 현재 폴더에 생성하도록 수정
 
+### Changelog 1.0.2
+- g/generate command에 --base 추가. base에는 ViewController의 base class를 지정한다. 디폴트값은 UIViewController이다.
+- ViewController 소스에 viewWill/DidAppear, viewWill/DidDisappear 추가
+
 ## Viper files structure
 ```bash
 .swift
@@ -69,7 +73,7 @@ vipergeng g MyFirstViperModule
 ```
 Another example:
 ```bash
-vipergeng generate MySecondViperModule --path=~/myproject/shared --author='My Name' --company='My Company' --project='project name'
+vipergeng generate MySecondViperModule --path=~/myproject/shared --author='My Name' --company='My Company' --project='project name --base=MyBaseViewController'
 ```
 
 And then the files structure will be automatically created. Don't forget to add this folder to your project dragging it into the XCode/Appcode inspector

data/lib/templates/default/objc/DataManager/API/VIPERAPIDataManager.h

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR.
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

data/lib/templates/default/objc/DataManager/API/VIPERAPIDataManager.m

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import "VIPERAPIDataManager.h"

data/lib/templates/default/objc/DataManager/Local/VIPERLocalDataManager.h

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

data/lib/templates/default/objc/DataManager/Local/VIPERLocalDataManager.m

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import "VIPERLocalDataManager.h"

data/lib/templates/default/objc/Interactor/VIPERInteractor.h

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

data/lib/templates/default/objc/Interactor/VIPERInteractor.m

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import "VIPERInteractor.h"

data/lib/templates/default/objc/Interactor/VIPERItem.h

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

data/lib/templates/default/objc/Interactor/VIPERItem.m

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import "VIPERItem.h"

data/lib/templates/default/objc/Presenter/VIPERPresenter.h

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

data/lib/templates/default/objc/Presenter/VIPERPresenter.m

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import "VIPERPresenter.h"

data/lib/templates/default/objc/Protocols/VIPERProtocols.h

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

data/lib/templates/default/objc/ViewController/VIPERViewController.h

@@ -0,0 +1,17 @@
+//
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "VIPERProtocols.h"
+#import "_BASE_VIEW_CONTROLLER_.h"
+
+@interface VIPERViewController : _BASE_VIEW_CONTROLLER_<VIPERViewProtocol>
+
+@property (nonatomic, strong) id <VIPERPresenterProtocol> presenter;
+
+@end

data/lib/templates/default/objc/{View/VIPERView.m → ViewController/VIPERViewController.m}

@@ -1,11 +1,14 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
-#import "VIPERView.h"
+#import "VIPERViewController.h"
 
-@implementation VIPERView
+@implementation VIPERViewController
 
 #pragma mark - ViewController Lifecycle
 
@@ -14,11 +17,6 @@
     [super viewDidLoad];
 }
 
-- (void)viewDidDisappear:(BOOL)animated
-{
-    [super viewDidDisappear:animated];
-}
-
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
@@ -29,4 +27,15 @@
     [super viewWillDisappear:animated];
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+}
+
+
 @end

data/lib/templates/default/objc/ViewController/VIPERViewController.xib

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="VIPERViewController" customModuleProvider="target">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </view>
+    </objects>
+</document>

data/lib/templates/default/objc/WireFrame/VIPERWireFrame.h

@@ -1,16 +1,18 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
 #import "VIPERProtocols.h"
-#import "VIPERView.h"
+#import "VIPERViewController.h"
 #import "VIPERLocalDataManager.h"
 #import "VIPERAPIDataManager.h"
 #import "VIPERInteractor.h"
 #import "VIPERPresenter.h"
-#import "VIPERWireframe.h"
 #import <UIKit/UIKit.h>
 
 @interface VIPERWireFrame : NSObject <VIPERWireFrameProtocol>

data/lib/templates/default/objc/WireFrame/VIPERWireFrame.m

@@ -1,6 +1,9 @@
 //
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
+//  ___FILENAME___.swift
+//  ___PROJECTNAME___
+//
+//  Created by ___FULLUSERNAME___ on ___DATE___.
+//  Copyright © ___YEAR___ ___ORGANIZATIONNAME___. All rights reserved.
 //
 
 #import "VIPERWireFrame.h"
@@ -10,7 +13,7 @@
 + (void)presentVIPERModuleFrom:(UIViewController*)fromViewController
 {
     // Generating module components
-    id <VIPERViewProtocol> view = [[VIPERView alloc] init];
+    id <VIPERViewProtocol> view = [[VIPERViewController alloc] initWithNibName:@"VIPERViewController" bundle:nil];
     id <VIPERPresenterProtocol, VIPERInteractorOutputProtocol> presenter = [VIPERPresenter new];
     id <VIPERInteractorInputProtocol> interactor = [VIPERInteractor new];
     id <VIPERAPIDataManagerInputProtocol> APIDataManager = [VIPERAPIDataManager new];

data/lib/templates/default/swift/ViewController/VIPERViewController.xib

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="VIPERViewController" customModuleProvider="target">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </view>
+    </objects>
+</document>

data/lib/templates/default/swift/WireFrame/VIPERWireFrame.swift

@@ -13,26 +13,21 @@ class VIPERWireFrame: VIPERWireFrameProtocol {
     static func presentVIPERModule(fromVC: UIViewController) {
 
         // Generating module components
-        let viewController = storyboard.instantiateViewController(withIdentifier: "VIPERViewController")
-        if let view = viewController as? VIPERViewController {
-            let presenter: VIPERPresenterProtocol & VIPERInteractorOutputProtocol = VIPERPresenter()
-            let interactor: VIPERInteractorInputProtocol = VIPERInteractor()
-            let APIDataManager: VIPERAPIDataManagerInputProtocol = VIPERAPIDataManager()
-            let localDataManager: VIPERLocalDataManagerInputProtocol = VIPERLocalDataManager()
-            let wireFrame: VIPERWireFrameProtocol = VIPERWireFrame()
+        let view = VIPERViewController(nibName: "VIPERViewController", bundle: nil)
+        let presenter: VIPERPresenterProtocol & VIPERInteractorOutputProtocol = VIPERPresenter()
+        let interactor: VIPERInteractorInputProtocol = VIPERInteractor()
+        let APIDataManager: VIPERAPIDataManagerInputProtocol = VIPERAPIDataManager()
+        let localDataManager: VIPERLocalDataManagerInputProtocol = VIPERLocalDataManager()
+        let wireFrame: VIPERWireFrameProtocol = VIPERWireFrame()
 
-            // Connecting
-            view.presenter = presenter
-            presenter.view = view
-            presenter.wireFrame = wireFrame
-            presenter.interactor = interactor
-            interactor.presenter = presenter
-            interactor.APIDataManager = APIDataManager
-            interactor.localDatamanager = localDataManager
-        }
+        // Connecting
+        view.presenter = presenter
+        presenter.view = view
+        presenter.wireFrame = wireFrame
+        presenter.interactor = interactor
+        interactor.presenter = presenter
+        interactor.APIDataManager = APIDataManager
+        interactor.localDatamanager = localDataManager
     }
 
-    static var storyboard: UIStoryboard {
-        return UIStoryboard(name: "Main", bundle: Bundle.main)
-    }
 }

data/lib/vipergen/generator.rb

@@ -10,7 +10,8 @@ module Vipergen
 		PROJECT_REPLACEMENT_KEY = "___PROJECTNAME___"
 		FILE_REPLACEMENT_KEY= "___FILENAME___"
 		DATE_REPLACEMENT_KEY= "___DATE___"
-		VC_REPLACEMENT_KEY= "_BASE_VIEW_CONTROLLER_"
+		BASE_VC_REPLACEMENT_KEY= "_BASE_VIEW_CONTROLLER_"
+		BASE_VC_IMPORT_REPLACE_KEY = '#import "_BASE_VIEW_CONTROLLER_.h"'
 
 		# Main method that generate the VIPER files structure
 		def self.generate_viper(template, language, name, path, author, company, project, baseviewcontroller)
@@ -66,7 +67,10 @@ module Vipergen
 			content = content.gsub((Vipergen::Generator::FILE_REPLACEMENT_KEY), File.basename(filename,File.extname(filename)))
 			str = '%02d/%02d/%02d' % [Time.new.day, Time.new.month, Time.new.year%100]
 			content = content.gsub((Vipergen::Generator::DATE_REPLACEMENT_KEY), str)
-			content = content.gsub((Vipergen::Generator::VC_REPLACEMENT_KEY), baseviewcontroller)
+			if baseviewcontroller == 'UIViewController' then
+				content = content.gsub((Vipergen::Generator::BASE_VC_IMPORT_REPLACE_KEY), '')
+			end
+			content = content.gsub((Vipergen::Generator::BASE_VC_REPLACEMENT_KEY), baseviewcontroller)
 
 			# Saving content with replaced string
 			File.open(filename, "w+") do |file|

data/lib/vipergen/version.rb

@@ -1,4 +1,4 @@
 module Vipergen
   NAME = "vipergeng"
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

data/lib/vipergen/viperthor.rb

@@ -4,7 +4,7 @@ require 'vipergen'
 module Vipergen
   class ViperThor < Thor
 	desc "generate MODULE", "Generate a VIPER module"
-	# option :language, :required => false, :default => 'swift', :type => :string, :desc => "The language of the generated module (swift, objc)"
+	option :language, :required => false, :default => 'swift', :type => :string, :desc => "The language of the generated module (swift, objc)"
 	option :template, :required => false, :default => 'default', :type => :string , :desc => "Template for the generation"
 	option :path, :required => false, :default => './', :type => :string , :desc => "Path where the output module is going to be saved"
 	option :author, :required => false, :default => 'AuthorXXX', :type => :string , :desc => "Author to be specified on the file's header. Otherwise VIPER will be used"
@@ -12,10 +12,11 @@ module Vipergen
 	option :project, :required => false, :default => 'ProjectXXX', :type => :string, :desc => "Project to be specified on the file's header. Otherwise Project will be used"
 	option :base, :required => false, :default => 'UIViewController', :type => :string, :desc => "View Controller의 베이스 클래스 이름"
 	def generate(name)
-	   Vipergen::Generator.generate_viper(options[:template], 'swift', name, options[:path], options[:author], options[:company], options[:project], options[:base])
+	   Vipergen::Generator.generate_viper(options[:template], options[:language], name, options[:path], options[:author], options[:company], options[:project], options[:base])
 	end
 
 	desc "g MODULE", "Generate a VIPER module"
+	option :language, :required => false, :default => 'swift', :type => :string, :desc => "The language of the generated module (swift, objc)"
 	option :template, :required => false, :default => 'default', :type => :string , :desc => "Template for the generation"
 	option :path, :required => false, :default => './', :type => :string , :desc => "Path where the output module is going to be saved"
 	option :author, :required => false, :default => 'AuthorXXX', :type => :string , :desc => "Author to be specified on the file's header. Otherwise VIPER will be used"
@@ -23,7 +24,7 @@ module Vipergen
 	option :project, :required => false, :default => 'ProjectXXX', :type => :string, :desc => "Project to be specified on the file's header. Otherwise Project will be used"
 	option :base, :required => false, :default => 'UIViewController', :type => :string, :desc => "View Controller의 베이스 클래스 이름"
 	def g(name)
-		Vipergen::Generator.generate_viper(options[:template], 'swift', name, options[:path], options[:author], options[:company], options[:project], options[:base])
+		Vipergen::Generator.generate_viper(options[:template], options[:language], name, options[:path], options[:author], options[:company], options[:project], options[:base])
 	end
 
 	desc "templates", "Get a list of available templates"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vipergeng
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Pedro Piñera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,8 +103,9 @@ files:
 - lib/templates/default/objc/Presenter/VIPERPresenter.h
 - lib/templates/default/objc/Presenter/VIPERPresenter.m
 - lib/templates/default/objc/Protocols/VIPERProtocols.h
-- lib/templates/default/objc/View/VIPERView.h
-- lib/templates/default/objc/View/VIPERView.m
+- lib/templates/default/objc/ViewController/VIPERViewController.h
+- lib/templates/default/objc/ViewController/VIPERViewController.m
+- lib/templates/default/objc/ViewController/VIPERViewController.xib
 - lib/templates/default/objc/WireFrame/VIPERWireFrame.h
 - lib/templates/default/objc/WireFrame/VIPERWireFrame.m
 - lib/templates/default/swift/DataManager/API/VIPERAPIDataManager.swift
@@ -114,6 +115,7 @@ files:
 - lib/templates/default/swift/Presenter/VIPERPresenter.swift
 - lib/templates/default/swift/Protocols/VIPERProtocols.swift
 - lib/templates/default/swift/ViewController/VIPERViewController.swift
+- lib/templates/default/swift/ViewController/VIPERViewController.xib
 - lib/templates/default/swift/WireFrame/VIPERWireFrame.swift
 - lib/templates/default/viperspec.yml
 - lib/templates/naja/swift/Interactor/VIPERInteractor.swift

data/lib/templates/default/objc/View/VIPERView.h

@@ -1,13 +0,0 @@
-//
-// Created by AUTHOR
-// Copyright (c) YEAR AUTHOR. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "VIPERProtocols.h"
-
-@interface VIPERView : UIViewController <VIPERViewProtocol>
-
-@property (nonatomic, strong) id <VIPERPresenterProtocol> presenter;
-
-@end