lhj-tools 0.2.56 → 0.2.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c93a210742ecf72d29fac19fdcf217bcc49009f524ec0c0024953b9072aa5f
-  data.tar.gz: a7fd691691e09f01d76e04d67998a540a5051d38a617b35001e0f86876ea49f6
+  metadata.gz: 875d220405250a700a625e00c01066f23218ca09177b843b155165bc4dba3842
+  data.tar.gz: 5a4b9e1f653d31a54d6f4cd5a8a40c06d7002f2371d74caa562f5a34a7e2f871
 SHA512:
-  metadata.gz: 995f03687c2891e11cea349bb6979c930b595d0e9a27f5382f931780fe0b6103a2dabb476471e48e467fde94ceeb5067568127a7d9dd555fbb535250810fe63e
-  data.tar.gz: 2d55f0ed870d359e3a982fcdc4c90a6f328fb118f83c1c30926596109df1941e0d8b36e780d46cf6048e0dfd817610ab7b10105ad76184f44a8c0b03a8f453ed
+  metadata.gz: 5380890249c39f87d479383c60da890213ce34d15005f4120ebbb7f33d1819556ff7e071f3e47a53ff14ac504469422fe73afba0fad025a4b06a14859c34d7e5
+  data.tar.gz: c64c70794e07142dab6a268922b1508f56699b881fa4baff65ca18d30737bb20417dde791d9c6fb2f04f7760207899734c878ed5ad54c6316dd5a12e7de1833a

data/lib/lhj/helper/app_version_info.rb

@@ -5,14 +5,14 @@ require_relative 'team_member_config'
 module Lhj
   # version info
   class AppVersionInfo
+
+    VERSION_REGEX = /^(?<begin>[^#]*MARKETING_VERSION\s*=\s*)(?<value>(?<major>[0-9]+)(\.(?<minor>[0-9]+))?(\.(?<patch>[0-9]+))?(?<appendix>(\.[0-9]+)*)?(-(?<prerelease>(.+)))?)(?<end>)/
+
     # @param [Symbol] env
     def initialize(env, build_number, work_path)
       @env = env
       @build_number = build_number
       @work_path = work_path
-
-      version_var_name = 'MARKETING_VERSION'
-      @version_regex = /^(?<begin>[^#]*#{version_var_name}\s*=\s*)(?<value>(?<major>[0-9]+)(\.(?<minor>[0-9]+))?(\.(?<patch>[0-9]+))?(?<appendix>(\.[0-9]+)*)?(-(?<prerelease>(.+)))?)(?<end>)/i
       modify_code
     end
 
@@ -70,25 +70,27 @@ module Lhj
       "#{build_app_version} (#{build_app_version_no}) (build: #{build_version})"
     end
 
-    def build_app_version
-      # app version '1.0.0'
+    def self.all_app_version(path)
       vers = []
-      Dir.glob("#{@work_path}/*.xcodeproj/*.pbxproj").each do |file|
+      Dir.glob("#{path}/*.xcodeproj/*.pbxproj").each do |file|
         File.readlines(file).each do |l|
           next unless /MARKETING_VERSION/ =~ l
 
-          version_match = @version_regex.match(l)
-          major = version_match[:major].to_i
-          minor = version_match[:minor].to_i || 0
-          patch = version_match[:patch].to_i || 0
-          vers << { value: version_match[:value], major: major, minor: minor, patch: patch }
+          vers << fetch_version(l)
         end
       end
-      list = max_version(vers)
-      list.last[:value]
+      sort_version_list(vers)
     end
 
-    def max_version(list)
+    def self.fetch_version(line)
+      version_match = VERSION_REGEX.match(line)
+      major = version_match[:major].to_i
+      minor = version_match[:minor].to_i || 0
+      patch = version_match[:patch].to_i || 0
+      { value: version_match[:value], major: major, minor: minor, patch: patch }
+    end
+
+    def self.sort_version_list(list)
       list.sort do |a, b|
         ma = a[:major] <=> b[:major]
         ma = a[:minor] <=> b[:minor] if ma.zero?
@@ -97,6 +99,12 @@ module Lhj
       end
     end
 
+    def build_app_version
+      # app version '1.0.0'
+      vers = AppVersionInfo.all_app_version(@work_path)
+      vers.last[:value]
+    end
+
     def build_app_version_no
       # xcode build version
       # ${BUILD_NUMBER} of jenkins

data/lib/lhj/helper/image_oss_check_helper.rb

@@ -0,0 +1,73 @@
+module Lhj
+  class ImageOssCheckHelper
+
+    OSS_PATH_REGEX = /(?<var>[a-zA-Z0-9_]+)\W*=.*ml_addOssPathIgnoreGif:.*/.freeze
+
+    SD_IMAGE_OSS_REGEX = /sd_setImageWithURL:\s*\[NSURL\s*URLWithString:(?<url>[^\]]+)\]/.freeze
+
+    def self.check(path, type = 'm')
+      all_files = Dir.glob("#{path}/**/*.{#{type}}").reject do |p|
+        p =~ /Pods/
+      end
+      result = {}
+      all_files.each do |f|
+        infos = handle_file(f)
+        result[File.basename(f)] = infos if infos.length.positive?
+      end
+      show_result(result)
+    end
+
+    def self.show_result(result)
+      result.each do |k, v|
+        puts k
+        v.each do |o|
+          puts "第#{o[:idx]}行:"
+          puts o[:line]
+        end
+      end
+    end
+
+    def self.handle_file(file)
+      result = []
+      File.open(file, 'r') do |f|
+        oss_var = nil
+        multi_comment = false
+        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
+            multi_comment = false
+            next
+          end
+
+          next if multi_comment
+          next if line =~ %r{\s*//}
+
+          oss_var = fetch_oss_path(line) if line =~ OSS_PATH_REGEX
+          next unless line =~ SD_IMAGE_OSS_REGEX
+
+          oss_info = fetch_sd_image_url(file, line, idx, oss_var)
+          result << oss_info if oss_info
+          oss_var = nil if oss_info
+        end
+      end
+      result
+    end
+
+    def self.fetch_oss_path(line)
+      oss_match = OSS_PATH_REGEX.match(line)
+      oss_match[:var]
+    end
+
+    def self.fetch_sd_image_url(file, line, idx, oss_var)
+      url_match = SD_IMAGE_OSS_REGEX.match(line)
+      oss_url = url_match[:url]
+
+      return nil if oss_var && oss_var == oss_url
+      return nil if oss_url =~ /ml_addOssPathIgnoreGif/
+      return nil if oss_url =~ /x-oss-process=style/
+
+      { idx: idx + 1, line: line.strip }
+    end
+
+  end
+end

data/lib/lhj/lhj.rb

@@ -31,6 +31,7 @@ module Lhj
   require 'lhj/helper/bugly_helper'
   require 'lhj/helper/traditional_check_helper'
   require 'lhj/helper/todo_check_helper'
+  require 'lhj/helper/image_oss_check_helper'
 
   class Error < StandardError; end
 

data/lib/lhj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.56
+  version: 0.2.58
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -392,6 +392,7 @@ files:
 - lib/lhj/helper/erb_template_helper.rb
 - lib/lhj/helper/git_branch_feature_config.rb
 - lib/lhj/helper/git_helper.rb
+- lib/lhj/helper/image_oss_check_helper.rb
 - lib/lhj/helper/ios_robot_config.rb
 - lib/lhj/helper/jenkins_config.rb
 - lib/lhj/helper/local_config.rb