lhj-tools 0.1.56 → 0.1.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0466ef4a511c15e68582056fcee41d1b1453d68eb79bc68610277314ed54fc8a
-  data.tar.gz: caebb0fb1dcd50bbc8f5e841918e4ccf14d32ec8fb5261da7f7c0db546941c71
+  metadata.gz: 37fecc386839f728e03f6aab371802d40b0963c87fd98d357b68a6a4e9f80961
+  data.tar.gz: 28199dc639669faae50ca7ad0e2bfb8e8255117aa72589b61f8f6f47dabfcdcf
 SHA512:
-  metadata.gz: 7ad62cffb4efe791a82c5f9385f6150acc3e819e7f53e1d884a20300b2c640f2a0944f6a3e21be4fc98fd38850b59ea5f4b0e54cf80b681cab595269e938e15f
-  data.tar.gz: c1d31f95c7ca01eb66057d5ab40b22a7eab50e47ec498d64c476fd5729e3118be0cf566ff3a4bed935e6405ed4bf57bb1ca21103becfa1a9b6d71661aa9984f4
+  metadata.gz: b1cee265eb6eb4314ddde0a42b173e158eab15951d54b5747fa0041bc0074d84659efa358b0892634961bd3ab3e57c060b0b77d9c810f5345e1aa5154963ebfb
+  data.tar.gz: d6cc3cfee12a03734215b005149d4c9abb49acd26126a2f63399c477fc0f8aed1f4bf94cf62af0746d757e53cd385aee16c8159e6a9e5e44ec52d264005f3262

data/lib/lhj/command/rename_image.rb

@@ -43,6 +43,24 @@ module Lhj
         end
       end
 
+      def list_all_image
+        sort_list = Dir.glob("#{@current_path}/**/*.{png}").sort { |b, a| File.size(a) <=> File.size(b) }
+        sort_list.each do |f|
+          s = File.size(f)
+          s_s = "#{s}B"
+          if s > 1024 * 1024
+            bf = s / (1024.0 * 1024.0)
+            s_s = "#{format("%.1f",bf)}MB"
+          elsif s > 1024
+            bf = s / 1024.0
+            s_s = "#{format("%.1f",bf)}KB"
+          else
+            s_s = "#{s}KB"
+          end
+          puts "#{f} #{s_s}"
+        end
+      end
+
       def modify_name(file_name, extname)
         name = file_name.downcase + extname
         if @image_pre

data/lib/lhj/helper/app_version_info.rb

@@ -10,7 +10,11 @@ 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
+      setup_shell_script
     end
 
     def setup_config
@@ -19,6 +23,19 @@ 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
+
+    def setup_shell_script
+      project_path = Dir["#{@work_path}/*.xcodeproj"].first
+      project = Xcodeproj::Project.open(project_path)
+      target = project.targets.first
+      handle_list = target.shell_script_build_phases.select { |s| s.display_name == '[CP] Copy Pods Resources' || s.display_name == '[CP] Embed Pods Frameworks' }
+      handle_list.each do |shell|
+        shell.run_only_for_deployment_postprocessing = '0'
+        shell.build_action_mask = '12'
+      end
+      project.save
     end
 
     # build_app_version (build_app_version_no) (build: build_version)
@@ -31,13 +48,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/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.56"
+    VERSION = "0.1.60"
   end
 end

data/lib/lhj/tools.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require_relative "tools/version"
 require 'colored'
+require 'xcodeproj'
 
 module Lhj
   require 'lhj/jenkins/urihelper'

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.56
+  version: 0.1.60
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement