pindo 5.1.1 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05592fa0b0cb7bf97bec159a83fd562ab7fd0cbd08305e4f1a71cd827612bf01'
-  data.tar.gz: 717a3c0b905d7482974d04c4e901ec8f3fefe08a95dc1128af5263747a2435bd
+  metadata.gz: 3fa24d37418344443f4d08b84d7e01ce51dc295830659ab24572c0237ef2f430
+  data.tar.gz: 42e2903366c4eac78957837609d4bfe23660cdd8f5ebdb10e20ce2262bc03adc
 SHA512:
-  metadata.gz: 4b7772dd3ad4793df33b3ff90d20847b2676ab0c6b6583d0fa176eb43c010e4bde2e6e2755d1009a4b3bd92c14ab34b8690f97074b9ba7f3042d059abba27dfb
-  data.tar.gz: bbe8a06d9b55eaf57d247a83a8976b46ce2922ec8f4a1538ee2e889d09ce4638a9216d70eca2b7a3eb1fb3ec7d6c54c70e6188e98d9b0579fd78814501a6aee2
+  metadata.gz: '05883da5dbaad58a396d33d3b3b2d496bfc2755c1914ddf57cf01a5d3b988af094834a7426fcb0b4b73d817262d882717b1f505e4f39d465bf3b296ecc3e364c'
+  data.tar.gz: 2769c89d11df67437faf53633a1b966b21746740f2dea973301acef409ea963c4d2ba4ffd3673ae0e8dfd39cc4c972e87fd274353dcb8f656256b93a78b07480

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

@@ -95,7 +95,20 @@ module Pindo
               app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
           end
 
+          scheme_name = @args_proj_name if @args_proj_name
+          if !app_info_obj.nil? && !app_info_obj["appName"].nil? && !app_info_obj["appName"].empty?
+              scheme_name = app_info_obj["appName"]
+          end
+          if scheme_name.nil? || scheme_name.empty? && is_git_directory?(local_repo_dir:pindo_project_dir)
+              current_git_root_path = git_root_directory(local_repo_dir: pindo_project_dir)
+              git_repo_name = File.basename(current_git_root_path)
+              if !git_repo_name.nil? && !git_repo_name.empty?
+                scheme_name = git_repo_name
+              end
+          end
+
           android_build_helper = Pindo::AndroidBuildHelper.share_instance
+          android_build_helper.add_test_scheme(project_dir:pindo_project_dir,scheme_name:scheme_name)
           apk_path = android_build_helper.auto_build_apk(pindo_project_dir, !@args_release_flag)
           ipa_file_upload = Dir.glob(apk_path).max_by {|f| File.mtime(f)}
 

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

@@ -0,0 +1,200 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+require 'pindo/base/executable'
+require 'pindo/module/build/unityhelper'
+require 'pindo/module/build/buildhelper'
+
+module Pindo
+    class Command
+        class Unity < Command
+            class Autobuild < Unity
+
+                include Appselect
+                
+                include Pindo::Githelper
+                # Unity IPA包编译和上传命令
+                self.summary = '编译Unity工程生成iOS IPA并支持上传到测试平台'
+
+                # 详细说明
+                self.description = <<-DESC
+                    编译Unity工程生成iOS IPA并支持上传到测试平台。
+                    
+                    支持功能:
+
+                        * 编译生成IPA
+
+                        * 上传到测试平台  
+
+                        * 发送测试通知
+
+                    使用示例:
+
+                        $ pindo unity autobuild                    # 编译
+
+                        $ pindo unity autobuild --upload           # 编译并上传
+
+                        $ pindo unity autobuild --proj=myapp       # 指定项目名称
+                DESC
+
+                # 命令参数
+                self.arguments = [
+                    # 暂无参数
+                ]
+
+                # 命令选项
+                def self.options
+                    [
+                        ['--proj',   '指定上传到测试平台的项目名称'],
+                        ['--upload', '上传编译后的IPA到测试平台'],
+                        ['--base',   'Unity工程编译lib模式'],
+                    ].concat(super)
+                end
+
+
+                def initialize(argv)
+
+                    @args_proj_name = argv.option('proj')
+                    @args_upload_flag = argv.flag?('upload', false)
+                    @args_base_flag = argv.flag?('base', false)
+                
+
+                    super
+                end
+                
+
+                def run
+
+                    pindo_project_dir = Dir.pwd
+
+                    # 检查是否是Unity工程
+                    unity_helper = Pindo::Client::UnityHelper.share_instance
+                    unless unity_helper.unity_project?(pindo_project_dir)
+                        raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
+                    end
+
+                    if @args_upload_flag
+                        build_helper = Pindo::BuildHelper.share_instance
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
+                        if is_need_add_tag
+                            Pindo::Command::Dev::Tag::run(tag_action_parms) 
+                        end
+                    end
+
+                    project_unity_version = unity_helper.get_unity_version(pindo_project_dir)
+                    unity_exe_path = unity_helper.find_unity_path(project_unity_version:project_unity_version, force_change_version: @force_select_unity)
+                    puts
+                    puts "工程的Unity版本: #{project_unity_version}"
+                    puts "选择的Unity路径: #{unity_exe_path}"
+                    puts
+
+
+                    app_info_obj = nil
+                    if @args_upload_flag 
+                        proj_name = @args_proj_name
+                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+                    end
+
+                    pindo_project_dir = Dir.pwd
+
+                    ios_autobuild(unity_helper:unity_helper, unity_exe_path:unity_exe_path)
+                    Dir.chdir(pindo_project_dir)
+
+                    and_autobuild(unity_helper:unity_helper, unity_exe_path:unity_exe_path)
+                    Dir.chdir(pindo_project_dir)
+
+                    web_autobuild(unity_helper:unity_helper, unity_exe_path:unity_exe_path)
+                    Dir.chdir(pindo_project_dir)
+
+                end
+
+                def web_autobuild(unity_helper:nil, unity_exe_path:nil)
+                    pindo_project_dir = Dir.pwd
+
+                    web_export_dir = File.join(pindo_project_dir, "GoodPlatform/WebGL")
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'WebGL')
+                    
+                    system "open #{pindo_project_dir}"
+
+
+                end
+
+                def ios_autobuild(unity_helper:nil, unity_exe_path:nil)
+
+                    pindo_project_dir = Dir.pwd
+                    mainapp_bundleid= nil
+                    if @args_deploy_flag
+                        mainapp_bundleid = get_selected_deploy_bundleid()
+                    else
+                        mainapp_bundleid = get_selected_dev_bundleid()
+                    end
+
+                    isLibrary = @args_base_flag
+                    ios_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseiOS")
+                    if File.directory?(ios_export_lib_dir)
+                        isLibrary = true
+                    end
+                    pindo_ios_project_dir = File.join(pindo_project_dir, "GoodPlatform/iOS")
+                    if isLibrary
+                        pindo_ios_project_dir = ios_export_lib_dir
+                    end
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary)
+                    
+                    
+                    args_temp = []
+                    args_temp << "--bundleid=#{mainapp_bundleid}"
+
+                    if @args_upload_flag 
+                        args_temp << "--proj=#{app_info_obj["appName"]}"
+                        args_temp << "--upload"
+                    end
+                    
+                    Dir.chdir(pindo_ios_project_dir)
+                    
+                    Pindo::Command::Ios::Autobuild::run(args_temp)
+
+                end
+
+                def and_autobuild(unity_helper:nil, unity_exe_path:nil)
+
+                    pindo_project_dir = Dir.pwd
+                    isLibrary = @args_base_flag
+
+                    android_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseAndroid")
+                    if File.directory?(android_export_lib_dir)
+                        isLibrary = true
+                    end
+
+                    pindo_android_project_dir = File.join(pindo_project_dir, "GoodPlatform/Android")
+                    if isLibrary
+                        pindo_android_project_dir = android_export_lib_dir
+                    end
+                    puts "开始构建Unity项目..."
+
+                    unity_helper.build_project(
+                        unity_exe_full_path: unity_exe_path,
+                        project_path: pindo_project_dir,
+                        platform: 'Android',
+                        isLibrary: isLibrary
+                    )
+
+                    puts "Unity项目构建完成，准备处理Android项目..."
+                    args_temp = []
+
+                    if @args_upload_flag
+                        args_temp << "--proj=#{app_info_obj["appName"]}"
+                        args_temp << "--upload"
+                    end
+
+                    Dir.chdir(pindo_android_project_dir)
+
+                    Pindo::Command::Android::Autobuild::run(args_temp)
+
+                end
+
+
+            end
+        end
+    end
+end

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

@@ -0,0 +1,152 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+require 'pindo/base/executable'
+require 'pindo/module/build/unityhelper'
+require 'pindo/module/build/buildhelper'
+
+module Pindo
+    class Command
+        class Unity < Command
+            class Web < Unity
+
+                include Appselect
+                
+                include Pindo::Githelper
+                # Unity IPA包编译和上传命令
+                self.summary = '编译Unity工程生成iOS IPA并支持上传到测试平台'
+
+                # 详细说明
+                self.description = <<-DESC
+                    编译Unity工程生成iOS IPA并支持上传到测试平台。
+                    
+                    支持功能:
+
+                        * 编译生成IPA
+
+                        * 上传到测试平台  
+
+                        * 发送测试通知
+
+                    使用示例:
+
+                        $ pindo unity ipa                    # 编译IPA
+
+                        $ pindo unity ipa --upload           # 编译并上传
+
+                        $ pindo unity ipa --send             # 编译上传并发送通知
+
+                        $ pindo unity ipa --proj=myapp       # 指定项目名称
+                DESC
+
+                # 命令参数
+                self.arguments = [
+                    # 暂无参数
+                ]
+
+                # 命令选项
+                def self.options
+                    [
+                        ['--proj',   '指定上传到测试平台的项目名称'],
+                        ['--upload', '上传编译后的IPA到测试平台'],
+                        ['--send',   '上传成功后发送测试通知'],
+                        ['--base',   'Unity工程编译lib模式'],
+                        ['--unity-version', '切换Unity版本']
+                    ].concat(super)
+                end
+
+
+                def initialize(argv)
+
+                    @args_proj_name = argv.option('proj')
+                    @args_upload_flag = argv.flag?('upload', false)
+                    @args_send_flag = argv.flag?('send', false)
+                    @args_deploy_flag = argv.flag?('deploy', false)
+                    @args_base_flag = argv.flag?('base', false)
+                    @force_select_unity = argv.flag?('unity-version', false)
+                    
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
+                    super
+                end
+                
+
+                def run
+
+                    pindo_project_dir = Dir.pwd
+
+                    # 检查是否是Unity工程
+                    unity_helper = Pindo::Client::UnityHelper.share_instance
+                    unless unity_helper.unity_project?(pindo_project_dir)
+                        raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
+                    end
+
+                    if @args_upload_flag
+                        build_helper = Pindo::BuildHelper.share_instance
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
+                        if is_need_add_tag
+                            Pindo::Command::Dev::Tag::run(tag_action_parms) 
+                        end
+                    end
+
+                    project_unity_version = unity_helper.get_unity_version(pindo_project_dir)
+                    puts
+                    puts "工程的Unity版本: #{project_unity_version}"
+                    unity_exe_path = unity_helper.find_unity_path(project_unity_version:project_unity_version, force_change_version: @force_select_unity)
+                    puts "选择的Unity路径: #{unity_exe_path}"
+                    puts
+
+                    app_info_obj = nil
+                    if @args_upload_flag 
+                        proj_name = @args_proj_name
+                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+                    end
+
+                    mainapp_bundleid= nil
+                    if @args_deploy_flag
+                        mainapp_bundleid = get_selected_deploy_bundleid()
+                    else
+                        mainapp_bundleid = get_selected_dev_bundleid()
+                    end
+
+                    isLibrary = @args_base_flag
+
+                    ios_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseiOS")
+                    if File.directory?(ios_export_lib_dir)
+                        isLibrary = true
+                    end
+
+                    pindo_ios_project_dir = File.join(pindo_project_dir, "GoodPlatform/iOS")
+                    if isLibrary
+                        pindo_ios_project_dir = ios_export_lib_dir
+                    end
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary)
+                    
+                    
+                    args_temp = []
+                    args_temp << "--bundleid=#{mainapp_bundleid}"
+
+                    if @args_upload_flag 
+                        args_temp << "--proj=#{app_info_obj["appName"]}"
+                        args_temp << "--upload"
+                    end
+                    if @args_send_flag
+                        args_temp << "--send"
+                    end
+                    
+                    Dir.chdir(pindo_ios_project_dir)
+                    
+                    Pindo::Command::Ios::Autobuild::run(args_temp)
+
+
+                end
+
+
+            end
+        end
+    end
+end

data/lib/pindo/command/unity.rb

@@ -2,7 +2,7 @@
 
 require 'pindo/command/unity/ipa'
 require 'pindo/command/unity/apk'
-
+require 'pindo/command/unity/autobuild'
 
 module Pindo
   class Command

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

@@ -4,6 +4,10 @@ require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/build/buildhelper'
+require 'pindo/module/webserver/brotli_file_handler'
+require 'pindo/module/webserver/webgl_page_handler'
+require 'pindo/module/webserver/responsive_preview_handler'
+require 'pindo/module/webserver/webgl_server_helper'
 require 'webrick'  # 添加WebRick HTTP服务器
 require 'socket'
 
@@ -63,180 +67,6 @@ module Pindo
                     end
                 end
 
-                # 处理.br扩展名请求的servlet
-                class BrotliFileHandler < WEBrick::HTTPServlet::AbstractServlet
-                    def initialize(server, root_dir, debug=false)
-                        super(server)
-                        @root_dir = root_dir
-                        @debug = debug
-                    end
-                  
-                    def do_GET(req, res)
-                        # 只处理.br结尾的文件
-                        unless req.path.end_with?('.br')
-                            res.status = 404
-                            return
-                        end
-                      
-                        file_path = File.join(@root_dir, req.path[1..-1])
-                        UI.debug("处理.br文件请求: #{req.path}", @debug)
-                      
-                        if File.exist?(file_path)
-                            # 确定原始文件类型
-                            base_name = File.basename(req.path, ".br")
-                            ext = File.extname(base_name)
-                            
-                            content_type = case ext
-                                when ".js" then "application/javascript"
-                                when ".wasm" then "application/wasm"
-                                when ".data" then "application/octet-stream"
-                                when ".json" then "application/json"
-                                else "application/octet-stream"
-                            end
-                            
-                            # 读取文件
-                            file_content = File.binread(file_path)
-                            
-                            # 设置响应
-                            res.status = 200
-                            res.header["Content-Encoding"] = "br"
-                            res.content_type = content_type
-                            res.body = file_content
-                        else
-                            UI.debug("未找到.br文件: #{file_path}", @debug)
-                            res.status = 404
-                        end
-                    end
-                end
-
-                # 自定义前端页面处理器，处理Unity WebGL的特殊文件加载需求
-                class WebGLPageHandler < WEBrick::HTTPServlet::AbstractServlet
-                    def initialize(server, root_dir, debug=false)
-                        super(server)
-                        @root_dir = root_dir
-                        @debug = debug
-                    end
-                  
-                    def do_GET(req, res)
-                        path = req.path
-                        path = "/index.html" if path == "/"
-                        
-                        file_path = File.join(@root_dir, path[1..-1])
-                        
-                        if File.exist?(file_path)
-                            # 确定内容类型
-                            ext = File.extname(file_path)
-                            content_type = case ext
-                                when ".html" then "text/html"
-                                when ".js" then "application/javascript"
-                                when ".css" then "text/css"
-                                when ".png" then "image/png"
-                                when ".jpg", ".jpeg" then "image/jpeg"
-                                when ".gif" then "image/gif"
-                                when ".ico" then "image/x-icon"
-                                else "application/octet-stream"
-                            end
-                            
-                            res.content_type = content_type
-                            res.body = File.read(file_path)
-                            res.status = 200
-                        else
-                            res.status = 404
-                        end
-                    end
-                end
-
-                # 获取本机局域网IP地址
-                def get_local_ip
-                    ip = nil
-                    Socket.ip_address_list.each do |addr_info|
-                        if addr_info.ipv4? && !addr_info.ipv4_loopback?
-                            ip = addr_info.ip_address
-                            break
-                        end
-                    end
-                    return ip || 'localhost'
-                end
-
-                # 启动HTTP服务器
-                def start_http_server(webgl_dir, port)
-                    begin
-                        # 确保目录存在
-                        unless File.directory?(webgl_dir)
-                            UI.puts("错误: WebGL目录不存在: #{webgl_dir}")
-                            return nil
-                        end
-
-                        # 检查index.html是否存在
-                        if !File.exist?(File.join(webgl_dir, "index.html"))
-                            UI.puts("警告: WebGL目录中未找到index.html文件")
-                        end
-
-                        # 创建自定义日志格式器，只记录错误
-                        custom_log = [
-                            [:error, WEBrick::AccessLog::COMMON_LOG_FORMAT],
-                        ]
-
-                        # 采用直接的方法配置服务器
-                        server = WEBrick::HTTPServer.new(
-                            :Port => port,
-                            :DocumentRoot => webgl_dir,
-                            :Logger => WEBrick::Log.new(nil, WEBrick::Log::ERROR),
-                            :AccessLog => @args_debug ? nil : [],
-                            :DoNotReverseLookup => true,
-                            :BindAddress => '0.0.0.0'  # 绑定到所有网络接口，使其在局域网可访问
-                        )
-
-                        # 挂载处理程序
-                        server.mount("/", WebGLPageHandler, webgl_dir, @args_debug)
-                        
-                        # 挂载Brotli处理器（后缀为.br的文件）
-                        paths_with_br = []
-                        Find.find(webgl_dir) do |path|
-                            if path.end_with?('.br') && File.file?(path)
-                                rel_path = path.sub(webgl_dir, '')
-                                paths_with_br << rel_path
-                            end
-                        end
-                        
-                        # 挂载每个.br文件
-                        paths_with_br.each do |br_path|
-                            server.mount(br_path, BrotliFileHandler, webgl_dir, @args_debug)
-                        end
-                        
-                        # 只在调试模式下显示详细信息
-                        if @args_debug
-                            UI.puts("找到.br文件: #{paths_with_br.join(', ')}")
-                            
-                            UI.puts("WebGL目录内容:")
-                            Dir.entries(webgl_dir).each do |entry|
-                                next if entry == "." || entry == ".."
-                                UI.puts("  - #{entry}")
-                                
-                                # 递归显示子目录中的文件（限制为一级）
-                                entry_path = File.join(webgl_dir, entry)
-                                if File.directory?(entry_path)
-                                    Dir.entries(entry_path).each do |subentry|
-                                        next if subentry == "." || subentry == ".."
-                                        UI.puts("    - #{entry}/#{subentry}")
-                                    end
-                                end
-                            end
-                        end
-
-                        # 启动服务器并返回
-                        local_ip = get_local_ip
-                        UI.puts("启动WebGL HTTP服务器，端口: #{port}，目录: #{webgl_dir}")
-                        UI.puts("本地访问地址: http://localhost:#{port}/index.html")
-                        UI.puts("局域网访问地址: http://#{local_ip}:#{port}/index.html")
-                        return server
-                    rescue Exception => e
-                        UI.puts("启动HTTP服务器失败: #{e.message}")
-                        UI.debug(e.backtrace.join("\n"), @args_debug)
-                        return nil
-                    end
-                end
-
                 def run
                     pindo_project_dir = Dir.pwd
                     build_helper = Pindo::BuildHelper.share_instance
@@ -255,12 +85,22 @@ module Pindo
                     UI.debug("WebGL资源目录: #{webgl_res_dir}", @args_debug)
                     UI.debug("目录存在: #{File.directory?(webgl_res_dir)}", @args_debug)
                     
-                    # 启动HTTP服务器而不是简单打开目录
-                    server = start_http_server(webgl_res_dir, @args_port)
+                    # 使用WebGlServerHelper启动HTTP服务器
+                    server = Pindo::WebServer::WebGlServerHelper.start_http_server(webgl_res_dir, @args_port, @args_debug)
                     
                     if server
-                        # 打开浏览器展示WebGL内容
-                        system("open http://localhost:#{@args_port}/index.html")
+                        # 获取本地IP地址
+                        local_ip = Pindo::WebServer::WebGlServerHelper.get_local_ip
+                        
+                        # 显示访问地址
+                        UI.puts("启动WebGL HTTP服务器，端口: #{@args_port}，目录: #{webgl_res_dir}")
+                        UI.puts("原始WebGL本地预览地址: http://localhost:#{@args_port}/")
+                        UI.puts("模拟设备本地预览地址: http://localhost:#{@args_port}/responsive")
+                        UI.puts("原始WebGL局域网预览地址: http://#{local_ip}:#{@args_port}/")
+                        UI.puts("模拟设备局域网预览地址: http://#{local_ip}:#{@args_port}/responsive")
+                        
+                        # 打开浏览器展示WebGL内容 - 直接打开预览页面
+                        system("open http://localhost:#{@args_port}/responsive")
                         
                         # 捕获Ctrl+C信号来优雅地关闭服务器
                         trap('INT') { server.shutdown }