pindo 5.0.8 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd9ab9e245a2445159ada59a12a793d1540e92b7560ef32cb4296a2fc146b6d
-  data.tar.gz: c10f9d424c8a111512689cf6e076984d71de81c71248ea113edef3ebb22261e3
+  metadata.gz: c4b35412145fbb0e9fe730f9539f13cd1e09ab3e61410551afe4ac51c9144f33
+  data.tar.gz: 03f430b2b2919a302cd23634f0bfe90a818f81f0edd562fa4dc4a2097a32bfe1
 SHA512:
-  metadata.gz: bd9326c3c907e9ea350b4a5efab1bb51303708aea1210e601951c5ad8ab8a17f453603e385723f584853c9abb52977c78582ebaa01238504ec8a246763dcd19b
-  data.tar.gz: ae18025d46aaac286965ed1323e9070dd092a6dd6223e498be81f1c8141c8c0284e2d8465cb3e8258abd486cb61b95c9de9b1abeca12925bcedf96a6a132f3bb
+  metadata.gz: 3ba02d4282856b94492237aa0898543f750a67e192d6f5f01ca4e91d1a14d1aca11436d7df49867bf3e19bb617063dfc51ad642e94e40c6790239ea1367a72c7
+  data.tar.gz: f36fcc01bb367a57bf9f5eee1e617ee0c75143926d75a0ea13e370e032eab3de9118f25304c41f7b103bbb6cb635a47a3d850e0766fa72cb9a255deb1ab69d76

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

@@ -11,6 +11,7 @@ module Pindo
             class Autobuild < Ios
         
                 include Appselect
+                include Pindo::Githelper
                 # 命令的简要说明 - 打包iOS工程并发布到蒲公英
                 self.summary = '打包iOS工程并发布到蒲公英'
     
@@ -119,8 +120,7 @@ module Pindo
                         build_helper.delete_libtarget_firebase_shell(pindo_project_dir)
                     end
                     
-
-
+                    
                     mainapp_bundleid= nil
                     if @args_bundle_id
                         mainapp_bundleid = @args_bundle_id
@@ -150,7 +150,14 @@ module Pindo
                     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
+
                     Pindo::Command::Ios::Debug::modify_cert_with_project(project_dir:pindo_project_dir, config_file:config_json_file, scheme_name:scheme_name)
 
                     if File.exist?(File.join(pindo_project_dir, "Podfile"))

data/lib/pindo/command/ios/debug.rb

@@ -6,7 +6,7 @@ module Pindo
       class Debug < Ios
         
             include Appselect
-            
+            include Pindo::Githelper
             include XcodeCertHelper
             self.summary = '更新iOS证书并使用新证书设置Xcode工程'
             self.description = <<-DESC

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

@@ -87,7 +87,6 @@ module Pindo
 
                     if @args_upload_flag
                         build_helper = Pindo::BuildHelper.share_instance
-                        build_helper.check_check_and_install_cliff(pindo_project_dir)
                         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) 

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

@@ -0,0 +1,165 @@
+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 Web < Command
+            class Autobuild < Web
+        
+                include Appselect
+                include Pindo::Githelper
+
+                self.summary = '打包Unity WebGL包'
+
+                # 命令的详细说明,包含用法示例
+                self.description = <<-DESC
+                    编译WebGL包并支持上传到测试平台。
+                    
+                    支持功能:
+
+                        * 编译Debug包
+
+                        * 上传到测试平台  
+
+                        * 发送测试通知
+
+                    使用示例:
+
+                        $ pindo web autobuild                    # 编译Debug包
+
+                        $ pindo web autobuild --upload           # 编译并上传
+
+                        $ pindo web autobuild --proj=myapp       # 指定项目名称
+
+                        $ pindo web autobuild --run            # 编译完成后再本地打开webgl包
+                DESC
+
+                # 命令的参数列表
+                self.arguments = [
+                    # 暂无参数
+                ]
+
+                # 命令的选项列表
+                def self.options
+                    [
+                        ['--bundleid', '指定打包的bundleID'],
+                        # 指定上传到蒲公英的项目
+                        ['--proj',   '指定上传到测试平台的项目名称'],
+                        # 上传编译包
+                        ['--upload', '上传编译后的ipa到测试平台'],
+                        # 发送通知
+                        ['--send',   '上传成功后发送测试通知'],
+                        # 编译完成后再本地打开webgl包
+                        ['--run',   '编译完成后再本地打开webgl包']
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @args_deploy_flag = argv.flag?('deploy', false)
+                    @args_adhoc_flag = argv.flag?('adhoc', false)  
+                    @args_upload_flag = argv.flag?('upload', false)  
+                    @args_send_flag = argv.flag?('send', false)  
+                    @args_proj_name = argv.option('proj')  
+                    @args_bundle_id = argv.option('bundleid')
+                    @args_run_flag = argv.flag?('run', false)
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
+                    super
+                    @additional_args = argv.remainder!
+                end
+
+                def validate!
+                    
+                    super
+                end
+
+                def run
+                    pindo_project_dir = Dir.pwd
+
+                    build_helper = Pindo::BuildHelper.share_instance
+                    project_type = build_helper.project_type(pindo_project_dir)
+
+                    args_temp = []
+                    args_temp << "--proj=#{@args_proj_name}" if @args_proj_name
+                    args_temp << "--upload" if @args_upload_flag
+                    args_temp << "--send" if @args_send_flag
+                    case project_type
+                    when :ios
+                        puts "iOS 工程， 请使用 pindo ios autobuild"
+                    when :android
+                        puts "Android 工程， 请使用 pindo android build"
+
+                    when :unity
+                        web_autobuild
+                    else
+                        raise Informative, "当前目录不是工程目录，不能编译"
+                    end
+                end
+
+                def web_autobuild
+                    pindo_project_dir = Dir.pwd
+                    build_helper = Pindo::BuildHelper.share_instance
+                    
+                    if @args_upload_flag
+                        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
+
+                    unity_helper = Pindo::Client::UnityHelper.share_instance
+                    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
+
+                    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')
+                    
+                    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}"
+
+                    if !html_file_upload.nil? && !app_info_obj.nil? 
+                        description = nil
+                        result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:html_file_upload, description:description)
+                        if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
+                            msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])
+                            PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                            if @args_send_flag
+                                PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                            end
+                        end
+                    end
+                    
+                    system "open #{pindo_project_dir}"
+
+                    if @args_run_flag
+                        Pindo::Command::Web::Run.run([])
+                    end
+                end
+
+
+            end
+        end
+    end
+end
+  

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

@@ -0,0 +1,266 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'  
+require 'fileutils'
+require 'pindo/base/executable'
+require 'pindo/module/build/buildhelper'
+require 'webrick'  # 添加WebRick HTTP服务器
+
+module Pindo
+    class Command
+        class Web < Command
+            class Run < Web
+        
+
+                self.summary = '运行Unity WebGL包'
+                
+                # 命令的详细说明,包含用法示例
+                self.description = <<-DESC
+                    运行Unity WebGL包。
+                    
+                    使用示例:
+
+                        $ pindo web run                    
+
+                DESC
+
+                # 命令的参数列表
+                self.arguments = [
+                    # 暂无参数
+                ]
+
+                # 命令的选项列表
+                def self.options
+                    [
+                        # 添加HTTP服务器端口选项
+                        ['--port',   '指定HTTP服务器的端口，默认为8000'],
+                        # 添加调试选项
+                        ['--debug',  '显示详细的调试信息']
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+                    @args_port = argv.option('port', '8000').to_i  # 添加端口参数，默认8000
+                    @args_debug = argv.flag?('debug', false)  # 是否显示调试信息
+
+                    super
+                    @additional_args = argv.remainder!
+                end
+
+                def validate!
+                    super
+                end
+
+                # 添加UI模块作为输出辅助
+                module UI
+                    def self.puts(message)
+                        Kernel.puts message
+                    end
+                    
+                    def self.debug(message, debug_enabled)
+                        Kernel.puts message if debug_enabled
+                    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
+
+                # 启动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
+                        )
+
+                        # 挂载处理程序
+                        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
+
+                        # 启动服务器并返回
+                        UI.puts("启动WebGL HTTP服务器，端口: #{port}，目录: #{webgl_dir}")
+                        UI.puts("请访问: http://localhost:#{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
+                    project_type = build_helper.project_type(pindo_project_dir)
+
+                    webgl_res_dir = Dir.pwd
+                    case project_type
+                    when :unity
+                        webgl_res_dir = File.join(pindo_project_dir, "GoodPlatform/WebGL/build")
+                    end
+
+                    # 确保路径规范化
+                    webgl_res_dir = File.expand_path(webgl_res_dir)
+                    
+                    # 只在调试模式下显示这些信息
+                    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)
+                    
+                    if server
+                        # 打开浏览器展示WebGL内容
+                        system("open http://localhost:#{@args_port}/index.html")
+                        
+                        # 捕获Ctrl+C信号来优雅地关闭服务器
+                        trap('INT') { server.shutdown }
+                        trap('TERM') { server.shutdown }
+                        
+                        # 启动服务器主循环
+                        UI.puts("服务器运行中，按Ctrl+C停止...")
+                        server.start
+                    else
+                        # 如果服务器启动失败，回退到简单打开目录
+                        UI.puts("无法启动HTTP服务器，将直接打开WebGL目录")
+                        system "open #{webgl_res_dir}"
+                    end
+                end
+            end
+        end
+    end
+end
+  

data/lib/pindo/command/web.rb

@@ -0,0 +1,14 @@
+
+
+require 'pindo/command/web/autobuild'
+require 'pindo/command/web/run'
+
+module Pindo
+  class Command
+    
+    class Web < Command
+      self.abstract_command = true
+      self.summary = 'Web 相关命令'
+    end
+  end
+end

data/lib/pindo/command.rb

@@ -49,7 +49,8 @@ module Pindo
         require 'pindo/command/unity'
         require 'pindo/command/ios'
         require 'pindo/command/android'
-
+        require 'pindo/command/web'
+        
         attr_accessor :args_help_flag
         alias_method :args_help_flag?, :args_help_flag
 

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

@@ -149,6 +149,7 @@ module Pindo
                 if !ipa_file_upload.nil? &&
                     File.extname(ipa_file_upload).eql?(".app") &&
                     File.extname(ipa_file_upload).eql?(".apk")
+
                     mac_app_path = ipa_file_upload
                     ipa_base_dir = File.dirname(ipa_file_upload)
                     ipa_base_name = File.basename(ipa_file_upload, File.extname(ipa_file_upload))
@@ -167,8 +168,39 @@ module Pindo
                         Dir.chdir(current_dir)
                     end
                 end
+                puts "ipa_file_upload: ++++1"
+                if !ipa_file_upload.nil? &&
+                    File.extname(ipa_file_upload).eql?(".html")
 
+                    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"
+                    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_name = json_data["productName"]
+                            # 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")
+                    if File.exist?(web_res_zip_fullname)
+                        FileUtils.rm_rf(web_res_zip_fullname)
+                    end
+                    Zip::File.open(web_res_zip_fullname, Zip::File::CREATE) do |zipfile|
+                        Dir.chdir web_res_path
+                        Dir.glob("**/*").reject {|fn| File.directory?(fn) }.each do |file|
+                            zipfile.add(file.sub(web_res_path + '/', ''), file)
+                        end
+                    end
+                    Dir.chdir(current_project_dir)
+                    ipa_file_upload = web_res_zip_fullname
+                end
+                puts "ipa_file_upload: ++++2"
                 unless !ipa_file_upload.nil? && File.exist?(ipa_file_upload)
                     return
                 end

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "5.0.8"
+  	VERSION = "5.1.0"
 
   	class VersionCheck
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.0.8
+  version: 5.1.0
 platform: ruby
 authors:
 - wade
@@ -389,6 +389,9 @@ files:
 - lib/pindo/command/utils/tgate.rb
 - lib/pindo/command/utils/xcassets.rb
 - lib/pindo/command/utils/xcassets.sh
+- lib/pindo/command/web.rb
+- lib/pindo/command/web/autobuild.rb
+- lib/pindo/command/web/run.rb
 - lib/pindo/config/pindoconfig.rb
 - lib/pindo/config/pindouserlocalconfig.rb
 - lib/pindo/module/android/apk_helper.rb