lhj-tools 0.1.54 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba3c81ae4e0b59daafc45266b2b3fea814b1a15547eb0501b3e2bba19b167240
-  data.tar.gz: 5c818f2bffe07c9e3f5ef50544f82ecc4303f2b020099ba0064cf93f12575723
+  metadata.gz: bf0d16f649032902e604fa473c87bb216331af98a1b2ac6bc5789f4d071d2e06
+  data.tar.gz: 29092ea4c0149f8444745c4d739bf4ed14b2109252c575a2b297ed26e5af66dc
 SHA512:
-  metadata.gz: a87a98b3150d9763a7e41f153a3af6ef8291e7ae1074c8c12fd6f51fafc4ed36557605bb484d13d2b3ae5e9a58b0ffac69b95af951f15023bc1a90e06ddd78a5
-  data.tar.gz: 20d3838363aa11ce08db7e18f5ff5efb24abcb627e2b3ab1b8c15c72bbf0d0555eda8d8a8742ddd892fda9ecbef387904480616173faccc011d57808bfe05ef5
+  metadata.gz: a7a1b7631c050c2c06f250476db7126dbac04da145b8463f1790e1f94d08ead4128f238979c39fba0376467da02346c7dcd5f1488bd90e12514d5957f5d2322c
+  data.tar.gz: 46dbc87040a631fb6b2a031ded28bcb3a4826159f07162637ba1408a538465a20b127b000eae42592438df2d85a0e309fab7890c35e68b29aa14965a77cf141d

data/lib/lhj/helper/app_version_info.rb

@@ -1,5 +1,6 @@
 require_relative 'log_helper'
 require_relative 'pgyer_shortcut_helper'
+require_relative 'team_member_config'
 
 module Lhj
   # version info
@@ -9,6 +10,18 @@ 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
+
+    def setup_config
+      number = build_app_version_no
+      Dir.chdir(@work_path) do
+        command = %(xcrun agvtool new-version -all #{number})
+        Actions.sh(command, log: false)
+      end
     end
 
     # build_app_version (build_app_version_no) (build: build_version)
@@ -21,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
@@ -58,8 +84,20 @@ module Lhj
 
     def update_log
       Dir.chdir(@work_path) do
-        Lhj::Actions.git_log_last_commits(' %an %ar - %s;', 3, :exclude_merges, 'short', false)
+        message = Lhj::Actions.git_log_last_commits(' %an %ar - %s;', 5, :exclude_merges, 'short', false)
+        handle_message(message)
+      end
+    end
+
+    def handle_message(m)
+      message = m
+      unless message.empty?
+        message = message.gsub('seconds ', '秒').gsub('minutes ', '分钟').gsub('hours ', '小时').gsub('weeks ', '周').gsub('days ', '天').gsub('ago ', '前')
+        Lhj::TeamMemberConfig.config.each do |key, value|
+          message = message.gsub(key, value) if message =~ /#{key}/
+        end
       end
+      message
     end
 
   end

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/helper/pgyer_helper.rb

@@ -64,11 +64,11 @@ module Lhj
         @result = response.body
         puts @result
         puts 'upload success'
-        if @result['data'] && @result['data']['appUpdateDescription'] && @env == :uat
-          str = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])
-          str = Lhj::VikaHelper.trans_vika(str)
-          @result['data']['appUpdateDescription'] = str
-        end
+        # if @result['data'] && @result['data']['appUpdateDescription'] && @env == :uat
+        #   str = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])
+        #   str = Lhj::VikaHelper.trans_vika(str)
+        #   @result['data']['appUpdateDescription'] = str
+        # end
       rescue Faraday::TimeoutError
         puts 'upload fail'
       end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.54"
+    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.54
+  version: 0.1.57
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide