lhj-tools 0.1.8 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ccdf622ec71e3f0f9b8c090e0587ecde300a61d05cccde837d3730b9b0fdebe
-  data.tar.gz: 92d0a661cf877bce61751e137f764155244cc3c8f629c910556c342b0766ae6d
+  metadata.gz: d53d84a79a0bde89e0f6f4299cd74bec6f34b50bb4ae9534047a1981e8ecf481
+  data.tar.gz: 5c11e01ef959b491a5bd03e8f737de5a68cd0b6dffba586015291717c71a1b39
 SHA512:
-  metadata.gz: 6fd7f9f518499f766beb7afd778e1542d61c40522958ff02ffdf5f3d167ed1260ea5e915de33848e0b2fbfc042313bfd96920f5436c72648e5222eddeda76d6b
-  data.tar.gz: b9df71c7bb5d7cdb63e18319fe23278d08d13d9a39d94133be4cf99cb8e3cc4f7f04f4f4cce73f528dbe88f757dcd5c0e87fb04a302cd2dd56939a78d89fcd75
+  metadata.gz: 60619bab6cafe45d4717c97d70fba34921dd79f2e21327bcfcdc155a76cc86a2341cef50c7506ed65980c610a2d97eb1b8d79c82641dd01faf077f581ac2d2e5
+  data.tar.gz: 95b1acbb95b7342da7bb4c946b7506c7572d619374f39906b0c6804e691f38e2388ed567c37b06b4c451e4aeb382d48fd13c5a90ae1fa6bcde9253104b092e94

data/lib/lhj/command/config/info.rb

@@ -3,43 +3,94 @@ require 'lhj/config'
 
 module Lhj
   class Command
+    # config
     class Config < Command
+      def initialize(argv)
+        @cli = HighLine.new
+        super
+      end
+
+      def show_config
+        config_arr = Dir.glob("#{config_dir}/**/*.yml")
+        config_arr.each_index { |i| puts "#{i}.#{File.basename(config_arr[i])}".yellow }
+        idx = ask_which_one
+        config_file = config_arr[idx]
+        handle_yaml(config_file)
+      end
+
+      def handle_yaml(file)
+        '子类实现'
+      end
+
+      def handle
+        show_config
+      end
+
+      def config_dir
+        Lhj::Config.instance.home_dir
+      end
+
+      def print_table(title, table_rows)
+        table = Terminal::Table.new title: title, headings: %w[键 值], rows: table_rows
+        puts table
+      end
+
       # show config info
       class Info < Config
         self.summary = '查看配置信息'
 
-        def initialize(argv)
-          @cli = HighLine.new
-          super
-        end
 
-        def handle
-          show_config
-        end
+        def handle_yaml(file)
+          table_rows = []
+          content = YAML.load_file(file)
 
-        def show_config
-          config_arr = Dir.glob("#{config_dir}/**/*.yml")
-          config_arr.each_index { |i| puts "#{i}.#{File.basename(config_arr[i])}".yellow }
-          idx = ask_which_one
-          config_file = config_arr[idx]
-          show_yaml(config_file)
-        end
+          case content
+          when Array
+            content.each do |row|
+              next unless row.is_a?(Hash)
+
+              row.each do |key, value|
+                table_rows << [key, value]
+              end
+              table_rows << :separator
+            end
+          when Hash
+            content.each do |key, value|
+              table_rows << [key, value]
+            end
+          end
 
-        def show_yaml(file)
-          table_rows = []
-          yaml = YAML.load_file(file)
-          yaml.each { |key, value| table_rows << [key, value] }
           title = File.basename(file).to_s
-          table = Terminal::Table.new title: title, headings: %w[键 值], rows: table_rows
-          puts table
+          print_table(title, table_rows) if table_rows.count.positive?
         end
 
         def ask_which_one
           @cli.ask('查看哪个配置: '.green).strip.to_i
         end
+      end
+
+      class Update < Config
+
+        def ask_which_one
+          @cli.ask('更新哪个配置: '.green).strip.to_i
+        end
+
+        def handle_yaml(file)
+          table_rows = []
+          content = YAML.load_file(file)
+
+          if content.is_a?(Hash)
+            content.each do |key, value|
+              table_rows << [key, value]
+            end
+          end
+
+          title = File.basename(file).to_s
+          print_table(title, table_rows) if table_rows.count.positive?
 
-        def config_dir
-          Lhj::Config.instance.home_dir
+          cmd = ['open']
+          cmd << file
+          Actions.sh(cmd.join(' '))
         end
       end
     end

data/lib/lhj/command/init.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'faraday'
 require 'faraday_middleware'
 require 'net/http'
@@ -9,18 +10,41 @@ module Lhj
     # sync config
     class Init < Command
       self.summary = '初始化控件'
-      self.description = '使用工具前先执行`lhj init`'
+      self.description = '使用工具前先执行`lhj init --url=http://xxx`'
 
-      def handle
-        FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
-        download_file
+      self.arguments = [
+        CLAide::Argument.new('url', true)
+      ]
+
+      def self.options
+        [
+          %w[--url 配置文件的url]
+        ]
+      end
+
+      def validate!
+        super
+        unless @url
+          path = File.join(target_folder, 'config_file.yml')
+          help! '配置url必须输入' unless File.exist?(path)
+        end
       end
 
-      def down_load_urls
-        %w[http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/localizable_config.yml
-           http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/oss_config.yml
-           http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/yapi.yml
-           http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/zh2hant.yml]
+      def initialize(argv)
+        @url = argv.option('url')
+        super
+      end
+
+      def handle
+        FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
+        if @url
+          file_path = file_name_from_url(@url)
+          save_url_to_file(@url, file_path)
+        else
+          file_path = File.join(target_folder, 'config_file.yml')
+        end
+        content = YAML.load_file(file_path)
+        download_file(content) if content.is_a?(Array)
       end
 
       def target_folder
@@ -39,14 +63,22 @@ module Lhj
         url.scan(%r{/([^/]+)}).flatten.last
       end
 
-      def download_file
-        down_load_urls.each do |url|
-          file_name = file_name_with_url(url)
-          file_path = File.join(target_folder, file_name)
-          save_file(url, file_path) unless File.exist?(file_path)
+      def download_file(urls)
+        urls.each do |url|
+          file_path = file_name_from_url(url)
+          save_url_to_file(url, file_path)
         end
         puts "工具初始化完成 \n"
       end
+
+      def save_url_to_file(url, file_path)
+        save_file(url, file_path) unless File.exist?(file_path)
+      end
+
+      def file_name_from_url(url)
+        file_name = file_name_with_url(url)
+        File.join(target_folder, file_name)
+      end
     end
   end
 end

data/lib/lhj/command/sync_pod_repo.rb

@@ -12,6 +12,10 @@ module Lhj
         super
       end
 
+      def begin_title
+        '读取映射文件~/.lhj/pod_config.yml'
+      end
+
       def handle
         sync
       end
@@ -39,7 +43,7 @@ module Lhj
           Actions.sh('git add .')
           puts '3.git add成功'.green
 
-          Actions.sh("git commit -m '同步主工程代码by fastlane'")
+          Actions.sh("git commit -m '使用工具同步主工程代码'")
           puts '4.git 提交成功'.green
 
           Actions.sh('git push')
@@ -100,13 +104,11 @@ module Lhj
         cmd = ['git tag']
         cmd << '--force'
         cmd << tag
-        UI.message("Adding git tag '#{tag}' 🎯.")
         Actions.sh(cmd.join(' '))
       end
 
       def push_tag
         cmd = ['git push --tags']
-        UI.message('git push --tags 🎯.')
         Actions.sh(cmd.join(' '))
       end
 

data/lib/lhj/command/view.rb

@@ -47,102 +47,118 @@ module Lhj
         print_value
       end
 
+      def puts_d(str)
+        puts str.blue
+      end
+
+      def puts_i(str)
+        puts str.blue
+      end
+
+      def puts_l(str)
+        puts str.blue
+      end
+
+      def puts_v(str)
+        puts str.blue
+      end
+
       def print_declare
         names.each do |name|
-          puts '///'
-          puts "@property (nonatomic, strong) #{type} *#{name};"
+          puts_d '///'
+          puts_d "@property (nonatomic, strong) #{type} *#{name};"
         end
       end
 
       def print_instance
         names.each do |name|
-          puts "-(#{type} *)#{name}"
-          puts '{'
-          puts "    if(!_#{name}){"
+          puts_i "-(#{type} *)#{name}"
+          puts_i '{'
+          puts_i "    if(!_#{name}){"
           print_alloc(name)
-          puts "        _#{name}.translatesAutoresizingMaskIntoConstraints = NO;"
+          puts_i "        _#{name}.translatesAutoresizingMaskIntoConstraints = NO;"
           print_property(name)
-          puts '    }'
-          puts "    return _#{name};"
-          puts '}'
-          puts "\n"
+          puts_i '    }'
+          puts_i "    return _#{name};"
+          puts_i '}'
+          puts_i "\n"
         end
       end
 
       def print_alloc(name)
         case type
         when 'UIImageView'
-          puts "        _#{name} = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@\"xxxx\"]];"
+          puts_i "        _#{name} = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@\"xxxx\"]];"
         when 'UIButton'
-          puts "        _#{name} = [UIButton buttonWithType:UIButtonTypeCustom];"
+          puts_i "        _#{name} = [UIButton buttonWithType:UIButtonTypeCustom];"
         when 'UITableView'
-          puts "        _#{name} = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];"
+          puts_i "        _#{name} = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];"
         else
-          puts "        _#{name} = [[#{type} alloc] init];"
+          puts_i "        _#{name} = [[#{type} alloc] init];"
         end
       end
 
       def print_property(name)
         case type
         when 'UILabel'
-          puts "        _#{name}.textColor = kSetCOLOR(0x333333);"
-          puts "        _#{name}.text = @\"xxxxxxxx\";"
-          puts "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
-          puts "        _#{name}.textAlignment = NSTextAlignmentCenter;"
+          puts_i "        _#{name}.textColor = kSetCOLOR(0x333333);"
+          puts_i "        _#{name}.text = @\"xxxxxxxx\";"
+          puts_i "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
+          puts_i "        _#{name}.textAlignment = NSTextAlignmentCenter;"
         when 'UIImageView'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
-          puts "        _#{name}.contentMode = UIViewContentModeScaleAspectFit;"
-          puts "        _#{name}.clipsToBounds = YES;"
-          puts "        _#{name}.layer.cornerRadius = 6.0f;"
-          puts "        _#{name}.layer.borderColor = kLineColor.CGColor;"
-          puts "        _#{name}.layer.borderWidth = 0.5;"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        _#{name}.contentMode = UIViewContentModeScaleAspectFit;"
+          puts_i "        _#{name}.clipsToBounds = YES;"
+          puts_i "        _#{name}.layer.cornerRadius = 6.0f;"
+          puts_i "        _#{name}.layer.borderColor = kLineColor.CGColor;"
+          puts_i "        _#{name}.layer.borderWidth = 0.5;"
         when 'UITextField'
-          puts "        _#{name}.textColor = kSetCOLOR(0x333333);"
-          puts "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
+          puts_i "        _#{name}.textColor = kSetCOLOR(0x333333);"
+          puts_i "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
         when 'UIView'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
         when 'UIStackView'
-          puts "        _#{name}.axis = UILayoutConstraintAxisHorizontal;"
-          puts "        _#{name}.distribution = UIStackViewDistributionFillEqually;"
+          puts_i "        _#{name}.axis = UILayoutConstraintAxisHorizontal;"
+          puts_i "        _#{name}.distribution = UIStackViewDistributionFillEqually;"
         when 'UITableView'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
-          puts "        _#{name}.delegate = self;"
-          puts "        _#{name}.delegate = self;"
-          puts "        _#{name}.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
-          puts "        _#{name}.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
-          puts "        _#{name}.separatorStyle = UITableViewCellSeparatorStyleNone;"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        _#{name}.delegate = self;"
+          puts_i "        _#{name}.delegate = self;"
+          puts_i "        _#{name}.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
+          puts_i "        _#{name}.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
+          puts_i "        _#{name}.separatorStyle = UITableViewCellSeparatorStyleNone;"
         when 'UIButton'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
-          puts "        [_#{name} setTitle:@\"xxx\" forState:UIControlStateNormal];"
-          puts "        [_#{name} setTitleColor:kSetCOLOR(0x999999) forState:UIControlStateNormal];"
-          puts "        _#{name}.titleLabel.font = [UIFont systemFontOfSize:14.0 weight:UIFontWeightRegular];"
-          puts "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateNormal];"
-          puts "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateSelected];"
-          puts "        [_#{name} addTarget:self action:@selector(actionHandler:) forControlEvents:UIControlEventTouchUpInside];"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        [_#{name} setTitle:@\"xxx\" forState:UIControlStateNormal];"
+          puts_i "        [_#{name} setTitleColor:kSetCOLOR(0x999999) forState:UIControlStateNormal];"
+          puts_i "        _#{name}.titleLabel.font = [UIFont systemFontOfSize:14.0 weight:UIFontWeightRegular];"
+          puts_i "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateNormal];"
+          puts_i "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateSelected];"
+          puts_i "        [_#{name} addTarget:self action:@selector(actionHandler:) forControlEvents:UIControlEventTouchUpInside];"
         end
       end
 
       def print_layout
         names.each do |name|
-          puts "[contentView addSubview:self.#{name}];"
-          puts "[self.#{name}.leadingAnchor constraintEqualToAnchor:contentView.leadingAnchor constant:0].active = YES;"
-          puts "[self.#{name}.trailingAnchor constraintEqualToAnchor:contentView.trailingAnchor constant:0].active = YES;"
-          puts "[self.#{name}.topAnchor constraintEqualToAnchor:contentView.topAnchor].active = YES;"
-          puts "[self.#{name}.bottomAnchor constraintEqualToAnchor:contentView.bottomAnchor].active = YES;"
-          puts "[self.#{name}.widthAnchor constraintEqualToConstant:80].active = YES;"
-          puts "[self.#{name}.heightAnchor constraintEqualToConstant:80].active = YES;"
+          puts_l "[contentView addSubview:self.#{name}];"
+          puts_l "[self.#{name}.leadingAnchor constraintEqualToAnchor:contentView.leadingAnchor constant:0].active = YES;"
+          puts_l "[self.#{name}.trailingAnchor constraintEqualToAnchor:contentView.trailingAnchor constant:0].active = YES;"
+          puts_l "[self.#{name}.topAnchor constraintEqualToAnchor:contentView.topAnchor].active = YES;"
+          puts_l "[self.#{name}.bottomAnchor constraintEqualToAnchor:contentView.bottomAnchor].active = YES;"
+          puts_l "[self.#{name}.widthAnchor constraintEqualToConstant:80].active = YES;"
+          puts_l "[self.#{name}.heightAnchor constraintEqualToConstant:80].active = YES;"
           if type.eql?('UILabel')
-            puts "[self.#{name} setContentHuggingPriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
-            puts "[self.#{name} setContentCompressionResistancePriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
+            puts_l "[self.#{name} setContentHuggingPriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
+            puts_l "[self.#{name} setContentCompressionResistancePriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
           end
-          puts "\n\n"
+          puts_l "\n\n"
         end
       end
 
       def print_value
         names.each do |name|
           if type.eql?('UILabel')
-            puts "self.#{name}.text = @\"xxxxx\";"
+            puts_v "self.#{name}.text = @\"xxxxx\";"
           end
         end
       end

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

@@ -0,0 +1,15 @@
+module Lhj
+  # format
+  module ErbFormatter
+    # base
+    class Base
+      def initialize(runner)
+        @runner = runner
+      end
+
+      def render
+        'Implement global help here'
+      end
+    end
+  end
+end

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/formatters/template/model.erb

@@ -0,0 +1,10 @@
+<% if @result_model_name %>
+          if (responseMessage.resultCode == 0 && responseMessage.error == nil) {
+              if ([responseMessage.detailMsg isKindOfClass:[NSDictionary class]]) {
+                  <%= @result_model_name %> *info = <%= @result_model_name %> yy_modelWithDictionary:responseMessage.detailMsg];
+                  callback(info,responseMessage);
+              }
+          } else {
+              callback(nil,responseMessage);
+          }
+<% end %>

data/lib/lhj/command/yapi/formatters/template/yapi.erb

@@ -0,0 +1,28 @@
+/**
+*  <%= @title %> -- <%= @username %>
+*  <%= @desc %>
+*/
+static NSString * const <%= @path_key %> = @"<%= @path %>";
+
+<% if @method == 'GET' -%>
++(void)get<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<% unless @result_model_name.empty? -%><%= @result_model_name %> *model, <% end -%>MLResponseMessage *response))callback
+{
+    [MLNetworkingManager getWithUrl:<%= @path_key %> params:params response:^(MLResponseMessage *responseMessage) {
+          <%= @model_template %>
+    }];
+}
+<% elsif @method == 'JSON' -%>
++(void)postJson<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<% unless @result_model_name.empty? -%><%= @result_model_name %> *model, <% end -%>MLResponseMessage *response))callback
+{
+    [MLNetworkingManager requestJsonWithUrl:<%= @path_key %> httpMedth:kRequestMethodPOST params:param response:^(MLResponseMessage *responseMessage) {
+          <%= @model_template %>
+    }];
+}
+<% else -%>
++(void)post<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<% unless @result_model_name.empty? -%><%= @result_model_name %> *model, <% end -%>MLResponseMessage *response))callback
+{
+    [MLNetworkingManager postWithUrl:<%= @path_key %> params:params response:^(MLResponseMessage *response) {
+          <%= @model_template %>
+    }];
+}
+<% end -%>

data/lib/lhj/command/yapi.rb

@@ -2,6 +2,7 @@ require 'net/https'
 require 'uri'
 require 'json'
 require 'yaml'
+require 'lhj/command/yapi/formatters/service'
 
 module Lhj
   class Command
@@ -22,23 +23,57 @@ 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 begin_title
+        '读取配置文件~/.lhj/yapi.yml'
+      end
+
       def handle
-        load_config
-        fetch_model
-        print_methods
+        process(yml_file) if File.exist?(yml_file)
+      end
+
+      def process(config_file)
+        load_config(config_file)
+        res_body = req_api_model
+        unless res_body['errcode'].to_i.zero?
+          puts '请修改 ~/.lhj/yapi.yml文件的对应的__wpkreporterwid_,_yapi_token,_yapi_uid这三个值'.red
+          return
+        end
+        return unless res_body && !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
 
@@ -55,6 +90,12 @@ module Lhj
         @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.blue
         @m_file_array ||= []
@@ -75,9 +116,12 @@ module Lhj
         "#{@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')
         end
@@ -101,79 +145,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 unless res.body['errcode'].to_i.zero?
-        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".green
-          fetch_res_boy(res_json)
-          print_models
-          print_models_implementation
-          puts "\n<===============打印返回数据模型-End=====================>\n".green
+      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".green
-          @models = []
-          @model_names = []
-          fetch_req_body(res_json)
-          print_models
-          print_models_implementation
-          puts "\n<===============打印请求模型-End=====================>\n".green
+        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']
@@ -192,22 +238,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"
@@ -218,8 +264,8 @@ 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.positive?
@@ -243,9 +289,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};"
@@ -268,39 +314,36 @@ module Lhj
         end
       end
 
-      def print_methods
-        puts "\n<===============方法调用=====================>\n".green
-        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
+
+        @param_model_name = 'MLParamModel' if @param_model_name.empty?
+      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

@@ -30,19 +30,23 @@ module Lhj
     self.abstract_command = true
     self.command = 'lhj'
 
+    def begin_title
+      '开始处理...'
+    end
+
     def auto_spin
-      print "正在处理...\n".green
+      puts begin_title.green
       # @spinner.auto_spin
     end
 
     def stop
-      print '处理完成'.green
+      puts '处理完成'.green
       # @spinner.success('Done!')
     end
 
     def initialize(argv)
       super(argv)
-      @spinner = TTY::Spinner.new('...', output: $stdout, format: :dots, clear: true)
+      @spinner = TTY::Spinner.new('[:spinner]...', output: $stdout, format: :dots, clear: true)
     end
 
     def run

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.8"
+    VERSION = "0.1.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.12
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -142,16 +142,16 @@ dependencies:
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -297,6 +297,11 @@ files:
 - lib/lhj/command/trans.rb
 - lib/lhj/command/view.rb
 - lib/lhj/command/yapi.rb
+- lib/lhj/command/yapi/formatters/base.rb
+- lib/lhj/command/yapi/formatters/command_context.rb
+- lib/lhj/command/yapi/formatters/service.rb
+- lib/lhj/command/yapi/formatters/template/model.erb
+- lib/lhj/command/yapi/formatters/template/yapi.erb
 - lib/lhj/config.rb
 - lib/lhj/helper/local_config.rb
 - lib/lhj/helper/oss_config.rb