pindo 5.5.8 → 5.6.2

data/lib/pindo/module/build/unityhelper.rb

@@ -1,6 +1,8 @@
 require 'open3'
 require 'json'
 require 'singleton'
+require 'pindo/base/funlog'
+require 'pindo/config/pindoconfig'
 
 # 定义Informative异常类
 class Informative < StandardError; end
@@ -380,17 +382,95 @@ module Pindo
         end
       end
 
+      # 比较版本号 (语义化版本比较)
+      # 返回: true 如果 v1 < v2, false 否则
+      def version_less_than?(v1, v2)
+        return false if v1.nil? || v2.nil?
+
+        Gem::Version.new(v1) < Gem::Version.new(v2)
+      rescue ArgumentError
+        # 版本格式无效时的降级处理
+        v1.to_s < v2.to_s
+      end
+
+      # 检查 GoodUnityBuild 版本是否满足要求
+      def check_goodunitybuild_version(unity_exe_full_path, project_path)
+        library_version = get_library_version(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
+
+        return unless library_version
+
+        required_version = Pindoconfig.instance.pindo_user_config_json["goodunitybuild_version"]
+
+        puts "当前使用的 GoodUnityBuild 版本: #{library_version}"
+        puts "要求的 GoodUnityBuild 最底版本: #{required_version}"
+
+        return unless required_version
+
+        if version_less_than?(library_version, required_version)
+          raise Informative, <<~MSG
+            GoodUnityBuild 版本过低！
+            当前版本: #{library_version}
+            要求版本: #{required_version}
+            请更新 GoodUnityBuild 库到 #{required_version} 或更高版本
+          MSG
+        end
+      rescue Informative
+        raise
+      rescue => e
+        puts "GoodUnityBuild 库版本检查失败: #{e.message}"
+      end
+
+      # 获取 GoodUnityBuild 库版本
+      def get_library_version(unity_exe_full_path:, project_path:)
+        cmd_args = [
+          unity_exe_full_path,
+          "-batchmode",
+          "-quit",
+          "-projectPath",
+          project_path.to_s,
+          "-executeMethod",
+          "GoodUnityBuild.BuildManager.PrintLibraryVersion"
+        ]
+
+        stdout_str, _, _ = Open3.capture3(*cmd_args)
+
+        # 尝试多种模式匹配版本号
+        patterns = [
+          /GoodUnityBuild Version:\s*(\d+\.\d+\.\d+)/i,
+          /\[GoodUnityBuild\]\s+Version\s+(\d+\.\d+\.\d+)/i
+        ]
+
+        patterns.each do |pattern|
+          if match = stdout_str.match(pattern)
+            return match[1]
+          end
+        end
+
+        # 从文件读取作为备用方案
+        version_file = File.join(project_path, "Logs", "GoodUnityBuild_version.txt")
+        if File.exist?(version_file)
+          content = File.read(version_file).strip
+          return content[/(\d+\.\d+\.\d+)/, 1]
+        end
+
+        nil
+      rescue => e
+        nil
+      end
 
       def build_project(unity_exe_full_path:nil, project_path:nil, platform: nil, isLibrary: false)
 
         # 检查是否有Unity进程在运行，传入Unity路径和项目路径以精确匹配
         check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
 
+        # 检查 GoodUnityBuild 库版本
+        check_goodunitybuild_version(unity_exe_full_path, project_path)
+
         additional_args = {}
         additional_args[:platform] = platform if platform
         additional_args[:buildtype] = 'library' if isLibrary
 
-        # 首先尝试使用GoodUnityBuild.BuildManager.BatchBuild
+        # 使用GoodUnityBuild.BuildManager.BatchBuild进行构建
         result = execute_unity_command(unity_exe_full_path, project_path, additional_args)
 
         if result[:success]

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -56,6 +56,14 @@ module Pindo
                 upload_proj_name = @proj_name
             end
 
+            # 检查环境变量
+            env_project_name = ENV['PINDO_PROJECT_NAME']
+            if env_project_name && !env_project_name.empty?
+                upload_proj_name = env_project_name
+                puts "\n使用环境变量指定的项目名称: #{upload_proj_name}"
+                puts
+            end
+
             app_info_obj = nil
             if login
 
@@ -64,6 +72,12 @@ module Pindo
                 end
 
                 if !app_info_obj.nil?
+                    # 如果使用环境变量找到了项目，保存到缓存
+                    if env_project_name && !env_project_name.empty?
+                        require_relative '../../base/pindocontext'
+                        context = Pindo::PindoContext.instance
+                        context.set_selection(Pindo::PindoContext::SelectionKey::PROJECT_NAME, upload_proj_name)
+                    end
                     return app_info_obj
                 end
 
@@ -110,18 +124,21 @@ module Pindo
                 proj_name_array.uniq
                 proj_name_array << "自定义输入Pyger上的App代号"
 
-                # 检查缓存的 App Key
-                require_relative '../../base/pindocontext'
-                context = Pindo::PindoContext.instance
-                cached_app_key = context.get_selection(Pindo::PindoContext::SelectionKey::PROJECT_NAME)
-
-                if cached_app_key && proj_name_array.include?(cached_app_key)
-                    puts "\n使用之前选择的App代号: #{cached_app_key}"
-                    upload_proj_name = cached_app_key
-                    # 直接使用缓存的选择，跳过后续选择逻辑
+                # 如果环境变量已经设置了项目名，跳过选择逻辑
+                if !(env_project_name && !env_project_name.empty?)
+                    # 检查缓存的 App Key
+                    require_relative '../../base/pindocontext'
+                    context = Pindo::PindoContext.instance
+                    cached_app_key = context.get_selection(Pindo::PindoContext::SelectionKey::PROJECT_NAME)
+
+                    if cached_app_key && proj_name_array.include?(cached_app_key)
+                        puts "\n使用之前选择的App代号: #{cached_app_key}"
+                        upload_proj_name = cached_app_key
+                        # 直接使用缓存的选择，跳过后续选择逻辑
+                    end
                 end
 
-                # 只有在没有缓存或缓存无效时才显示选择菜单
+                # 只有在没有缓存或缓存无效，且没有环境变量时才显示选择菜单
                 if upload_proj_name.nil? || upload_proj_name.empty?
                     if proj_name_array.size > 1
                         cli = HighLine.new
@@ -283,7 +300,6 @@ module Pindo
                 # aws_client = AWSS3Client.new
                 aws_client = JPSClient::UploadClient.new(@pgyer_client)
                 upload_res = aws_client.upload_file(binary_file:ipa_file_upload)
-                puts upload_res
                 attach_key_url = nil
                 attachFileUrls = []
 

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.5.8"
+  VERSION = "5.6.2"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.5.8
+  version: 5.6.2
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -115,20 +115,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement