lhj-tools 0.1.55 → 0.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b66a2c394691aa23ab4da26a83f5f9623e68c4355cb7f782916568f969a17b6d
-  data.tar.gz: 9b41f62a7770b26363f9db7b434f1e56b3fb3d72de4e5c78cd10f3f9478d5018
+  metadata.gz: b6f6a3fc5a64065faa8bcb7aa05a27c54ed132f2927f066fc59e2c3baba316d2
+  data.tar.gz: 6869c78cd31dcaea3129fbcd6d9b80b3300305482023a9e408b990424433aba0
 SHA512:
-  metadata.gz: 5f1fcb3e75bf22881735c6e768d3c95cc0d506f89641edf52695565b700b7e7e92cebecaa7bef7a000f19279d487389597a1581b8e82e9146f5eb1e9ded789ee
-  data.tar.gz: 8b3900e23599f314e11205b488b0804e31e90f7080527c1f3635da9258ee1f13c8ee45b19e62657a7d9701edff2dc19b0fa2e657dbf137d9897a3c0d9cf01cb3
+  metadata.gz: be09281aae804bc6417f82d92280adf4c2648983ababc591db31ac1d54b357e2c22900b81e9ddf5873e8f46c3db1fa9cb8434ad7115830a70be98451e46f4973
+  data.tar.gz: 1a9588d30b4e319f9728a3db1afda29e4fb58b3f6ba11758cb71e617fca031cb9b967670f8790b7a04d90374133d4d67b2c00bb5ffaa9134109f6a0788bd4317

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,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
 
@@ -18,6 +22,7 @@ module Lhj
         command = %(xcrun agvtool new-version -all #{number})
         Actions.sh(command, log: false)
       end
+      FileUtils.rm_r Dir.glob("#{@work_path}/archive*.zip")
     end
 
     # build_app_version (build_app_version_no) (build: build_version)
@@ -30,13 +35,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
@@ -67,8 +85,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

@@ -71,6 +71,7 @@ module Lhj
         # end
       rescue Faraday::TimeoutError
         puts 'upload fail'
+        FileUtils.rm_r Dir.glob("#{path}/archive*.zip")
       end
     end
 
@@ -92,12 +93,16 @@ module Lhj
       return unless file_exists
 
       Lhj::OSS::Helper.instance.upload(oss_key, oss_file)
-      FileUtils.rm(oss_file) if file_exists
+      FileUtils.rm_r Dir.glob("#{path}/archive*.zip")
     end
 
     def render_template
-      temp_str = File.read(File.join(Lhj::Config.instance.home_dir, 'pgyer.erb'))
-      Lhj::ErbFormatter::Service.new(self).render_template(temp_str)
+      if @result.is_a? Hash
+        temp_str = File.read(File.join(Lhj::Config.instance.home_dir, 'pgyer.erb'))
+        Lhj::ErbFormatter::Service.new(self).render_template(temp_str)
+      else
+        @result
+      end
     end
   end
 end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.55"
+    VERSION = "0.1.59"
   end
 end

metadata

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