yk_command 0.4.5 → 0.4.6

data/lib/yk_command/commands.rb

@@ -1,332 +1,41 @@
-require 'colored2'
 require 'thor'
-require 'fileutils'
-require 'psych'
-require 'yaml'
-require 'yk_command/analyze'
-require 'yk_command/request'
-require 'git'
+
+require 'yk_command/analyze/analyze'
+require 'yk_command/analyze/request'
+require 'yk_command/module/yk_module'
 
 module YkCommand
+
   class CLI < Thor
     include Thor::Actions
 
-    CONFIG_FILE = '.YKModuleFilesConfig.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)
-      @name = name
-      @module = @name
-      @lang = lang
-      @class_prefix = class_prefix
-      @final_path = "#{path}/#{@name}"
-      @author = author
-      @prefixed_module = @class_prefix + @module
-
-      say "generating file in path:#{@final_path}", :green
 
-      if File.exist?(@final_path.to_s)
-        say "#{@final_path} 已存在:", :red
-      else
-        prepare_folder
-        if File.exist?("#{@final_path}/configure")
-          system("#{@final_path}/configure", @name, @lang, @class_prefix, *@additional_args)
-        else
-          say 'Template does not have a configure file', :red
-        end
-        yk_module_folders
-        yk_template_files
-      end
+      YkModule.new(self .args,self .options).generate(path, name, lang, class_prefix, author)
     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}"
-      config = File.exist?(config_file_path) ? YAML.load_file(config_file_path) : {}
-      input_name = ask("Project name [#{config[:project]}] ?")
-
-      if input_name != ''
-        @name = input_name
-        config[:project] = input_name if input_name != config[:project]
-      else
-        @name = config[:project]
-      end
-
-      File.open(config_file_path, 'w') do |f|
-        f.write config.to_yaml
-      end
-
-      @final_path = "#{path}/#{@name}"
-
-      if File.exist?(@final_path.to_s)
-        say "#{@final_path} 已存在:", :red
-      else
-        prepare_folder
-        read_config(path)
-
-        if File.exist?("#{@final_path}/configure")
-          system("#{@final_path}/configure", @name, @lang, @class_prefix, *@additional_args)
-        else
-          say 'Template does not have a configure file', :red
-        end
-
-        yk_module_folders
-        yk_template_files
-
-      end
-    end
-
-    no_commands do
-      def read_config(path)
-        config_file_path = "#{path}/#{CONFIG_FILE}"
-        config = File.exist?(config_file_path) ? YAML.load_file(config_file_path) : {}
-
-        project = @name
-        say '语言:', :green
-        language = ask("Project language [#{config[:language]}] ?", limited_to: ['objc', 'swift', ''])
-        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[:class_prefix] = class_prefix.empty? ? config[:class_prefix] || '' : class_prefix
-        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')
-        @lang = config[:language]
-      end
-
-      def prepare_folder
-        host_a = 'yeah'
-        host_b = 'ka'
-        template_repo_url = "http://gitlab.#{host_a}#{host_b}.com/App/iOS/YKComponents/YKProjectTemplate.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.remove_dir("#{@final_path}/.git", true)
-      end
-
-      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
-
-      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'
-        }
-
-        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.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']
-        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
-
-        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'
-        }
-
-        private_level_folder_files.each do |file_name, folder|
-          final_prefix = @prefixed_module
-          if file_name == 'PrefixHeader.pch'
-            final_prefix = @module
-          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
-        end
-
-        Dir.chdir("#{@final_path}/Example") do
-          system 'pod install'
-          system "open './#{@name}.xcworkspace'"
-        end
-      end
-
+      YkModule.new(self .args,self .options ).create(path)
     end
 
-    require 'gitlab'
-    require 'gitlab/paginated_response'
-
-    include Gitlab
     desc 'dependency <Podfile.lock Path>', '解析Podfile.lock'
     method_option :dependency, aliases: '-d'
 
     def dependency(path = nil)
-      say "\ncurrent working folder: #{path}\n"
-      project_path = ''
-      project_name = ''
-      begin
-        g = Git.open(path)
-        project_path = Pathname.new(g.lib.git_work_dir)
-        project_name = g.config['remote.origin.url'].split('/').last.split('.')[0]
-
-        unless project_name.empty?
-          podfiles = Dir.glob("#{path}/**/Podfile")
-          if !podfiles.empty?
-            begin
-              project_path = podfiles[podfiles.length - 1]
-              podfile_dir = Pathname.new(project_path).dirname.to_s
-              say "start analyze... path contain [Podfile ,Pods/ ,Podfile.lock]  is #{podfile_dir} \n ", :green
-              result = Analyzer.new.analyze(podfile_dir)
-              app_info = Request.new.get_project_info(project_name)
-              if app_info['id']
-                say "uploading dependencies for project  #{project_name}  ..."
-                upload_res = Request.new.upload_app_dependency(app_info['id'], result)
-                if upload_res['code'] == 0
-                  say 'uploaded , finished ', :green
-                  say "\n<-- \n"
-                  { 'code' => '0', 'name' => project_name }
-                else
-                  say "Error :upload dependencies for project #{project_name} -  #{app_info["id"]} failed ", :red
-                  say "\n<-- \n"
-                  { 'code' => '1', 'name' => project_name }
-                end
-              else
-                say "Error :Get App project ID failed , #{project_name}", :red
-                say "\n<-- \n"
-                { 'code' => '1', 'name' => project_name }
-              end
-
-            rescue
-              say "Error : #{$!}", :red
-              say "Error : #{ $@}", :red
-              say "Skip folder :  #{podfile_dir}  ", :red
-              say "\n<-- \n"
-              { 'code' => '1', 'name' => project_name }
-            end
-
-          else
-            say "No podfile find ,Skip folder :  #{project_name}  ", :yellow
-            say "\n<-- \n"
-            { 'code' => '2', 'name' => '' }
-          end
-
-        end
-
-      rescue
-        say "No .git folder find  in #{path} ,skip folder ...   ", :yellow
-        say "\n<--\n", :yellow
-        { 'code' => '2', 'name' => '' }
-      end
-
+      Analyzer.new.dependency path
     end
 
     desc 'workspace_analyze <AppHost Path>', '遍历项目目录 批量上传项目依赖信息'
     method_option :workspace_analyze, aliases: '-w'
 
     def workspace_analyze(path = nil)
-      Dir.chdir(path)
-      subdir_list = Dir['*'].reject { |o| not File.directory?(o) }
-      say "Start in Workspace : #{path}  ...", :yellow
-      subdir_list.each do |project_dir|
-        say "\n#{Pathname.new(project_dir).split[1]}  ", :yellow
-      end
-      say "\n ... start scanning to analyze ...\n\n"
-
-      success_count = 0
-      success_name_list = []
-      failed_count = 0
-      failed_name_list = []
-      skip_count = 0
-
-      subdir_list.each { |project_dir|
-        project_path = "#{path}/#{project_dir}"
-        res = dependency project_path
-        if res['code'] == '0'
-          success_count += 1
-          success_name_list << res['name']
-        elsif res['code'] == '1'
-          failed_count += 1
-          failed_name_list << res['name']
-        else
-          skip_count += 1
-        end
-      }
-
-      say "\nworkspace analyze done ! ..."
-      say "success:#{success_count},#{success_name_list}", :green
-      say "failed :#{failed_count},#{failed_name_list}", :red
-      say "skip   :#{skip_count}", :yellow
-
+      Analyzer.new.workspace_analyze path
     end
 
   end

data/lib/yk_command/module/yk_module.rb

@@ -0,0 +1,226 @@
+
+require 'colored'
+require 'fileutils'
+require 'psych'
+require 'yaml'
+require 'thor/actions'
+
+
+module YkCommand
+
+  CONFIG_FILE = '.YKModuleFilesConfig.yml'.freeze
+
+  class YkModule < Thor
+    include Thor::Actions
+    no_commands do
+
+      def initialize(args = [], options = {}, config = {})
+        super
+
+      end
+
+      def generate(path = nil, name, lang, class_prefix, author)
+
+        @name = name
+        @module = @name
+        @lang = lang
+        @class_prefix = class_prefix
+        @final_path = "#{path}/#{@name}"
+        @author = author
+        @prefixed_module = @class_prefix + @module
+
+        say "generating file in path:#{@final_path}", :green
+
+        if File.exist?(@final_path.to_s)
+          say "#{@final_path} 已存在:", :red
+        else
+          prepare_folder
+          if File.exist?("#{@final_path}/configure")
+            system("#{@final_path}/configure", @name, @lang, @class_prefix, *@additional_args)
+          else
+            say 'Template does not have a configure file', :red
+          end
+          yk_module_folders
+          yk_template_files
+        end
+      end
+
+      def create(path = nil)
+
+        path = Dir.pwd if path.nil?
+        say '模块名:', :green
+        config_file_path = "#{path}/#{CONFIG_FILE}"
+        config = File.exist?(config_file_path) ? YAML.load_file(config_file_path) : {}
+        input_name = ask("Project name [#{config[:project]}] ?")
+
+        if input_name != ''
+          @name = input_name
+          config[:project] = input_name if input_name != config[:project]
+        else
+          @name = config[:project]
+        end
+
+        File.open(config_file_path, 'w') do |f|
+          f.write config.to_yaml
+        end
+
+        @final_path = "#{path}/#{@name}"
+
+        if File.exist?(@final_path.to_s)
+          say "#{@final_path} 已存在:", :red
+        else
+          prepare_folder
+          read_config(path)
+
+          if File.exist?("#{@final_path}/configure")
+            system("#{@final_path}/configure", @name, @lang, @class_prefix, *@additional_args)
+          else
+            say 'Template does not have a configure file', :red
+          end
+
+          yk_module_folders
+          yk_template_files
+
+        end
+      end
+
+      def read_config(path)
+        config_file_path = "#{path}/#{CONFIG_FILE}"
+        config = File.exist?(config_file_path) ? YAML.load_file(config_file_path) : {}
+
+        project = @name
+        say '语言:', :green
+        language = ask("Project language [#{config[:language]}] ?", limited_to: ['objc', 'swift', ''])
+        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[:class_prefix] = class_prefix.empty? ? config[:class_prefix] || '' : class_prefix
+        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')
+        @lang = config[:language]
+      end
+
+      def prepare_folder
+        host_a = 'yeah'
+        host_b = 'ka'
+        template_repo_url = "http://gitlab.#{host_a}#{host_b}.com/App/iOS/YKComponents/YKProjectTemplate.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.remove_dir("#{@final_path}/.git", true)
+      end
+
+      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::YkModule.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'
+        }
+
+        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.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']
+        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
+
+        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'
+        }
+
+        private_level_folder_files.each do |file_name, folder|
+          final_prefix = @prefixed_module
+          if file_name == 'PrefixHeader.pch'
+            final_prefix = @module
+          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
+        end
+
+        Dir.chdir("#{@final_path}/Example") do
+          system 'pod install'
+          system "open './#{@name}.xcworkspace'"
+        end
+      end
+    end
+  end
+end

data/lib/yk_command/version.rb

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

data/yk_command.gemspec

@@ -41,16 +41,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'cocoapods'
   spec.add_development_dependency 'cocoapods-core'
   spec.add_development_dependency 'httparty'
-  spec.add_development_dependency 'gitlab'
 
   spec.add_dependency 'git'
   spec.add_dependency 'bundler'
   spec.add_dependency 'thor'
   spec.add_dependency 'xcodeproj'
   spec.add_dependency 'colored'
-  spec.add_dependency 'pathname'
+  spec.add_dependency 'colored2'
+  spec.add_dependency 'pathname','0.1.0'
   spec.add_dependency 'httparty'
-  spec.add_dependency 'gitlab'
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 end