pindo 5.13.2 → 5.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efb0e602f3e0c11eca368669749cfc80c51854a3d7563dfe7d2a66e639507c12
-  data.tar.gz: 77df00465e5213f16b11241564184a969a43d49385476930a395524a5cf55764
+  metadata.gz: 7b8f4e3397e7d22aee8dd0011d92a8eec9c7cfb8b51b3676a78e518b27c71b25
+  data.tar.gz: e8eca26bbd129b1f561d09462f5dde5bedf5059172c711ec01da98427a19f446
 SHA512:
-  metadata.gz: c3c3826097cdf84681875828afe7c41af58c5422b9371ea7b23ebb994de3131b04d851099abcd91b548356f227422b67800a5fdb599ba9d863a733d5a3662618
-  data.tar.gz: 4b9275fe85f02ea8438367de51f950dbef8c9ab794d9a541844e4ec7875093e7c89ff0e173fe01dbc087a28ac416c5a1795941dacc22044ef4308544e9587268
+  metadata.gz: 2b6e7699071cd70dff2f482105dd93dd3168a962a59b7b477ad4a359f191c0021612ae993d00a024dcf7f38dcd6875a39ef4670131a3c8948038d81d38dbc56c
+  data.tar.gz: 20fa09db784a2894e3bc9119f9917a4431031e68fc365b3e77dff1e650b599bfcac8fc5b4914f2e3e87add02ffeec4319c815855fe9e0f77aa1da10288513e87

data/lib/pindo/command/appstore/adhocbuild.rb

@@ -251,22 +251,20 @@ module Pindo
             build_task.dependencies << tasks.last.id if tasks.any?
             tasks << build_task
 
-            # 3. 上传任务（如果需要）
-            if @args_upload_flag
-              upload_task = Pindo::TaskSystem::JPSUploadTask.new(
-                'ipa',
-                File.join(ios_project_path, 'build'),
-                nil,
-                app_info_obj: config[:app_info_obj],
-                workflow_info: config[:workflow_info],
-                project_name: @args_proj_name,
-                context: {
-                  send_to_chat: @args_send_flag
-                },
-                dependencies: [build_task.id]
-              )
-              tasks << upload_task
-            end
+            # 3. 上传任务（总是添加）
+            upload_task = Pindo::TaskSystem::JPSUploadTask.new(
+              'ipa',
+              File.join(ios_project_path, 'build'),
+              nil,
+              app_info_obj: config[:app_info_obj],
+              workflow_info: config[:workflow_info],
+              project_name: @args_proj_name,
+              context: {
+                send_to_chat: @args_send_flag
+              },
+              dependencies: [build_task.id]
+            )
+            tasks << upload_task
 
             tasks
           else

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

@@ -5,39 +5,40 @@ require 'fileutils'
 require 'json'
 require 'faraday'
 require 'xcodeproj'
+require 'pindo/module/xcode/applovin_xcode_helper'
 
 module Pindo
     class Command
         class Ios < Command
             class Applovin < Ios
-        
+
                 self.summary = '接入applovin max广告平台时更新Xcode中info.plist'
-  
+
                 self.description = <<-DESC
                     接入applovin max广告平台时更新Xcode中info.plist。
-                    
+
                     支持功能:
-                    
+
                         * 自动获取applovin广告平台的SKAdNetwork IDs
-                        
+
                         * 更新Xcode工程中的info.plist文件
-                        
+
                         * 支持保存SKAdNetwork IDs到本地配置
-                    
+
                     使用示例:
-                    
+
                         $ pindo ios applovin                     # 更新当前目录下工程的info.plist
-                        
+
                         $ pindo ios applovin --appstore          # 使用AppStore模式更新
-                        
+
                         $ pindo ios applovin --install           # 运行applovin安装脚本
-                        
+
                         $ pindo ios applovin --upload            # 保存SKAdNetwork IDs到本地
                 DESC
-        
+
                 self.arguments = [
                 ]
-          
+
                 def self.options
                     [
                         ['--appstore', 'AppStore模式，一般不使用'],
@@ -45,7 +46,7 @@ module Pindo
                         ['--upload',   '保存SKAdNetwork IDs到本地配置'],
                     ].concat(super)
                 end
-        
+
                 def initialize(argv)
 
                     @args_appstore_flag = argv.flag?('appstore', false)
@@ -55,178 +56,19 @@ module Pindo
                     super(argv)
                     @additional_args = argv.remainder!
                 end
-        
+
                 def validate!
                     super
                 end
-        
-                def run
-
-                    skadnetwork_id_array = []
-
-                    Funlog.instance.fancyinfo_start("正在请求applovin数据...")
-
-                    applovin_res_json = req_applovin_json
-                    # puts JSON.pretty_generate(applovin_res_json)
-
-                    if !applovin_res_json.nil? && !applovin_res_json["skadnetwork_ids"].nil?
-                        applovin_res_json["skadnetwork_ids"].each do |network_id|
-                            skadnetwork_id_array << network_id["skadnetwork_id"]
-                        end
-                    end
-
-                    applovin_media_res_json = req_applovin_mediia_json
-                    # puts JSON.pretty_generate(applovin_media_res_json)
-                    if !applovin_media_res_json.nil? && !applovin_media_res_json["mediationSKAdnetworkIdsSpecs"].nil?
-                        applovin_media_res_json["mediationSKAdnetworkIdsSpecs"].each do |media_item|
-                            skadnetwork_id_array = skadnetwork_id_array + media_item["skAdnetworkIds"]
-                        end
-                    end
-
-                    skadnetwork_id_array = skadnetwork_id_array.uniq || []
-
-                    Funlog.instance.fancyinfo_success("请求applovin数据，获取到#{skadnetwork_id_array.size}条数据...")
-
-                    if !skadnetwork_id_array.nil? && skadnetwork_id_array.size > 50
-                        # puts "From Applovin SKAdNetworkItems Size: #{skadnetwork_id_array.size}"
-                        if @args_upload_flag
-                            applovin_config_file = File.join(pindo_single_config.pindo_common_configdir,"applovin_client_config.json")
-                            origin_json = {}
-                            if File.exist?(applovin_config_file)
-                                origin_json = JSON.parse(File.read(applovin_config_file))
-                            end
-                            origin_json["SKAdNetworkItems"] = skadnetwork_id_array
-                            File.write(applovin_config_file, JSON.pretty_generate(origin_json))
-                            git_addpush_repo(path:pindo_single_config.pindo_common_configdir, message:"Applovin SKAdNetworkItems", commit_file_params:["applovin_client_config.json"])
-                        end
-                    else
-                        Funlog.instance.fancyinfo_start("网络拉取applovin数据太少,从缓存中获取数据...")
-                        config_file = File.join(File::expand_path(Pindoconfig.instance.pindo_common_configdir), "applovin_client_config.json")
-                        config_json = JSON.parse(File.read(config_file))
-                        skadnetwork_id_array = skadnetwork_id_array + config_json["SKAdNetworkItems"]
-                        # puts "From Config SKAdNetworkItems Size: #{skadnetwork_id_array.size}"
-                        Funlog.instance.fancyinfo_success("网络拉取applovin数据太少,从缓存中获取到#{skadnetwork_id_array.size}条数据...")
-                    end
-
-
-                    Funlog.instance.fancyinfo_start("正在写入Xcode中...")
-
-                    skadnetwork_id_array = skadnetwork_id_array.uniq || []
-
-                    project_root_dir = Dir.pwd
-                    xcodeproj_file_name = Dir.glob(File.join(project_root_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-
-                    plist_file_name = File.join(project_root_dir,  "AppEntry/Info.plist")
-                    if !xcodeproj_file_name.nil?
-                        proj_name = File.basename(xcodeproj_file_name, ".xcodeproj")   
-                        plist_file_name = get_applovin_infoplist(project_dir:project_root_dir, proj_name:proj_name) 
-                    end
-
-
-                    info_plist_dict = {}
-                    if File.exist?(plist_file_name)
-                        info_plist_dict = Xcodeproj::Plist.read_from_path(plist_file_name)    
-                    end
-                    
-
-                    info_plist_dict["NSAdvertisingAttributionReportEndpoint"] = info_plist_dict["NSAdvertisingAttributionReportEndpoint"] || "https://postbacks-app.com"
-
-                    if !info_plist_dict.has_key?("NSAppTransportSecurity")
-                        info_plist_dict["NSAppTransportSecurity"] = {}
-                        info_plist_dict["NSAppTransportSecurity"]["NSAllowsArbitraryLoads"] = true
-                    end
-
-
-                    if !skadnetwork_id_array.nil? && skadnetwork_id_array.size > 0
-                        info_plist_dict["SKAdNetworkItems"] = []
-                        skadnetwork_id_array.each do |network_id|
-                            item = {}
-                            item["SKAdNetworkIdentifier"] = network_id
-                            info_plist_dict["SKAdNetworkItems"] << item
-                        end
-                    end
-
-                    Xcodeproj::Plist.write_to_path(info_plist_dict, plist_file_name)
-
-                    Funlog.instance.fancyinfo_success("Xcode中applovin数据修改完成！")
-                    
-                    if @args_install_flag && !xcodeproj_file_name.nil? && File.exist?(xcodeproj_file_name)
-
-                        pindo_common_dir = pindo_single_config.pindo_common_configdir
-
-                        app_lovin_script = File.join(pindo_common_dir, "AppLovinQualityServiceSetup-ios-dev.rb")
-                        if @args_appstore_flag
-                            app_lovin_script = File.join(pindo_common_dir, "AppLovinQualityServiceSetup-ios.rb")
-                        end
-
-                        project_script_file = File.join(project_root_dir, "AppLovinQualityServiceSetup-ios.rb")
-                        FileUtils.cp_r(app_lovin_script, project_script_file)
-                        command = "ruby " + project_script_file
-                        # puts command
-                        system command  
-                    end
-
-
-                end
-
-
-                def get_applovin_infoplist(project_dir:nil, proj_name:nil)
-
-                    info_plist_path = File.join(project_dir,  "AppEntry/Info.plist")
-                    proj_fullname = File.join(project_dir, proj_name) + ".xcodeproj"
-                    if File.exist?(proj_fullname)
-                        project_obj = Xcodeproj::Project.open(proj_fullname)
-                        project_obj.targets.each do |target|
 
-                            if target.product_type.to_s.eql?("com.apple.product-type.application") then
-                                temp_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-                                info_plist_path = File.join(project_dir, temp_info)
-                            end
-                        end
-                    end
-
-                    return info_plist_path
-                end
-
-
-                def req_applovin_json
-
-                    begin
-                        # https://dash.applovin.com/docs/v1/skadnetwork_ids.json
-                        applovin_url = "https://dash.applovin.com/docs/v1/skadnetwork_ids.json"
-                        con = Faraday.new 
-                        res = con.get do |req|
-                            req.url applovin_url
-                            req.headers['Content-Type'] = 'application/json'
-                        end
-
-                        applovin_res_json = JSON.parse(res.body)
-
-                        return applovin_res_json
-                    rescue Exception => e
-                        return nil 
-                    end
-                    
-
-                    
-                end
-
-                def req_applovin_mediia_json
-
-
-                    begin
-                        applovin_url = "https://dash.applovin.com/docs/v1/mediation_sk_adnetwork_ids"
-                        con = Faraday.new 
-                        res = con.get do |req|
-                            req.url applovin_url
-                            req.headers['Content-Type'] = 'application/json'
-                        end
-
-                        applovin_res_json = JSON.parse(res.body)
-                        return applovin_res_json
-                    rescue Exception => e
-                        return nil 
-                    end
+                def run
+                    # 使用 ApplovinXcodeHelper 执行更新操作
+                    Pindo::ApplovinXcodeHelper.update_applovin_config(
+                        project_dir: Dir.pwd,
+                        appstore_mode: @args_appstore_flag,
+                        install_script: @args_install_flag,
+                        upload_config: @args_upload_flag
+                    )
                 end
 
             end

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

@@ -15,6 +15,8 @@ require 'pindo/module/task/model/build_task'
 require 'pindo/module/task/model/jps_upload_task'
 require 'pindo/options/options'
 require 'pindo/options/helpers/bundleid_selector'
+require 'pindo/config/build_info_manager'
+require 'pindo/config/ios_config_parser'
 
 module Pindo
     class Command
@@ -246,6 +248,9 @@ module Pindo
                     # Bundle ID 已经通过 value_block 自动获取
                     bundle_id = @args_bundle_id
 
+                    # 拉取并加载配置文件到 IosConfigParser
+                    load_config_file(pindo_project_dir, bundle_id)
+
                     # 获取 JPS 配置
                     app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: pindo_project_dir,
@@ -261,6 +266,43 @@ module Pindo
                     }
                 end
 
+                # 拉取并加载配置文件
+                def load_config_file(project_dir, bundle_id)
+                    if bundle_id && !bundle_id.empty?
+                        # 如果指定了 Bundle ID，拉取配置
+                        puts "\n拉取 Bundle ID 配置: #{bundle_id}"
+
+                        build_info_manager = Pindo::BuildInfoManager.share_instance
+                        success = build_info_manager.pull_appconfig_with_reponame(
+                            repo_name: bundle_id,
+                            target_dir: project_dir
+                        )
+
+                        unless success
+                            raise Informative, "拉取配置失败: #{bundle_id}"
+                        end
+
+                        # 加载拉取的配置到 IosConfigParser
+                        config_file = File.join(project_dir, "config.json")
+                        if File.exist?(config_file)
+                            puts "  ✓ 加载配置文件: #{config_file}"
+                            Pindo::IosConfigParser.instance.load_config(config_file: config_file)
+                        else
+                            raise Informative, "配置文件不存在: #{config_file}"
+                        end
+                    else
+                        # 如果没有指定 Bundle ID，使用当前目录的 config.json
+                        config_file = File.join(project_dir, "config.json")
+
+                        if File.exist?(config_file)
+                            puts "\n使用当前目录配置文件: #{config_file}"
+                            Pindo::IosConfigParser.instance.load_config(config_file: config_file)
+                        else
+                            raise Informative, "当前目录未找到 config.json 文件，请使用 --bundleid 参数指定 Bundle ID"
+                        end
+                    end
+                end
+
             end
         end
     end

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

@@ -1,6 +1,7 @@
 require 'highline/import'
 require 'fileutils'
 require 'json'
+require 'pindo/module/xcode/cocoapods_helper'
 
 module Pindo
     class Command
@@ -52,43 +53,11 @@ module Pindo
                 end
 
                 def run
-
-                    working_dir = @project_dir
-
-                    pod_array = pindo_single_config.pod_repo_dict
-                    pod_index_url = nil
-                    if !pod_array.nil?
-                        pod_index_url = pod_array['podindex']
-                    else
-                        raise Informative, '私有Pod索引地址未知！！'
-                    end
-                    sources = Pod::Config.instance.sources_manager.all
-                    repos_path = File.expand_path("~/.cocoapods/repos")
-
-                    private_source = sources.select { |s| s.git? && s.url.to_s.eql?(pod_index_url)}.first
-                    if !private_source.nil?
-
-                        puts "私有Pod地址:#{pod_index_url}"
-                        puts "私有Pod目录：~/.cocoapods"
-                        getcode_to_dir(reponame:File.basename(private_source.repo), remote_url: pod_index_url, path:repos_path)
-                    else
-                        puts "私有Pod地址:#{pod_index_url}"
-                        puts "私有Pod目录：~/.cocoapods"
-                        repository_name = pod_index_url.split("/").last.chomp(".git")
-                        getcode_to_dir(reponame:repository_name, remote_url: pod_index_url, path:repos_path)
-                    end
-
-
-                    if @args_install_flag
-                        begin
-                            if File.exist?("#{working_dir}/Podfile")
-                                Pod::Command::Install::run(['--clean-install'])
-                            end
-                        rescue => e
-                            puts e.message
-                        end
-                    end
-
+                    # 使用 CocoaPodsHelper 执行更新操作
+                    Pindo::CocoaPodsHelper.update_pod_repo(
+                        install: @args_install_flag,
+                        project_dir: @project_dir
+                    )
                 end
 
 

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

@@ -12,6 +12,8 @@ require 'pindo/module/task/model/build_task'
 require 'pindo/module/task/model/unity_export_task'
 require 'pindo/module/task/model/jps_upload_task'
 require 'pindo/module/task/model/git_tag_task'
+require 'pindo/config/build_info_manager'
+require 'pindo/config/ios_config_parser'
 
 module Pindo
     class Command
@@ -393,6 +395,9 @@ module Pindo
                             end
                             puts "  Bundle ID: #{platform_config["bundle_id"]}"
 
+                            # 拉取并加载 iOS 配置文件
+                            prepare_ios_config(platform_config["bundle_id"])
+
                         when 'android'
                             # 获取 Android Package Name
                             if @args_bundle_name
@@ -420,6 +425,46 @@ module Pindo
 
                 private
 
+                # 准备 iOS 配置文件
+                # 参考 appstore autobuild 的 prepare_config 方法
+                def prepare_ios_config(bundle_id)
+                    pindo_project_dir = Dir.pwd
+
+                    if bundle_id && !bundle_id.empty?
+                        # 拉取配置到 Unity 根目录
+                        puts "\n拉取 iOS Bundle ID 配置: #{bundle_id}"
+
+                        build_info_manager = Pindo::BuildInfoManager.share_instance
+                        success = build_info_manager.pull_appconfig_with_reponame(
+                            repo_name: bundle_id,
+                            target_dir: pindo_project_dir
+                        )
+
+                        unless success
+                            raise Informative, "拉取 iOS 配置失败: #{bundle_id}"
+                        end
+
+                        # 加载拉取的配置到 IosConfigParser
+                        config_file = File.join(pindo_project_dir, "config.json")
+                        if File.exist?(config_file)
+                            puts "  ✓ 加载配置文件: #{config_file}"
+                            Pindo::IosConfigParser.instance.load_config(config_file: config_file)
+                        else
+                            raise Informative, "配置文件不存在: #{config_file}"
+                        end
+                    else
+                        # 如果没有指定 Bundle ID，使用当前目录的 config.json
+                        config_file = File.join(pindo_project_dir, "config.json")
+
+                        if File.exist?(config_file)
+                            puts "\n使用当前目录配置文件: #{config_file}"
+                            Pindo::IosConfigParser.instance.load_config(config_file: config_file)
+                        else
+                            raise Informative, "当前目录未找到 config.json 文件，请使用 --bundleid 参数指定 Bundle ID"
+                        end
+                    end
+                end
+
                 # 获取 WebGL 包序号
                 def fetch_webgl_index_no(app_info_obj:, workflow_info:)
                     index_count = -1

data/lib/pindo/module/cert/xcode_cert_helper.rb

@@ -28,7 +28,7 @@ module Pindo
         # @param build_type [String, Symbol] 构建类型 ('dev', 'adhoc', 'release' 或 'development', 'adhoc', 'appstore')
         # @param platform_type [String] 平台类型 ('ios', 'macos')
         # @param project_dir [String] 项目目录
-        # @param config_file [String, nil] 配置文件路径（可选，默认从 project_dir 加载）
+        # @param config_file [String, nil] 配置文件路径（可选，仅当单例未加载时使用）
         # @param skip_xcode_config [Boolean] 是否跳过 Xcode 配置
         # @return [Hash] 返回证书信息 { provisioning_info_array:, team_id: }
         def install_and_config_certs(
@@ -41,11 +41,14 @@ module Pindo
             # 标准化构建类型
             cert_type = normalize_build_type(build_type)
 
-            # 配置加载
+            # 使用 IosConfigParser 单例（应该已经在命令层加载）
             require 'pindo/config/ios_config_parser'
             config_parser = Pindo::IosConfigParser.instance
-            config_path = config_file || File.join(project_dir, 'config.json')
-            config_parser.load_config(config_file: config_path)
+
+            # 检查配置是否已加载
+            if config_parser.config_json.nil?
+                raise Informative, "install_and_config_certs 函数中, 配置未加载config.json"
+            end
 
             apple_id = config_parser.apple_id
             bundle_id_map = config_parser.get_bundle_id_map

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

@@ -313,12 +313,20 @@ module Pindo
 
                 proj_name_array_append = []
 
-                if File.exist?(File.join(working_directory, "config.json"))
-                    config_json = JSON.parse(File.read(File.join(working_directory, "config.json")))
-                    new_proj_string = config_json["project_info"]["project_name"]
-                    if !new_proj_string.nil? && !new_proj_string.empty?
-                        proj_name_array_append << config_json["project_info"]["project_name"]
+                # 尝试从 IosConfigParser 单例获取项目名称
+                begin
+                    require 'pindo/config/ios_config_parser'
+                    config_parser = Pindo::IosConfigParser.instance
+
+                    # 如果单例中有配置，使用配置中的项目名称
+                    if !config_parser.config_json.nil?
+                        new_proj_string = config_parser.config_json.dig("project_info", "project_name")
+                        if !new_proj_string.nil? && !new_proj_string.empty?
+                            proj_name_array_append << new_proj_string
+                        end
                     end
+                rescue => e
+                    # 忽略错误，继续使用其他方式获取项目名称
                 end
 
                 xcodeproj_file_name = Dir.glob(File.join(Dir.pwd, "/*.xcodeproj")).max_by {|f| File.mtime(f)}