lhj-tools 0.2.55 → 0.2.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68770ecdc2bcbbaf11c4abb141a369a5c29db2cc259a5611380c21d19b1f4e6d
-  data.tar.gz: 7f140ea8851f5b4e3d8bb7580f6a026af755daedcf29b3afaaaf12ffc339bb35
+  metadata.gz: 1522e2e897fadad490a8c1b9baaff75d7472a3d7deeadf7bdb790ff310bcd56d
+  data.tar.gz: fa96344cdf3abd706ac13f0b349a3c9b0eb3e745d4da0befb1dc0ef4fcc0d57f
 SHA512:
-  metadata.gz: 65042d867dd01f4a6758932c4739e346292fe87013e91a4fa7c6b620b63a954e0a8b2b73e13e327d95b6bda55dacbc759d7bcff384373d488ed78619813de735
-  data.tar.gz: '0729678a05e7e8502ddf70489bfb8517677b155ec5767223eeb21c8179b489d78eaeeaef005faaa673cbf414068c4afbc07033d4d5db4b4cfc78ecacebe295ad'
+  metadata.gz: f8c8b06eb183abc0969c0ec0d09fccff56c2977ccc3f55923e49180759ac36dbce014f1a98297afd84e93f5befc8eda5f219c09e9792d65780b8af8949d25134
+  data.tar.gz: 9d7caf469da443e5be5b0aa963848cc0ce9f5eac7ae60542d67bdafee2841a7aa3bc8bfa0aca0f4f6422417e3144d300f5341ac38f39aaaf6052d4a8e0ff8eec

data/lib/lhj/helper/app_version_info.rb

@@ -5,14 +5,18 @@ 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
+      modify_code
+    end
 
-      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
+    def modify_code
       setup_config
       setup_shell_script
       setup_pod_script
@@ -66,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?
@@ -93,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/pgyer_helper.rb

@@ -76,6 +76,7 @@ module Lhj
     def upload_with_type(path, file)
       return unless @env == :release
       return unless /hai/ =~ path
+      return if @env == :release
 
       # step 1
       folder_path_dir = path

data/lib/lhj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.55
+  version: 0.2.57
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj