yk_command 0.6.2 → 0.6.4

data/lib/yk_command/module/module_handler.rb

@@ -44,7 +44,8 @@ module YkCommand
 
       def yk_template_files
 
-        register_path = "#{@final_path}/#{@name}/Classes/Private/Register"
+        # objc register
+        register_path = "#{@final_path}/#{@name}/Classes/Private/RegisterOC"
         registger = {
           'RouterRegister.h' => 'RouterRegister',
           'RouterRegister.m' => 'RouterRegister',
@@ -57,31 +58,59 @@ module YkCommand
           template "#{__dir__}/template/objc/#{file_name}", final_file
         end
 
-        public_folder_path = "#{@final_path}/#{@name}/Classes/Public"
+        #swift register
+        s_register_path = "#{@final_path}/#{@name}/Classes/Private/RegisterSwift"
+        s_registger = {
+          'ModuleRegisterMix.h' => 'Bridge',
+          'ModuleRegisterMix.m' => 'Bridge',
+          'ModuleRegisterSwift.swift' => 'Bridge',
+          'RouterRegisterSwift.swift' => 'Router',
+          'ServiceRegisterSwift.swift' => 'Service',
+        }
+
+        s_registger.each do |file_name, _folder|
+          s_final_file = File.join(s_register_path, _folder, "#{@prefixed_module}#{file_name}")
+          template "#{__dir__}/template/swift/#{file_name}", s_final_file
+        end
+
+        #assets bundle
+        assets_path = "#{@final_path}/#{@name}/Assets"
+        FileUtils.mkdir(File.join(@final_path, @name, "Assets", "Images.xcassets"))
 
-        template_code_filename = ['ServiceProtocol.h', 'RouterDefine.h']
+        #public
+        public_folder_path = "#{@final_path}/#{@name}/Classes/Public"
+        template_code_filename = [
+          'ServiceProtocol.h',
+          'RouterDefine.h',
+          'Helper.h',
+          'Helper.m',
+        ]
         template_code_filename.each do |file_name|
           final_file = "#{public_folder_path}/#{@prefixed_module}#{file_name}"
           source = "#{__dir__}/template/objc/#{file_name}"
           template source, final_file
         end
 
-        swift_template_code_filename = ['RouterDefine.swift']
+        # router define
+        swift_template_code_filename = [
+          'RouterDefineSwift.swift',
+          'Tool.swift',
+        ]
         swift_template_code_filename.each do |file_name|
-          final_file = "#{public_folder_path}/#{@prefixed_module}_Swift_#{file_name}"
+          final_file = "#{public_folder_path}/#{@prefixed_module}#{file_name}"
           source = "#{__dir__}/template/swift/#{file_name}"
           template source, final_file
         end
 
         private_folder_path = "#{@final_path}/#{@name}/Classes/Private"
-        #pch file
+        #common file
         # pch_file_name = "PrefixHeader.pch"
         # final_file = "#{private_folder_path}/#{@prefixed_module}#{pch_file_name}"
         # source = "#{__dir__}/template/objc/#{pch_file_name}"
         # template source, final_file
 
         private_level_folder_files = {
-          'PrefixHeader.pch' => 'Business',
+          'PrefixHeader.pch' => '.',
           'CategoryHeader.h' => 'Category',
           'ToolsHeader.h' => 'Tools',
           'vendorHeader.h' => 'Vendor'
@@ -98,10 +127,20 @@ module YkCommand
           template source, final_file
         end
 
-        business_demo_path = "#{@final_path}/#{@name}/Classes/Private/Business"
+        #demo oc
+        business_demo_path = "#{@final_path}/#{@name}/Classes/Private/Business/Demo"
         demo_replace_file = ['DemoViewController.h', 'DemoViewController.m', 'DemoViewModel.h', 'DemoViewModel.m']
         demo_replace_file.each do |file_name|
-          final_file = "#{business_demo_path}/Demo/#{@prefixed_module}#{file_name}"
+          final_file = "#{business_demo_path}/oc/#{@prefixed_module}#{file_name}"
+          source = "#{__dir__}/template/objc/demo/#{file_name}"
+          template source, final_file
+        end
+
+        #demo swift
+        business_demo_path = "#{@final_path}/#{@name}/Classes/Private/Business/Demo"
+        demo_replace_file = ['DemoVC_sw.swift', "AppDelegate.swift"]
+        demo_replace_file.each do |file_name|
+          final_file = "#{business_demo_path}/Swift/#{@prefixed_module}#{file_name}"
           source = "#{__dir__}/template/objc/demo/#{file_name}"
           template source, final_file
         end

data/lib/yk_command/module/template/objc/Helper.h

@@ -0,0 +1,16 @@
+//
+//  <%= @prefixed_module %>Helper.h
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+NSBundle * kModuleBundle_<%= @project %>(void);
+NSBundle * kModuleResourceBundle_<%= @project %>(void);
+UIImage * __nullable kModuleResourceImage_<%= @project %>(NSString *name);
+
+NS_ASSUME_NONNULL_END

data/lib/yk_command/module/template/objc/Helper.m

@@ -0,0 +1,41 @@
+//
+//  <%= @prefixed_module %>Helper.m
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+#import "<%= @prefixed_module %>Helper.h"
+
+@interface <%= @prefixed_module %>HelperPrivate: NSObject
+@end
+
+@implementation <%= @prefixed_module %>HelperPrivate
+@end
+
+
+NSString * const kModuleName<%= @project %> = @"<%= @project %>";
+
+NSBundle * kModuleBundle_<%= @project %>(void) {
+    return [NSBundle bundleForClass:[<%= @prefixed_module %>HelperPrivate class]];
+}
+
+NSString * __nullable kModuleResourceBundlePath_<%= @project %>(void) {
+    NSString *bundlePath = [kModuleBundle_<%= @project %>() pathForResource:kModuleName<%= @project %> ofType:@"bundle"];
+    if (bundlePath.length == 0) { //bundle 不存在
+        return nil;
+    }
+    return bundlePath;
+}
+
+NSBundle * kModuleResourceBundle_<%= @project %>(void) {
+    NSString *path = kModuleResourceBundlePath_<%= @project %>();
+    return path.length ? [NSBundle bundleWithPath:path] : kModuleBundle_<%= @project %>();
+}
+
+UIImage * __nullable kModuleResourceImage_<%= @project %>(NSString *name) {
+    return [UIImage imageNamed:name inBundle:kModuleResourceBundle_<%= @project %>() compatibleWithTraitCollection:nil];
+}
+
+
+

data/lib/yk_command/module/template/objc/demo/AppDelegate.swift

@@ -0,0 +1,16 @@
+//
+//  <%= @prefixed_module %>AppDelegate.swift
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+import UIKit
+
+class <%= @prefixed_module %>AppDelegate: UIResponder, UIApplicationDelegate {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        print("\(self)--\(#function)")
+        return true
+    }
+}

data/lib/yk_command/module/template/objc/demo/DemoVC_sw.swift

@@ -0,0 +1,30 @@
+//
+//  <%= @prefixed_module %>DemoVC_sw.swift
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+import UIKit
+
+class <%= @prefixed_module %>DemoVC_sw: UIViewController {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = .cyan
+        title = NSStringFromClass(type(of: self))
+
+        // Do any additional setup after loading the view.
+    }
+    
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}

data/lib/yk_command/module/template/swift/ModuleRegisterMix.h

@@ -0,0 +1,17 @@
+//
+//  <%= @prefixed_module %>ModuleRegisterMix.h
+//
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface <%= @prefixed_module %>ModuleRegisterMix : NSObject
+
+@end
+
+NS_ASSUME_NONNULL_END

data/lib/yk_command/module/template/swift/ModuleRegisterMix.m

@@ -0,0 +1,61 @@
+//
+//  <%= @prefixed_module %>ModuleRegisterMix.m
+//
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+#import "<%= @prefixed_module %>ModuleRegisterMix.h"
+
+#import "<%= @prefixed_module %>RouterDefine.h"
+
+#import "<%= @prefixed_module %>DemoViewController.h"
+
+#import <<%= @name %>/<%= @name %>-Swift.h>
+#import <YKRouterComponent/YKRouterComponentHeader.h>
+#import <YKRouterComponent/YKRouterComponentHeader.h>
+#import <YKModuleLifeCircleComponent/YKModuleLifeCircleComponentHeader.h>
+
+@interface <%= @prefixed_module %>ModuleRegisterMix()
+@end
+
+@implementation <%= @prefixed_module %>ModuleRegisterMix
+
+@end
+
+#pragma mark - AppLife define
+@interface <%= @prefixed_module %>ModuleRegisterMix(AppLife)
+@end
+@implementation <%= @prefixed_module %>ModuleRegisterMix(AppLife)
+@YKModuleLifeRegister(){
+    YKModuleLifeDefineRegisters(@[
+        <%= @prefixed_module %>ModuleRegisterSwift.class, //此处关联swift版本的声明周期托管器， 遵循STAppLifeCircleRegisterProtocol
+    ]);
+}
+@end
+
+
+#pragma mark - Service define  --以下代码为预置代码，无需改动
+@interface <%= @prefixed_module %>ModuleRegisterMix(Service)
+@end
+@implementation <%= @prefixed_module %>ModuleRegisterMix(Service)
+@YKModuleServiceRegister(){
+    YKModuleServiceDefineRegisterClsArr(@[
+        <%= @prefixed_module %>ModuleRegisterSwift.class,//此处关联Swift版本的服务注册器， 遵循YKServiceRegisterProtocol
+    ]);
+}
+@end
+
+
+#pragma mark - Router define --以下代码为预置代码，无需改动
+@interface <%= @prefixed_module %>ModuleRegisterMix(router)
+@end
+@implementation <%= @prefixed_module %>ModuleRegisterMix(Router)
+@YKRouterRegister(){
+    YKRouterDefineRegisters(@[
+        <%= @prefixed_module %>ModuleRegisterSwift.class, //此处关联Swift版本的路由注册器， 遵循YKRouterRegisterProtocol
+    ]);
+}
+@end
+

data/lib/yk_command/module/template/swift/ModuleRegisterSwift.swift

@@ -0,0 +1,41 @@
+//
+//  <%= @prefixed_module %>ModuleRegisterSwift.swift
+//
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+import UIKit
+import YKRouterComponent
+import YKModuleServiceComponent
+import YKModuleLifeCircleComponent
+
+@objc
+public class <%= @prefixed_module %>ModuleRegisterSwift: NSObject {
+}
+
+
+//MARK: - Applife
+ extension <%= @prefixed_module %>ModuleRegisterSwift: YKModuleLifeCircleRegisterProtocol {
+     public static func ykModuleLifeRegisterExecute() {
+         YKModuleLifeCollocation(<%= @prefixed_module %>AppDelegate()) //托管swift版本的appDelegate
+     }
+ }
+
+
+//MARK: - Service --以下代码为预置代码，无需改动
+extension <%= @prefixed_module %>ModuleRegisterSwift: YKModuleServiceRegisterProtocol {
+    public static func ykModuleServiceRegitAction() {
+        // 声明swift版本的服务注册器，此处其实是过了一次桥，通过中间WRMaileServiceRegister_swift，将WRMaileServiceRegister_swift保护起来，使其不需要\@objc\声明
+        YKModuleServiceComponent().ykDefineRegisters(clsArr: [<%= @prefixed_module %>ServiceRegisterSwift.self])
+    }
+}
+
+//MARK: - Router --以下代码为预置代码，无需改动
+extension <%= @prefixed_module %>ModuleRegisterSwift: YKRouterComponentRegisterProtocol {
+    public static func ykRouterRegisterExecute() {
+    // 声明swift版本的路由注册器，此处其实是过了一次桥，通过中间POD_NAMERegister_swift，将POD_NAMERegister_routerSwift保护起来，使其不需要\@objc\声明
+        YKRouterDefineRegisters([<%= @prefixed_module %>RouterRegisterSwift.self])
+    }
+}

data/lib/yk_command/module/template/swift/RouterDefineSwift.swift

@@ -0,0 +1,15 @@
+//
+//  <%= @prefixed_module %>RouterDefineSwift.swift
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+//
+
+
+import Foundation
+
+@objc
+public class <%= @prefixed_module %>RouterConstants: NSObject {
+    @objc public static let testVC_swift: String = "testVC_swift"
+}

data/lib/yk_command/module/template/swift/RouterRegisterSwift.swift

@@ -0,0 +1,23 @@
+//  <%= @prefixed_module %>RouterRegisterSwift.swift
+//
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+import UIKit
+
+import YKRouterComponent
+
+class <%= @prefixed_module %>RouterRegisterSwift: NSObject {
+}
+
+extension <%= @prefixed_module %>RouterRegisterSwift: YKRouterComponentRegisterProtocol {
+    static func ykRouterRegisterExecute() {
+        //注册路由 kRouter_example_POD_NAME_swift
+        YKRouterRegisterUrlParttern(<%= @prefixed_module %>RouterConstants.testVC_swift, nil) { (urlRequest: YKRouterUrlRequest, complete: YKRouterUrlCompletion?) in
+        let vc = <%= @prefixed_module %>DemoVC_sw()
+        urlRequest.fromVC?.navigationController?.pushViewController(vc, animated: true)
+        }
+    }
+}

data/lib/yk_command/module/template/swift/ServiceRegisterSwift.swift

@@ -0,0 +1,20 @@
+//
+//  <%= @prefixed_module %>ServiceRegisterSwift.swift
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+import Foundation
+
+import YKModuleServiceComponent
+
+class <%= @prefixed_module %>ServiceRegisterSwift: NSObject, YKModuleServiceRegisterProtocol {
+    static func ykModuleServiceRegitAction() {
+        //注册服务 NSObject --> NSObjectProtocol   NSObjectProtocol为 swift 协议
+        //YKModuleServiceComponent().ykRegistModuleService(service: NSObject.self, protocol: NSObjectProtocol.self, err: nil)
+        
+        //注册服务 NSObject --> NSObjectProtocol   NSObjectProtocol为 OC 协议
+//        YKService().ykRegisterModuleService_oc(NSObject.self, protocol: NSObjectProtocol.self, err: nil)
+    }
+}

data/lib/yk_command/module/template/swift/Tool.swift

@@ -0,0 +1,53 @@
+//
+//  <%= @prefixed_module %>Tool.swift
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+import UIKit
+
+@objc
+open class <%= @prefixed_module %>Tool: NSObject {
+    static let kModuleName = "<%= @project %>"
+    
+    private class func kResourceBundlePath() -> String? {
+        let bundlePath: String? = kModuleBundle().path(forResource: kModuleName, ofType: "bundle")
+        if bundlePath == nil { //bundle 不存在
+            print("\nPOD_NAME xcassets bundle not exist:\(kModuleName)\n")
+        }
+        return bundlePath
+    }
+    
+    /// 组件bundle
+   @objc public class func kModuleBundle() -> Bundle{
+        let result = Bundle.init(for: <%= @prefixed_module %>Tool.self)
+        return result
+    }
+    
+    /// 组件 素材bundle
+    @objc public class func kModuleResourceBundle() -> Bundle {
+        let path: String? = self.kResourceBundlePath()
+        var result = Bundle.main
+        if path != nil {
+            result = Bundle.init(path: path!)!
+            if result.isLoaded == false {
+                do {
+                    try result.loadAndReturnError()
+                }
+                catch {
+                    
+                }
+            }
+        }
+        
+        return result
+    }
+    
+    ///资源组件 获取xcasserts 中图片
+   @objc public class func kResourceImage(name: String?) -> UIImage? {
+       let imgName = name ?? ""
+       let result = UIImage.init(named: imgName, in: kModuleResourceBundle(), compatibleWith: nil)
+       return result
+    }
+}

data/lib/yk_command/module/template/tools/PrefixHeader.pch

@@ -0,0 +1,15 @@
+//
+//  POD_NAMEPrefixHeader.pch
+//  Pods
+//
+//  Created by PROJECT_OWNER on TODAYS_DATE.
+//  Copyright (c) TODAYS_YEAR PROJECT_ORGANIZATIONNAME. All rights reserved.
+//
+
+#ifndef POD_NAMEPrefixHeader_pch
+#define POD_NAMEPrefixHeader_pch
+
+// Include any system framework and library headers here that should be included in all compilation units.
+// You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
+
+#endif /* POD_NAMEPrefixHeader_pch */

data/lib/yk_command/module/template/tools/PrefixHeader_swift.swift

@@ -0,0 +1,10 @@
+//
+//  POD_NAMEPrefixHeader_swift.swift
+//  Pods
+//
+//  Created by PROJECT_OWNER on TODAYS_DATE.
+//  Copyright (c) TODAYS_YEAR PROJECT_ORGANIZATIONNAME. All rights reserved.
+//
+
+//swift 版本的prefix 文件
+// @_exported import SwiftyJSON

data/lib/yk_command/module/yk_module.rb

@@ -201,11 +201,11 @@ module YkCommand
 
       # host_a = 'yeah'
       # host_b = 'ka'
-      # template_repo_url = "http://gitlab.#{host_a}#{host_b}.com/App/iOS/YKComponents/YKProjectTemplate.git"
+      # template_repo_url = "http://gitlab.#{host_a}#{host_b}.com/App/iOS/YKComponents/full_component_demo_template.git"
       # system("git clone #{template_repo_url} #{@final_path}")
 
       # FileUtils.remove_dir(@final_path, true)
-      # FileUtils.cp_r('/Users/imacn24/Documents/dev/YKProjectTemplate', @final_path)
+      # FileUtils.cp_r('/Users/imacn24/Documents/dev/full_component_demo_template', @final_path)
       # FileUtils.remove_dir("#{@final_path}/.git", true)
       # end
 

data/lib/yk_command/project/{YKProjectTemplate → full_component_demo_template}/NAME.podspec

@@ -91,9 +91,9 @@ Pod::Spec.new do |spec|
   #  Not including the public_header_files will make all headers public.
   #
 
-  spec.source_files = '${POD_NAME}/Classes/**/*'
+  spec.source_files = '${POD_NAME}/Classes/**/*.{h,m,mm,c,cpp,swift,pch}'
   spec.exclude_files = "Classes/Exclude"
-  spec.prefix_header_file = '${POD_NAME}/Classes/Private/Business/${POD_NAME}PrefixHeader.pch'
+  spec.prefix_header_file = '${POD_NAME}/Classes/Private/${POD_NAME}PrefixHeader.pch'
   spec.public_header_files = '${POD_NAME}/Classes/Public/**/*.h'
 
   # spec.public_header_files = "Classes/**/*.h"
@@ -111,9 +111,9 @@ Pod::Spec.new do |spec|
 
   # spec.resource  = "icon.png"
   # spec.resources = "Resources/*.png"
-  #  spec.resource_bundles = {
-  #    '${POD_NAME}' => ['${POD_NAME}/**/*.{xib,png,json}']
-  #  }
+   spec.resource_bundles = {
+     '${POD_NAME}' => ['${POD_NAME}/Assets/**/*.xcassets']
+   }
   # spec.preserve_paths = "FilesToSave", "MoreFilesToSave"
 
 

data/lib/yk_command/project/{YKProjectTemplate → full_component_demo_template}/templates/ios/Example/PROJECT/CPDViewController.m

@@ -14,6 +14,7 @@
 #import <PROJECT/CPDPROJECTServiceProtocol.h>
 
 #import <PROJECT/CPDPROJECTRouterDefine.h>
+#import <PROJECT/CPDPROJECTHelper.h>
 
 @interface CPDViewController ()
 
@@ -32,7 +33,8 @@
     NSLog(@"这里调用模块的路由");
     [self yk_openUrl:kDemoRouterString parameter:@{}];
     
-    
+    UIImage *img1 = kModuleResourceImage_PROJECT(@"123");
+    NSLog(@"img1:%@", img1);
 }
 
 - (IBAction)serviceEvent:(id)sender {

data/lib/yk_command/project/full_component_demo_template/templates/ios/Example/PROJECT.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

data/lib/yk_command/project/full_component_demo_template/templates/ios/Example/Podfile

@@ -0,0 +1,34 @@
+
+platform :ios, '10.0'
+
+inhibit_all_warnings!
+use_modular_headers!
+use_frameworks! :linkage => :static
+
+
+#pod_install hook
+post_install do |installer|
+
+  # 单个target编辑配置
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      #config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
+
+      config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = "org.cocoapods.${PRODUCT_NAME}"
+      config.build_settings['EXPANDED_CODE_SIGN_IDENTITY'] = ""
+      config.build_settings['CODE_SIGNING_REQUIRED'] = "NO"
+      config.build_settings['CODE_SIGNING_ALLOWED'] = "NO"
+    end
+  end
+
+end
+
+target '${POD_NAME}_Example' do
+  pod '${POD_NAME}', :path => '../'
+
+  target '${POD_NAME}_Tests' do
+    inherit! :search_paths
+
+    ${INCLUDED_PODS}
+  end
+end