pindo 5.6.2 → 5.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74540551eee20b918542b7de441e214fcfcbcaa4d747348efdd9bcd312d36d67
-  data.tar.gz: 6f4d6e175b6ff344b9bb26fe85f3a349348a3487ca0999fb86b847d8e37446de
+  metadata.gz: 380db3ee1ad0c4583d215d3186a2481f7daa9c66d1f1c64b4b92cf249a410ecf
+  data.tar.gz: 6051ed21964c7d499718593e24e9f36211f86478109752467fe37673f76e5a9e
 SHA512:
-  metadata.gz: 31a3e0cfef6eb95d8deaa16f95a15da7c91fb33f10acc642e57e9e4e26a0f315114fec8572ca35e0c1ebb83bdc163101e10155555ef23a30171a0f3fbd18f96b
-  data.tar.gz: 31fd9e169330f6a8713d9d7472c96d26a74bb32afb3e6c9ad3d6d36dd3a84f76f939ee4e50f478650916cc9a101170e27bcb8d861d69296f2802bc6613da6221
+  metadata.gz: 667ea2d4a16d1b8d5581bf69b920158c1e34711fa29fe8f532074d0e85b34629668b641fa4df7436e830466a100e78506b83107f744980520f1439cb2b6fcff5
+  data.tar.gz: 073d4acec0c92f7592b1ce7a64a1eb0fc2db7858b89a82fd543f9e95da250da5c8eb100b8218b201547a39ab8863d1ece4d57c8ecddbb914bcfae5808464eadd

data/lib/pindo/command/jps/upload.rb

@@ -18,7 +18,8 @@ module Pindo
 
                     支持功能:
 
-                        * 上传ipa/apk安装包
+                        * 上传ipa/apk/html安装包
+                        * Unity工程自动检测iOS/Android/WebGL包
                         * 添加版本描述
                         * 上传附件
                         * 重签名
@@ -124,13 +125,44 @@ module Pindo
                             build_path = File.join(current_project_dir, "build", "*.{apk}")
                             @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
                         when :unity
+                            # Unity 工程支持三种平台的包：iOS、Android 和 WebGL
+                            all_packages = []
 
-                            if File.exist?(File.join(current_project_dir, "GoodPlatform/BaseiOS"))
-                                build_path = File.join(current_project_dir, "GoodPlatform/BaseiOS/build", "*.{ipa,app}")
-                                @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                            # 检测 iOS 包（收集所有 iOS 包）
+                            if File.exist?(File.join(current_project_dir, "GoodPlatform/BaseiOS/build"))
+                                ios_build_path = File.join(current_project_dir, "GoodPlatform/BaseiOS/build", "*.{ipa,app}")
+                                all_packages.concat(Dir.glob(ios_build_path))
+                            end
+
+                            if File.exist?(File.join(current_project_dir, "GoodPlatform/iOS/build"))
+                                ios_build_path = File.join(current_project_dir, "GoodPlatform/iOS/build", "*.{ipa,app}")
+                                all_packages.concat(Dir.glob(ios_build_path))
+                            end
+
+                            # 检测 Android 包（收集所有 Android 包）
+                            if File.exist?(File.join(current_project_dir, "GoodPlatform/BaseAndroid/build"))
+                                android_build_path = File.join(current_project_dir, "GoodPlatform/BaseAndroid/build", "*.{apk,aab}")
+                                all_packages.concat(Dir.glob(android_build_path))
+                            end
+
+                            if File.exist?(File.join(current_project_dir, "GoodPlatform/Android/build"))
+                                android_build_path = File.join(current_project_dir, "GoodPlatform/Android/build", "*.{apk,aab}")
+                                all_packages.concat(Dir.glob(android_build_path))
+                            end
+
+                            # 检测 WebGL 包（HTML 文件）
+                            if File.exist?(File.join(current_project_dir, "GoodPlatform/WebGL/build"))
+                                webgl_build_path = File.join(current_project_dir, "GoodPlatform/WebGL/build", "index.html")
+                                webgl_files = Dir.glob(webgl_build_path)
+                                all_packages.concat(webgl_files)
+                            end
+
+                            # 从所有找到的包中选择最新的一个
+                            if all_packages.length > 0
+                                # 选择修改时间最新的文件
+                                @args_ipa_file = all_packages.max_by {|f| File.mtime(f)}
                             else
-                                build_path = File.join(current_project_dir, "GoodPlatform/iOS/build", "*.{ipa,app}")
-                                @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                                @args_ipa_file = nil
                             end
                         else
                             raise Informative, "当前目录不是工程目录，不能编译"
@@ -138,7 +170,7 @@ module Pindo
 
 
                         if @args_ipa_file.nil?
-                            build_path = File.join(current_project_dir, "*.{ipa,app,apk}")
+                            build_path = File.join(current_project_dir, "*.{ipa,app,apk,html}")
                             @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
                         end
 

data/lib/pindo/command/web/autobuild.rb

@@ -140,8 +140,9 @@ module Pindo
                     
                     build_path = File.join(web_export_dir, "build", "index.{html}")
                     html_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-                    puts "html_file_upload: #{html_file_upload}"
-                    puts "app_info_obj: #{app_info_obj}"
+                    # 调试输出已移除，保持界面简洁
+                    # puts "html_file_upload: #{html_file_upload}"
+                    # puts "app_info_obj: #{app_info_obj}"
 
                     if !html_file_upload.nil? && !app_info_obj.nil? 
                         description = nil

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

@@ -231,19 +231,21 @@ module Pindo
                     web_res_path = File.dirname(ipa_file_upload)
                     web_zip_dir = File.dirname(web_res_path)
                     web_build_name = "webgl_build"
-                    # web_build_version = "1.0.0"
+                    web_build_version = "1.0.0"
                     begin
-                        if File.exist?(File.join(web_zip_dir, "web_build_info.json"))
-                            json_data = JSON.parse(File.read(File.join(web_zip_dir, "web_build_info.json")))
+                        # web_build_info.json 应该和 index.html 在同一目录
+                        if File.exist?(File.join(web_res_path, "web_build_info.json"))
+                            json_data = JSON.parse(File.read(File.join(web_res_path, "web_build_info.json")))
                             web_build_name = json_data["productName"]
-                            # web_build_version = json_data["version"]
+                            web_build_version = json_data["version"]
+
                         end
                     rescue StandardError => e
 
                     end
                     current_project_dir = Dir.pwd
                     web_build_name = web_build_name.downcase.strip.gsub(/[\s\-_]/, '')
-                    web_res_zip_fullname = File.join(web_zip_dir, web_build_name + ".zip")
+                    web_res_zip_fullname = File.join(web_zip_dir, web_build_name + "_" + web_build_version + ".zip")
                     if File.exist?(web_res_zip_fullname)
                         FileUtils.rm_rf(web_res_zip_fullname)
                     end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.6.2"
+  VERSION = "5.6.3"
 
   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.6.2
+  version: 5.6.3
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-10-05 00:00:00.000000000 Z
+date: 2025-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide