lhj-tools 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55ea8babd6d7b1aa8bdbc376bd7c624620dc4b868be6fa6decf8ba46443f4e4d
-  data.tar.gz: e802b2a688c86d442a6f2776b7d6ce0abf93edf82ef3b3fe2bdf4624ba8f4aa4
+  metadata.gz: a1d71c98366bbad8074af38f9c4381db08fb138457a61cd119ff3f3405ac9ba7
+  data.tar.gz: 37d5b49a7403e202dea0c557bcbe17e35e4d3483b2e4a8fa4868d58527d5d545
 SHA512:
-  metadata.gz: e23b3398d6c629c30814c5a3b0354430b215ce0d0b9f6cab8e499a87da74d0fc6d3a7c174e81d31d53e89a6eab603bc2f572e428f6715e3ab71a739f7e03a24d
-  data.tar.gz: 11872fd8fefb0e3dc88e344f20755bbb1a2615e4e28c91e09e20ff9c616379d35f6a33d57cd0b670a115e31e5725f121919ec74cd5db512423b9a36a28dfb70a
+  metadata.gz: 5a190d0b7d8adf62726401fac4c550acf6b70eb08c0a1775e18df2a724e2156b0c9b4a0b04bd009a8c9b2a3be2b44bb571344058ad5590115088203e13b4f417
+  data.tar.gz: dc1ac168f906f8a0db1675ae3dc6ec93dbec6424a7edcfbabe80c3308031f969f4db91057e0783057e4d1e04922fbb70bf3aa326ceec210a75eab3fc23d1f9e1

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

@@ -27,9 +27,29 @@ module Lhj
 
         def show_yaml(file)
           table_rows = []
-          yaml = YAML.load_file(file)
-          yaml.each { |key, value| table_rows << [key, value] }
+          content = YAML.load_file(file)
+
+          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
+
           title = File.basename(file).to_s
+          print_table(title, table_rows) if table_rows.count.positive?
+        end
+
+        def print_table(title, table_rows)
           table = Terminal::Table.new title: title, headings: %w[键 值], rows: table_rows
           puts table
         end

data/lib/lhj/command/init.rb

@@ -9,20 +9,34 @@ 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 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
-           http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/pod_config.yml
-           http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/main_config.yml]
+      def validate!
+        super
+        help! '配置url必须输入' unless @url
+      end
+
+      def initialize(argv)
+        @url = argv.option('url')
+        super
+      end
+
+      def handle
+        FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
+        file_path = file_name_from_url(@url)
+        save_url_to_file(@url, file_path)
+        content = YAML.load_file(file_path)
+        download_file(content) if content.is_a?(Array)
       end
 
       def target_folder
@@ -41,14 +55,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

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.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,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 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
+        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
 
@@ -55,6 +86,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 +112,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 +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 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 +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"
@@ -218,8 +260,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 +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};"
@@ -268,39 +310,34 @@ 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
+      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,8 +30,12 @@ module Lhj
     self.abstract_command = true
     self.command = 'lhj'
 
+    def begin_title
+      '开始处理...'
+    end
+
     def auto_spin
-      puts "开始处理...\n".green
+      puts begin_title.green
       # @spinner.auto_spin
     end
 
@@ -42,7 +46,7 @@ module Lhj
 
     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.9"
+    VERSION = "0.1.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-01-28 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,9 @@ 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/config.rb
 - lib/lhj/helper/local_config.rb
 - lib/lhj/helper/oss_config.rb