pindo 5.10.4 → 5.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a37cd33906ccb091fe34db97b79126f3a0f7a2ef0011e5f0b989387320346b
-  data.tar.gz: b134ad5e2dba8ad21427ef5da0878086f03d7a2593df45ec6f911273d4b943ad
+  metadata.gz: 0c0935db120a0696b34c40a6f73b2c3610848940fee0395d86655041bf934864
+  data.tar.gz: 0337a78bdc208a9ba38c5e4a86d707d8e256f0a63a40a6274fd05fc35c40f270
 SHA512:
-  metadata.gz: 182dbe219fe39ca4316c7e8e9616187a059c6bd3e562528f118af4385ee6b371cc489a246e76237f656fee9a4d5239a9cd063ced3e0ab903aacf950f5f6ef273
-  data.tar.gz: 4e3c8d87cd5c57b089234af2eecf686697f8360815db52aa3cbd23bcc68c617fa21e6e461cdfc3e4b16fbefd552a0722d5f9af2d1a5dd5e0dc1a860b7d46e4e7
+  metadata.gz: 1065f8460b739d1d15843ea898f97c97f9e192180da44cc7bbb04a18c7d4f51c0e8491cdda16c3f849b7eda0fa775cba5913dace2396bdf5f366537f287d5dce
+  data.tar.gz: eb8b7d8eb79bf371dd3ebab16d25116d6c8bcc98ed6b6fe99c5782392dae360d546e8f6cbe0ff551acb4f3b8fa8ee2d45c72f9abb1e2aa128d8c873ee4e35bd2

data/lib/pindo/base/funlog.rb

@@ -56,13 +56,20 @@ module Pindo
          puts "  ✓ #{message}"
       end
 
-      # 输出静态警告信息（不使用spinner，对应 fancyinfo_error）
+      # 输出静态警告信息（不使用spinner）
       # @param args [Array] 要输出的消息
       def warning(*args)
          message = args.join(" ")
          puts "\e[33m  ⚠ #{message}\e[0m"
       end
 
+      # 输出静态错误信息（不使用spinner，对应 fancyinfo_error）
+      # @param args [Array] 要输出的消息
+      def error(*args)
+         message = args.join(" ")
+         puts "\e[31m  ✗ #{message}\e[0m"
+      end
+
     #-------------------------------------------------------------------------#
     #-------------------------------------------------------------------------#
     # @!group Singleton
@@ -113,6 +120,10 @@ module Pindo
       def warning(*args)
         instance.warning(*args)
       end
+
+      def error(*args)
+        instance.error(*args)
+      end
     end
 
     # Provides support for accessing the configuration instance in other

data/lib/pindo/base/pindocontext.rb

@@ -10,6 +10,7 @@ module Pindo
       TAG_DECISION = :tag_decision      # 打Tag决定
       PROJECT_NAME = :project_name      # 项目名称
       BUNDLE_ID = :bundle_id            # Bundle ID
+      ANDROID_BUNDLE_NAME = :android_bundle_name  # Android Bundle Name
       CERT_TYPE = :cert_type            # 证书类型
     end
     
@@ -508,6 +509,8 @@ module Pindo
         case key.to_s
         when 'bundle_id'
           puts "  Bundle ID: #{value}"
+        when 'android_bundle_name'
+          puts "  Bundle Name: #{value}"
         when 'project_name', 'app_key'  # 兼容旧的 app_key
           puts "  项目名称: #{value}"
         when 'tag_decision'

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

@@ -1,9 +1,9 @@
 require 'highline/import'
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/module/build/buildhelper'
-require 'pindo/module/build/versionhelper'
-require 'pindo/module/android/build_helper'
+require 'pindo/module/build/build_helper'
+require 'pindo/module/build/version_helper'
+require 'pindo/module/android/android_build_helper'
 require 'pindo/module/android/android_build_config_helper'
 
 module Pindo
@@ -35,15 +35,18 @@ module Pindo
                         $ pindo android autobuild --release          # 编译Release包
                         $ pindo android autobuild --upload           # 编译并上传
                         $ pindo android autobuild --send             # 编译、上传并发送群组通知
+                        $ pindo android autobuild --bundle_name=com.example.app  # 使用指定bundle name的配置
 
                         # CI/CD自动化构建
                         $ PINDO_FORCE_BUILD=1 PINDO_PROJECT_NAME="Test Demo" PINDO_TAG_DECISION=new pindo android autobuild --upload
+                        $ pindo android autobuild --bundle_name=com.example.app --upload --send  # 使用配置并上传
         DESC
 
         def self.options
           [
             ['--release',     '使用Release模式构建'],
             ['--proj=NAME',   '指定上传到测试平台的项目名称'],
+            ['--bundle_name=NAME', '指定Android Package Name（如com.example.app，会拉取对应配置）'],
             ['--upload',      '编译后上传到测试平台（自动发送给自己）'],
             ['--send',        '发送通知到测试群组（同时发送给自己）']
           ].concat(super)
@@ -54,6 +57,7 @@ module Pindo
           @args_upload_flag = argv.flag?('upload', false)
           @args_send_flag = argv.flag?('send', false)
           @args_proj_name = argv.option('proj')
+          @args_bundle_name = argv.option('bundle_name')
 
 
           if @args_send_flag
@@ -70,14 +74,24 @@ module Pindo
           # 加载 JPS 配置（如果存在）
           context = Pindo::PindoContext.instance
           context.load_and_apply_jps_config(pindo_project_dir)
-
           # 确认并应用缓存（如果有）
           context.confirm_and_apply_cache
+
+
+          @main_bundle_name = nil
+          if @args_bundle_name
+              @main_bundle_name = @args_bundle_name
+          else
+              @main_bundle_name = get_selected_dev_bundle_name()
+          end
+
+
           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 << "--bundle_name=#{@main_bundle_name}" if @main_bundle_name
           args_temp << "--upload" if @args_upload_flag
           args_temp << "--send" if @args_send_flag
 
@@ -113,15 +127,15 @@ module Pindo
 
           # ===== 使用 workflow 配置更新 Android 项目 =====
           if workflow_info && workflow_info[:package_name]
-            package_name = workflow_info[:package_name]
+            workflow_packname = workflow_info[:package_name]
 
             puts "\n使用工作流配置更新 Android 项目:"
-            puts "  Package Name: #{package_name}"
+            puts "  Workflow Package Name: #{workflow_packname}"
 
             # 一次性更新 App Name、Application ID 和 URL Schemes
-            Pindo::AndroidBuildConfigHelper.update_project_with_packagename(
+            Pindo::AndroidBuildConfigHelper.update_project_with_workflow(
               project_dir: pindo_project_dir,
-              package_name: package_name
+              workflow_packname: workflow_packname
             )
           else
             raise Informative, "未获取到工作流信息"
@@ -157,6 +171,46 @@ module Pindo
             Funlog.warning("非Git仓库，保持工程原有版本号")
           end
 
+
+          # ===== 如果指定了 bundle_name，覆盖 Application ID 和 google-services.json =====
+          # 注意：这必须在 update_project_with_workflow 之后，以覆盖工作流的默认配置
+          if @main_bundle_name && !@main_bundle_name.empty?
+            puts "\n正在处理指定的 Bundle Name: #{@main_bundle_name}..."
+
+            # 检查是否为通配符或通用 bundle_name
+            # 如果是 com.test.* 或 com.test 这样的通配符，跳过配置更新
+            is_wildcard = @main_bundle_name.include?('*') ||
+                         @main_bundle_name.end_with?('.') ||
+                         ['com.test', 'com.example', 'com.demo'].include?(@main_bundle_name)
+
+            if is_wildcard
+              puts "  ⚠️  检测到通配符或通用 Bundle Name: #{@main_bundle_name}"
+              puts "  ⚠️  跳过 google-services.json 和 Application ID 更新"
+            else
+              # 只有具体的 bundle_name 才执行配置更新
+              # 直接使用 clong_buildconfig_repo 拉取配置仓库
+              config_repo_dir = clong_buildconfig_repo(repo_name: @main_bundle_name)
+
+              if config_repo_dir && File.exist?(config_repo_dir)
+                # 1. 拷贝 google-services.json 到 launcher 目录
+                Pindo::AndroidBuildConfigHelper.copy_google_services_from_config_repo(
+                  config_repo_dir: config_repo_dir,
+                  project_dir: pindo_project_dir
+                )
+
+                # 2. 更新 Application ID 为指定的 bundle_name（覆盖工作流设置）
+                Pindo::AndroidBuildConfigHelper.update_application_id(
+                  project_dir: pindo_project_dir,
+                  application_id: @main_bundle_name
+                )
+
+                puts "  ✓ Bundle Name 配置处理完成"
+              else
+                raise Informative, "无法获取配置仓库"
+              end
+            end
+          end
+
           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)
@@ -223,7 +277,6 @@ module Pindo
             raise e
           end
 
-
         end
       end
     end

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

@@ -1,8 +1,8 @@
 require 'highline/import'
 require 'fileutils'
 require 'json'
-require 'pindo/module/build/buildhelper'
-require 'pindo/module/android/build_helper'
+require 'pindo/module/build/build_helper'
+require 'pindo/module/android/android_build_helper'
 
 module Pindo
   class Command
@@ -99,15 +99,15 @@ module Pindo
 
               # ===== 使用 workflow 配置更新 Android 项目 =====
               if workflow_info && workflow_info[:package_name]
-                package_name = workflow_info[:package_name]
+                workflow_packname = workflow_info[:package_name]
 
                 puts "\n使用工作流配置更新 Android 项目:"
-                puts "  Package Name: #{package_name}"
+                puts "  Workflow Package Name: #{workflow_packname}"
 
                 # 一次性更新 App Name、Application ID 和 URL Schemes
-                Pindo::AndroidBuildConfigHelper.update_project_with_packagename(
+                Pindo::AndroidBuildConfigHelper.update_project_with_workflow(
                   project_dir: pindo_project_dir,
-                  package_name: package_name
+                  workflow_packname: workflow_packname
                 )
               else
                 raise Informative, "未获取到工作流信息"

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

@@ -71,11 +71,11 @@ module Pindo
         def run
           pindo_project_dir = Dir.pwd
 
-          # 如果设置了 dsign 标志，则执行签名文件获取并直接返回
-          if @args_dsign_flag
-            Pindo::AndroidBuildHelper.share_instance.dsign(pindo_project_dir, !@args_release_flag)
-            return
-          end
+          # # 如果设置了 dsign 标志，则执行签名文件获取并直接返回
+          # if @args_dsign_flag
+          #   Pindo::AndroidBuildHelper.share_instance.dsign(pindo_project_dir, !@args_release_flag)
+          #   return
+          # end
 
 
           app_info_obj = nil
@@ -91,15 +91,15 @@ module Pindo
 
               # ===== 使用 workflow 配置更新 Android 项目 =====
               if workflow_info && workflow_info[:package_name]
-                package_name = workflow_info[:package_name]
+                workflow_packname = workflow_info[:package_name]
 
                 puts "\n使用工作流配置更新 Android 项目:"
-                puts "  Package Name: #{package_name}"
+                puts "  Workflow Package Name: #{workflow_packname}"
 
                 # 一次性更新 App Name、Application ID 和 URL Schemes
-                Pindo::AndroidBuildConfigHelper.update_project_with_packagename(
+                Pindo::AndroidBuildConfigHelper.update_project_with_workflow(
                   project_dir: pindo_project_dir,
-                  package_name: package_name
+                  workflow_packname: workflow_packname
                 )
               else
                 raise Informative, "未获取到工作流信息"

data/lib/pindo/command/deploy/build.rb

@@ -3,13 +3,13 @@ require 'fileutils'
 require 'json'
 require 'xcodeproj'
 require 'gym'
+require 'pindo/module/xcode/xcode_build_helper'
 
 module Pindo
     class Command
         class Deploy < Command
             class Build < Deploy
 
-
                 self.summary = '编译工程'
 
                 self.description = <<-DESC
@@ -22,7 +22,7 @@ module Pindo
 
                 def self.options
                     [
-                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo deploy build --proj=aichatv4'],
+                        ['--proj', '指定上传到JPS对应的项目名称(大小写空格忽略)，用法:pindo deploy build --proj=aichatv4'],
                         ['--upload', '是否上传编译后的ipa(上传成功后会自动发送消息给自己), 用法:pindo deploy build --upload'],
                         ['--send',  '发送消息到项目群(注意:不带此参数也会发送给自己),用法:pindo deploy build --send'],
                         ['--resign',  '上传到之后是否重签名,用法:pindo deploy build --resign'],
@@ -72,6 +72,9 @@ module Pindo
                     new_project_dir = Dir.pwd
                     project_fullname = Dir.glob(File.join(new_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
 
+                    # 修复 Xcode 16 链接器兼容性问题
+                    Pindo::XcodeBuildHelper.fix_xcode16_linker_flags(project_dir: new_project_dir)
+
                     if File.exist?(File.join(new_project_dir, "build"))
                         FileUtils.rm_rf(File.join(new_project_dir, "build"))
                     end

data/lib/pindo/command/deploy/cert.rb

@@ -1,8 +1,8 @@
 require 'fileutils'
 require 'match'
-require 'pindo/module/build/swarkhelper'
+require 'pindo/module/build/swark_helper'
 require 'pindo/module/cert/xcodecerthelper'
-require 'pindo/module/cert/certhelper'
+require 'pindo/module/cert/cert_helper'
 
 module Pindo
     class Command
@@ -11,7 +11,6 @@ module Pindo
 
             include Command::DeployOptions
             include XcodeCertHelper
-            include CertHelper
             include SwarkHelper
 
 
@@ -52,8 +51,8 @@ module Pindo
                 ['--macos', 'macos平台证书'],
                 ['--clean', '删除本地缓存的证书'],
                 ['--cleangit', '删除远程仓库中的证书'],
-                ['--upload', '生成上传pgyer的证书'],
-                ['--match', '生成上传pgyer的证书'],
+                ['--upload', '生成上传JPS的证书'],
+                ['--match', '生成上传JPS的证书'],
                 ['--renew', '重新生成证书']
               ].concat(super)
             end
@@ -121,9 +120,9 @@ module Pindo
                   cert_reponame = cert_git_url.split("/").last.chomp(".git")
                   certs_dir = getcode_to_dir(reponame:cert_reponame, remote_url:cert_git_url, path: pindo_single_config.pindo_dir, new_branch:@apple_id)
 
-                  install_certs(cert_url:cert_git_url, certs_dir:certs_dir, cert_type:@build_type, platform_type:platform_type)
+                  Pindo::CertHelper.install_certs(cert_url:cert_git_url, certs_dir:certs_dir, cert_type:@build_type, platform_type:platform_type)
                   bundle_id_map = get_bundle_id_map
-                  provisioning_info_array = install_provisionfiles(cert_url:cert_git_url, certs_dir:certs_dir, bundle_id_map:bundle_id_map, cert_type:@build_type, platform_type:platform_type)
+                  provisioning_info_array = Pindo::CertHelper.install_provisionfiles(cert_url:cert_git_url, certs_dir:certs_dir, bundle_id_map:bundle_id_map, cert_type:@build_type, platform_type:platform_type)
                   pindo_single_config.set_cert_info(dict: provisioning_info_array)
                 end
 

data/lib/pindo/command/deploy/configproj.rb

@@ -1,9 +1,10 @@
 
 require 'find'
 require 'cocoapods-core'
-require 'pindo/module/xcode/xcodebuildhelper'
+require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/module/xcode/xcodeappconfig'
-require 'pindo/module/build/swarkhelper'
+require 'pindo/module/xcode/xcode_res_helper'
+require 'pindo/module/build/swark_helper'
 
 module Pindo
     class Command
@@ -12,7 +13,6 @@ module Pindo
         
                 include Command::DeployOptions
 
-                include XcodeBuildHelper
                 include XcodeAppConfig
                 include XcodeCertHelper
 

data/lib/pindo/command/deploy/confusecode.rb

@@ -10,7 +10,7 @@ module Pindo
         
                 include Command::DeployOptions
 
-                include CommonConfuseProj
+                include ConfuseXcodeProj
 
                 self.summary = '替换混淆名称'
         

data/lib/pindo/command/deploy/confuseproj.rb

@@ -13,7 +13,7 @@ module Pindo
 
                 include Command::DeployOptions
                 
-                include CommonConfuseProj
+                include ConfuseXcodeProj
 
                 self.summary = '给Xcode添加混淆设置'
         

data/lib/pindo/command/deploy/pem.rb

@@ -6,9 +6,8 @@ module Pindo
       class Deploy < Command
         class Pem < Deploy
           
-          require 'pindo/module/cert/pemhelper'
+          require 'pindo/module/cert/pem_helper'
           include Command::DeployOptions
-          include PemHelper
 
           self.summary = '创建App的push证书'
   
@@ -22,7 +21,7 @@ module Pindo
 
           def run
             
-            login(apple_id:@apple_id)
+            Pindo::PemHelper.login(apple_id:@apple_id)
 
             pem_type="prod"
             if @args_dev_flag
@@ -34,7 +33,7 @@ module Pindo
             FileUtils.mkdir_p(push_path) unless File.exist?(push_path)
             puts push_path
 
-            x509_cert_path = create_certificate(bundle_id:@bundle_id,type: pem_type, output_path:push_path);
+            x509_cert_path = Pindo::PemHelper.create_certificate(bundle_id:@bundle_id,type: pem_type, output_path:push_path);
 
             if File.exist?(x509_cert_path) && File.exist?(push_path)
               app_config_dir = clong_buildconfig_repo(repo_name: @deploy_repo_name)

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

@@ -3,7 +3,7 @@ require 'xcodeproj'
 require 'find'  
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/build/build_helper'
 
 module Pindo
     class Command
@@ -53,7 +53,7 @@ module Pindo
                     [
                         ['--deploy',  '默认用开发的bundle id，用法:pindo dev autobuild --deploy'],
                         ['--adhoc',   '默认用dev证书，使用--adhoc设置使用adhoc证书编译'],
-                        ['--proj',    '指定上传到pgyer对应的项目名称(大小写空格忽略)'],
+                        ['--proj',    '指定上传到JPS对应的项目名称(大小写空格忽略)'],
                         ['--upload',  '是否上传编译后的ipa'],
                         ['--send',    '上传到之后是否发送测试信息'],
                     ].concat(super)

data/lib/pindo/command/dev/build.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 require 'json'
 require 'xcodeproj'
 require 'gym'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/build/build_helper'
 
 module Pindo
     class Command
@@ -42,7 +42,7 @@ module Pindo
 
                 def self.options
                     [
-                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo dev build --proj=aichatv4'],
+                        ['--proj', '指定上传到JPS对应的项目名称(大小写空格忽略)，用法:pindo dev build --proj=aichatv4'],
                         ['--upload', '是否上传编译后的ipa, 用法:pindo dev build --upload'],
                         ['--send',  '上传到之后是否发送测试信息,用法:pindo dev build --send'],
                     ].concat(super)

data/lib/pindo/command/dev/feishu.rb

@@ -1,7 +1,7 @@
 require 'highline/import'
 require 'fileutils'
 require 'pindo/client/feishuclient'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/build/build_helper'
 require 'pindo/module/pgyer/pgyerhelper'
 
 module Pindo

data/lib/pindo/command/gplay/pullconfig.rb

@@ -0,0 +1,48 @@
+require 'fileutils'
+
+module Pindo
+  class Command
+    class Gplay < Command
+      class Pullconfig < Gplay
+
+        self.summary = '下载并更新Google Play应用配置仓库'
+
+        self.description = <<-DESC
+下载并更新Google Play应用配置仓库
+
+使用示例:
+    pindo gplay pullconfig com.example.app
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('bundle_name', true)
+        ]
+
+        def initialize(argv)
+          @bundle_name = argv.shift_argument
+          super
+          @additional_args = argv.remainder!
+        end
+
+        def validate!
+          super
+
+          if @bundle_name.nil?
+            say "You need input a bundle name"
+            @bundle_name = ask('Bundle Name: ') || nil
+          end
+          help! 'You need input a bundle name' if @bundle_name.nil? || @bundle_name.empty?
+        end
+
+        def run
+          # 克隆配置仓库（使用继承的方法）
+          app_config_dir = clong_buildconfig_repo(repo_name: @bundle_name)
+
+          # 返回配置仓库路径
+          app_config_dir
+        end
+
+      end
+    end
+  end
+end

data/lib/pindo/command/gplay.rb

@@ -1,9 +1,10 @@
 
-require 'pindo/command/gplay/iap'
-require 'pindo/command/gplay/itcapp'
-require 'pindo/command/gplay/metadata'
-require 'pindo/command/gplay/screenshots'
-require 'pindo/command/gplay/upload'
+# require 'pindo/command/gplay/iap'
+# require 'pindo/command/gplay/itcapp'
+# require 'pindo/command/gplay/metadata'
+require 'pindo/command/gplay/pullconfig'
+# require 'pindo/command/gplay/screenshots'
+# require 'pindo/command/gplay/upload'
 
 module Pindo
   class Command

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

@@ -1,8 +1,9 @@
 require 'highline/import'
 require 'xcodeproj'
-require 'find'  
+require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
+require 'pindo/module/xcode/xcode_build_config'
 
 module Pindo
     class Command
@@ -45,7 +46,7 @@ module Pindo
                 # 命令的选项列表
                 def self.options
                     [
-                        # 指定上传到蒲公英的项目
+                        # 指定上传到JPS的项目
                         ['--proj',   '指定上传到测试平台的项目名称'],
                         # 上传编译包
                         ['--upload', '上传编译后的ipa到测试平台'],
@@ -92,15 +93,15 @@ module Pindo
 
                         # ===== 使用 workflow 配置更新项目 =====
                         if workflow_info && workflow_info[:package_name]
-                          package_name = workflow_info[:package_name]
+                          workflow_packname = workflow_info[:package_name]
 
                           puts "\n使用工作流配置更新 iOS 项目:"
-                          puts "  Package Name: #{package_name}"
+                          puts "  Workflow Package Name: #{workflow_packname}"
 
                           # 一次性更新 Display Name、Bundle ID 和 URL Schemes
-                          Pindo::XcodeBuildConfig.update_project_with_packagename(
+                          Pindo::XcodeBuildConfig.update_project_with_workflow(
                             project_dir: project_dir,
-                            package_name: package_name
+                            workflow_packname: workflow_packname
                           )
                         else
                           raise Informative, "未获取到工作流信息"