lhj-tools 0.2.74 → 0.2.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7617205034e037486f6f9cb332e7064f49bd32d509d9f1e957c5df47100dabb
-  data.tar.gz: 254627f1697ed73f5aeb332d8e9da0f15e2b356698e02d1ce695836d0e7139cf
+  metadata.gz: 0ff453988d6ea9c2bb877d84e1ecf252763a5255cd40f037f11fccc343fb29b7
+  data.tar.gz: ff065515c59fd2b7fd2bbc1dd9d6797b095b7568f74d16c67466e495b398585e
 SHA512:
-  metadata.gz: 8f596ee969cb0231148e553cff8683280ea271dd4bf303ea6347c2963d6ee8f05b8802d05ebca7f174834aec3e09874b58ba16141df418420f1a44304584a1b6
-  data.tar.gz: 8cdcccbca6add90899a7e0efb3c3b62a5c67bc9f7ba054c5c183b4e6626cb369da5dc6c11026090a46e059f9d6fb4f6b172f1d33fb523d42d6ce63714e5a75f0
+  metadata.gz: 7c57ef0fa0e8efe87101e22717836e7da3bb61c7b2e05bc731f09989042f65f03d5d16229fa03f7dde3439ae77db3ec170c0aa442ccc116d437b83029a215e7c
+  data.tar.gz: 99009572f8b1a2880fd5f85458b360edc625f84fd32a40c6a8ed28b93df971a1428a066a0d3180f6bfbc0293f9493e99b0fff78e73a5211b2ca940593d23c6ba

data/lib/lhj/helper/ios_api_available_check_helper.rb

@@ -2,7 +2,8 @@
 module Lhj
   class IosApiAvailableCheckHelper
 
-    API_AVAILABLE_KEY_BEGIN_REGEX = /@available\(/.freeze
+    API_AVAILABLE_KEY_BEGIN_REGEX = /@available/.freeze
+    BLOCK_KEY_BEGIN_REGEX = /\^/.freeze
 
     def self.check(path, type = 'm')
       all_files = Dir.glob("#{path}/**/*.{#{type}}").reject do |p|
@@ -10,9 +11,13 @@ module Lhj
       end
       result = {}
       all_files.each do |f|
-        wrapper_lines = find_available_wrapper(f)
-        infos = handle_file(f, wrapper_lines)
-        result[File.basename(f)] = infos if infos.length.positive?
+        file_name = File.basename(f)
+        wrapper_map = find_available_wrapper(f)
+        # block循环引用提醒
+        handle_block_notify(file_name, wrapper_map[:blocks]) if wrapper_map[:blocks].length.positive?
+        # 处理高版本api提示
+        infos = handle_available_file(f, wrapper_map[:avails])
+        result[file_name] = infos if infos.length.positive?
       end
       # result
       # show_result(result)
@@ -30,10 +35,12 @@ module Lhj
     end
 
     def self.find_available_wrapper(file)
-      lines = []
+      available_lines = []
+      block_lines = []
       File.open(file, 'r') do |f|
         multi_comment = false
         available_idx = 0
+        block_idx = 0
         f.readlines.each_with_index do |line, idx|
           multi_comment = true if line =~ %r{/\*} && line !~ %r{\*/} && !multi_comment
           if line !~ %r{/\*} && line =~ %r{\*/} && multi_comment
@@ -43,17 +50,42 @@ module Lhj
 
           next if multi_comment
           next if line =~ %r{\s*//}
-          next unless line =~ API_AVAILABLE_KEY_BEGIN_REGEX || available_idx.positive?
 
-          available_idx += 1 if line =~ /\{/
-          available_idx -= 1 if line =~ /\}/
-          lines << { idx: idx, line: line }
+          if line =~ API_AVAILABLE_KEY_BEGIN_REGEX || available_idx.positive?
+            available_idx += 1 if line =~ /\{/
+            available_idx -= 1 if line =~ /\}/
+            available_lines << { idx: idx }
+          end
+          if (line =~ BLOCK_KEY_BEGIN_REGEX && line !~ /^\s*[+-]/ && line !~ /dispatch_get_main_queue/) || block_idx.positive?
+            line_position = block_idx.zero? ? :start : :process
+            block_idx += 1 if line =~ /\{/
+            block_idx -= 1 if line =~ /\}/
+            line_position = :end if block_idx.zero?
+            block_lines << { idx: idx, line: line, position: line_position }
+          end
         end
       end
-      lines
+      { avails: available_lines, blocks: block_lines }
+    end
+
+    def self.handle_block_notify(file_name, wrapper_lines)
+      arr = wrapper_lines.filter { |l| l[:position] != :start }
+      arr.filter! { |l| l[:position] != :end }
+      arr.filter! { |l| l[:line] =~ /self/ || l[:line] =~ /\s+_/ }
+      arr.filter! { |l| l[:line] !~ /\^/ }
+      arr.filter! { |l| l[:line] !~ /weak/ }
+      arr.filter! { |l| l[:line] !~ /strong/ }
+      return if arr.empty?
+
+      puts "源文件:#{file_name}"
+      arr.each do |l|
+        puts "第#{l[:idx] + 1}行:"
+        puts l[:line].strip
+      end
+      puts "\n"
     end
 
-    def self.handle_file(file, wrapper_lines)
+    def self.handle_available_file(file, wrapper_lines)
       result = []
       File.open(file, 'r') do |f|
         multi_comment = false
@@ -71,15 +103,15 @@ module Lhj
           # 2. 找到的行是否已available代码块
           next if wrapper_lines.length.positive? && wrapper_lines.any? { |w| w[:idx] == idx }
 
-          result << { idx: idx + 1, line: line }
+          result << { idx: idx + 1, line: line.strip }
         end
       end
       result
     end
 
     def self.match_white_list_reg(line)
-      regs ||= load_white_api_list
-      regs.any? { |r| line =~ /#{r}/ }
+      @regs ||= load_white_api_list
+      @regs.any? { |r| /#{r}/ =~ line }
     end
 
     def self.load_white_api_list
@@ -95,6 +127,7 @@ module Lhj
     def self.notify(result)
       temp = Lhj::ErbTemplateHelper.load('ios_avaliable_api_notify')
       temp_result = Lhj::ErbTemplateHelper.render(temp, { result: result, branch: git_branch }, '-')
+      puts temp_result
       Lhj::Dingtalk.post_message_robot(robot_url, 'check code', temp_result)
     end
 

data/lib/lhj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lhj
-  VERSION = '0.2.74'
+  VERSION = '0.2.76'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.74
+  version: 0.2.76
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj