lhj-tools 0.1.6 → 0.1.10

data/lib/lhj/command/yapi/formatters/command_context.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Lhj
+  module ErbFormatter
+    # context
+    class Context
+      def initialize(target)
+        @target = target
+      end
+
+      def fetch_binding
+        @target.instance_eval { binding }.tap do |bind|
+          decorate_binding(bind)
+        end
+      end
+
+      # 空方法
+      def decorate_binding(bind)
+        bind.eval('save = 1')
+      end
+    end
+  end
+end

data/lib/lhj/command/yapi/formatters/service.rb

@@ -0,0 +1,23 @@
+require 'erb'
+require_relative 'base'
+require_relative 'command_context'
+
+module Lhj
+  module ErbFormatter
+    # service
+    class Service < Base
+      # @param [String] name
+      def render(name = 'yapi')
+        template(name).result(Context.new(@runner).fetch_binding)
+      end
+
+      def template(name)
+        if RUBY_VERSION < '2.6'
+          ERB.new(File.read(File.join(File.dirname(__FILE__), 'template', "#{name}.erb")), nil, '-')
+        else
+          ERB.new(File.read(File.join(File.dirname(__FILE__), 'template', "#{name}.erb")), trim_mode: '-')
+        end
+      end
+    end
+  end
+end

data/lib/lhj/command/yapi.rb

@@ -2,9 +2,11 @@ require 'net/https'
 require 'uri'
 require 'json'
 require 'yaml'
+require 'lhj/command/yapi/formatters/service'
 
 module Lhj
   class Command
+    # generate model from yapi
     class Yapi < Command
       self.summary = '通过yapi接口生成请求'
       self.description = '更新 ~/.lhj/yapi.yml 文件配置后执行`lhj api`生成接口模型'
@@ -21,23 +23,53 @@ module Lhj
         @id = argv.option('id')
         @model_pre_name = argv.option('model-pre')
         @save = argv.flag?('save', false)
+        @debug = argv.flag?('debug', false)
         @http_url = ''
         @http_headers = []
-        @data_json = {}
-        @models = []
         @config_id = ''
         @config_model_pre = 'ML'
         @model_default_suffix = 'Model'
         @type_trans = {}
         @config_model_names = []
         @model_names = []
+        # <<<===== model for template
+        @result_model_name = ''
+        @param_model_name = ''
+        @model_template = ''
+        @desc = ''
+        @path = ''
+        @path_name = ''
+        @path_key = ''
+        @method = 'GET'
+        @title = ''
+        @username = ''
+        @req_body_is_json_schema = false
+        # =====>>>
         super
       end
 
-      def run
-        load_config
-        fetch_model
-        print_methods
+      def begin_title
+        '读取配置文件~/.lhj/yapi.yml'
+      end
+
+      def handle
+        process(yml_file) if File.exist?(yml_file)
+      end
+
+      def process(config_file)
+        load_config(config_file)
+        res_body = req_api_model
+        return unless res_body && res_body['errcode'].to_i.zero? && !res_body.empty?
+
+        # 1.print request result
+        print_res_body_model(res_body)
+        # 2.print request json body
+        print_req_body_model(res_body)
+        # 3.print request param
+        print_req_query(res_body['data'])
+        # 4.print request method
+        print_http_method(res_body['data'])
+        # 5.save to file
         save_to_file if @save
       end
 
@@ -49,13 +81,19 @@ module Lhj
       end
 
       def puts_h(str)
-        puts str
+        puts str.magenta
+        @h_file_array ||= []
+        @h_file_array << str
+      end
+
+      def puts_h_red(str)
+        puts str.red
         @h_file_array ||= []
         @h_file_array << str
       end
 
       def puts_m(str)
-        puts str
+        puts str.blue
         @m_file_array ||= []
         @m_file_array << str
       end
@@ -65,20 +103,23 @@ module Lhj
         file_name = gen_model_name('')
         h_file = File.join('.', "#{file_name}.h")
         m_file = File.join('.', "#{file_name}.m")
-        File.write(h_file, @h_file_array.join("\n")) if @h_file_array.count > 0
-        File.write(m_file, @m_file_array.join("\n")) if @m_file_array.count > 0
-        puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}"
+        File.write(h_file, @h_file_array.join("\n")) if @h_file_array.count.positive?
+        File.write(m_file, @m_file_array.join("\n")) if @m_file_array.count.positive?
+        puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}".green
       end
 
       def url_str
         "#{@http_url}#{api_id}"
       end
 
-      def load_config
-        yml = File.join(Lhj::Config.instance.home_dir, 'yapi.yml')
-        config = YAML.load_file(yml)
+      def yml_file
+        File.join(Lhj::Config.instance.home_dir, 'yapi.yml')
+      end
+
+      def load_config(file)
+        config = YAML.load_file(file)
         config.each do |k, v|
-          @http_headers << "#{k}=#{v}" if (k.eql?('__wpkreporterwid_') || k.eql?('_yapi_token') || k.eql?('_yapi_uid'))
+          @http_headers << "#{k}=#{v}" if k.eql?('__wpkreporterwid_') || k.eql?('_yapi_token') || k.eql?('_yapi_uid')
         end
         @http_url = config['url']
         @config_id = config['id']
@@ -100,79 +141,81 @@ module Lhj
         @config_model_suffix || @model_default_suffix
       end
 
-      def req_model
+      def req_api_model
         uri = URI.parse(url_str)
         req = Net::HTTP::Get.new(uri)
         req['Cookie'] = @http_headers.join('; ')
         res = Net::HTTP.start(uri.hostname, uri.port) do |http|
           http.request(req)
         end
-        puts res.body
-        JSON.parse(res.body)
+        res_json = JSON.parse(res.body)
+        puts res.body unless res_json['errcode'].to_i.zero?
+        puts res.body if @debug
+        res_json
       end
 
-      def fetch_model
-        res_json = req_model
-        begin
-          puts "\n<===============打印返回数据模型-Begin=====================>\n"
-          fetch_res_boy(res_json)
-          print_models
-          print_models_implementation
-          puts "\n<===============打印返回数据模型-End=====================>\n"
+      def print_res_body_model(res_json)
+        res_body = fetch_res_boy(res_json)
+        return unless res_body
+
+        puts "\n<===============打印返回数据模型-Begin=====================>\n".green
+        models = []
+        handle_model(res_body) do |model|
+          models << model
         end
-        begin
-          puts "\n<===============打印请求模型-Begin=====================>\n"
-          @models = []
-          @model_names = []
-          fetch_req_body(res_json)
-          print_models
-          print_models_implementation
-          puts "\n<===============打印请求模型-End=====================>\n"
+        print_models(models)
+        print_models_impl(models)
+        @result_model_name = models.last[:name]
+        puts "\n<===============打印返回数据模型-End=====================>\n".green
+      end
+
+      def print_req_body_model(res_json)
+        req_body = fetch_req_body(res_json)
+        return unless req_body
+
+        puts "\n<===============打印请求模型-Begin=====================>\n".green
+        models = []
+        handle_model(req_body) do |model|
+          models << model
         end
+        print_models(models)
+        print_models_impl(models)
+        @param_model_name = models.last[:name]
+        puts "\n<===============打印请求模型-End=====================>\n".green
       end
 
       def fetch_res_boy(res_json)
-        if res_json && res_json['data']
-          @data_json = res_json['data']
-          if @data_json['res_body']
-            begin
-              res_body = JSON.parse(@data_json['res_body'])
-              detail_obj = res_body['properties']['detailMsg'] || {}
-              detail_obj['name'] = gen_model_name('')
-              handle_model(detail_obj)
-            rescue => ex
-              puts ex
-            end
-          end
-        end
+        return if !res_json || !res_json['data'] || !res_json['data']['res_body']
+
+        res_body = JSON.parse(res_json['data']['res_body'])
+        return if !res_body['properties'] || !res_body['properties']['detailMsg']
+
+        result = res_body['properties']['detailMsg']
+        return unless result['type'] == 'object' || result['type'] == 'array'
+
+        result['name'] = gen_model_name('')
+        result
       end
 
       def fetch_req_body(res_json)
-        if res_json && res_json['data']
-          @data_json = res_json['data']
-          if @data_json['req_body_other']
-            begin
-              res_body = JSON.parse(@data_json['req_body_other'])
-              res_body['name'] = gen_model_name('')
-              handle_model(res_body)
-            rescue => ex
-              puts ex
-            end
-          end
-        end
+        return if !res_json || !res_json['data'] || !res_json['data']['req_body_other']
+
+        result = JSON.parse(res_json['data']['req_body_other'])
+        result['name'] = gen_model_name('')
+        result
       end
 
       def gen_model_name(name)
         n = name.gsub(/vo|model|list/i, '').gsub(/(.*)s$/, '\1').gsub(/^\w/) { $&.upcase }
         if n.length <= 0
-          n = @config_model_names.detect { |c| !@model_names.any? { |n| n.gsub(/#{model_pre}(.*)Model/, '\1').eql?(c) } }
+          n = @config_model_names.detect { |c| @model_names.none? { |na| na.gsub(/#{model_pre}(.*)Model/, '\1').eql?(c) } }
         end
         model_name = "#{model_pre}#{n}#{model_suffix}"
         @model_names << model_name
         model_name
       end
 
-      def handle_model(model)
+      def handle_model(model, &block)
         p_type = model['type']
         p_name = model['name']
         p_properties = model['properties']
@@ -191,22 +234,22 @@ module Lhj
                 c_model[:type_name] = 'NSString'
               else
                 c_model[:type_name] = o['name']
-                handle_model(o)
+                handle_model(o, &block)
               end
             end
             properties << c_model
           end
           p_model[:properties] = properties
-          @models << p_model
+          block[p_model] if block_given?
         when 'array'
           t = model['items']
           t['name'] = p_name
-          handle_model(t)
+          handle_model(t, &block)
         end
       end
 
-      def print_models
-        @models.each do |model|
+      def print_models(models)
+        models.each do |model|
           model_name = model[:name] || ''
           model_properties = model[:properties]
           puts_h "@interface #{model_name} : NSObject"
@@ -217,11 +260,11 @@ module Lhj
         end
       end
 
-      def print_models_implementation
-        @models.each do |model|
+      def print_models_impl(models)
+        models.each do |model|
           puts_m "@implementation #{model[:name]}"
           str = model[:properties].filter { |p| p[:type].eql?('array') && !p[:type_name].eql?('NSString') }.map { |p| "@\"#{p[:key]}\": #{p[:type_name]}.class" }.join(', ')
-          if str && str.length > 0
+          if str && str.length.positive?
             puts_m '+(NSDictionary *)modelContainerPropertyGenericClass {'
             puts_m "  return @{#{str}};"
             puts_m '}'
@@ -242,9 +285,9 @@ module Lhj
         case type
         when 'integer'
           puts_h "@property (nonatomic, assign) NSInteger #{key};"
-          if des.include?('分')
-            puts_h '/////////==========删掉其中一个属性'
-            puts_h "@property (nonatomic, strong) MLCentNumber *#{key};"
+          if des.include?('分') || des.include?('0.01')
+            puts_h_red '/////////==========删掉其中一个属性'
+            puts_h_red "@property (nonatomic, strong) MLCentNumber *#{key};"
           end
         when 'cent'
           puts_h "@property (nonatomic, strong) MLCentNumber *#{key};"
@@ -267,39 +310,34 @@ module Lhj
         end
       end
 
-      def print_methods
-        puts "\n<===============方法调用=====================>\n"
-        puts_m '/**'
-        puts_m " *  #{@data_json['title']} -- #{@data_json['username']}"
-        puts_m ' */'
-        key_str = @data_json['path'].split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { $&.upcase } }.join('')
-        key = "k#{key_str}URL"
-        puts_m "static NSString * const #{key} = @\"#{@data_json['path']}\";"
-        puts_m "\n\n"
+      # @param [Object] data
+      def print_req_query(data)
+        return unless data && data['req_query']
+
         puts_h '@interface MLParamModel : NSObject'
-        @data_json['req_query'].each do |h|
+        data['req_query'].each do |h|
           des = h['desc']
           puts_h "///#{des}  #{h['example']}"
           puts_h "@property (nonatomic, copy) NSString *#{h['name']};"
         end
         puts_h '@end'
         puts "\n\n"
-        model = @models.last
-        if @data_json['method'].eql?('GET')
-          puts_m "    [MLNetworkingManager getWithUrl:#{key} params:nil response:^(MLResponseMessage *responseMessage) {"
-          puts_m '        if (response.resultCode == 0 && !response.error){'
-          puts_m '            NSDictionary *detailMsg = response.detailMsg'
-          puts_m "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
-          puts_m '        }'
-          puts_m '    }];'
-        else
-          puts_m "    [MLNetworkingManager postWithUrl:#{key} params:nil response:^(MLResponseMessage *responseMessage) {"
-          puts_m '        if (response.resultCode == 0 && !response.error){'
-          puts_m '            NSDictionary *detailMsg = response.detailMsg'
-          puts_m "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
-          puts_m '        }'
-          puts_m '    }];'
-        end
+      end
+
+      def print_http_method(data)
+        return unless data
+
+        @path = data['path']
+        @method = data['method']
+        @title = data['title']
+        @username = data['username']
+        @desc = data['desc']
+        @method = 'JSON' if data['req_body_is_json_schema']
+        @path_name = @path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { $&.upcase } }.join('') if @path
+        @path_key = "k#{@path_name}URL"
+        puts "\n<===============方法调用=====================>\n".green
+        @model_template = Lhj::ErbFormatter::Service.new(self).render('model')
+        puts Lhj::ErbFormatter::Service.new(self).render('yapi').blue
       end
     end
   end

data/lib/lhj/command.rb

@@ -1,10 +1,13 @@
 require 'claide'
 require "tty-spinner"
+require 'lhj/action/sh_helper'
+require 'lhj/ui/ui'
 
 module Lhj
   # command plugin
   class Command < CLAide::Command
     require 'lhj/command/init'
+    require 'lhj/command/config'
     require 'lhj/command/head_import'
     require 'lhj/command/refactor_rename'
     require 'lhj/command/local/fetch'
@@ -20,21 +23,40 @@ module Lhj
     require 'lhj/command/rename_image'
     require 'lhj/command/trans'
     require 'lhj/command/yapi'
+    require 'lhj/command/file_path'
+    require 'lhj/command/http'
+    require 'lhj/command/sync_pod_repo'
 
     self.abstract_command = true
     self.command = 'lhj'
 
-    def spinner
-      @spinner ||= TTY::Spinner.new('[:spinner]正在处理...', output: $stdout, format: :dots)
+    def begin_title
+      '开始处理...'
     end
 
     def auto_spin
-      spinner.auto_spin
-      puts "\n"
+      puts begin_title.green
+      # @spinner.auto_spin
     end
 
     def stop
-      spinner.stop('Done!')
+      puts '处理完成'.green
+      # @spinner.success('Done!')
+    end
+
+    def initialize(argv)
+      super(argv)
+      @spinner = TTY::Spinner.new('[:spinner]...', output: $stdout, format: :dots, clear: true)
+    end
+
+    def run
+      auto_spin
+      handle
+      stop
+    end
+
+    def handle
+      raise 'A subclass should override the `Lhj::Command#run` method'
     end
 
   end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.6"
+    VERSION = "0.1.10"
   end
 end

data/lib/lhj/tools.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative "tools/version"
+require 'colored'
 
 module Lhj
   require 'lhj/config'

data/lib/lhj/tree/hash_walker.rb

@@ -2,7 +2,7 @@
 
 require 'pathname'
 
-require 'lhj/tree/node'
+require_relative 'node'
 
 module Lhj
   class Tree

data/lib/lhj/tree/path_walker.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require 'pathname'
-
-require 'lhj/tree/node'
+require_relative 'node'
 
 module Lhj
   class Tree

data/lib/lhj/tree/tree.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'lhj/tree/node'
-require 'lhj/tree/directory_renderer'
-require 'lhj/tree/number_renderer'
-require 'lhj/tree/hash_walker'
-require 'lhj/tree/path_walker'
+require_relative 'node'
+require_relative 'directory_renderer'
+require_relative 'number_renderer'
+require_relative 'hash_walker'
+require_relative 'path_walker'
 
 module Lhj
   class Tree

data/lib/lhj/ui/errors/lhj_common_error.rb

@@ -0,0 +1,19 @@
+require_relative 'lhj_exception'
+
+module Lhj
+  class Interface
+    # Super class for exception types that we do not want to record
+    # explicitly as crashes or user errors
+    class LhjCommonException < LhjException; end
+
+    # Raised when there is a build failure in xcodebuild
+    class LhjBuildFailure < LhjCommonException; end
+
+    # Raised when a test fails when being run by tools such as scan or snapshot
+    class LhjTestFailure < LhjCommonException; end
+
+    # Raise this type of exception when a failure caused by a third party
+    # dependency (i.e. xcodebuild, gradle, slather) happens.
+    class LhjDependencyCausedException < LhjCommonException; end
+  end
+end

data/lib/lhj/ui/errors/lhj_crash.rb

@@ -0,0 +1,11 @@
+require_relative 'lhj_exception'
+
+module Lhj
+  class Interface
+    class LhjCrash < LhjException
+      def prefix
+        '[LHJ_CRASH]'
+      end
+    end
+  end
+end

data/lib/lhj/ui/errors/lhj_error.rb

@@ -0,0 +1,25 @@
+require_relative 'lhj_exception'
+
+module Lhj
+  class Interface
+    class LhjError < LhjException
+      attr_reader :show_github_issues
+      attr_reader :error_info
+
+      def initialize(show_github_issues: false, error_info: nil)
+        @show_github_issues = show_github_issues
+        @error_info = error_info
+      end
+
+      def prefix
+        '[USER_ERROR]'
+      end
+    end
+  end
+end
+
+class Exception
+  # def fastlane_should_report_metrics?
+  #   return false
+  # end
+end

data/lib/lhj/ui/errors/lhj_exception.rb

@@ -0,0 +1,19 @@
+module Lhj
+  class Interface
+    class LhjException < StandardError
+      def prefix
+        '[LHJ_EXCEPTION]'
+      end
+
+      def caused_by_calling_ui_method?(method_name: nil)
+        return false if backtrace.nil? || backtrace[0].nil? || method_name.nil?
+        first_frame = backtrace[0]
+        if first_frame.include?(method_name) && first_frame.include?('interface.rb')
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/lhj/ui/errors/lhj_shell_error.rb

@@ -0,0 +1,11 @@
+require_relative 'lhj_exception'
+
+module Lhj
+  class Interface
+    class LhjShellError < LhjException
+      def prefix
+        '[SHELL_ERROR]'
+      end
+    end
+  end
+end

data/lib/lhj/ui/errors.rb

@@ -0,0 +1 @@
+Dir[File.dirname(__FILE__) + "/errors/*.rb"].each { |f| require_relative f }