lhj-tools 0.1.65 → 0.1.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a240ecea0c02bc2351914fa2106519b155f9a10dd6e0cd949633ce61b38008bc
-  data.tar.gz: 10726a49406152ef2fdf5033566d0b5a0641f60955c61dc64d46400019816d7c
+  metadata.gz: 6df1841d5e97dbe6377056223a5f2c0ccfed590f6747080384bdc3cbace9d074
+  data.tar.gz: bfc4897e5922f4375142b45d48b2f599e82a36915e0017023fd5a956aa2970aa
 SHA512:
-  metadata.gz: b0c20d242daf9fc0bae5c8fc4823f25d92098637dd72740cc7380b9512902a73cb7a5aa0181b6b5d7df2fa4d30cd236966a63d06f841716347fe8c2298c75953
-  data.tar.gz: 4041061d05b0003afa3579812b16abccfdcd150347d7f6099ad9281d1dd71a77688c00c4aecd5dd8e2210c2f700ae25d0f0d864a74279cdcfee729dfdf4ab333
+  metadata.gz: 5da3a711e8d422449eb1d71edbb6587d9a0c90dd65af4bca924cc3979e1954f0f3743f9b2f883b3f630430f32117618424b0179c147b2fa3fdf212800fb1cbd4
+  data.tar.gz: 5dc4eaf4e99f1a195dfce0f9b9a8411db60dd1b5415264a01b61e8424c5da6ccf4bfeec34d410216d966bdbeeeeae1f21827e40d2081d85790d0772568a0553a

data/lib/lhj/command/yapi.rb

@@ -3,6 +3,8 @@ require 'uri'
 require 'json'
 require 'yaml'
 require 'lhj/command/yapi/formatters/service'
+require 'lhj/helper/dingtalk_config'
+require 'lhj/helper/erb_template_helper'
 
 module Lhj
   class Command
@@ -22,10 +24,13 @@ module Lhj
       def initialize(argv)
         @id = argv.option('id')
         @model_pre_name = argv.option('model-pre')
+        @language = argv.option('lan', 'oc')
         @save = argv.flag?('save', false)
+        @sync = argv.flag?('sync', false)
+        @notify = argv.flag?('notify', false)
         @debug = argv.flag?('debug', false)
-        @language = argv.option('lan', 'oc')
-        @http_url = ''
+        @sync = true if @notify
+        @save = true if @sync
         @http_headers = []
         @config_id = ''
         @config_model_pre = 'ML'
@@ -33,26 +38,10 @@ module Lhj
         @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
-        # =====>>>
+        @http_url = ''
         super
       end
 
-      def begin_title
-        '读取配置文件~/.lhj/yapi.yml'
-      end
-
       def handle
         process(yml_file) if File.exist?(yml_file)
       end
@@ -67,22 +56,19 @@ module Lhj
         return unless res_body && !res_body.empty?
 
         # 1.print request result
-        print_res_body_model(res_body)
+        result_model_name = print_res_body_model(res_body)
         # 2.print request json body
-        print_req_body_model(res_body)
+        param_model_name = 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'])
+        service_code = print_http_method(res_body['data'], result_model_name, param_model_name)
         # 5.save to file
-        save_to_file if @save
-      end
-
-      def test_ding
-        require 'net/http'
-        require 'uri'
-        body = { 'msgtype' => 'text', 'text' => { 'content' => 'error:上传蒲公英超时失败!' } }.to_json
-        Net::HTTP.post(URI('https://oapi.dingtalk.com/robot/send?access_token=6a3519057170cdb1b7274edfe43934c84a0062ffe2c9bcced434699296a7e26e'), body, 'Content-Type' => 'application/json')
+        file_map = save_to_file(service_code) if @save
+        # 6.push to git
+        push_to_git if @sync
+        # 7.notify robot
+        notify_robot(file_map) if @notify
       end
 
       def puts_h(str)
@@ -103,17 +89,43 @@ module Lhj
         @m_file_array << str
       end
 
-      def save_to_file
+      def sub_folder_name
+        return @sub_folder_name if @sub_folder_name
+
+        time = Time.now
+        @sub_folder_name ||= time.strftime('%Y%m%d%H%M%S')
+        @sub_folder_name
+      end
+
+      def save_to_file(service_code)
         @model_names = []
+        model_name = @config_model_names.frist
         file_name = gen_model_name('')
-        time = Time.now
-        folder_name = time.strftime('%Y%m%d%H%M%S')
-        FileUtils.mkdir_p(File.expand_path(folder_name, '.')) unless File.exist?(File.expand_path(folder_name, '.'))
-        h_file = File.join('.', folder_name, "#{file_name}.h")
-        m_file = File.join('.', folder_name, "#{file_name}.m")
+        unless File.exist?(File.expand_path(sub_folder_name, '.'))
+          FileUtils.mkdir_p(File.expand_path(sub_folder_name, '.'))
+        end
+        h_file = File.join('.', sub_folder_name, "#{file_name}.h")
+        m_file = File.join('.', sub_folder_name, "#{file_name}.m")
+        service_file = File.join('.', sub_folder_name, "#{model_pre}#{model_name}Service.m")
         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?
+        File.write(service_file, service_code) if service_code
         puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}".green
+        { h_file: h_file, m_file: m_file, s_file: service_file }
+      end
+
+      def push_to_git
+        Actions.sh('git checkout master', log: false)
+        Actions.sh('git add .', log: false)
+        Actions.sh("git commit -m 'generate yapi code'", log: false)
+        Actions.sh('git push', log: false)
+      end
+
+      def notify_robot(template_vars)
+        robot_url = 'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
+        template = Lhj::ErbTemplateHelper.load('oc_code_notify')
+        output = Lhj::ErbTemplateHelper.render(template, template_vars, '-')
+        Lhj::Dingtalk.post_message_robot(robot_url, '生成代码', output)
       end
 
       def url_str
@@ -178,8 +190,8 @@ module Lhj
         when 'java'
           print_models_for_java(models)
         end
-        @result_model_name = models.last[:name]
         puts "\n<===============打印返回数据模型-End=====================>\n".green
+        models.last[:name]
       end
 
       def print_req_body_model(res_json)
@@ -198,8 +210,8 @@ module Lhj
         when 'java'
           print_models_for_java(models)
         end
-        @param_model_name = models.last[:name]
         puts "\n<===============打印请求模型-End=====================>\n".green
+        models.last[:name]
       end
 
       def fetch_res_boy(res_json)
@@ -379,27 +391,39 @@ module Lhj
           puts "\n\n"
         when 'java'
         end
-        @param_model_name = 'MLParamModel' if @param_model_name.empty?
       end
 
-      def print_http_method(data)
+      def print_http_method(data, result_model_name, param_model_name)
         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"
+        path = data['path']
+        path_name = path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { $&.upcase } }.join('') if path
+        path_key = "k#{path_name}URL"
+        mth = data['method']
+        mth = 'JSON' if data['req_body_is_json_schema']
         case @language
         when 'oc'
           puts "\n<===============方法调用=====================>\n".green
-          @model_template = Lhj::ErbFormatter::Service.new(self).render('model')
-          puts Lhj::ErbFormatter::Service.new(self).render('yapi').blue
+          model_temp = Lhj::ErbTemplateHelper.load('oc_code_service_inner')
+          model_temp_result = Lhj::ErbTemplateHelper.render(model_temp, { result_model_name: result_model_name }, '-')
+
+          yapi_temp = Lhj::ErbTemplateHelper.load('oc_code_service')
+          yapi_vars = { title: data['title'],
+                        desc: data['desc'],
+                        username: data['username'],
+                        path: path,
+                        path_key: path_key,
+                        path_name: path_name,
+                        result_model_name: result_model_name,
+                        param_model_name: param_model_name || 'MLParamModel',
+                        mth: mth,
+                        model_template: model_temp_result }
+          yapi_temp_result = Lhj::ErbTemplateHelper.render(yapi_temp, yapi_vars, '-')
+          puts yapi_temp_result.green
+          return yapi_temp_result
         when 'java'
         end
+
       end
     end
   end

data/lib/lhj/helper/dingtalk_helper.rb

@@ -24,6 +24,11 @@ module Lhj
       Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
     end
 
+    def self.post_message_robot(robot_url, title, message)
+      http_body = { 'msgtype' => 'markdown', 'markdown' => { 'title' => title, 'text' => message } }.to_json
+      Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
+    end
+
     def self.fetch_branch
       name = Lhj::Actions.git_branch || ''
       name.split('/').last

data/lib/lhj/helper/erb_template_helper.rb

@@ -0,0 +1,38 @@
+require 'lhj/config'
+
+module Lhj
+  class ErbTemplateHelper
+    require "erb"
+    def self.load(template_name)
+      path = "#{Lhj::Config.instance.home_dir}/#{template_name}.erb"
+      load_from_path(path)
+    end
+
+    def self.load_from_path(template_filepath)
+      unless File.exist?(template_filepath)
+        UI.user_error!("Could not find template at path '#{template_filepath}'")
+      end
+      File.read(template_filepath)
+    end
+
+    def self.render(template, template_vars_hash, trim_mode = nil)
+      Lhj::ErbalT.new(template_vars_hash, trim_mode).render(template)
+    end
+  end
+  class ErbalT < OpenStruct
+    def initialize(hash, trim_mode = nil)
+      super(hash)
+      @trim_mode = trim_mode
+    end
+
+    def render(template)
+      # From Ruby 2.6, ERB.new takes keyword arguments and positional ones are deprecated
+      # https://bugs.ruby-lang.org/issues/14256
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
+        ERB.new(template, trim_mode: @trim_mode).result(binding)
+      else
+        ERB.new(template, nil, @trim_mode).result(binding)
+      end
+    end
+  end
+end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.65"
+    VERSION = "0.1.66"
   end
 end

data/lib/lhj/tools.rb

@@ -14,6 +14,7 @@ module Lhj
   require 'lhj/config'
   require 'lhj/helper/pod_repo_config'
   require 'lhj/helper/git_branch_feature_config'
+  require 'lhj/helper/erb_template_helper'
   require 'lhj/helper/pgyer_helper'
   require 'lhj/helper/pgyer_shortcut_helper'
   require 'lhj/helper/dingtalk_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.65
+  version: 0.1.66
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -373,6 +373,7 @@ files:
 - lib/lhj/helper/app_version_info.rb
 - lib/lhj/helper/dingtalk_config.rb
 - lib/lhj/helper/dingtalk_helper.rb
+- lib/lhj/helper/erb_template_helper.rb
 - lib/lhj/helper/git_branch_feature_config.rb
 - lib/lhj/helper/git_helper.rb
 - lib/lhj/helper/local_config.rb