yk_command 0.6.2 → 0.6.5

data/lib/yk_command/module/module_handler.rb

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

@@ -0,0 +1,20 @@
+//
+//  <%= @prefixed_module %>ServiceRegisterSwift.swift
+//  <%= @project %>
+//
+//  Created by <%= @author %> on <%= @date %>.
+//
+
+import Foundation
+
+import YKModuleServiceComponentSwift
+
+class <%= @prefixed_module %>ServiceRegisterSwift: NSObject, YKModuleServiceRegisterProtocol {
+    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)
+    }
+}

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/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,15 +91,13 @@ Pod::Spec.new do |spec|
   #  Not including the public_header_files will make all headers public.
   #
 
-  spec.source_files = '${POD_NAME}/Classes/**/*'
-  spec.exclude_files = "Classes/Exclude"
-  spec.prefix_header_file = '${POD_NAME}/Classes/Private/Business/${POD_NAME}PrefixHeader.pch'
-  spec.public_header_files = '${POD_NAME}/Classes/Public/**/*.h'
-
-  # spec.public_header_files = "Classes/**/*.h"
-
+  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/${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 = {
-  #    '${POD_NAME}' => ['${POD_NAME}/**/*.{xib,png,json}']
-  #  }
+  # 放置 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

@@ -0,0 +1,47 @@
+//
+//  CPDViewController.m
+//  PROJECT
+//
+//  Created by PROJECT_OWNER on TODAYS_DATE.
+//  Copyright (c) TODAYS_YEAR PROJECT_OWNER. All rights reserved.
+//
+
+#import "CPDViewController.h"
+
+#import <YKRouterComponent/YKRouterComponentHeader.h>
+#import <YKModuleServiceComponent/YKModuleServiceComponentHeader.h>
+
+@interface CPDViewController ()
+
+@end
+@implementation CPDViewController
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+	// Do any additional setup after loading the view, typically from a nib.
+    self.navigationItem.title = [NSString stringWithFormat:@"%@",@"PROJECT Demo"];
+}
+
+- (IBAction)routerEvent:(id)sender {
+    NSLog(@"这里调用模块的路由");
+//     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<NSObject> cls =YKModuleServiceWithProtocol(@protocol(CPDPROJECTServiceProtocol), &err);
+//       if (!err) {
+//         NSObject <CPDPROJECTServiceProtocol>* obj = [[cls alloc] init];
+//           [obj replaceThisMethod];
+//       }
+}
+
+@end

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