pindo 5.10.9 → 5.11.1

data/lib/pindo/module/android/android_build_config_helper.rb

@@ -23,7 +23,7 @@ module Pindo
             app_id_suffix = workflow_packname.gsub(/[^a-zA-Z0-9]/, '').downcase
             application_id = "com.heroneverdie101.#{app_id_suffix}"
             package_scheme = workflow_packname.gsub(/[^a-zA-Z0-9]/, '').downcase
-            bundle_scheme = application_id.gsub(/[^a-zA-Z0-9]/, '').downcase
+            # bundle_scheme 现在在 update_application_id 中处理
 
             # 1. 更新 App Name
             success_app_name = update_app_name_with_packagename(
@@ -46,16 +46,10 @@ module Pindo
                 puts "  ✓ 已添加Scheme: #{package_scheme} (基于 Package Name)"
             end
 
-            # 4. 添加基于 Application ID 的 Scheme
-            success_bundle_scheme = add_test_scheme(
-                project_dir: project_dir,
-                scheme_name: bundle_scheme
-            )
-            if success_bundle_scheme
-                puts "  ✓ 已添加Scheme: #{bundle_scheme} (基于 Application ID)"
-            end
+            # 注意：基于 Application ID 的 Scheme 将在 update_application_id 方法中添加
+            # 因为 Application ID 可能在后续流程中被覆盖
 
-            return success_app_name && success_app_id && success_package_scheme && success_bundle_scheme
+            return success_app_name && success_app_id && success_package_scheme
         end
 
         # 更新Android工程版本号
@@ -539,6 +533,85 @@ module Pindo
             end
         end
 
+        # 添加基于 Application ID 的 Scheme
+        # 读取当前项目的 Application ID 并添加对应的 Scheme
+        # @param project_dir [String] Android项目目录路径
+        # @return [Boolean] 是否成功添加
+        def self.add_application_id_based_scheme(project_dir: nil)
+            # 参数验证
+            if project_dir.nil? || !File.directory?(project_dir)
+                Funlog.instance.fancyinfo_error("项目路径无效: #{project_dir}")
+                return false
+            end
+
+            begin
+                # 获取主模块
+                main_module = Pindo::AndroidProjectHelper.get_main_module(project_dir)
+
+                # 支持多种项目结构
+                module_paths = []
+                module_paths << File.join(project_dir, main_module) if main_module
+                module_paths << File.join(project_dir, "app")
+                module_paths << File.join(project_dir, "unityLibrary/launcher")
+                module_paths << File.join(project_dir, "launcher")
+
+                gradle_file = nil
+                module_paths.each do |module_path|
+                    next unless File.exist?(module_path)
+
+                    if File.exist?(File.join(module_path, "build.gradle"))
+                        gradle_file = File.join(module_path, "build.gradle")
+                        break
+                    elsif File.exist?(File.join(module_path, "build.gradle.kts"))
+                        gradle_file = File.join(module_path, "build.gradle.kts")
+                        break
+                    end
+                end
+
+                if gradle_file.nil?
+                    Funlog.instance.fancyinfo_error("未找到build.gradle文件，无法读取 Application ID")
+                    return false
+                end
+
+                # 读取gradle文件，提取当前的 Application ID
+                content = File.read(gradle_file)
+                application_id = nil
+
+                # 匹配各种 applicationId 格式
+                if content =~ /applicationId\s+["']([^"']+)["']/
+                    application_id = $1
+                elsif content =~ /applicationId\s*=\s*["']([^"']+)["']/
+                    application_id = $1
+                end
+
+                if application_id.nil?
+                    Funlog.instance.fancyinfo_error("无法从 gradle 文件中读取 Application ID")
+                    return false
+                end
+
+                # 将 Application ID 转换为合法的 scheme 名称（只保留字母和数字）
+                bundle_scheme = application_id.gsub(/[^a-zA-Z0-9]/, '').downcase
+
+                # 添加 Scheme
+                success_scheme = add_test_scheme(
+                    project_dir: project_dir,
+                    scheme_name: bundle_scheme
+                )
+
+                if success_scheme
+                    puts "  ✓ 已添加Scheme: #{bundle_scheme} (基于 Application ID: #{application_id})"
+                    return true
+                else
+                    Funlog.instance.fancyinfo_error("添加 Scheme 失败: #{bundle_scheme}")
+                    return false
+                end
+
+            rescue StandardError => e
+                Funlog.instance.fancyinfo_error("添加基于 Application ID 的 Scheme 失败: #{e.message}")
+                return false
+            end
+        end
+
         # 添加测试scheme到Android工程
         # @param project_dir [String] Android项目目录路径
         # @param scheme_name [String] 要添加的scheme名称

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.10.9"
+  VERSION = "5.11.1"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.10.9
+  version: 5.11.1
 platform: ruby
 authors:
 - wade
@@ -314,10 +314,14 @@ files:
 - lib/pindo/command.rb
 - lib/pindo/command/android.rb
 - lib/pindo/command/android/autobuild.rb
+- lib/pindo/command/android/autoresign.rb
 - lib/pindo/command/android/build.rb
-- lib/pindo/command/android/debug.rb
+- lib/pindo/command/android/keystore.rb
 - lib/pindo/command/appstore.rb
+- lib/pindo/command/appstore/adhocbuild.rb
+- lib/pindo/command/appstore/autoresign.rb
 - lib/pindo/command/appstore/iap.rb
+- lib/pindo/command/appstore/import.rb
 - lib/pindo/command/appstore/itcapp.rb
 - lib/pindo/command/appstore/metadata.rb
 - lib/pindo/command/appstore/screenshots.rb
@@ -346,20 +350,14 @@ files:
 - lib/pindo/command/deploy/tag.rb
 - lib/pindo/command/deploy/updateconfig.rb
 - lib/pindo/command/deploy/uploadipa.rb
-- lib/pindo/command/dev.rb
 - lib/pindo/command/dev/autobuild.rb
 - lib/pindo/command/dev/build.rb
 - lib/pindo/command/dev/debug.rb
-- lib/pindo/command/dev/feishu.rb
-- lib/pindo/command/dev/repoinit.rb
-- lib/pindo/command/dev/tag.rb
 - lib/pindo/command/env.rb
 - lib/pindo/command/env/dreamstudio.rb
 - lib/pindo/command/env/quarkenv.rb
 - lib/pindo/command/env/swarkenv.rb
 - lib/pindo/command/env/workhard.rb
-- lib/pindo/command/feishu.rb
-- lib/pindo/command/feishu/send_message.rb
 - lib/pindo/command/gplay.rb
 - lib/pindo/command/gplay/iap.rb
 - lib/pindo/command/gplay/itcapp.rb
@@ -368,16 +366,14 @@ files:
 - lib/pindo/command/gplay/screenshots.rb
 - lib/pindo/command/gplay/upload.rb
 - lib/pindo/command/ios.rb
-- lib/pindo/command/ios/adhoc.rb
 - lib/pindo/command/ios/applovin.rb
 - lib/pindo/command/ios/autobuild.rb
 - lib/pindo/command/ios/autoresign.rb
 - lib/pindo/command/ios/build.rb
-- lib/pindo/command/ios/debug.rb
-- lib/pindo/command/ipa.rb
-- lib/pindo/command/ipa/autoresign.rb
-- lib/pindo/command/ipa/import.rb
-- lib/pindo/command/ipa/output.rb
+- lib/pindo/command/ios/cert.rb
+- lib/pindo/command/ios/podlint.rb
+- lib/pindo/command/ios/podpush.rb
+- lib/pindo/command/ios/podupdate.rb
 - lib/pindo/command/jps.rb
 - lib/pindo/command/jps/apptest.rb
 - lib/pindo/command/jps/bind.rb
@@ -386,11 +382,6 @@ files:
 - lib/pindo/command/jps/login.rb
 - lib/pindo/command/jps/resign.rb
 - lib/pindo/command/jps/upload.rb
-- lib/pindo/command/lib.rb
-- lib/pindo/command/lib/forcepush.rb
-- lib/pindo/command/lib/lint.rb
-- lib/pindo/command/lib/push.rb
-- lib/pindo/command/lib/update.rb
 - lib/pindo/command/repo.rb
 - lib/pindo/command/repo/clone.rb
 - lib/pindo/command/repo/create.rb
@@ -400,18 +391,21 @@ files:
 - lib/pindo/command/unity.rb
 - lib/pindo/command/unity/apk.rb
 - lib/pindo/command/unity/autobuild.rb
-- lib/pindo/command/unity/initpack.rb
 - lib/pindo/command/unity/ipa.rb
-- lib/pindo/command/unity/pack.rb
-- lib/pindo/command/unity/upload.rb
+- lib/pindo/command/unity/packbuild.rb
+- lib/pindo/command/unity/packinit.rb
+- lib/pindo/command/unity/packpush.rb
 - lib/pindo/command/unity/web.rb
 - lib/pindo/command/utils.rb
 - lib/pindo/command/utils/boss.rb
 - lib/pindo/command/utils/clearcert.rb
 - lib/pindo/command/utils/device.rb
+- lib/pindo/command/utils/feishu.rb
 - lib/pindo/command/utils/icon.rb
 - lib/pindo/command/utils/renewcert.rb
 - lib/pindo/command/utils/renewproj.rb
+- lib/pindo/command/utils/repoinit.rb
+- lib/pindo/command/utils/tag.rb
 - lib/pindo/command/utils/tgate.rb
 - lib/pindo/command/utils/xcassets.rb
 - lib/pindo/command/utils/xcassets.sh

data/lib/pindo/command/dev.rb

@@ -1,21 +0,0 @@
-# require 'pindo/command/dev/create'
-
-
-require 'pindo/command/dev/tag'
-require 'pindo/command/dev/debug'
-require 'pindo/command/dev/autobuild'
-require 'pindo/command/dev/build'
-require 'pindo/command/dev/repoinit'
-require 'pindo/command/dev/feishu'
-
-module Pindo
-    class Command
-        
-        class Dev < Command
-            self.abstract_command = true
-            self.summary = '开发阶段使用的相关命令'
-
-        end
-        
-    end
-end

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

@@ -1,103 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'json'
-require 'net/http'
-require 'uri'
-require 'pindo/client/httpclient'
-
-module Pindo
-  module Command
-    module Feishu
-      class SendMessage
-        def self.run(options)
-          new(options).run
-        end
-
-        def initialize(options)
-          @options = options
-          @webhook_url = options[:webhook_url]
-          @message = options[:message]
-          @title = options[:title] || "通知"
-          @at_all = options[:at_all] || false
-        end
-
-        def run
-          unless @webhook_url
-            puts "错误：未提供飞书 webhook URL"
-            return false
-          end
-
-          unless @message
-            puts "错误：未提供消息内容"
-            return false
-          end
-
-          send_message
-        end
-
-        private
-
-        def send_message
-          uri = URI(@webhook_url)
-          
-          # 构建消息内容
-          content = {
-            "msg_type": "post",
-            "content": {
-              "post": {
-                "zh_cn": {
-                  "title": @title,
-                  "content": [
-                    [
-                      {
-                        "tag": "text",
-                        "text": @message
-                      }
-                    ]
-                  ]
-                }
-              }
-            }
-          }
-
-          # 如果需要@所有人
-          if @at_all
-            content[:content][:post][:zh_cn][:content][0].unshift(
-              {
-                "tag": "at",
-                "user_id": "all"
-              }
-            )
-          end
-
-          # 发送请求
-          begin
-            con = HttpClient.create_instance_with_proxy
-            res = con.post do |req|
-              req.url uri
-              req.headers['Content-Type'] = 'application/json'
-              req.body = content.to_json
-            end
-
-            if res.status == 200
-              result = JSON.parse(res.body)
-              if result['code'] == 0
-                puts "消息发送成功！"
-                return true
-              else
-                puts "消息发送失败：#{result['msg']}"
-                return false
-              end
-            else
-              puts "消息发送失败：HTTP #{res.status}"
-              return false
-            end
-          rescue => e
-            puts "发送消息时出错：#{e.message}"
-            return false
-          end
-        end
-      end
-    end
-  end
-end 

data/lib/pindo/command/feishu.rb

@@ -1,50 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'claide'
-require 'pindo/command/feishu/send_message'
-
-module Pindo
-  module Command
-    class Feishu < CLAide::Command
-      self.description = '飞书相关命令'
-      self.command = 'feishu'
-      self.abstract_command = true
-
-      def self.options
-        [
-          ['--webhook-url=URL', '飞书 webhook URL'],
-          ['--message=MESSAGE', '要发送的消息内容'],
-          ['--title=TITLE', '消息标题（可选）'],
-          ['--at-all', '是否@所有人（可选）']
-        ]
-      end
-
-      def initialize(argv)
-        super
-        @webhook_url = argv.option('webhook-url')
-        @message = argv.option('message')
-        @title = argv.option('title')
-        @at_all = argv.flag?('at-all')
-      end
-
-      def validate!
-        super
-        unless @webhook_url
-          help! '必须提供 webhook URL'
-        end
-        unless @message
-          help! '必须提供消息内容'
-        end
-      end
-
-      def run
-        Pindo::Command::Feishu::SendMessage.run(
-          webhook_url: @webhook_url,
-          message: @message,
-          title: @title,
-          at_all: @at_all
-        )
-      end
-    end
-  end
-end 

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

@@ -1,245 +0,0 @@
-require 'highline/import'
-require 'xcodeproj'
-require 'find'
-require 'fileutils'
-require 'pindo/base/executable'
-require 'pindo/module/xcode/xcode_build_config'
-
-module Pindo
-    class Command
-        class Ios < Command
-            class Adhoc < Ios
-        
-                include Appselect
-
-                # 命令的简要说明 - 设置开发环境并编译iOS工程
-                self.summary = '设置开发环境并编译iOS工程'
-    
-                # 命令的详细说明,包含用法示例
-                self.description = <<-DESC
-                    设置开发环境并编译iOS工程。
-                    
-                    支持功能:
-
-                        * 自动设置开发环境
-
-                        * 编译打包上传
-
-                        * 发送测试通知
-
-                    使用示例:
-
-                        $ pindo ios adhoc                    # 设置开发环境
-
-                        $ pindo ios adhoc --upload           # 编译并上传
-
-                        $ pindo ios adhoc --send             # 编译并上传并发送通知
-
-                        $ pindo ios adhoc --proj=myapp       # 指定项目名称
-                DESC
-
-                # 命令的参数列表
-                self.arguments = [
-
-                ]
-
-                # 命令的选项列表
-                def self.options
-                    [
-                        # 指定上传到JPS的项目
-                        ['--proj',   '指定上传到测试平台的项目名称'],
-                        # 上传编译包
-                        ['--upload', '上传编译后的ipa到测试平台'],
-                        # 发送通知
-                        ['--send',   '上传成功后发送测试通知']
-                    ].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')
-
-                    if @args_send_flag
-                        @args_upload_flag = true
-                    end
-
-                    super
-                    @additional_args = argv.remainder!
-                end
-
-                def validate!
-                    
-                    super
-                end
-
-                def run
-
-                    project_dir = Dir.pwd
-
-                    app_info_obj = nil
-                    workflow_info = nil
-                    if @args_upload_flag
-                        proj_name = @args_proj_name
-                        # 传入 package_type 获取 workflow_info
-                        app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
-                          working_directory: Dir.pwd,
-                          proj_name: proj_name,
-                          package_type: 'ipa'
-                        )
-
-                        # ===== 使用 workflow 配置更新项目 =====
-                        if workflow_info && workflow_info[:package_name]
-                          workflow_packname = workflow_info[:package_name]
-
-                          puts "\n使用工作流配置更新 iOS 项目:"
-                          puts "  Workflow Package Name: #{workflow_packname}"
-
-                          # 一次性更新 Display Name、Bundle ID 和 URL Schemes
-                          Pindo::XcodeBuildConfig.update_project_with_workflow(
-                            project_dir: project_dir,
-                            workflow_packname: workflow_packname
-                          )
-                        else
-                          raise Informative, "未获取到工作流信息"
-                        end
-                    end
-
-                    mainapp_bundleid= nil
-                    if @args_deploy_flag
-                        mainapp_bundleid = get_selected_deploy_bundleid()
-                    else
-                        mainapp_bundleid = get_selected_dev_bundleid()
-                    end
-
-                    args_temp = []
-                    args_temp << mainapp_bundleid
-                    Pindo::Command::Deploy::Pullconfig::run(args_temp)
-
-                    Dir.chdir(project_dir)
-
-                    config_json_file = File.join(project_dir,"config.json")
-                    # 处理entitlements配置
-                    Pindo::XcodeBuildConfig.update_entitlements_config(project_dir: project_dir, config_file: config_json_file)
-
-                    if File.exist?(File.join(project_dir, "Podfile"))
-                        
-                        args_temp = []
-                        args_temp << config_json_file
-                        Pindo::Command::Lib::Update::run([])
-
-                        begin
-                            if File.exist?(File.join(project_dir, "Podfile.lock"))
-                                FileUtils.rm_rf(File.join(project_dir, "Podfile.lock"))    
-                            end
-                            if File.exist?(File.join(project_dir,"Pods"))
-                                FileUtils.rm_rf(File.join(project_dir, "Pods"))    
-                            end
-                            puts "正在执行pod deintegrate..."
-                            system 'pod deintegrate'
-                            puts "正在执行pod install..."
-                            system 'pod install'
-                        rescue => error
-                            puts(error.to_s)
-                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
-                        end
-
-                        Dir.chdir(project_dir)
-                        pod_lock_file = File.join(project_dir, "Podfile.lock")
-                        if !File.exist?(pod_lock_file)
-                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
-                        end
-
-                    end
-                    
-
-                    args_temp = []
-                    if @args_adhoc_flag
-                        args_temp << "--adhoc"
-                    else
-                        args_temp << "--dev"
-                    end
-
-                    project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-                    if !project_fullname.nil?
-                        project_obj = Xcodeproj::Project.open(project_fullname)
-                        project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
-                        if !project_build_platform.nil? && project_build_platform.eql?("macosx")
-                            @args_macos_flag = true
-                        end
-                    end
-
-                    if @args_macos_flag
-                        args_temp << "--macos"
-                    end
-
-                    Pindo::Command::Deploy::Cert::run(args_temp)
-
-                    # 根据证书配置后的实际 Bundle ID 重新更新 URL Schemes
-                    # 因为 Cert::run 可能会修改 PRODUCT_BUNDLE_IDENTIFIER
-                    if @args_upload_flag && workflow_info && workflow_info[:package_name]
-                        Pindo::XcodeBuildConfig.update_url_schemes_with_bundleid(
-                            project_dir: project_dir,
-                            package_name: workflow_info[:package_name]
-                        )
-                    end
-
-                    Dir.chdir(project_dir)
-                    Pindo::Command::Deploy::Build::run(args_temp)
-
-
-                    pindo_new_project_dir = Dir.pwd
-                    build_path = File.join(pindo_new_project_dir, "build", "*.{ipa,app}")
-                    ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-
-                    if !ipa_file_upload.nil? && !app_info_obj.nil?
-                        description = nil
-                        if File.exist?(File.join(pindo_new_project_dir, ".release_info"))
-                            description = File.read(File.join(pindo_new_project_dir, ".release_info"))
-                        else
-                            if File.exist?(File.join(pindo_new_project_dir, ".git"))
-                                description = git!(%W(-C #{pindo_new_project_dir} show -s --format=%h::%s)).strip
-                            end
-                        end
-                        result_data = PgyerHelper.share_instace.start_upload(
-                            app_info_obj: app_info_obj,
-                            ipa_file_upload: ipa_file_upload,
-                            description: description,
-                            workflow_info: workflow_info
-                        )
-                        if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
-                            PgyerHelper.share_instace.print_app_version_info(
-                                app_info_obj: app_info_obj,
-                                app_version_info_obj: result_data["data"]
-                            )
-                            if @args_send_flag
-                                # 始终发送给自己
-                                PgyerHelper.share_instace.send_apptest_msg(
-                                    app_info_obj: app_info_obj,
-                                    app_version_info_obj: result_data["data"],
-                                    receiveType: "self"
-                                )
-
-                                # 额外发送到测试群
-                                PgyerHelper.share_instace.send_apptest_msg(
-                                    app_info_obj: app_info_obj,
-                                    app_version_info_obj: result_data["data"],
-                                    chatEnv: "DevTest",
-                                    receiveType: "chat"
-                                )
-                            end
-                        end
-                    end
-                    
-                    system "open #{project_dir}"
-
-                end
-
-            end
-        end
-    end
-end
-  

data/lib/pindo/command/ipa.rb

@@ -1,16 +0,0 @@
-
-
-require 'pindo/command/ipa/import'
-require 'pindo/command/ipa/output'
-require 'pindo/command/ipa/autoresign'
-
-module Pindo
-  class Command
-    
-    class Ipa < Command
-      self.abstract_command = true
-      self.summary = '发布阶段自动化相关命令'
-    end
-
-  end
-end