pindo 5.13.1 → 5.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce0a5c40dcd8dbdcef15ad36aebc63fa189108aa38e05923e81662830a4a2996
-  data.tar.gz: c05cd7079948fa242597eceaccb3cab522035fad0a63b53a3e9a0af6296309f9
+  metadata.gz: efb0e602f3e0c11eca368669749cfc80c51854a3d7563dfe7d2a66e639507c12
+  data.tar.gz: 77df00465e5213f16b11241564184a969a43d49385476930a395524a5cf55764
 SHA512:
-  metadata.gz: f7f88c219338108d5107f7b3436763a93186e91bebc5b27d608f9ae1f2e7d01185ea0727aa1162357ae07fd8aae682d883b3c57a676e328d096b04ce7bebbb08
-  data.tar.gz: 22cc175b1716238b98613116c9103d4b2324e3e3394f2f965a8d76c99144e3c197793ccdfefa733aea0d3e516340582b938a3b3ea533e150baa9a18d3406049a
+  metadata.gz: c3c3826097cdf84681875828afe7c41af58c5422b9371ea7b23ebb994de3131b04d851099abcd91b548356f227422b67800a5fdb599ba9d863a733d5a3662618
+  data.tar.gz: 4b9275fe85f02ea8438367de51f950dbef8c9ab794d9a541844e4ec7875093e7c89ff0e173fe01dbc087a28ac416c5a1795941dacc22044ef4308544e9587268

data/lib/pindo/base/git_handler.rb

@@ -0,0 +1,692 @@
+require 'fileutils'
+require 'pindo/base/executable'
+require 'etc'
+require 'claide'
+
+module Pindo
+  # Git 操作处理类
+  # 提供所有 Git 相关的静态方法，方便其他模块直接调用
+  class GitHandler
+
+    class << self
+      extend Executable
+      executable :git
+      def prepare_gitenv()
+        usrname = Etc.getlogin
+        git!(%W(config --global user.email #{usrname}@example.com))
+        git!(%W(config --global user.name #{usrname}))
+      end
+
+      def is_git_directory?(local_repo_dir: nil)
+        args = local_repo_dir ? %W(-C #{local_repo_dir} rev-parse --is-inside-work-tree) : %w(rev-parse --is-inside-work-tree)
+        begin
+          git!(args)
+          true
+        rescue StandardError => e
+          false
+        end
+      end
+
+      def git_root_directory(local_repo_dir: nil)
+        return nil unless is_git_directory?(local_repo_dir: local_repo_dir)
+
+        args = local_repo_dir ? %W(-C #{local_repo_dir} rev-parse --show-toplevel) : %w(rev-parse --show-toplevel)
+        begin
+          git!(args).strip
+        rescue StandardError => e
+          nil
+        end
+      end
+
+      def add_branch(local_repo_dir: nil, branch: nil)
+
+          current=Dir.pwd
+          result = false
+
+          if !local_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
+            git!(%W(-C #{local_repo_dir} checkout -b #{branch}))
+            result = true
+          end
+
+          git!(%W(-C #{local_repo_dir} push origin #{branch}:#{branch}))
+
+          Dir.chdir(current)
+          return result
+      end
+
+      def remove_branch(local_repo_dir: nil, branch: nil)
+          current=Dir.pwd
+
+          result = false
+          if File.exist?(local_repo_dir)
+            current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
+            if local_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
+                git!(%W(-C #{local_repo_dir} branch -D #{branch}))
+                result = true
+            end
+
+            if remote_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
+                git!(%W(-C #{local_repo_dir} push origin :#{branch}))
+                result = true
+            end
+
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+      end
+
+
+      def local_branch_exists?(local_repo_dir: nil, branch: nil)
+          current=Dir.pwd
+          result = false
+
+          if File.exist?(local_repo_dir)
+            Dir.chdir(local_repo_dir)
+
+            res_data = Executable.capture_command('git', %W(rev-parse --verify #{branch}), :capture => :out)
+            # puts "=====1"
+            # puts res_data
+            # res_data = git!(%W(-C #{local_repo_dir} --no-pager branch --list origin/#{branch} --no-color -r))
+            result = !res_data.nil? && !res_data.empty?
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+      end
+
+      def remote_branch_exists?(local_repo_dir: nil, branch: nil)
+          current=Dir.pwd
+          result = false
+          if File.exist?(local_repo_dir)
+            Dir.chdir(local_repo_dir)
+            res_data = git!(%W(-C #{local_repo_dir} ls-remote --heads origin refs/heads/#{branch}))
+            result = !res_data.nil? && !res_data.empty?
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+      end
+
+
+      def add_tag(local_repo_dir: nil, tag_name: nil)
+
+          current=Dir.pwd
+          result = false
+          if File.exist?(local_repo_dir)
+            Dir.chdir(local_repo_dir)
+            if !local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+                git!(%W(-C #{local_repo_dir} tag #{tag_name}))
+                result = true
+            end
+            git!(%W(-C #{local_repo_dir} push origin #{tag_name}))
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+      end
+
+      def add_tag_with_check(local_repo_dir:nil, tag_name:nil, check: true)
+
+          if remote_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+              puts
+              puts "路径: #{local_repo_dir}"
+              puts "Tag: #{tag_name}"
+              puts
+              puts "仓库已经存在同样tag:#{tag_name} !!!"
+
+              if check
+                answer = agree("确定删除远程仓库的tag, 重新添加tag:#{tag_name}吗(Y/n)?:")
+                unless answer
+                    raise Informative, "添加tag异常！！！"
+                end
+              end
+
+              if local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+                  git!(%W(-C #{local_repo_dir} tag -d #{tag_name}))
+              end
+              git!(%W(-C #{local_repo_dir} push origin :#{tag_name}))
+              add_tag(local_repo_dir:local_repo_dir, tag_name:tag_name)
+          else
+              if local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+                  git!(%W(-C #{local_repo_dir} tag -d #{tag_name}))
+              end
+              add_tag(local_repo_dir:local_repo_dir, tag_name:tag_name)
+          end
+      end
+
+      def remove_tag(local_repo_dir: nil, tag_name: nil)
+
+          result = false
+          current=Dir.pwd
+          if File.exist?(local_repo_dir)
+            Dir.chdir(local_repo_dir)
+            if local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+                git!(%W(-C #{local_repo_dir} tag -d #{tag_name}))
+                result = true
+            end
+            if remote_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+                git!(%W(-C #{local_repo_dir} push origin :#{tag_name}))
+                result = true
+            end
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+
+      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!(%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
+
+
+      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
+      end
+
+      def git_latest_commit_id(local_repo_dir:nil)
+
+        current=Dir.pwd
+
+        unless File.exist?(File::join(local_repo_dir, ".git"))
+          return nil
+        end
+
+        commit_id = nil
+
+        if File.exist?(local_repo_dir)
+          Dir.chdir(local_repo_dir)
+          current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
+          # puts "current_branch: #{current_branch}"
+
+          # git log -n 1 --pretty=format:"commit %H"
+          # format_str = "commit %H"
+          # latest_log_info = git!(%W(-C #{current} log -n 1 --pretty=#{format_str} #{current_branch})).strip
+          commit_id = git!(%W(-C #{local_repo_dir} rev-parse #{current_branch})).strip
+        end
+        Dir.chdir(current)
+
+        return commit_id
+      end
+
+      def getcode_to_dir(reponame:nil, remote_url:nil, path: nil, new_branch:"master", new_tag: nil)
+
+        current=Dir.pwd
+        local_repo_dir = File::join(path, reponame)
+
+        Funlog.instance.fancyinfo_update("开始更新仓库:#{local_repo_dir}...")
+
+        begin
+
+
+          if !reponame.empty? && !remote_url.empty? && !path.empty?
+
+              if File.exist?(local_repo_dir)
+                Dir.chdir(local_repo_dir)
+
+                remote_info = git!(%W(remote -v))
+                if remote_info.include?("git.coding.net")
+                  current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
+                  git!(%W(remote remove origin))
+                  git!(%W(remote add origin #{remote_url}))
+                  args = %W(-C #{local_repo_dir} fetch origin)
+                  args.push('--progress')
+                  git!(args)
+                  git!(%W(-C #{local_repo_dir} branch --set-upstream-to=origin/#{current_branch}  #{current_branch}))
+                end
+
+                git!(%W(-C #{local_repo_dir} fetch origin --progress))
+              else
+                git! ['clone', remote_url, local_repo_dir]
+              end
+
+              Dir.chdir(local_repo_dir)
+              current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
+              if current_branch.eql?(new_branch)
+                  git!(%W(-C #{local_repo_dir} reset --hard origin/#{new_branch}))
+                  git!(%W(-C #{local_repo_dir} branch --set-upstream-to=origin/#{new_branch} #{new_branch}))
+                  git!(%W(-C #{local_repo_dir} pull))
+
+              else
+                git!(%W(-C #{local_repo_dir} clean -fd))
+                if local_branch_exists?(local_repo_dir:local_repo_dir, branch:new_branch)
+                  git!(%W(-C #{local_repo_dir} checkout #{new_branch}))
+                else
+                  if !remote_branch_exists?(local_repo_dir:local_repo_dir, branch:new_branch)
+                      git!(%W(-C #{local_repo_dir} checkout -b #{new_branch}))
+                  else
+                      raise Informative, "仓库中的#{new_branch}分支不存在 !!!"
+                  end
+                end
+                git!(%W(-C #{local_repo_dir} branch --set-upstream-to=origin/#{new_branch} #{new_branch}))
+                git!(%W(-C #{local_repo_dir} pull))
+              end
+
+              if !new_tag.nil? && new_tag != ""
+                if !new_tag.nil? && new_tag != "" && local_tag_exists?(local_repo_dir:local_repo_dir, tag_name:new_tag)
+                  puts "tag : #{new_tag} is exist !!!"
+                  git!(%W(-C #{local_repo_dir} checkout #{new_tag}))
+                else
+                  raise Informative, "tag #{new_tag} is not exist !!!"
+                end
+              end
+
+          end
+          $stdin.flush
+          Funlog.instance.fancyinfo_success("仓库#{local_repo_dir}更新完成!")
+        rescue StandardError => e
+          Funlog.instance.fancyinfo_error("仓库#{local_repo_dir}更新失败!")
+          raise Informative, e.to_s
+        end
+
+        Dir.chdir(current)
+        return local_repo_dir
+      end
+
+      def get_repo_base_name(repo_url:nil)
+        temp_url = String.new(repo_url)
+        index = temp_url.rindex('/')
+        temp_url = temp_url.slice(index + 1, temp_url.length)
+        base_name = temp_url.gsub!(/\.git/, "")
+        return base_name
+      end
+
+      def clong_buildconfig_repo(repo_name:nil)
+
+
+        pindo_dir = File::expand_path(Pindoconfig.instance.pindo_dir)
+        if !File.exist?(pindo_dir)
+          FileUtils.mkdir(pindo_dir)
+        end
+
+        repo_org_name = Pindoconfig.instance.build_deploy_org
+
+        git_repo_file = File.join(Pindoconfig.instance.pindo_env_configdir,  "git_base_url.json")
+        git_repo_json = JSON.parse(File.read(git_repo_file))
+        if repo_name && git_repo_json && git_repo_json[repo_name]
+          repo_org_name = git_repo_json[repo_name]
+        end
+
+        url = File.join("https://gitee.com", repo_org_name, repo_name + ".git")
+        getcode_to_dir(reponame:repo_name, remote_url: url, path:pindo_dir)
+        config_repo_dir = File.join(pindo_dir, repo_name)
+
+
+
+        return config_repo_dir
+      end
+
+      def clone_pindo_common_config_repo(force_delete:false)
+        pindo_dir = File::expand_path(Pindoconfig.instance.pindo_dir)
+        if !File.exist?(pindo_dir)
+          FileUtils.mkdir(pindo_dir)
+        end
+
+        common_config_dir_basename = get_repo_base_name(repo_url:Pindoconfig.instance.pindo_common_config_giturl)
+        config_repo_dir = File.join(pindo_dir, common_config_dir_basename)
+        if force_delete
+          if File.exist?(config_repo_dir)
+            FileUtils.rm_rf(config_repo_dir)
+          end
+        end
+        getcode_to_dir(reponame:common_config_dir_basename, remote_url:Pindoconfig.instance.pindo_common_config_giturl, path:pindo_dir)
+
+        return config_repo_dir
+      end
+
+      def clone_pindo_env_config_repo(force_delete:false)
+        pindo_dir = File::expand_path(Pindoconfig.instance.pindo_dir)
+        if !File.exist?(pindo_dir)
+          FileUtils.mkdir(pindo_dir)
+        end
+
+        env_config_dir_basename = get_repo_base_name(repo_url:Pindoconfig.instance.pindo_env_config_giturl)
+        config_repo_dir = File.join(pindo_dir, env_config_dir_basename)
+        if force_delete
+          if File.exist?(config_repo_dir)
+            FileUtils.rm_rf(config_repo_dir)
+          end
+        end
+        getcode_to_dir(reponame:env_config_dir_basename, remote_url:Pindoconfig.instance.pindo_env_config_giturl, path:pindo_dir)
+        return config_repo_dir
+      end
+
+      def clone_devclang_repo
+        pindo_dir = File::expand_path(Pindoconfig.instance.pindo_dir)
+        if !File.exist?(pindo_dir)
+          FileUtils.mkdir(pindo_dir)
+        end
+
+        getcode_to_dir(reponame:"confuseclang", remote_url:Pindoconfig.instance.dev_clang_giturl, path:pindo_dir)
+
+        config_repo_dir = File.join(pindo_dir, "confuseclang")
+        return config_repo_dir
+      end
+
+      def clone_clang_repo
+        pindo_dir = File::expand_path(Pindoconfig.instance.pindo_dir)
+        if !File.exist?(pindo_dir)
+          FileUtils.mkdir(pindo_dir)
+        end
+
+        getcode_to_dir(reponame:"deployclang", remote_url:Pindoconfig.instance.deploy_clang_giturl, path:pindo_dir)
+
+        config_repo_dir = File.join(pindo_dir, "deployclang")
+        return config_repo_dir
+      end
+
+      def git_addpush_repo(path:nil, message:"res", commit_file_params:nil)
+        current=Dir.pwd
+        Dir.chdir(path)
+        begin
+            if !commit_file_params.nil? && !commit_file_params.empty?
+              files_list = git! ['ls-files', '--other', '--modified', '--exclude-standard'] || []
+
+              need_commit = false
+              commit_file_params.each do |file_name|
+                if !files_list.nil? && files_list.size > 0 && files_list.include?(file_name)
+                    need_commit = true
+                    git! ['add', file_name]
+                end
+              end
+              if need_commit
+                git! ['commit', '-m ' + "#{message}"]
+                git! ['push']
+              else
+                # puts "\n#{path}\n!!!仓库中文件未发生变化，无需提交!!!\n"
+              end
+            else
+              files_list = git! ['ls-files', '--other', '--modified', '--exclude-standard'] || []
+              # puts "提交如下内容："
+              # puts files_list
+              if !files_list.nil? && files_list.size > 0
+                  git! ['add', '-A']
+                  git! ['commit', '-m ' + "#{message}"]
+                  git! ['push']
+              else
+                puts "\n#{path}\n!!!仓库中文件未发生变化，无需提交!!!\n"
+              end
+            end
+
+        rescue => error
+            # puts(error.to_s)
+            raise Informative, "\n#{path}\n 仓库失败 ！！！"
+        end
+
+
+        Dir.chdir(current)
+      end
+
+
+
+        # 处理未提交的文件
+        # @param project_dir [String] 项目目录路径
+        # @raise [Informative] 当用户选择退出或需要手动处理文件时抛出
+        def process_need_add_files(project_dir:nil)
+            raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+
+            current_project_dir = project_dir
+            origin_path = Dir.pwd
+
+            begin
+                Dir.chdir(current_project_dir)
+
+                # 获取当前分支信息
+                coding_branch = git!(%W(-C #{current_project_dir} rev-parse --abbrev-ref HEAD)).strip
+                # 重置暂存区
+                git!(%W(-C #{current_project_dir} restore --staged #{current_project_dir}))
+
+                # 获取未跟踪和已修改的文件
+                files_list = git!(%W(-C #{current_project_dir} ls-files --other --modified --exclude-standard)) || []
+
+                if files_list.nil? || files_list.empty?
+                    return
+                end
+
+                # 显示文件状态
+                display_file_status(coding_branch, files_list)
+
+                # 处理用户选择
+                process_user_choice(current_project_dir, coding_branch)
+
+            ensure
+                Dir.chdir(origin_path)
+            end
+        end
+
+        private
+
+        def display_file_status(branch, files)
+            puts "═" * 60
+            puts "⚠️  警告：检测到未提交的文件".red
+            puts "═" * 60
+            puts
+            puts "当前所在分支: #{branch}".red
+            puts "以下文件尚未提交到 Git:".red
+            puts
+
+            # 将文件列表分行并用红色显示
+            if files.is_a?(String)
+                files.split("\n").each do |file|
+                    puts "  • #{file}".red unless file.empty?
+                end
+            else
+                files.each do |file|
+                    puts "  • #{file}".red unless file.empty?
+                end
+            end
+
+            puts
+            puts "═" * 60
+        end
+
+        def process_user_choice(project_dir, branch)
+            process_types = ["全部提交", "全部删除", "先退出，手动来处理退出"]
+            cli = HighLine.new
+            menu_choice = "None"
+
+            cli.choose do |menu|
+                menu.header = "对以上未提交的文件, 有下列处理方式".red
+                menu.prompt = "请选择如何处理(1/2/3...):".yellow
+                process_types.each do |item|
+                    menu.choice(item) { |choice| menu_choice = choice }
+                end
+            end
+
+            puts "选择的处理方式为: #{menu_choice}"
+
+            case menu_choice
+            when "全部提交"
+                handle_commit_all(project_dir, branch)
+            when "全部删除"
+                handle_delete_all(project_dir, branch)
+            else
+                raise Informative, "请手动处理未提交的文件！！！"
+            end
+        end
+
+        def handle_commit_all(project_dir, branch)
+            message = ask('请输入提交的备注信息: ') || "release code"
+
+            Funlog.instance.fancyinfo_start("开始提交文件...")
+            git! ['add', '-A']
+            git! ['commit', '-m', message]
+            git!(%W(-C #{project_dir} fetch origin))
+            Funlog.instance.fancyinfo_success("commit文件完成!")
+            Funlog.instance.fancyinfo_start("正在push...")
+            if remote_branch_exists?(local_repo_dir: project_dir, branch: branch)
+                git!(%W(-C #{project_dir} branch --set-upstream-to=origin/#{branch} #{branch}))
+                git! ['pull']
+                git! ['push']
+            else
+                git!(%W(-C #{project_dir} push --set-upstream origin #{branch}))
+            end
+            Funlog.instance.fancyinfo_success("push文件完成!")
+        end
+
+        def handle_delete_all(project_dir, branch)
+            answer = agree("有未提交的文件，确认删除？(Y/n）:")
+            unless answer
+                raise Informative, "请手动处理未提交的文件！！！"
+            end
+
+            git!(%W(-C #{project_dir} reset --hard))
+            git!(%W(-C #{project_dir} clean -df))
+            git!(%W(-C #{project_dir} branch --set-upstream-to=origin/#{branch} #{branch}))
+            git!(%W(-C #{project_dir} pull))
+        end
+
+        public
+
+      # 获取最新的版本标签
+      # @param project_dir [String] 项目目录路径
+      # @return [String, nil] 返回最新的版本标签，如果没有则返回nil
+      def get_latest_version_tag(project_dir:nil, tag_prefix:"v")
+          return nil unless project_dir && File.exist?(project_dir)
+
+          begin
+              # 获取所有以v开头的标签并按版本号排序
+              tags = git!(%W(-C #{project_dir} tag -l #{tag_prefix}*)).split("\n")
+              return nil if tags.empty?
+
+              # 按版本号排序（假设格式为 v1.2.3）
+              sorted_tags = tags.sort_by do |tag|
+                  tag.gsub(tag_prefix, '').split('.').map(&:to_i)
+              end
+
+              sorted_tags.last
+          rescue StandardError => e
+              nil
+          end
+      end
+
+      # 创建新的版本标签
+      # @param project_dir [String] 项目目录路径
+      # @param tag_prefix [String] 标签前缀
+      # @param increment_mode [String] 版本号增加模式 ("major", "minor", "patch")
+      # @param force_retag [Boolean] 是否强制重新打最新的tag
+      # @return [String] 返回新创建的版本标签或已存在的标签
+      # @raise [ArgumentError] 当项目目录不存在时抛出
+      def create_next_version_tag(project_dir:nil, tag_prefix:"v", increment_mode:"minor", force_retag:false)
+          raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+
+          latest_tag = get_latest_version_tag(project_dir: project_dir, tag_prefix: tag_prefix)
+          if latest_tag.nil?
+              latest_tag = get_latest_version_tag(project_dir: project_dir, tag_prefix: "")
+          end
+          # 如果没有任何tag，创建初始版本
+          if latest_tag.nil?
+              new_tag = tag_prefix + "1.0.0"
+              add_tag_with_check(local_repo_dir: project_dir, tag_name: new_tag, check: false)
+              Funlog.instance.fancyinfo_success("创建新tag完成!")
+              return new_tag
+          end
+
+          if is_tag_at_head?(git_root_dir: project_dir, tag_name: latest_tag)
+              return latest_tag
+          end
+
+          if force_retag && latest_tag
+              # 删除并重新打tag
+              Funlog.instance.fancyinfo_update("正在重新打tag: #{latest_tag}")
+              remove_tag(local_repo_dir: project_dir, tag_name: latest_tag)
+              add_tag_with_check(local_repo_dir: project_dir, tag_name: latest_tag)
+              Funlog.instance.fancyinfo_success("重新打tag完成!")
+              return latest_tag
+          end
+
+          # 解析当前版本号
+          version_numbers = latest_tag.gsub(tag_prefix, '').split('.').map(&:to_i)
+          major, minor, patch = version_numbers
+
+          # 根据increment_mode增加版本号
+          case increment_mode
+          when "major"
+              major += 1
+              minor = 0
+              patch = 0
+          when "minor"
+              minor += 1
+              patch = 0
+          when "patch"
+              patch += 1
+          end
+
+          new_tag = tag_prefix + "#{major}.#{minor}.#{patch}"
+          add_tag_with_check(local_repo_dir: project_dir, tag_name: new_tag, check: false)
+          Funlog.instance.fancyinfo_success("创建新tag完成!")
+          new_tag
+      end
+
+      # 检查仓库是否有未提交的更改（包括未暂存和已暂存的更改）
+      # @param git_root_dir [String] 项目目录路径
+      # @return [Boolean] 如果有未提交的更改返回true，否则返回false
+      def has_uncommitted_changes?(git_root_dir:nil)
+          return false if git_root_dir.nil?
+
+          begin
+              # 使用 git status --porcelain 检查是否有更改
+              # 如果输出不为空，说明有未提交的更改
+              status_output = git!(%W(-C #{git_root_dir} status --porcelain)).strip
+              !status_output.empty?
+          rescue StandardError => e
+              false
+          end
+      end
+
+      # 检查tag是否在指定的commit上
+      # @param git_root_dir [String] 项目目录路径
+      # @param tag_name [String] 标签名称
+      # @return [Boolean] 如果tag在当前HEAD上返回true，否则返回false
+      def is_tag_at_head?(git_root_dir:nil, tag_name:nil)
+          return false if git_root_dir.nil? || tag_name.nil?
+
+          begin
+              # 获取tag的commit hash
+              tag_commit = git!(%W(-C #{git_root_dir} rev-parse #{tag_name})).strip
+              # 获取HEAD的commit hash
+              head_commit = git!(%W(-C #{git_root_dir} rev-parse HEAD)).strip
+
+              # 比较两个commit hash是否相同
+              tag_commit == head_commit
+          rescue StandardError => e
+              false
+          end
+      end
+
+    end
+  end
+end