lhj-tools 0.1.56 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0466ef4a511c15e68582056fcee41d1b1453d68eb79bc68610277314ed54fc8a
-  data.tar.gz: caebb0fb1dcd50bbc8f5e841918e4ccf14d32ec8fb5261da7f7c0db546941c71
+  metadata.gz: bf0d16f649032902e604fa473c87bb216331af98a1b2ac6bc5789f4d071d2e06
+  data.tar.gz: 29092ea4c0149f8444745c4d739bf4ed14b2109252c575a2b297ed26e5af66dc
 SHA512:
-  metadata.gz: 7ad62cffb4efe791a82c5f9385f6150acc3e819e7f53e1d884a20300b2c640f2a0944f6a3e21be4fc98fd38850b59ea5f4b0e54cf80b681cab595269e938e15f
-  data.tar.gz: c1d31f95c7ca01eb66057d5ab40b22a7eab50e47ec498d64c476fd5729e3118be0cf566ff3a4bed935e6405ed4bf57bb1ca21103becfa1a9b6d71661aa9984f4
+  metadata.gz: a7a1b7631c050c2c06f250476db7126dbac04da145b8463f1790e1f94d08ead4128f238979c39fba0376467da02346c7dcd5f1488bd90e12514d5957f5d2322c
+  data.tar.gz: 46dbc87040a631fb6b2a031ded28bcb3a4826159f07162637ba1408a538465a20b127b000eae42592438df2d85a0e309fab7890c35e68b29aa14965a77cf141d

data/lib/lhj/helper/app_version_info.rb

@@ -10,6 +10,9 @@ module Lhj
       @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
       setup_config
     end
 
@@ -31,13 +34,26 @@ module Lhj
       vers = []
       Dir.glob("#{@work_path}/*.xcodeproj/*.pbxproj").each do |file|
         File.readlines(file).each do |l|
-          if /MARKETING_VERSION.*(\d+\.\d+\.\d+)/ =~ l
-            ma = l.match(/(\d+\.\d+\.\d+)/)
-            vers << ma[0]
-          end
+          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 }
         end
       end
-      vers[0]
+      list = max_version(vers)
+      list.last[:value]
+    end
+
+    def max_version(list)
+      list.sort do |a, b|
+        ma = a[:major] <=> b[:major]
+        ma = a[:minor] <=> b[:minor] if ma.zero?
+        ma = a[:patch] <=> b[:patch] if ma.zero?
+        ma
+      end
     end
 
     def build_app_version_no

data/lib/lhj/helper/pgyer_config.rb

@@ -24,6 +24,8 @@ module Lhj
         config['gray_api_key']
       when :uat
         config['uat_api_key']
+      when :test
+        config['uat_api_key']
       else
         config['api_key']
       end
@@ -37,6 +39,8 @@ module Lhj
         config['gray_user_key']
       when :uat
         config['uat_user_key']
+      when :test
+        config['uat_user_key']
       else
         config['user_key']
       end
@@ -50,6 +54,8 @@ module Lhj
         config['gray_shortcut_url']
       when :uat
         config['uat_shortcut_url']
+      when :test
+        config['uat_shortcut_url']
       else
         config['shortcut_url']
       end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.56"
+    VERSION = "0.1.57"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.56
+  version: 0.1.57
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide