pindo 4.9.3 → 4.9.5

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

@@ -64,21 +64,40 @@ module Pindo
                 end
 
                 def run
+                    pindo_project_dir = Dir.pwd
 
-                    pindo_unity_project_dir = Dir.pwd
                     build_helper = Pindo::BuildHelper.share_instance
-                    unless build_helper.ios_project?(pindo_unity_project_dir)
-                        raise Informative, "当前目录不是iOS工程，请在iOS工程根目录下执行此命令"
+                    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
+                        ios_build
+                    when :android
+                        raise Informative,  "Android 工程， 请使用 pindo android build"
+                    when :unity
+                        raise Informative,  "Unity 工程， 请使用 pindo unity ipa"
+                    else
+                        raise Informative, "当前目录不是工程目录，不能编译"
                     end
+            
+                end
 
+                def ios_build
+                    
+                    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_unity_project_dir)
+                        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) 
                         end
                     end
 
-                    
                     app_info_obj = nil
                     if @args_upload_flag 
                         proj_name = @args_proj_name
@@ -90,24 +109,13 @@ module Pindo
                     Pindo::Command::Deploy::Build::run(args_temp)
 
 
-                    pindo_new_project_dir = Dir.pwd
-                    build_path = File.join(pindo_new_project_dir, "build", "*.{ipa,app,apk}")
+                    Dir.chdir(pindo_project_dir)
+                    build_path = File.join(pindo_project_dir, "build", "*.{ipa,app,apk}")
                     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
-                                unless !description.nil? && description.length > 10
-                                    description = nil
-                                end
-                            end
-                        end
-
                         result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_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"])
@@ -118,11 +126,8 @@ module Pindo
                             end
                         end
                     end
-
-
                 end
 
-
             end
         end
     end

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

@@ -199,7 +199,7 @@ module Pindo
                         applovin_args = []
                         applovin_args << "--appstore"
                         applovin_args << "--install"
-                        Pindo::Command::Dev::Applovin::run(applovin_args)
+                        Pindo::Command::Ios::Applovin::run(applovin_args)
                     end
 
                     if @build_flag

data/lib/pindo/command/pgyer/apptest.rb

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -9,11 +7,27 @@ module Pindo
         class Pgyer < Command
             class Apptest < Pgyer
 
-
                 self.summary = '获取pgyer中指定app的测试链接和二维码'
 
                 self.description = <<-DESC
-                  获取pgyer中指定app的测试链接和二维码，终端运行：pindo pgyer apptest
+                    获取pgyer中指定app的测试链接和二维码。
+
+                    支持功能:
+
+                        * 获取app测试链接
+                        * 获取app二维码
+                        * 发送测试信息
+                        * 查看历史版本
+
+                    使用示例:
+
+                        $ pindo pgyer apptest                    # 获取当前目录项目的测试链接
+                        
+                        $ pindo pgyer apptest --proj=demo       # 获取指定项目的测试链接
+                        
+                        $ pindo pgyer apptest --list            # 列出历史版本供选择
+                        
+                        $ pindo pgyer apptest --send            # 发送测试信息
                 DESC
 
                 self.arguments = [
@@ -29,7 +43,6 @@ module Pindo
                   ].concat(super)
                 end
 
-
                 def initialize(argv)
 
                     @args_login_flag = argv.flag?('login', false)
@@ -55,7 +68,6 @@ module Pindo
                         raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
                     end
 
-
                     if !app_info_obj.nil?
 
                         version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(app_info_obj:app_info_obj, list_select_flat:@args_list_flag)
@@ -79,7 +91,6 @@ module Pindo
 
                 end
 
-
             end
         end
     end

data/lib/pindo/command/pgyer/comment.rb

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -13,7 +11,21 @@ module Pindo
                 self.summary = '修改pgyer中已经上传安装包的备注信息'
 
                 self.description = <<-DESC
-                  修改pgyer中已经上传安装包的备注信息，终端运行：pindo pgyer apptest
+                修改pgyer中已经上传安装包的备注信息。
+                
+                支持功能:
+
+                    * 修改版本备注
+                    * 查看历史版本
+                    * 选择指定版本
+
+                使用示例:
+
+                        $ pindo pgyer comment                    # 修改当前目录项目的最新版本备注
+                        
+                        $ pindo pgyer comment --proj=demo       # 修改指定项目的版本备注
+                        
+                        $ pindo pgyer comment --list            # 列出历史版本供选择修改
                 DESC
 
                 self.arguments = [

data/lib/pindo/command/pgyer/download.rb

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -15,7 +13,21 @@ module Pindo
                 self.summary = '从pgyer下载指定app的安装包'
 
                 self.description = <<-DESC
-                  从pgyer下载指定app的安装包。终端直接运行:pindo pgyer download 
+                    从pgyer下载指定app的安装包。
+
+                    支持功能:
+
+                        * 下载指定版本安装包
+                        * 查看历史版本
+                        * 显示下载进度
+
+                    使用示例:
+
+                        $ pindo pgyer download                   # 下载当前目录项目的最新版本
+                        
+                        $ pindo pgyer download --proj=demo      # 下载指定项目的安装包
+                        
+                        $ pindo pgyer download --list           # 列出历史版本供选择下载
                 DESC
 
                 self.arguments = [

data/lib/pindo/command/pgyer/login.rb

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -11,10 +9,22 @@ module Pindo
 
             class Login < Pgyer
 
-                self.summary = '登录pgyer'
+                self.summary = '登录pgyer测试平台'
 
                 self.description = <<-DESC
-                  登录pgyer，终端运行：pindo pgyer login
+                    登录pgyer测试平台。
+
+                    支持功能:
+
+                        * 账号密码登录
+                        * 记住登录状态
+                        * 强制重新登录
+
+                    使用示例:
+
+                        $ pindo pgyer login                     # 登录pgyer
+                        
+                        $ pindo pgyer login --force            # 强制重新登录
                 DESC
 
                 self.arguments = [

data/lib/pindo/command/pgyer/resign.rb

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -10,10 +8,28 @@ module Pindo
             class Resign < Pgyer
 
 
-                self.summary = '获取pgyer中指定app的测试链接和二维码'
+                self.summary = '重签名pgyer中的安装包'
 
                 self.description = <<-DESC
-                  获取pgyer中指定app的测试链接和二维码，终端运行：pindo pgyer resign
+                    重签名pgyer中的安装包。
+
+                    支持功能:
+
+                        * 选择证书重签名
+                        * 查看历史版本
+                        * 发送测试信息
+
+                    使用示例:
+
+                        $ pindo pgyer resign                    # 重签名当前项目最新版本
+                        
+                        $ pindo pgyer resign --proj=demo       # 重签名指定项目
+                        
+                        $ pindo pgyer resign --list            # 列出历史版本供选择
+                        
+                        $ pindo pgyer resign --certid=xxx      # 使用指定证书重签名
+                        
+                        $ pindo pgyer resign --send            # 重签名后发送测试信息
                 DESC
 
                 self.arguments = [

data/lib/pindo/command/pgyer/upload.rb

@@ -1,11 +1,9 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'json'
 require 'faraday'
 require 'pindo/module/pgyer/pgyerhelper'
-
+require 'pindo/module/build/buildhelper'
 
 module Pindo
     class Command
@@ -13,10 +11,32 @@ module Pindo
             class Upload < Pgyer
 
 
-                self.summary = '上传ipa包到pgyer测试网站'
+                self.summary = '上传安装包到pgyer测试平台'
 
                 self.description = <<-DESC
-                  上传ipa包到pgyer。用法：例如:pindo pgyer upload  path/to/demo.ipa
+                    上传安装包到pgyer测试平台。
+
+                    支持功能:
+
+                        * 上传ipa/apk安装包
+                        * 添加版本描述
+                        * 上传附件
+                        * 重签名
+                        * 发送测试信息
+
+                    使用示例:
+
+                        $ pindo pgyer upload path/to/app.ipa           # 上传指定安装包
+                        
+                        $ pindo pgyer upload --proj=demo              # 上传到指定项目
+                        
+                        $ pindo pgyer upload --desc="版本说明"         # 添加版本描述
+                        
+                        $ pindo pgyer upload --attach=file.zip        # 上传附件
+                        
+                        $ pindo pgyer upload --resign                 # 上传后重签名
+                        
+                        $ pindo pgyer upload --send                   # 上传后发送企业微信测试信息
                 DESC
 
                 self.arguments = [
@@ -33,7 +53,7 @@ module Pindo
                     ['--desc', '指定上传的备注信息: -pindo pgyer upload -desc="1.upload message"'],
                     ['--resign',  '上传到之后是否重签名,用法:pindo pgyer upload --resign'],
                     ['--certid',  '设置重签名的正式id,用法:pindo pgyer upload --certid=com.test.bundleid'],
-
+                    
                   ].concat(super)
                 end
 
@@ -85,9 +105,39 @@ module Pindo
                 def run
 
                     current_project_dir = Dir.pwd
+                    build_helper = Pindo::BuildHelper.share_instance
+                    build_helper.check_check_and_install_cliff(current_project_dir)
+                    is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(current_project_dir)
+
+                    Dir.chdir(current_project_dir)
+                    if is_need_add_tag
+                        Pindo::Command::Dev::Tag::run(tag_action_parms) 
+                    end
+
                     if @args_ipa_file.nil? || !File.exist?(@args_ipa_file)
-                        build_path = File.join(current_project_dir, "build", "*.{ipa,app,apk}")
-                        @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                        # 获取build目录下的ipa文件
+                        project_type = build_helper.project_type(current_project_dir)
+                        case project_type
+                        when :ios
+                            build_path = File.join(current_project_dir, "build", "*.{ipa,app}")
+                            @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                        when :android
+                            build_path = File.join(current_project_dir, "build", "*.{apk}")
+                            @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                        when :unity
+                            
+                            if File.exist?(File.join(current_project_dir, "GoodPlatform/BaseiOS"))
+                                build_path = File.join(current_project_dir, "GoodPlatform/BaseiOS/build", "*.{ipa,app}")
+                                @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                            else
+                                build_path = File.join(current_project_dir, "GoodPlatform/iOS/build", "*.{ipa,app}")
+                                @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                            end
+                        else
+                            raise Informative, "当前目录不是工程目录，不能编译"
+                        end
+
+
                         if @args_ipa_file.nil?
                             build_path = File.join(current_project_dir, "*.{ipa,app,apk}")
                             @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
@@ -123,7 +173,6 @@ module Pindo
                         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
                            if @args_resign_flag
                                 args = []
@@ -141,9 +190,6 @@ module Pindo
                         end
                     end
 
-
-
-
                 end
 
             end

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

@@ -77,23 +77,24 @@ module Pindo
 
                 def run
 
-                    pindo_unity_project_dir = Dir.pwd
+                    pindo_project_dir = Dir.pwd
 
                     # 检查是否是Unity工程
                     unity_helper = Pindo::Client::UnityHelper.share_instance
-                    unless unity_helper.unity_project?(pindo_unity_project_dir)
+                    unless unity_helper.unity_project?(pindo_project_dir)
                         raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
                     end
 
                     if @args_upload_flag
                         build_helper = Pindo::BuildHelper.share_instance
-                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_unity_project_dir)
+                        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) 
                         end
                     end
 
-                    project_unity_version = unity_helper.get_unity_version(pindo_unity_project_dir)
+                    project_unity_version = unity_helper.get_unity_version(pindo_project_dir)
                     project_unity_major_version = project_unity_version.split('.')[0..1].join('.')
                     puts
                     puts "工程的Unity版本: #{project_unity_version}"
@@ -106,7 +107,6 @@ module Pindo
                         proj_name = @args_proj_name
                         app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
                     end
-                    puts app_info_obj
 
                     mainapp_bundleid= nil
                     if @args_deploy_flag
@@ -117,16 +117,16 @@ module Pindo
 
                     isLibrary = @args_base_flag
 
-                    ios_export_lib_dir = File.join(pindo_unity_project_dir, "GoodPlatform/BaseiOS")
+                    ios_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseiOS")
                     if File.directory?(ios_export_lib_dir)
                         isLibrary = true
                     end
 
-                    pindo_ios_project_dir = File.join(pindo_unity_project_dir, "GoodPlatform/iOS")
+                    pindo_ios_project_dir = File.join(pindo_project_dir, "GoodPlatform/iOS")
                     if isLibrary
                         pindo_ios_project_dir = ios_export_lib_dir
                     end
-                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_unity_project_dir, platform:'iOS', isLibrary:isLibrary)
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary)
                     
                     
                     args_temp = []

data/lib/pindo/module/build/buildhelper.rb

@@ -14,6 +14,95 @@ module Pindo
           end
         end
 
+        def check_check_and_install_cliff(project_path)
+          if is_git_directory?(local_repo_dir: project_path)
+            current_git_root_path = git_root_directory(local_repo_dir: project_path)
+            unless File.exist?(File.join(current_git_root_path, 'cliff.toml'))
+              add_git_cliffconfig(current_git_root_path)
+            end
+          end
+
+          begin
+            if !system('which git-cliff > /dev/null 2>&1')
+              puts "安装git-cliff..."
+              install_gitcliff()
+            end
+          rescue
+            raise Informative, "安装git-cliff出现错误"
+          end
+        end
+
+        def write_gitignore(git_root_dir)
+          gitignore_path = File.join(git_root_dir, '.gitignore')
+          gitignore_content = <<~GITIGNORE
+            # Build logs
+            build_ios.log
+            CHANGELOG.md
+
+            # Platform specific directories
+            /GoodPlatform/iOS/config.json
+            /GoodPlatform/iOS/*
+            /GoodPlatform/Android/*
+            /GoodPlatform/MacOS/*
+            /GoodPlatform/BaseiOS/Unity/*
+            /GoodPlatform/BaseiOS/Pods/
+            /GoodPlatform/BaseiOS/Podfile.lock
+            /GoodPlatform/BaseAndroid/Unity/*
+            /GoodPlatform/BaseMac/Unity/*
+          GITIGNORE
+          # Append to existing .gitignore or create new one
+          File.open(gitignore_path, 'a') do |f|
+            f.puts("\n# Added by Pindo")
+            f.puts(gitignore_content)
+          end
+        end
+
+        def add_git_cliffconfig(project_path)
+
+          temp_dir = Dir.pwd
+          Funlog.instance.fancyinfo_start("添加日志变更git-cliff配置...")
+          if is_git_directory?(local_repo_dir: project_path)
+            current_git_root_path = git_root_directory(local_repo_dir: project_path)
+            Dir.chdir(current_git_root_path)
+            pindo_common_dir = clone_pindo_common_config_repo(force_delete:false)
+            if File.exist?(File.join(pindo_common_dir, 'cliff.toml'))
+              FileUtils.cp_r(File.join(pindo_common_dir, 'cliff.toml'), File.join(current_git_root_path, 'cliff.toml'))
+            end
+            Funlog.instance.fancyinfo_update("仓库添加git-cliff配置")
+            write_gitignore(current_git_root_path)
+            Funlog.instance.fancyinfo_update("仓库添加.gitignore")
+            Dir.chdir(current_git_root_path)
+            current_branch = git!(%W(-C #{current_git_root_path} rev-parse --abbrev-ref HEAD)).strip
+            git!(%W(-C #{current_git_root_path} add cliff.toml))
+            git!(%W(-C #{current_git_root_path} add .gitignore))
+            commit_message = "docs: 添加日志变更配置".encode('UTF-8')
+            git!(%W(-C #{current_git_root_path} commit -m #{commit_message}))
+            git!(%W(-C #{current_git_root_path} push origin #{current_branch}))
+            
+          else
+            Funlog.instance.fancyinfo_error("当前目录不是git仓库，请在git仓库根目录下执行此命令")
+            raise Informative, "当前目录不是git仓库，请在git仓库根目录下执行此命令"
+            Dir.chdir(temp_dir)
+          end
+          Funlog.instance.fancyinfo_success("日志变更git-cliff配置完成!")
+          Dir.chdir(temp_dir)
+        end
+
+        def install_gitcliff()
+          puts "\n检查git-cliff命令是否安装"
+          # 请检查git-cliff命令是否安装
+          begin
+            if !system('which git-cliff > /dev/null 2>&1')
+              # /bin/bash -c "$(curl -fsSL https://gitee.com/goodtools/env/raw/master/gitcliff_install.sh)"
+              #安装git-cliff
+              system('bash -c "$(curl -fsSL https://gitee.com/goodtools/env/raw/master/gitcliff_install.sh)"')
+            end
+          rescue
+            raise Informative, "安装git-cliff出现错误"
+          end
+        end
+
+
         def check_is_need_add_tag?(project_path)
           tag_action_parms = nil
           is_need_add_tag = false

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.9.3"
+  	VERSION = "4.9.5"
 
   	class VersionCheck
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.9.3
+  version: 4.9.5
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-02-22 00:00:00.000000000 Z
+date: 2025-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -274,15 +274,10 @@ files:
 - lib/pindo/command/deploy/updateconfig.rb
 - lib/pindo/command/deploy/uploadipa.rb
 - lib/pindo/command/dev.rb
-- lib/pindo/command/dev/applovin.rb
 - lib/pindo/command/dev/autobuild.rb
-- lib/pindo/command/dev/autoresign.rb
 - lib/pindo/command/dev/build.rb
-- lib/pindo/command/dev/confusecode.rb
-- lib/pindo/command/dev/confuseproj.rb
-- lib/pindo/command/dev/createbuild.rb
 - lib/pindo/command/dev/debug.rb
-- lib/pindo/command/dev/pgyercert.rb
+- lib/pindo/command/dev/repoinit.rb
 - lib/pindo/command/dev/tag.rb
 - lib/pindo/command/env.rb
 - lib/pindo/command/env/dreamstudio.rb