pindo 5.18.17 → 5.18.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4f5555594146ac02e8057cc535c1233b2c81b5204e6807a021744e9eeafd8b
-  data.tar.gz: 1ad745131de6737f27c1c419253bf4dabc2c704cb2440f70ca7ad660d902b989
+  metadata.gz: 004b03010300629da1e55b7c6b34eada7cd76e55247deb8f76865d7446ef3572
+  data.tar.gz: 44757caa7ef3e6ae5253bd17d4a0c35ebe0c4cb6120d7ee2840c1a010b6800d2
 SHA512:
-  metadata.gz: 0c505ba3e2a3f0c7bb74e6f57e588eeca6ab50844104abb98c4f02e6e676e584069135841f0793c951a0cc47c218e0d4b791c116ac5bffb7cc76437df9947218
-  data.tar.gz: f0635784ade7e61a8b623238da8d60b04d221ceafb5312fea289063a065596db37aba8e6a67fe0210b4ece19e98d713d22fffd202805b4c530002f395265011c
+  metadata.gz: 05bd2c5264163a1ec12aa545e165f2bee0d832e2c038cd30d506c932842c024f9664d6ecd51c7aa80a71f061ffcaf4747a56caac6223b2c34fe4887845681fc6
+  data.tar.gz: 03d477b345f080c1dfe28e5367786d2147029e86aac185c4aa698b8d17acc98064bee17958060be7d1f44ebb5a41e2790a228a9a4b4699d5d9e2bb6f99709a1d

data/lib/pindo/base/git_handler.rb

@@ -229,39 +229,27 @@ module Pindo
       end
 
 
-      def remote_tag_exists?(local_repo_dir: nil, tag_name: nil)
-
-          result = false
-          current=Dir.pwd
-
-          if File.exist?(local_repo_dir)
-            Dir.chdir(local_repo_dir)
-            tag_ref = "refs/tags/#{tag_name}"
-            res_data = git_remote!(local_repo_dir, %W(-C #{local_repo_dir} ls-remote --tags origin #{tag_ref}))
-            result =  !res_data.nil? && !res_data.empty?
-          else
-            result = false
-          end
-          Dir.chdir(current)
-          return result
-
+      # 获取远程 tag 指向的 commit SHA，不存在返回 nil
+      # 命令已带 -C，无需 Dir.chdir（并发模式下 chdir 会污染全局 cwd）
+      def remote_tag_commit(local_repo_dir: nil, tag_name: nil)
+          return nil if local_repo_dir.nil? || !File.exist?(local_repo_dir)
+          tag_ref = "refs/tags/#{tag_name}"
+          res_data = git_remote!(local_repo_dir, %W(-C #{local_repo_dir} ls-remote --tags origin #{tag_ref}))
+          lines = res_data.to_s.lines.map(&:strip).reject(&:empty?)
+          return nil if lines.empty?
+          # annotated tag 的 ^{} 解引用行才是真实 commit，优先取它
+          deref = lines.find { |l| l.include?("^{}") }
+          (deref || lines.first).split(/\s+/).first
+      end
 
+      def remote_tag_exists?(local_repo_dir: nil, tag_name: nil)
+          !remote_tag_commit(local_repo_dir: local_repo_dir, tag_name: tag_name).nil?
       end
 
       def local_tag_exists?(local_repo_dir: nil, tag_name: nil)
-          # tag_ref = "refs/tags/#{tag_name}"
-          result = false
-          current=Dir.pwd
-
-          if File.exist? (local_repo_dir)
-            Dir.chdir(local_repo_dir)
-            res_data = git!(%W(-C #{local_repo_dir} tag --list #{tag_name}))
-            result = !res_data.nil? && !res_data.empty?
-          else
-            result = false
-          end
-          Dir.chdir(current)
-          return result
+          return false if local_repo_dir.nil? || !File.exist?(local_repo_dir)
+          res_data = git!(%W(-C #{local_repo_dir} tag --list #{tag_name}))
+          !res_data.nil? && !res_data.empty?
       end
 
       def git_latest_commit_id(local_repo_dir:nil)

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

@@ -7,6 +7,7 @@ require 'pindo/module/build/build_helper'
 require 'pindo/module/utils/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
+require 'pindo/base/git_handler'
 require 'pindo/config/ios_config_parser'
 require 'pindo/config/build_info_manager'
 require 'pindo/module/task/task_manager'
@@ -132,6 +133,10 @@ module Pindo
           pindo_project_dir = Dir.pwd
 
           begin
+            # 克隆公共/环境配置仓库（AdHoc 合并依赖 deploy_build_setting.json）
+            Pindo::GitHandler.clone_pindo_common_config_repo(force_delete: false)
+            Pindo::GitHandler.clone_pindo_env_config_repo(force_delete: false)
+
             # 加载 JPS 配置（如果存在）
             Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir, conf: @args_conf)
 
@@ -196,6 +201,11 @@ module Pindo
                                   "  方式2: pindo appstore adhocbuild --bundleid=com.example.app"
             end
           end
+
+          # 在导出前合并 AdHoc 配置，确保 Unity AppConfig 等使用 AdHoc 值
+          # 失败 fail-fast：合并失败会抛 Informative 直接中断，
+          # 避免用原始 Bundle ID / Apple ID 产出错误身份的 AdHoc 包
+          Pindo::BuildInfoManager.share_instance.merge_adhoc_config_into_parser
         end
 
         # 创建构建任务
@@ -226,7 +236,7 @@ module Pindo
               # 1.1 Unity 配置编译模式任务（可选）
               unless @args_skip_config
                 unity_config_task = Pindo::TaskSystem::UnityConfigTask.new(
-                  'release',  # AdHoc 也使用 release 模式
+                  'adhoc',  # AdHoc 使用 adhoc 模式
                   project_path: config[:project_path]
                 )
                 tasks << unity_config_task
@@ -263,7 +273,8 @@ module Pindo
                 project_path: config[:project_path],
                 export_path: ios_export_path,
                 deploy_mode: 'adhoc',  # AdHoc 使用 adhoc 模式
-                context: unity_context
+                context: unity_context,
+                app_config: Pindo::IosConfigParser.instance.unity_appconfig_values  # 导出前改写工程 AppConfig
               )
               unity_export_task.dependencies << last_task.id if last_task
               tasks << unity_export_task

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

@@ -253,7 +253,8 @@ module Pindo
                 'ios',
                 project_path: project_path,
                 export_path: ios_export_path,
-                deploy_mode: 'release'  # AppStore 使用 release 模式
+                deploy_mode: 'release',  # AppStore 使用 release 模式
+                app_config: Pindo::IosConfigParser.instance.unity_appconfig_values  # 导出前改写工程 AppConfig
               )
               unity_export_task.dependencies << last_task.id
               tasks << unity_export_task

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

@@ -42,6 +42,28 @@ module Pindo
                 def validate!
                   super
 
+                  # 加载配置
+                  project_dir = Dir.pwd
+                  config_file = File.join(project_dir, "config.json")
+
+                  config_parser = Pindo::IosConfigParser.instance
+                  config_parser.load_config(config_file: config_file)
+                  @config_json = config_parser.config_json
+                  @bundle_id = config_parser.bundle_id
+                  @apple_id = config_parser.apple_id
+
+                  if @config_json.nil? || @config_json.empty?
+                      raise Informative, "配置未加载，请检查配置文件: #{config_file}"
+                  end
+
+                  if @bundle_id.nil? || @bundle_id.empty?
+                      raise Informative, "无法从配置文件中获取 Bundle ID"
+                  end
+
+                  if @apple_id.nil? || @apple_id.empty?
+                      raise Informative, "无法从配置文件中获取 Apple ID"
+                  end
+
                   pindo_dir = File.expand_path(pindo_single_config.pindo_dir)
                   config_repo_dir = File.join(pindo_dir, @bundle_id)
                   @iapconfig_dir = File.join(config_repo_dir, "fastlane/iap")
@@ -63,29 +85,6 @@ module Pindo
 
                 def run
 
-
-                    # 加载配置
-                    project_dir = Dir.pwd
-                    config_file = File.join(project_dir, "config.json")
-
-                    config_parser = Pindo::IosConfigParser.instance
-                    config_parser.load_config(config_file: config_file)
-                    @config_json = config_parser.config_json
-                    @bundle_id = config_parser.bundle_id
-                    @apple_id = config_parser.apple_id
-
-                    if @config_json.nil? || @config_json.empty?
-                        raise Informative, "配置未加载，请检查配置文件: #{config_file}"
-                    end
-
-                    if @bundle_id.nil? || @bundle_id.empty?
-                        raise Informative, "无法从配置文件中获取 Bundle ID"
-                    end
-
-                    if @apple_id.nil? || @apple_id.empty?
-                        raise Informative, "无法从配置文件中获取 Apple ID"
-                    end
-
                     if @download_flag
 
                         login_api_key(apple_id: @apple_id)
@@ -121,18 +120,7 @@ module Pindo
                 def download_appstore_iap(appstore_iap_file: nil)
                     puts "正在下载appstore iap 信息 ..."
 
-                    app_list_response = @app_store_connect.list_apps(filter: {
-                          bundle_id: @bundle_id
-                      })
-
-                    current_app = nil
-                    app_list_response[:data].each do |app_info|
-                      if app_info[:attributes][:bundle_id].to_s.eql?(@bundle_id)
-                          current_app = app_info
-                      end
-                    end
-
-                    app_id = current_app[:id]
+                    app_id = find_appstore_app_id
 
                     puts " "
                     puts "app_id :  #{app_id}  +++++++++"
@@ -162,7 +150,7 @@ module Pindo
 
                     pindo_dir = File.expand_path(pindo_single_config.pindo_dir)
                     config_repo_dir = File.join(pindo_dir, @bundle_id)
-                    git_addpush_repo(path: config_repo_dir, message: "download app iap", commit_file_params: ["fastlane/iap/iap_appstore_download.json"])
+                    Pindo::GitHandler.git_addpush_repo(path: config_repo_dir, message: "download app iap", commit_file_params: ["fastlane/iap/iap_appstore_download.json"])
 
                     update_app_share_secrets(app_id: app_id, need_create: false)
                 end
@@ -307,39 +295,51 @@ module Pindo
                             file.close
                         end
 
-                        git_addpush_repo(path: config_repo_dir, message: "update app shared secret", commit_file_params: ["config.json"])
+                        Pindo::GitHandler.git_addpush_repo(path: config_repo_dir, message: "update app shared secret", commit_file_params: ["config.json"])
 
                     end
 
 
                 end
 
-                def create_appstore_iap(appstore_iap_file: nil)
+                def find_appstore_app_id
 
-                  temp_iap_json = JSON.parse(File.read(appstore_iap_file))
+                  app_list_response = @app_store_connect.list_apps(filter: {
+                        bundle_id: @bundle_id
+                    })
 
-                  if @check_flag
-                      check_purchase_items_right(in_app_purchase_json: temp_iap_json, config_json: @config_json)
+                  if app_list_response.nil? || app_list_response[:data].nil?
+                      error_detail = if !app_list_response.nil? && !app_list_response[:errors].nil?
+                                       JSON.pretty_generate(app_list_response[:errors])
+                                     else
+                                       app_list_response.inspect
+                                     end
+                      raise Informative, "获取 App 列表失败，App Store Connect 返回：\n#{error_detail}"
                   end
 
-                  in_app_purchase_json = process_purchase_items(in_app_purchase_json: temp_iap_json, iap_tester: @iaptester)
+                  current_app = app_list_response[:data].find do |app_info|
+                      app_info[:attributes][:bundle_id].to_s.eql?(@bundle_id)
+                  end
 
+                  if current_app.nil?
+                      raise Informative, "在 App Store Connect 中未找到 Bundle ID 为 #{@bundle_id} 的 App"
+                  end
 
-                  app_list_response = @app_store_connect.list_apps(filter: {
-                        bundle_id: @bundle_id
-                    })
+                  current_app[:id]
+                end
 
+                def create_appstore_iap(appstore_iap_file: nil)
 
-                  # puts app_list_response
-                  current_app = nil
+                  temp_iap_json = JSON.parse(File.read(appstore_iap_file))
 
-                  app_list_response[:data].each do |app_info|
-                    if app_info[:attributes][:bundle_id].to_s.eql?(@bundle_id)
-                        current_app = app_info
-                    end
+                  if @check_flag
+                      check_purchase_items_right(in_app_purchase_json: temp_iap_json, config_json: @config_json)
                   end
 
-                  app_id = current_app[:id]
+                  in_app_purchase_json = process_purchase_items(in_app_purchase_json: temp_iap_json, iap_tester: @iaptester)
+
+
+                  app_id = find_appstore_app_id
 
                   puts " "
                   puts "app_id :  #{app_id}  +++++++++"
@@ -789,7 +789,11 @@ module Pindo
                         @iaptester = sandbox_tester_json["iaptester"]
                       end
 
-                      if !@iaptester.nil? && @iaptester["need_create"]
+                      if @iaptester.nil?
+                        raise Informative, "没有Sandbox Tester !!!"
+                      end
+
+                      if @iaptester["need_create"]
                           puts
                           puts
                           if itc_has_sandbox_tester(email: @iaptester["email"])
@@ -806,7 +810,7 @@ module Pindo
                               end
                           end
                       else
-                        raise Informative, "没有Sandbox Tester !!!"
+                          puts "沙盒账号：#{@iaptester["email"]} 配置 need_create=false，跳过创建。"
                       end
 
                 end

data/lib/pindo/config/build_info_manager.rb

@@ -2,6 +2,7 @@ require 'singleton'
 require 'fileutils'
 require 'pindo/base/git_handler'
 require 'pindo/config/pindoconfig'
+require 'pindo/config/ios_config_parser'
 
 module Pindo
 
@@ -174,6 +175,36 @@ module Pindo
       end
     end
 
+    # 解析并克隆 AdHoc 配置仓库，将 AdHoc 配置合并进 IosConfigParser 单例
+    # 供命令层（导出前）与 AdHoc 构建任务复用；幂等，可重复调用
+    # @return [String, nil] AdHoc 配置仓库目录；无 app_type 时返回 nil
+    def merge_adhoc_config_into_parser
+      config_parser = Pindo::IosConfigParser.instance
+
+      # 幂等短路：已合并则直接复用缓存目录，避免重复克隆与重复改写
+      return config_parser.adhoc_config_dir if config_parser.adhoc_merged?
+
+      config_json = config_parser.config_json
+      unless config_json && config_json.dig('project_info', 'app_type')
+        puts "配置中缺少 app_type，跳过 AdHoc 配置合并"
+        return nil
+      end
+
+      adhoc_repo_name = get_deploy_repo_with_modul_name(
+        module_name: config_json['project_info']['app_type']
+      )
+      if adhoc_repo_name.nil? || adhoc_repo_name.empty?
+        raise Informative, "config.json app_type is error!!!"
+      end
+
+      adhoc_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: adhoc_repo_name)
+
+      # 合并失败采用 fail-fast：modify_config_with_adhoc 会抛 Informative，
+      # 直接冒泡给调用方，避免静默退化为原始配置产出错误身份的包
+      config_parser.modify_config_with_adhoc(adhoc_config_dir: adhoc_config_dir)
+      adhoc_config_dir
+    end
+
     # 将仓库注册到 git_base_url.json，指定其所属 org
     def modify_repo_setting(repo_name:, owner_org:)
       pindo_setting_dir = pindo_single_config.pindo_env_configdir