yk_command 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f040cbe03968a6a21d06f5b7e4c7f5298f17a492d5c858d756928bbf1388d58
-  data.tar.gz: 4dbd51254178b5ed5b9375ce138c69fc120b206e0e8c0926c60bc09ad46c71be
+  metadata.gz: be65a7c2288fc57e31f8a34211a1155e7d3ac040b3a9ce312c74ddb87e75f5e2
+  data.tar.gz: 2f7e12d9ab2884ac180ce1a5f77e104fafa9e0c36bde7fa08482d94dd7b29be8
 SHA512:
-  metadata.gz: 7e0baa1b2df34984201586c2351d8540c9fc3939ddd2528c304168370c33cbd13df3cb5f6fb9ca6863974b676bcbdfc7f775034b4828e1629ed96cff4de331c9
-  data.tar.gz: 47f96a4896ff0b92ef293d7f40763e098da3c7987a9a75a69558cd2c7cfd9dac678f72110ef6db73ee4f2ba5e59bb4add066c1eeabfcf659143059eec1b38586
+  metadata.gz: 8eeff4266d02b1496bdde08469fa30c888173451771c339ef06490608cd1862f5497e9463d2fd139d9773313dbe1e78052bf5817f41eec483997e7faa3e813c4
+  data.tar.gz: 2cf0deb795d35afdc5e3e57b83bd6f6349840f4ccb3ef405eb824bba14df69049263bbc8a2e889363d120f0f84d220b5c35e33ee4ec966b8906003470813f438

data/.idea/sonarlint/issuestore/index.pb

@@ -45,8 +45,6 @@ b
 2lib/yk_command/project/setup/ProjectManipulator.rb,f/6/f6e109e4c314cef09022792f4b88dd267a682d28
 d
 4lib/yk_command/project/setup/TemplateConfigurator.rb,8/f/8f9b3c6ba85192218bf69497d64693c792545edb
-W
-'lib/yk_command/module/module_handler.rb,8/4/841f2109f591be400d71147c5dfcb8a1cc2d144b
 =
 
 A
@@ -71,12 +69,8 @@ klib/yk_command/project/full_component_demo_template/templates/ios/Example/PROJE
 elib/yk_command/project/full_component_demo_template/templates/ios/Example/PROJECT/CPDViewController.m,c/9/c973c369f2aa20ae7393f8ad1bae5fcc9dad88a6
 �

 hlib/yk_command/project/full_component_demo_template/templates/swift/Example/PROJECT/ViewController.swift,e/a/ea5310f3594c5f758431573a3eee2e3cb34f8370
-n
->lib/yk_command/module/template/swift/RouterRegisterSwift.swift,e/7/e7859f10f0642d758bd3e51a5c1fc8dd30857da0
 q
 Alib/yk_command/project/full_component_demo_template/POD_README.md,0/d/0dbcd16920547d0b8058e424f5bbc22888b9d24c
-J
-lib/yk_command/commands.rb,9/0/90c3ae459446d94ee4d518d1d70cf0d7c221b395
 v
 Flib/yk_command/project/simple_component_demo_template/NAME-osx.podspec,6/c/6c61bf367999c685c974253a7e78b0d53b7bdc75
 r
@@ -90,8 +84,4 @@ h
 j
 :lib/yk_command/module/template/objc/demo/AppDelegate.swift,7/0/703a9a497b73c9ae46f475cf01385805ce3107d9
 n
->lib/yk_command/module/template/swift/ModuleRegisterSwift.swift,a/c/ace0d6f0fec5ed05717682fdff9078acfde3a7a3
-T
-$lib/yk_command/project/yk_project.rb,5/6/56b2d27b09b172bae1a27bc07f664d2ed5a6c3c6
-I
-lib/yk_command/version.rb,c/5/c5e8ad55d5b356f308ba78bbba690733f246ebcb
+>lib/yk_command/module/template/swift/ModuleRegisterSwift.swift,a/c/ace0d6f0fec5ed05717682fdff9078acfde3a7a3

data/lib/yk_command/commands.rb

@@ -42,9 +42,10 @@ module YkCommand
     desc 'create_host_app <Path>', '生成一个 App 工程'
     method_option :create_host_app, aliases: '-csd'
     def create_host_app(path = nil)
-      put ' -- '
+      puts' -- '
       #TODO 实现创建一个host app项目，分为纯净版本，类似于Xcode的初始项目，和包含基础组件和热门组件用于生产目的的项目
       #
+      YkProject.new(true).create_host('TestApp','swift','YK','Tom',path);
     end
 
 

data/lib/yk_command/module/module_handler.rb

@@ -17,132 +17,72 @@ module YkCommand
 
     no_commands do
       def yk_module_folders
-        class_folder_path = "#{@final_path}/#{@name}/Classes"
 
-        first_level_folders = %w[Public Private]
-
-        # public_level_folders = ['Register']
-        # public_level_folders.each do |folder|
-        #   path = "#{class_folder_path}/Public/#{folder}"
-        #   empty_directory path
-        # end
-
-        private_level_folders = %w[Business Category Vendor Tools]
-
-        first_level_folders.each do |folder|
-          path = "#{class_folder_path}/#{folder}"
-          empty_directory path
-        end
-
-        private_level_folders.each do |folder|
-          path = "#{class_folder_path}/Private/#{folder}"
-          empty_directory path
-        end
       end
 
       YkCommand::ModuleHandler.source_root(File.dirname(__FILE__))
 
       def yk_template_files
 
-        # objc register
-        register_path = "#{@final_path}/#{@name}/Classes/Private/RegisterOC"
-        registger = {
-          'RouterRegister.h' => 'RouterRegister',
-          'RouterRegister.m' => 'RouterRegister',
-          'ServiceRegister.h' => 'ServiceRegister',
-          'ServiceRegister.m' => 'ServiceRegister'
-        }
+        module_root_path = File.join(@final_path, @name)
+        module_classes_path = File.join(module_root_path, "Classes")
+        file_root_path = File.join(__dir__, "template")
 
-        registger.each do |file_name, _folder|
-          final_file = "#{register_path}/#{@prefixed_module}#{file_name}"
-          template "#{__dir__}/template/objc/#{file_name}", final_file
-        end
+        # assets bundle
+        FileUtils.mkdir(File.join(module_root_path, "Assets", "Images.xcassets"))
+        # resources directory
+        FileUtils.mkdir(File.join(module_root_path,"Resources"))
 
-        #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',
-        }
+        dest_dir_business = "Work/Business"
+        dest_dir_category = "Work/Category"
+        dest_dir_vendor = "Work/Vendor"
+        dest_dir_tools = "Work/Tools"
 
-        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
+        dest_dir_register_oc = "Work/RegisterOC"
+        dest_dir_register_swift = "Work/RegisterSwift"
 
-        #assets bundle
-        assets_path = "#{@final_path}/#{@name}/Assets"
-        FileUtils.mkdir(File.join(@final_path, @name, "Assets", "Images.xcassets"))
-
-        #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
+        dest_dir_pch = "."
+        # pch file
+        file_dir_pch = File.join(file_root_path, "objc")
+        file_arr_pch = {
+          'PrefixHeader.pch' => dest_dir_pch,
+        }
 
-        # 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}#{file_name}"
-          source = "#{__dir__}/template/swift/#{file_name}"
-          template source, final_file
+        file_arr_pch.each do |file, folder|
+          template(File.join(file_dir_pch, file), File.join(module_classes_path, folder, "#{@project}#{file}"))
         end
 
-        private_folder_path = "#{@final_path}/#{@name}/Classes/Private"
-        #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' => '.',
-          'CategoryHeader.h' => 'Category',
-          'ToolsHeader.h' => 'Tools',
-          'vendorHeader.h' => 'Vendor'
+        # objc files
+        file_dir_oc = File.join(file_root_path, "objc")
+        file_arr_oc = {
+          'RouterRegister.h' => dest_dir_register_oc,
+          'RouterRegister.m' => dest_dir_register_oc,
+          'ServiceRegister.h' => dest_dir_register_oc,
+          'ServiceRegister.m' => dest_dir_register_oc,
+          'CategoryHeader.h' => dest_dir_category,
+          'ToolsHeader.h' => dest_dir_tools,
+          'Helper.h' => dest_dir_tools,
+          'Helper.m' => dest_dir_tools,
+          'VendorHeader.h' => dest_dir_vendor,
+          'BusinessHeader.h' => dest_dir_business,
         }
 
-        private_level_folder_files.each do |file_name, folder|
-          final_prefix = @prefixed_module
-          if file_name == 'PrefixHeader.pch'
-            final_prefix = @name
-          end
-
-          final_file = "#{private_folder_path}/#{folder}/#{final_prefix}#{file_name}"
-          source = "#{__dir__}/template/objc/#{file_name}"
-          template source, final_file
+        file_arr_oc.each do |file, folder|
+          template(File.join(file_dir_oc, file), File.join(module_classes_path, folder, "#{@prefixed_module}#{file}"))
         end
 
-        #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}/oc/#{@prefixed_module}#{file_name}"
-          source = "#{__dir__}/template/objc/demo/#{file_name}"
-          template source, final_file
-        end
+        # swift files
+        file_dir_swift = File.join(file_root_path, "swift")
+        file_arr_swift = {
+          'RouterRegisterSwift.swift' => dest_dir_register_swift,
+          'ServiceRegisterSwift.swift' => dest_dir_register_swift,
+
+          'PrefixHeader_swift.swift' => dest_dir_pch,
+          'Tool.swift' => dest_dir_tools,
+        }
 
-        #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
+        file_arr_swift.each do |file, folder|
+          template(File.join(file_dir_swift, file), File.join(module_classes_path, folder, "#{@prefixed_module}#{file}"))
         end
 
 

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

@@ -9,6 +9,4 @@
 #ifndef <%= @prefixed_module %>CategoryHeader_h
 #define <%= @prefixed_module %>CategoryHeader_h
 
-#import <YKCategoryComponent/YKCategoriesComponentHeader.h>
-
 #endif /* <%= @prefixed_module %>CategoryHeader_h */

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

@@ -10,23 +10,16 @@
 
 #import <YKRouterComponent/YKRouterComponentHeader.h>
 
-#import "<%= @prefixed_module %>RouterDefine.h"
-
-#import "<%= @prefixed_module %>DemoViewController.h"
-
-#import <<%= @name %>/<%= @name %>-Swift.h>
-
+@interface <%= @prefixed_module %>RouterRegister()<YKRouterComponentRegisterProtocol>
+@end
 @implementation <%= @prefixed_module %>RouterRegister
 
-@YKRouterRegister() {
-
-[[YKRouterComponent shareInstance] ykRegisterUrlPartterns:kDemoRouterString error:nil action:^(YKRouterUrlRequest * _Nonnull urlRequest, YKRouterUrlCompletion  _Nonnull completetion) {
-
-        <%= @prefixed_module %>DemoViewController *vc = [[<%= @prefixed_module %>DemoViewController alloc] init];
-                [[UIViewController yk_topViewController].navigationController pushViewController:vc animated:YES];
-
-    }];
-
++ (void)ykRouterRegisterExecute {
+//     [[YKRouterComponent shareInstance] ykRegisterUrlPartterns:@"kDemoRouterString" error:nil action:^(YKRouterUrlRequest * _Nonnull urlRequest, YKRouterUrlCompletion  _Nonnull completetion) {
+//
+//         UIViewController *vc = [[UIViewController alloc] init];
+//         [urlRequest.fromVC.navigationController pushViewController:vc animated:YES];
+//     }];
 }
 
 

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

@@ -9,17 +9,13 @@
 #import "<%= @prefixed_module %>ServiceRegister.h"
 #import <YKModuleServiceComponent/YKModuleServiceComponentHeader.h>
 
-#import "<%= @prefixed_module %>ServiceProtocol.h"
-
-
-#import "<%= @prefixed_module %>DemoViewModel.h"
-
+@interface <%= @prefixed_module %>ServiceRegister()<YKModuleServiceRegisterProtocol>
+@end
 
 @implementation <%= @prefixed_module %>ServiceRegister
 
-@YKModuleServiceRegister(){
-    YKModuleServiceRegisterExecute(<%= @prefixed_module %>DemoViewModel.class, @protocol(<%= @prefixed_module %>ServiceProtocol), nil);
++ (void)ykModuleServiceRegistAction {
+//     YKModuleServiceRegisterExecute(XXXX.class, @protocol(XXXProtocol), nil);
 }
 
-
 @end

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

@@ -15,9 +15,9 @@ 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)
-        }
+        //YKRouterRegisterUrlParttern("routerUrl", nil) { (urlRequest: YKRouterUrlRequest, complete: YKRouterUrlCompletion?) in
+        //let vc = UIViewController()
+        //urlRequest.fromVC?.navigationController?.pushViewController(vc, animated: true)
+        //}
     }
 }

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

@@ -7,14 +7,14 @@
 
 import Foundation
 
-import YKModuleServiceComponent
+import YKModuleServiceComponentSwift
 
 class <%= @prefixed_module %>ServiceRegisterSwift: NSObject, YKModuleServiceRegisterProtocol {
-    static func ykModuleServiceRegitAction() {
+    static func ykModuleServiceRegistAction() {
         //注册服务 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)
+        //YKService().ykRegisterModuleService_oc(NSObject.self, protocol: NSObjectProtocol.self, err: nil)
     }
 }

data/lib/yk_command/project/full_component_demo_template/NAME.podspec

@@ -92,14 +92,12 @@ Pod::Spec.new do |spec|
   #
 
   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/${POD_NAME}PrefixHeader.pch'
-  spec.public_header_files = '${POD_NAME}/Classes/Public/**/*.h'
-
-  # spec.public_header_files = "Classes/**/*.h"
-
+  # spec.exclude_files = "Classes/Exclude" #排除文件
 
+  spec.prefix_header_file = '${POD_NAME}/Classes/${POD_NAME}PrefixHeader.pch'
 
+  spec.project_header_files = '${POD_NAME}/Classes/{Category,Register,Tools,Vendor,Business}/**/*.{h}'
+  #spec.public_header_files = '${POD_NAME}/Classes/Public/**/*.h' #此处放置组件的对外暴漏的头文件
 
   # ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
@@ -110,10 +108,12 @@ Pod::Spec.new do |spec|
   #
 
   # spec.resource  = "icon.png"
-  # spec.resources = "Resources/*.png"
-   spec.resource_bundles = {
+  # 放置 json,font,jpg,png等资源
+  spec.resources = "${POD_NAME}/{Classes,Resources}/**/*.{png,jpg,font,json,xib}"
+
+  spec.resource_bundles = {
      '${POD_NAME}' => ['${POD_NAME}/Assets/**/*.xcassets']
-   }
+  }
   # spec.preserve_paths = "FilesToSave", "MoreFilesToSave"
 
 
@@ -141,11 +141,11 @@ Pod::Spec.new do |spec|
   # spec.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
   # spec.dependency "JSONKit", "~> 1.4"
 
-
-
-  spec.dependency "YKCategoryComponent"
+  # 组件化架构中间件
   spec.dependency "YKModuleLifeCircleComponent"
   spec.dependency "YKRouterComponent"
-  spec.dependency "YKModuleServiceComponent"
+  spec.dependency "YKModuleServiceComponent" # oc 服务中间件
+  spec.dependency "YKModuleServiceComponent.swift" #swift 服务中间件， 如果是纯oc组件，请注释此中间件
 
+  # 其他依赖pod
 end

data/lib/yk_command/project/full_component_demo_template/templates/ios/Example/PROJECT/CPDViewController.m

@@ -11,11 +11,6 @@
 #import <YKRouterComponent/YKRouterComponentHeader.h>
 #import <YKModuleServiceComponent/YKModuleServiceComponentHeader.h>
 
-#import <PROJECT/CPDPROJECTServiceProtocol.h>
-
-#import <PROJECT/CPDPROJECTRouterDefine.h>
-#import <PROJECT/CPDPROJECTHelper.h>
-
 @interface CPDViewController ()
 
 @end
@@ -28,35 +23,25 @@
     self.navigationItem.title = [NSString stringWithFormat:@"%@",@"PROJECT Demo"];
 }
 
-
 - (IBAction)routerEvent:(id)sender {
     NSLog(@"这里调用模块的路由");
-    [self yk_openUrl:kDemoRouterString parameter:@{}];
-    
-    UIImage *img1 = kModuleResourceImage_PROJECT(@"123");
-    NSLog(@"img1:%@", img1);
+//     YKRouterUrlRequest* request = [YKRouterUrlRequest instanceWithBuilder:^(YKRouterUrlRequest * _Nonnull builder) {
+//             builder.url = @"url";
+//             builder.parameter = @{};
+//         }];
+//     return [[YKRouterComponent shareInstance] ykOpenUrl:request complete:^(YKRouterUrlResponse * _Nonnull urlResponse) {
+//
+//     }];
 }
 
 - (IBAction)serviceEvent:(id)sender {
     NSLog(@"这里调用模块的服务");
-    NSError *err;
-    __kindof Class<CPDPROJECTServiceProtocol> cls =YKModuleServiceWithProtocol(@protocol(CPDPROJECTServiceProtocol), &err);
-      if (!err) {
-        NSObject <CPDPROJECTServiceProtocol>* obj = [[cls alloc] init];
-          [obj replaceThisMethod];
-      }
+//     NSError *err;
+//     __kindof Class<NSObject> cls =YKModuleServiceWithProtocol(@protocol(CPDPROJECTServiceProtocol), &err);
+//       if (!err) {
+//         NSObject <CPDPROJECTServiceProtocol>* obj = [[cls alloc] init];
+//           [obj replaceThisMethod];
+//       }
 }
 
-- (void)yk_openUrl:(NSString *)url parameter:(NSDictionary *__nullable)parameters  {
-    
-    YKRouterUrlRequest* request = [YKRouterUrlRequest instanceWithBuilder:^(YKRouterUrlRequest * _Nonnull builder) {
-        builder.url = url;
-        builder.parameter = parameters;
-    }];
-    return [[YKRouterComponent shareInstance] ykOpenUrl:request complete:^(YKRouterUrlResponse * _Nonnull urlResponse) {
-        
-    }];
-}
-
-
 @end

data/lib/yk_command/project/full_component_demo_template/templates/swift/Example/PROJECT/ViewController.swift

@@ -11,9 +11,7 @@ import UIKit
 import PROJECT
 
 import YKRouterComponent
-import YKModuleServiceComponent
-
-
+import YKModuleServiceComponentSwift
 
 class ViewController: UIViewController {
 
@@ -26,18 +24,28 @@ class ViewController: UIViewController {
 
     @IBAction func routerEvent(_ sender: Any) {
         print("---调用路由---")
-        YKRouterComponent.shareInstance().ykOpenUrlInstance(CPDPROJECTRouterConstants.testVC_swift, fromVC: self, complete: nil)
-
-        let img1 = CPDPROJECTTool.kResourceImage(name: "123")
-
-        let img2 = kModuleResourceImage_PROJECT("123")
-        print("img1:\(img1)")
-        print("img2:\(img2)")
+//         YKRouterComponent.shareInstance().ykOpenUrlInstance("routerUrl", fromVC: self, complete: nil)
     }
   
 
     @IBAction func serviceEvent(_ sender: Any) {
         print("---调用服务---")
+        // oc 专用接口
+//        let ser: AnyClass? = YKModuleServiceComponent().ykModule(with: NSObjectProtocol.self, error: nil)
+//        guard let ser: NSObjectProtocol.Type = ser as? NSObjectProtocol.Type else {
+//            print("no ser confor to protocol:\(XXX_SwiftProtocol.self)")
+//            return
+//        }
+//        ser.xxx()
+
+        // swift / oc 通用接口
+//        let ser: AnyClass? = YKModuleServiceComponent().ykModule(protocol: XXX_SwiftProtocol.self, error: nil)
+//        guard let ser: XXX_SwiftProtocol.Type = ser as? XXX_SwiftProtocol.Type else{
+//            print("no ser confor to protocol:\(XXX_SwiftProtocol.self)")
+//            return
+//        }
+//
+//        ser.xxx()
     }
 }
 

data/lib/yk_command/project/setup/ConfigureiOS.rb

@@ -93,8 +93,7 @@ module Pod
 
       # # remove podspec for osx
       # `rm ./NAME-osx.podspec`
-
-      `touch #{$current_dir}/Pod/Classes/ReplaceMe.swift`
+      `touch #{$current_dir}/Pod/Classes/ReplaceMe.m`
 
       `mv #{$current_dir}/templates/ios/* #{$current_dir}`
 

data/lib/yk_command/project/setup/TemplateConfigurator.rb

@@ -107,13 +107,13 @@ module Pod
     end
 
     def add_yk_pods
-      self.add_pod_to_podfile "YKCategoryComponent"
+      # self.add_pod_to_podfile "YKCategoryComponent"
       self.add_pod_to_podfile "YKModuleLifeCircleComponent"
       self.add_pod_to_podfile "YKRouterComponent"
-      self.add_pod_to_podfile "YKModuleServiceComponent"
-      
+
       if @framework == "swift"
-        self.add_pod_to_podfile "SnapKit"
+        # self.add_pod_to_podfile "SnapKit"
+        self.add_pod_to_podfile "YKModuleServiceComponent.swift"
       else
         self.add_pod_to_podfile "YKModuleServiceComponent"
       end

data/lib/yk_command/project/yk_project.rb

@@ -22,6 +22,11 @@ module YkCommand
 
       end
 
+      def create_host(app_name, framework, prefix, author, at_path)
+        prepare_project(app_name,framework, prefix, author, at_path)
+      end
+
+
       def prepare_project(pod_name, framework, prefix, author, at_path)
 
         des_path = Pathname.new(at_path)

data/lib/yk_command/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module YkCommand
-  VERSION = '0.6.4'.freeze
+  VERSION = '0.6.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yk_command
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Major Tom
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -283,35 +283,22 @@ files:
 - lib/yk_command/module/module_handler.rb
 - lib/yk_command/module/template/.DS_Store
 - lib/yk_command/module/template/objc/.DS_Store
+- lib/yk_command/module/template/objc/BusinessHeader.h
 - lib/yk_command/module/template/objc/CategoryHeader.h
 - lib/yk_command/module/template/objc/Helper.h
 - lib/yk_command/module/template/objc/Helper.m
 - lib/yk_command/module/template/objc/PrefixHeader.pch
-- lib/yk_command/module/template/objc/RouterDefine.h
 - lib/yk_command/module/template/objc/RouterRegister.h
 - lib/yk_command/module/template/objc/RouterRegister.m
-- lib/yk_command/module/template/objc/ServiceProtocol.h
 - lib/yk_command/module/template/objc/ServiceRegister.h
 - lib/yk_command/module/template/objc/ServiceRegister.m
 - lib/yk_command/module/template/objc/ToolsHeader.h
 - lib/yk_command/module/template/objc/VendorHeader.h
-- lib/yk_command/module/template/objc/demo/AppDelegate.swift
-- lib/yk_command/module/template/objc/demo/DemoVC_sw.swift
-- lib/yk_command/module/template/objc/demo/DemoViewController.h
-- lib/yk_command/module/template/objc/demo/DemoViewController.m
-- lib/yk_command/module/template/objc/demo/DemoViewModel.h
-- lib/yk_command/module/template/objc/demo/DemoViewModel.m
 - lib/yk_command/module/template/swift/.DS_Store
-- lib/yk_command/module/template/swift/ModuleRegisterMix.h
-- lib/yk_command/module/template/swift/ModuleRegisterMix.m
-- lib/yk_command/module/template/swift/ModuleRegisterSwift.swift
-- lib/yk_command/module/template/swift/RouterDefineSwift.swift
+- lib/yk_command/module/template/swift/PrefixHeader_swift.swift
 - lib/yk_command/module/template/swift/RouterRegisterSwift.swift
 - lib/yk_command/module/template/swift/ServiceRegisterSwift.swift
 - lib/yk_command/module/template/swift/Tool.swift
-- lib/yk_command/module/template/tools/.DS_Store
-- lib/yk_command/module/template/tools/PrefixHeader.pch
-- lib/yk_command/module/template/tools/PrefixHeader_swift.swift
 - lib/yk_command/module/yk_module.rb
 - lib/yk_command/project/.DS_Store
 - lib/yk_command/project/full_component_demo_template/.gitignore
@@ -472,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: a short summary, because RubyGems requires one.

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

@@ -1,14 +0,0 @@
-//
-//  <%= @prefixed_module %>RouterDefine.h
-//  <%= @project %>
-//
-//  Created by <%= @author %> on <%= @date %>.
-//
-//
-
-#ifndef <%= @prefixed_module %>RouterDefine_h
-#define <%= @prefixed_module %>RouterDefine_h
-
-static NSString *kDemoRouterString = @"<%= @prefixed_module %>DemoPage";
-
-#endif /* <%= @prefixed_module %>RouterDefine_h */

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

@@ -1,15 +0,0 @@
-//
-//  <%= @prefixed_module %>ServiceProtocol.h
-//  <%= @project %>
-//
-//  Created by <%= @author %> on <%= @date %>.
-//
-//
-
-#import <Foundation/Foundation.h>
-
-@protocol <%= @prefixed_module %>ServiceProtocol <NSObject>
-
-- (void)replaceThisMethod;
-
-@end

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

@@ -1,16 +0,0 @@
-//
-//  <%= @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

@@ -1,30 +0,0 @@
-//
-//  <%= @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/objc/demo/DemoViewController.h

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

data/lib/yk_command/module/template/objc/demo/DemoViewController.m

@@ -1,28 +0,0 @@
-//
-//  <%= @prefixed_module %>DemoViewController.m
-//  <%= @project %>
-//
-//  Created by <%= @author %> on <%= @date %>.
-//
-//
-
-
-#import "<%= @prefixed_module %>DemoViewController.h"
-
-@interface <%= @prefixed_module %>DemoViewController ()
-
-@end
-
-@implementation <%= @prefixed_module %>DemoViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view from its nib.
-    NSLog(@"----- viewDidLoad -----");
-    self.view.backgroundColor = [UIColor colorWithRed:0.3 green:0.4 blue:0.35 alpha:1.0];
-    self.navigationItem.title = @"<%= @prefixed_module %>DemoViewController";
-}
-
- 
-
-@end

data/lib/yk_command/module/template/objc/demo/DemoViewModel.h

@@ -1,14 +0,0 @@
-//
-//  <%= @prefixed_module %>DemoViewModel.h
-//  <%= @project %>
-//
-//  Created by <%= @author %> on <%= @date %>.
-//
-//
-
-#import <Foundation/Foundation.h>
-
-#import "<%= @prefixed_module %>ServiceProtocol.h"
-@interface <%= @prefixed_module %>DemoViewModel : NSObject <<%= @prefixed_module %>ServiceProtocol>
-
-@end

data/lib/yk_command/module/template/objc/demo/DemoViewModel.m

@@ -1,19 +0,0 @@
-//
-//  <%= @prefixed_module %>DemoViewModel.m
-//  <%= @project %>
-//
-//  Created by <%= @author %> on <%= @date %>.
-//
-//
-
-#import "<%= @prefixed_module %>DemoViewModel.h"
-
-
-@implementation <%= @prefixed_module %>DemoViewModel
-
-- (void)replaceThisMethod {
-    NSLog(@"----- replace me -----");
-}
-
-
-@end

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

@@ -1,17 +0,0 @@
-//
-//  <%= @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

@@ -1,61 +0,0 @@
-//
-//  <%= @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

@@ -1,41 +0,0 @@
-//
-//  <%= @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

@@ -1,15 +0,0 @@
-//
-//  <%= @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/tools/PrefixHeader.pch

@@ -1,15 +0,0 @@
-//
-//  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 */