lib/mt_tool/commands.rb in mt_tool-0.1.2 vs lib/mt_tool/commands.rb in mt_tool-0.1.3

@@ -10,11 +10,12 @@
 
     CONFIG_FILE = '.MTModuleFilesConfig.yml'.freeze
 
     desc 'generate <Path> <Module Name> <Language> <Prefix - 前缀> <Author - 作者>', '直接生成项目 例子： yk_command generate  . HomeModule oc MT Tom.Liu '
     method_option :generate, aliases: '-g'
-    def generate(path = nil,name,lang ,class_prefix,author)
+
+    def generate(path = nil, name, lang, class_prefix, author)
       @name = name
       @module = @name
       @lang = lang
       @class_prefix = class_prefix
       @final_path = "#{path}/#{@name}"
@@ -37,10 +38,11 @@
       end
     end
 
     desc 'create <Path>', '在某个路径下交互式生成项目'
     method_option :create, aliases: '-c'
+
     def create(path = nil)
       path = Dir.pwd if path.nil?
 
       say '模块名:', :green
       config_file_path = "#{path}/#{CONFIG_FILE}"
@@ -89,26 +91,26 @@
         say '类名前缀:', :green
         class_prefix = ask("Class prefix [#{config[:class_prefix]}] ?")
         say '文件作者:', :green
         author = ask("Author [#{config[:author]}] ?")
 
-        config[:project]      = project.empty?      ? config[:project] || ''      : project
-        config[:language]     = language.empty?     ? config[:language] || 'objc' : language
+        config[:project] = project.empty? ? config[:project] || '' : project
+        config[:language] = language.empty? ? config[:language] || 'objc' : language
         config[:class_prefix] = class_prefix.empty? ? config[:class_prefix] || '' : class_prefix
-        config[:author]       = author.empty?       ? config[:author] || ''       : author
+        config[:author] = author.empty? ? config[:author] || '' : author
 
         File.open(config_file_path, 'w') do |f|
           f.write config.to_yaml
           # f.write YAML.to_yaml(config)
         end
 
         @module = @name
         @class_prefix = config[:class_prefix]
         @prefixed_module = config[:class_prefix] + @module
-        @project         = config[:project]
-        @author          = config[:author]
-        @date            = Time.now.strftime('%d/%m/%y')
+        @project = config[:project]
+        @author = config[:author]
+        @date = Time.now.strftime('%d/%m/%y')
         @lang = config[:language]
       end
 
       def prepare_folder
 
@@ -136,12 +138,10 @@
         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
@@ -149,24 +149,24 @@
       CLI.source_root(File.dirname(__FILE__))
 
       def yk_template_files
         register_path = "#{@final_path}/#{@name}/Classes/Private/Register"
         registger = {
-          'RouterRegister.h'     => 'RouterRegister',
-          'RouterRegister.m'     => 'RouterRegister',
-          'ServiceRegister.h'     => 'ServiceRegister',
-          'ServiceRegister.m'     => 'ServiceRegister'
+          'RouterRegister.h' => 'RouterRegister',
+          'RouterRegister.m' => 'RouterRegister',
+          'ServiceRegister.h' => 'ServiceRegister',
+          'ServiceRegister.m' => 'ServiceRegister'
         }
 
         registger.each do |file_name, _folder|
           final_file = "#{register_path}/#{@prefixed_module}#{file_name}"
           template "#{__dir__}/template/objc/#{file_name}", final_file
         end
 
         public_folder_path = "#{@final_path}/#{@name}/Classes/Public"
 
-        template_code_filename = ['ServiceProtocol.h','RouterDefine.h']
+        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
         end
@@ -176,24 +176,22 @@
           final_file = "#{public_folder_path}/#{@prefixed_module}_Swift_#{file_name}"
           source = "#{__dir__}/template/swift/#{file_name}"
           template source, final_file
         end
 
-
-
         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.pch' => 'Business',
+          'CategoryHeader.h' => 'Category',
+          'ToolsHeader.h' => 'Tools',
+          'vendorHeader.h' => 'Vendor'
         }
 
         private_level_folder_files.each do |file_name, folder|
           final_prefix = @prefixed_module
           if file_name == 'PrefixHeader.pch'
@@ -203,31 +201,39 @@
           final_file = "#{private_folder_path}/#{folder}/#{final_prefix}#{file_name}"
           source = "#{__dir__}/template/objc/#{file_name}"
           template source, final_file
         end
 
+        tools_files_path = "#{@final_path}/#{@name}/Classes/Private/Tools"
+
+        tool_files = ['Bundle.h','Bundle.m']
+        tool_files.each do |file_name|
+          final_file = "#{tools_files_path}/#{@prefixed_module}#{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 = ['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
         end
 
-
-
         Dir.chdir("#{@final_path}/Example") do
           system 'pod install'
           system "open './#{@name}.xcworkspace'"
         end
       end
 
     end
 
     desc 'dependency <Podfile.lock Path>', '解析Podfile.lock'
     method_option :dependency, aliases: '-d'
+
     def dependency(path = nil)
-      say 'start resolve dependency',:green
+      say 'start resolve dependency', :green
 
       analyzer = Analyzer.new
       result = analyzer.analyze(path)
       pp result