lhj-tools 0.1.62 → 0.1.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba6211ebff2bc66ab95a3b3c7959156041b1c105c2e2b46cbf908a4bd5e126f
-  data.tar.gz: ee19c536c4c4c82fe9dfa9defe2c4db0e0dda9ad4eb287a3e861e3918b17f857
+  metadata.gz: 9d368ea2cf5928005086cd6dba1f5d66446a4815c6367efd015295d2363a5f8e
+  data.tar.gz: e1242e6281d858b5f872224ffa002f3445c891ebe0ffd2188ce477ce25aa0d53
 SHA512:
-  metadata.gz: 6ca8d2e5b7c738d0155ba72274dbe7c225b047e91b4efd2009651a7156e8d1cc49a8c29907c3cda8f251286f845f9f675b897ddb2cf82d5b8a5f44bd12cc8c6a
-  data.tar.gz: fa660c51bc40b2c39eada931362fb91a09c6f12986284c23914d93e5564cc42c2387b0f6c7bce2c70c845b51e1bfc2d3f498449985408cc833303aaf7d165b79
+  metadata.gz: 523743a35a0fcb52957788287576b6d7833e5ba9112b55ad003382c61e0ddc17b6ea30a97e41d9fcb8f5d41a2b051f6cbeb37942a4aa38d635946d69c2408608
+  data.tar.gz: 7a2c91ada15b17c4b6ef40923f146cc9977c41874441213e52484c3e13d0d29c5b1e4b7d2f364af28cbcda0719cfd668b61660c0bb8d676bc9d4c6e0c09b80e3

data/lib/lhj/command/yapi/yapi_init.rb

@@ -0,0 +1,83 @@
+require 'selenium-webdriver'
+
+module Lhj
+  class Command
+    # generate model from yapi
+    class YapiInit < Command
+      self.summary = '更新yapi请求cookie'
+      self.description = '更新 ~/.lhj/yapi.yml 文件配置'
+
+      # @return [String]
+      def interface_url
+        url = []
+        url << 'h'
+        url << 't'
+        url << 't'
+        url << 'p'
+        url << ':'
+        url << '/'
+        url << '/'
+        url << 'y'
+        url << 'a'
+        url << 'p'
+        url << 'i'
+        url << '.'
+        url << 'm'
+        url << 'i'
+        url << 'g'
+        url << 'u'
+        url << 'a'
+        url << 't'
+        url << 'e'
+        url << 'c'
+        url << 'h'
+        url << '.'
+        url << 'c'
+        url << 'o'
+        url << 'm'
+        url.join('')
+      end
+
+      def request_cookie
+        options = Selenium::WebDriver::Chrome::Options.new(args: %w[start-maximized])
+        driver = Selenium::WebDriver.for(:chrome, capabilities: options)
+        driver.get interface_url
+        manage = driver.manage
+        manage.timeouts.implicit_wait = 10
+        manage.timeouts.page_load = 10
+        # 1.登录
+        all_btn = driver.all(tag_name: 'button')
+        login_btn = all_btn.find { |ele| ele.text =~ /钉钉登录/ } if all_btn
+        login_btn&.click
+        # 2.获取cookies
+        wait = Selenium::WebDriver::Wait.new(timeout: 60)
+        wait.until do
+          res = {}
+          manage.all_cookies.each do |cookie|
+            res[:wid] = cookie[:value] if cookie[:name] == '__wpkreporterwid_'
+            res[:uid] = cookie[:value] if cookie[:name] == '_yapi_uid'
+            res[:token] = cookie[:value] if cookie[:name] == '_yapi_token'
+          end
+          return res if res.values.count == 3
+        end
+      end
+
+      def config_file
+        File.join(Lhj::Config.instance.home_dir, 'yapi.yml')
+      end
+
+      def handle
+        cookie = request_cookie
+        config = YAML.load_file(config_file) if File.exist?(config_file)
+        if cookie && config
+          config['__wpkreporterwid_'] = cookie[:wid]
+          config['_yapi_uid'] = cookie[:uid].to_i
+          config['_yapi_token'] = cookie[:token]
+          file_to_save = File.open(config_file, 'w+')
+          YAML.dump(config, file_to_save)
+          file_to_save.close
+        end
+      end
+    end
+  end
+end

data/lib/lhj/command/yapi.rb

@@ -61,7 +61,7 @@ module Lhj
         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
+          puts '请执行 lhj yapi-init 初始化配置'.red
           return
         end
         return unless res_body && !res_body.empty?
@@ -312,12 +312,6 @@ module Lhj
         case type
         when 'integer'
           puts_h "@property (nonatomic, assign) NSInteger #{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};"
         when 'string'
           puts_h "@property (nonatomic, copy) NSString *#{key};"
         when 'number'
@@ -347,8 +341,6 @@ module Lhj
         case type
         when 'integer'
           puts_h "int #{key};//#{des} #{default}"
-        when 'cent'
-          puts_h "int #{key};//#{des} #{default}"
         when 'string'
           puts_h "String #{key};//#{des} #{default}"
         when 'number'

data/lib/lhj/command.rb

@@ -22,6 +22,7 @@ module Lhj
     require 'lhj/command/code/code_template'
     require 'lhj/command/rename_image'
     require 'lhj/command/trans'
+    require 'lhj/command/yapi/yapi_init'
     require 'lhj/command/yapi'
     require 'lhj/command/file_path'
     require 'lhj/command/http'

data/lib/lhj/helper/app_version_info.rb

@@ -98,7 +98,7 @@ module Lhj
 
     def update_log
       Dir.chdir(@work_path) do
-        message = Lhj::Actions.git_log_last_commits(' %an %ar - %s;', 5, :exclude_merges, 'short', false)
+        message = Lhj::Actions.git_log_last_commits(' %an %ar - %s;', 6, :exclude_merges, 'short', false)
         handle_message(message)
       end
     end
@@ -114,5 +114,22 @@ module Lhj
       message
     end
 
+    def custom_modify
+      return if @env != :release
+
+      Dir["#{@work_path}/**/*.m"].each do |file|
+        str = ''
+        File.open(file) do |f|
+          f.each_line do |line|
+            next if line =~ /todo/
+
+            str += line
+          end
+        end
+        File.open(file, 'w+') do |f|
+          f.write(str)
+        end
+      end
+    end
   end
 end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.62"
+    VERSION = "0.1.64"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.62
+  version: 0.1.64
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -302,6 +302,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.1
 description: lhj tools.
 email:
 - sanan.li@qq.com
@@ -353,6 +367,7 @@ files:
 - lib/lhj/command/yapi/formatters/template/model.erb
 - lib/lhj/command/yapi/formatters/template/pgyer.erb
 - lib/lhj/command/yapi/formatters/template/yapi.erb
+- lib/lhj/command/yapi/yapi_init.rb
 - lib/lhj/config.rb
 - lib/lhj/env.rb
 - lib/lhj/helper/app_version_info.rb