pindo 4.9.0 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11b00add7874d6645d53ba3962c504569851df828c965cd31d6fa90ea495c1bd
-  data.tar.gz: 8222a4ed3d3e036fdcaaf3dd8b3f1af1c683881693c2054358d0edc7b5f64362
+  metadata.gz: c74254c898c4aed8258d9c19ab0e74bdbce31fd1e3744e145c2ad1ec7e9112c7
+  data.tar.gz: a06a58190d7de3995e41939902fddbc1b104faed1e8c8c6cf210f505a84adfec
 SHA512:
-  metadata.gz: 869249634c7c48cf039749c1a36ff5ce2d9bd85c18d90165c168e755ab17001b695a334f909d6d85e67a688c813d6de05f968899f23c8051ac0b3ea04f4cfe24
-  data.tar.gz: c857e9ec891f54021610211ddfacd7009c2045baa5b91da03789a31452282c241e05f4e430915e5aa6d99fb8bb1a475188ec2825ec2bf2b45fcdef1268b41e75
+  metadata.gz: 88df3e2378300ed5f4bba46ebca8d1aee43225f3910074dd38a532b2bda32ba9e829cd813be6b853bd2c32be5e9fb376d09faea65482b7e0e2078e2abcdb0398
+  data.tar.gz: 541c1a5452e254c898ec992c82037e181fd7d5ce49a0bfeb3827b54efe0ba6b09dc116be108910bcddabf59c43a3d0612b70a44e9f4881072ed05295dbf4b5ab

data/lib/pindo/base/githelper.rb

@@ -1,4 +1,3 @@
-
 require 'fileutils'
 require 'pindo/base/executable'
 require 'etc'
@@ -10,13 +9,9 @@ module Pindo
       executable :git
     
       def prepare_gitenv()
-
-          usrname = Etc.getlogin
-          command = "git config --global user.email #{usrname}@example.com"
-          system command
-          command = "git config --global user.name #{usrname}"
-          system command
-
+        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)
@@ -132,7 +127,7 @@ module Pindo
           return result
       end
 
-      def add_tag_with_check(local_repo_dir:nil, tag_name:nil)
+      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
@@ -141,10 +136,13 @@ module Pindo
               puts 
               puts "仓库已经存在同样tag:#{tag_name} !!!"
               
-              answer = agree("确定删除远程仓库的tag, 重新添加tag:#{tag_name}吗(Y/n)?:")
-              unless answer
-                  raise Informative, "添加tag异常！！！"
+              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
@@ -307,9 +305,7 @@ module Pindo
           $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
 
@@ -453,74 +449,202 @@ module Pindo
 
 
 
+        # 处理未提交的文件
+        # @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
 
-                  current_project_dir = project_dir
-                  origin_path=Dir.pwd
-                  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.size > 0
-
-                      process_types = ["全部提交", "全部删除", "退出"]
-                      puts 
-                      puts "当前所在分支:#{coding_branch}有下面这些文件没有提交："
-                      puts 
-                      puts files_list
-                      puts 
-
-
-                      cli = HighLine.new
-                      menu_choice="None"
-                      cli.choose do |menu|                                  # you can also use constants like :blue
-                          menu.header = "对以上未提交的文件, 有下列处理方式"
-                          menu.prompt = "请选择如何处理(1/2/3...):"
-                          if !process_types.nil? && process_types.length > 0
-                            for index_item in process_types do
-                              menu.choice(index_item) do |details|
-                                # puts index_item
-                                menu_choice="#{details}"
-                              end
-                            end
-                          end
-                      end
-
-                      puts "选择的处理方式为: #{menu_choice}"
-                      if menu_choice.eql?("全部提交")
-                          message = ask('请输入提交的备注信息: ') || "release code"
-                          git! ['add', '-A']
-                          git! ['commit', '-m ' + "#{message}"]
-                          git!(%W(-C #{current_project_dir} fetch origin))
-                          if remote_branch_exists?(local_repo_dir: current_project_dir, branch:coding_branch)
-                            git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{coding_branch} #{coding_branch}))   
-                            git! ['pull']
-                            git! ['push']
-                          else
-                            git!(%W(-C #{current_project_dir} push --set-upstream origin #{coding_branch}))   
-                          end
-                      elsif menu_choice.eql?("全部删除")  
-
-                          answer = agree("有未提交的文件，确认删除？(Y/n）:")
-                          unless answer
-                            raise Informative, "请手动处理未提交的文件！！！"
-                          end 
-                          git!(%W(-C #{current_project_dir} reset --hard))
-                          git!(%W(-C #{current_project_dir} clean -dfx))
-                          git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{coding_branch} #{coding_branch})) 
-                          git!(%W(-C #{current_project_dir} pull))
-                      else
-                          raise Informative, "请手动处理未提交的文件！！！"
-                      end
-                  else
-                      puts "当前所在分支没有需要提交的文件！！"
-                      puts
-                  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 "\n当前所在分支:#{branch}有下面这些文件没有提交："
+            puts "\n#{files}\n"
+        end
+
+        def process_user_choice(project_dir, branch)
+            process_types = ["全部提交", "全部删除", "退出"]
+            cli = HighLine.new
+            menu_choice = "None"
+            
+            cli.choose do |menu|
+                menu.header = "对以上未提交的文件, 有下列处理方式"
+                menu.prompt = "请选择如何处理(1/2/3...):"
+                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 -dfx))
+            git!(%W(-C #{project_dir} branch --set-upstream-to=origin/#{branch} #{branch})) 
+            git!(%W(-C #{project_dir} pull))
+        end
 
-                  Dir.chdir(origin_path)
+      # 获取最新的版本标签
+      # @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?(project_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
+
+      # 检查tag是否在指定的commit上
+      # @param project_dir [String] 项目目录路径
+      # @param tag_name [String] 标签名称
+      # @return [Boolean] 如果tag在当前HEAD上返回true，否则返回false
+      def is_tag_at_head?(project_dir:nil, tag_name:nil)
+          return false if project_dir.nil? || tag_name.nil?
+          
+          begin
+              # 获取tag的commit hash
+              tag_commit = git!(%W(-C #{project_dir} rev-parse #{tag_name})).strip
+              # 获取HEAD的commit hash
+              head_commit = git!(%W(-C #{project_dir} rev-parse HEAD)).strip
+              
+              # 比较两个commit hash是否相同
+              tag_commit == head_commit
+          rescue StandardError => e
+              false
+          end
+      end
 
     end
 end

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

@@ -0,0 +1,184 @@
+require 'highline/import'
+require 'fileutils'
+
+module Pindo
+  class Command
+    class Dev < Command
+      class Tag < Dev
+        self.summary = '发布代码,添加tag,添加发布信息,并合并到发布分支'
+        self.description = <<-DESC
+          发布代码,添加tag,添加发布信息,并合并到发布分支。
+
+          支持功能:
+              * 处理未提交的文件
+              * 添加版本tag
+              * 合并到发布分支
+
+          使用示例:
+              $ pindo dev pub                    # 使用minor模式创建tag
+              $ pindo dev pub --mode=major       # 使用major模式创建tag
+              $ pindo dev pub --mode=patch       # 使用patch模式创建tag
+              $ pindo dev pub --retag            # 强制重新打tag
+        DESC
+        self.arguments = []
+
+        def self.options
+          [
+            ['--mode',   '指定版本号增加模式(major/minor/patch)，默认minor'],
+            ['--retag',  '强制重新打最新的tag']
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @mode = argv.option('mode') || 'minor'
+          @force_retag = argv.flag?('retag', false)
+          
+          unless ['major', 'minor', 'patch'].include?(@mode)
+            raise Informative, "mode参数必须是 major, minor 或 patch"
+          end
+          
+          super
+          @additional_args = argv.remainder!
+        end
+
+        def run
+          current_project_dir = Dir.pwd
+
+          # 检查当前目录是否是git仓库
+          unless is_git_directory?(local_repo_dir: current_project_dir)
+            Funlog.instance.fancyinfo_error("当前目录不是git仓库")
+            raise Informative, "请在git仓库目录下执行此命令"
+          end
+
+          # 获取git仓库根目录
+          root_dir = git_root_directory(local_repo_dir: current_project_dir)
+          if root_dir.nil?
+            Funlog.instance.fancyinfo_error("无法获取git仓库根目录")
+            raise Informative, "获取git仓库根目录失败"
+          end
+
+          
+
+          release_branch = "master"
+          process_need_add_files(project_dir: root_dir)
+
+          current_branch = git!(%W(-C #{root_dir} rev-parse --abbrev-ref HEAD)).strip
+          coding_branch = current_branch
+
+          Funlog.instance.fancyinfo_start("开始合并到#{release_branch}分支")
+          merge_to_release_branch(
+            project_dir: root_dir, 
+            release_branch: release_branch, 
+            coding_branch: coding_branch
+          )
+
+          add_release_tag(
+            project_dir: root_dir,
+            increment_mode: @mode,
+            force_retag: @force_retag
+          )
+        end
+
+        def add_release_tag(project_dir: nil, increment_mode: "minor", force_retag: false)
+          raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+            
+          Funlog.instance.fancyinfo_start("开始创建初tag")
+          latest_tag = get_latest_version_tag(project_dir: project_dir)
+          if latest_tag.nil?
+            new_tag = create_next_version_tag(
+              project_dir: project_dir,
+              tag_prefix: "v",
+              increment_mode: increment_mode,
+              force_retag: false
+            )
+            Funlog.instance.fancyinfo_success("创建初始tag: #{new_tag}")
+            Funlog.instance.fancyinfo_success("仓库路径: #{project_dir}")
+            return
+          end
+
+          if is_tag_at_head?(project_dir: project_dir, tag_name: latest_tag)
+            Funlog.instance.fancyinfo_success("当前commit已有tag: #{latest_tag}，无需重新打tag")
+            Funlog.instance.fancyinfo_success("仓库路径: #{project_dir}")
+            return
+          end
+
+          Funlog.instance.fancyinfo_success("最近的上次tag是: #{latest_tag} ")
+          new_tag = create_next_version_tag(
+              project_dir: project_dir,
+              tag_prefix: "v",
+              increment_mode: increment_mode,
+              force_retag: force_retag
+          )
+
+          Funlog.instance.fancyinfo_success("当前仓库的tag: #{new_tag}")
+          Funlog.instance.fancyinfo_success("仓库路径: #{project_dir}")
+        end
+
+        def merge_to_release_branch(project_dir: nil, release_branch: nil, coding_branch: nil)
+          current_project_dir = project_dir
+          Funlog.instance.fancyinfo_start("开始合并到#{release_branch}分支")
+          if !coding_branch.eql?(release_branch)
+            coding_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{coding_branch})).strip
+            release_branch_commit_id = "111"
+            
+            if remote_branch_exists?(local_repo_dir: current_project_dir, branch: release_branch)
+              Funlog.instance.fancyinfo_update("存在#{release_branch}远程分支")
+              if local_branch_exists?(local_repo_dir: current_project_dir, branch: release_branch)
+                Funlog.instance.fancyinfo_update("存在#{release_branch}本地分支")
+                git!(%W(-C #{current_project_dir} checkout #{release_branch}))
+              else
+                Funlog.instance.fancyinfo_update("存在#{release_branch}远程分支")
+                Funlog.instance.fancyinfo_update("不存在#{release_branch}本地分支")
+                git!(%W(-C #{current_project_dir} checkout -b #{release_branch} origin/#{release_branch}))
+              end
+
+              git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
+              git!(%W(-C #{current_project_dir} fetch origin #{release_branch}))
+              git!(%W(-C #{current_project_dir} merge origin/#{release_branch}))
+
+              res_data = Executable.capture_command('git', %W(merge #{coding_branch}), :capture => :out)
+
+              conflict_filelist = git!(%W(-C #{current_project_dir} diff --name-only --diff-filter=U --relative))
+              if !conflict_filelist.nil? && conflict_filelist.size > 0
+                puts "合并代码冲突， 冲突文件如下："
+                raise Informative, "请手动处理冲突的文件！！！"
+              else
+                git!(%W(-C #{current_project_dir} push))
+                Funlog.instance.fancyinfo_success("代码已经合并到#{release_branch}分支")
+                release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+              end
+
+            else
+              if local_branch_exists?(local_repo_dir: current_project_dir, branch: release_branch)
+                Funlog.instance.fancyinfo_update("不存在#{release_branch}远程分支")
+                Funlog.instance.fancyinfo_update("存在#{release_branch}本地分支")
+                git!(%W(-C #{current_project_dir} checkout #{release_branch}))
+                git!(%W(-C #{current_project_dir} checkout -b #{release_branch}_temp))
+                git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
+                git!(%W(-C #{current_project_dir} branch -D #{release_branch}))
+              else
+                Funlog.instance.fancyinfo_update("不存在#{release_branch}远程分支")
+                Funlog.instance.fancyinfo_update("不存在#{release_branch}本地分支")
+              end
+
+              git!(%W(-C #{current_project_dir} checkout -b #{release_branch}))
+              git!(%W(-C #{current_project_dir} push origin #{release_branch}))
+              git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
+
+              Funlog.instance.fancyinfo_success("代码已经合并到#{release_branch}分支")
+              release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+            end
+
+            git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
+            if !release_branch_commit_id.eql?(coding_branch_commit_id)
+              git!(%W(-C #{current_project_dir} merge #{release_branch}))
+              Funlog.instance.fancyinfo_success("已将#{release_branch}合并到#{coding_branch}")
+            end
+          else
+            Funlog.instance.fancyinfo_success("代码处于#{coding_branch}分支,无需合并")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pindo/command/dev.rb

@@ -1,7 +1,7 @@
 # require 'pindo/command/dev/create'
 
 
-require 'pindo/command/dev/pub'
+require 'pindo/command/dev/tag'
 require 'pindo/command/dev/debug'
 require 'pindo/command/dev/autoresign'
 require 'pindo/command/dev/autobuild'

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

@@ -3,7 +3,7 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/client/unityhelper'
+require 'pindo/module/build/unityhelper'
 
 module Pindo
     class Command
@@ -49,7 +49,8 @@ module Pindo
                         ['--proj',   '指定上传到测试平台的项目名称'],
                         ['--upload', '上传编译后的IPA到测试平台'],
                         ['--send',   '上传成功后发送测试通知'],
-                        ['--base',   'Unity工程编译lib模式']
+                        ['--base',   'Unity工程编译lib模式'],
+                        ['--unity-version', '切换Unity版本']
                     ].concat(super)
                 end
 
@@ -61,6 +62,8 @@ module Pindo
                     @args_send_flag = argv.flag?('send', false)
                     @args_deploy_flag = argv.flag?('deploy', false)
                     @args_base_flag = argv.flag?('base', false)
+                    @force_select_unity = argv.flag?('unity-version', false)
+                    
 
                     if @args_send_flag
                         @args_upload_flag = true
@@ -70,10 +73,15 @@ module Pindo
                 end
 
                 def export_ios_project(project_path, pindo_ios_project_dir, additional_args)
-                    begin
-                      # 获取 UnityHelper 实例
-                      unity_helper = Pindo::Client::UnityHelper.share_instance
 
+                    # 获取 UnityHelper 实例
+                    unity_helper = Pindo::Client::UnityHelper.share_instance
+                    # 获取 Unity 版本
+                    unity_version = unity_helper.find_unity_path
+                    puts "Unity 版本: #{unity_version}"
+
+                    begin
+                      
                       # 执行Unity命令
                       result = unity_helper.execute_unity_command(
                         project_path,
@@ -104,6 +112,19 @@ module Pindo
                 
 
                 def run
+                    pindo_unity_project_dir = Dir.pwd
+                    
+                    # 检查是否是Unity工程
+                    unity_helper = Pindo::Client::UnityHelper.share_instance
+ 
+                    if @force_select_unity
+                        puts "强制选择Unity版本"
+                        unity_helper.find_unity_path(change_unity_version:true)
+                    end
+
+                    unless unity_helper.unity_project?(pindo_unity_project_dir)
+                        raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
+                    end
                     
                     app_info_obj = nil
                     if @args_upload_flag 
@@ -119,7 +140,7 @@ module Pindo
                         mainapp_bundleid = get_selected_dev_bundleid()
                     end
 
-                    pindo_unity_project_dir = Dir.pwd
+                    
                     pindo_ios_project_dir = File.join(pindo_unity_project_dir, "Platform/iOS")
                     # 准备额外的参数
                     additional_args = {
@@ -156,6 +177,7 @@ module Pindo
 
                     Pindo::Command::Ios::Debug::run(args_temp)
 
+  
 
                 end
 

data/lib/pindo/config/pindouserlocalconfig.rb

@@ -1,4 +1,3 @@
-
 require 'fileutils'
 require 'json'
 
@@ -115,5 +114,22 @@ module Pindo
       end
     end
 
+    def save
+      @pindo_user_local_config_json = @pindo_user_local_config_json || {}
+      File.open(@pindo_user_local_config_file, "w") do |file|
+        file.write(JSON.pretty_generate(@pindo_user_local_config_json))
+        file.close
+      end
+    end
+
+    def unity_version
+      @pindo_user_local_config_json['unity_version'] if @pindo_user_local_config_json
+    end
+
+    def unity_version=(version)
+      @pindo_user_local_config_json = @pindo_user_local_config_json || {}
+      @pindo_user_local_config_json['unity_version'] = version
+    end
+
   end
 end

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

@@ -0,0 +1,143 @@
+require 'singleton'
+require 'fileutils'
+require 'xcodeproj' # 用于iOS项目检查
+
+module Pindo
+  module Module
+    module Build
+      class BuildHelper
+        include Singleton
+
+        class << self
+          def share_instance
+            instance
+          end
+        end
+
+        def unity_project?(project_path)
+          # 检查Unity工程的关键文件和目录
+          project_settings_path = File.join(project_path, "ProjectSettings")
+          assets_path = File.join(project_path, "Assets")
+          packages_path = File.join(project_path, "Packages")
+          
+          # Unity工程必须包含这些目录和文件
+          File.directory?(project_settings_path) && 
+          File.directory?(assets_path) && 
+          File.directory?(packages_path) &&
+          File.exist?(File.join(project_settings_path, "ProjectSettings.asset"))
+        end
+
+        def ios_project?(project_path)
+          # 检查iOS工程的关键文件
+          xcodeproj_files = Dir.glob(File.join(project_path, "*.xcodeproj"))
+          workspace_files = Dir.glob(File.join(project_path, "*.xcworkspace"))
+          
+          # 至少要有.xcodeproj文件或.xcworkspace文件
+          return false if xcodeproj_files.empty? && workspace_files.empty?
+          
+          if !xcodeproj_files.empty?
+            # 检查.xcodeproj内部结构
+            project_file = File.join(xcodeproj_files.first, "project.pbxproj")
+            return true if File.exist?(project_file)
+          end
+          
+          if !workspace_files.empty?
+            # 检查.xcworkspace内部结构
+            contents_file = File.join(workspace_files.first, "contents.xcworkspacedata")
+            return true if File.exist?(contents_file)
+          end
+          
+          false
+        end
+
+        def android_project?(project_path)
+          # 检查Android工程的关键文件和目录
+          gradle_file = File.exist?(File.join(project_path, "build.gradle"))
+          settings_gradle = File.exist?(File.join(project_path, "settings.gradle"))
+          app_dir = File.directory?(File.join(project_path, "app"))
+          
+          # Android Studio项目结构
+          if gradle_file && settings_gradle && app_dir
+            app_gradle = File.exist?(File.join(project_path, "app", "build.gradle"))
+            app_manifest = File.exist?(File.join(project_path, "app", "src", "main", "AndroidManifest.xml"))
+            return true if app_gradle && app_manifest
+          end
+          
+          # 传统Eclipse项目结构
+          if File.directory?(File.join(project_path, "src"))
+            manifest = File.join(project_path, "AndroidManifest.xml")
+            return true if File.exist?(manifest)
+          end
+          
+          false
+        end
+
+        def project_type(project_path)
+          raise ArgumentError, "项目路径不能为空" if project_path.nil? || project_path.empty?
+          raise ArgumentError, "项目路径不存在: #{project_path}" unless File.directory?(project_path)
+          
+          return :unity if unity_project?(project_path)
+          return :ios if ios_project?(project_path)
+          return :android if android_project?(project_path)
+          :unknown
+        end
+
+        def project_type_name(project_path)
+          case project_type(project_path)
+          when :unity
+            "Unity"
+          when :ios
+            "iOS"
+          when :android
+            "Android"
+          else
+            "Unknown"
+          end
+        end
+
+        def get_project_name(project_path)
+          case project_type(project_path)
+          when :unity
+            File.basename(project_path)
+          when :ios
+            xcodeproj = Dir.glob(File.join(project_path, "*.xcodeproj")).first
+            File.basename(xcodeproj, ".xcodeproj") if xcodeproj
+          when :android
+            settings_gradle = File.join(project_path, "settings.gradle")
+            if File.exist?(settings_gradle)
+              content = File.read(settings_gradle)
+              if content =~ /rootProject\.name\s*=\s*['"](.+)['"]/
+                $1
+              else
+                File.basename(project_path)
+              end
+            else
+              File.basename(project_path)
+            end
+          else
+            File.basename(project_path)
+          end
+        end
+
+        def get_project_version(project_path)
+          case project_type(project_path)
+          when :unity
+            version_file = File.join(project_path, "ProjectSettings", "ProjectVersion.txt")
+            if File.exist?(version_file)
+              content = File.read(version_file)
+              if content =~ /m_EditorVersion: (.*)/
+                $1.strip
+              end
+            end
+          when :ios
+            # 从Info.plist获取版本号
+            nil
+          when :android
+            # 从build.gradle获取版本号
+            nil
+          end
+        end
+      end
+    end
+  end
+end 

data/lib/pindo/{client → module/build}/unityhelper.rb

@@ -17,7 +17,7 @@ module Pindo
         "C:/Program Files/Unity/Hub/Editor/*/Unity.exe"
       ]
 
-      TARGET_UNITY_VERSION = "2021.3"
+      PINDO_UNITY_VERSION = "2021.3"
 
       class << self
         def share_instance
@@ -25,7 +25,7 @@ module Pindo
         end
       end
 
-      def find_unity_path
+      def find_unity_path(change_unity_version:false)
         paths = case RUBY_PLATFORM
                 when /darwin/
                   UNITY_MAC_PATHS
@@ -40,9 +40,8 @@ module Pindo
         paths.each do |path|
           if path.include?("*")
             Dir.glob(path).each do |expanded_path|
-              # 从路径中提取版本号
               version = extract_version_from_path(expanded_path)
-              if version && version.start_with?(TARGET_UNITY_VERSION)
+              if version
                 unity_versions << {
                   path: expanded_path,
                   version: version
@@ -51,7 +50,7 @@ module Pindo
             end
           elsif File.exist?(path)
             version = extract_version_from_path(path)
-            if version && version.start_with?(TARGET_UNITY_VERSION)
+            if version
               unity_versions << {
                 path: path,
                 version: version
@@ -61,12 +60,82 @@ module Pindo
         end
 
         if unity_versions.empty?
-          raise "No Unity #{TARGET_UNITY_VERSION} found in standard locations"
+          raise Informative, "未找到任何Unity版本"
+        end
+        
+        if unity_versions.length == 1
+          selected_unity = unity_versions.first
+          return selected_unity[:path]
+        end
+
+        # 获取所有可用的主版本号
+        major_versions = unity_versions.map { |v| 
+          v[:version].split('.')[0..1].join('.')
+        }.uniq.sort_by { |v| Gem::Version.new(v) }
+
+        if change_unity_version
+          # 让用户选择主版本号
+          puts "\n可用的Unity主版本:"
+          major_versions.each_with_index do |v, i|
+            puts "#{i + 1}. #{v}"
+          end
+
+          print "\n请选择Unity主版本 (1-#{major_versions.length}): "
+          choice = gets.chomp.to_i
+
+          if choice < 1 || choice > major_versions.length
+            raise Informative, "无效的选择"
+          end
+
+          selected_major_version = major_versions[choice - 1]
+          
+          # 保存选择的主版本号
+          config = Pindo::Config::PindoUserLocalConfig.instance
+          config.unity_version = selected_major_version
+          config.save
+
+          # 在选定主版本下选择最新的版本
+          matching_versions = unity_versions.select { |v| v[:version].start_with?(selected_major_version) }
+          selected_unity = matching_versions.sort_by { |v| Gem::Version.new(v[:version]) }.last
+          
+          return selected_unity[:path]
+        end
+
+        # 使用已保存的版本
+        config = Pindo::Config::PindoUserLocalConfig.instance
+        saved_version = config.unity_version
+
+        if saved_version
+          matching_versions = unity_versions.select { |v| v[:version].start_with?(saved_version) }
+          if matching_versions.any?
+            selected_unity = matching_versions.sort_by { |v| Gem::Version.new(v[:version]) }.last
+            return selected_unity[:path]
+          end
+        end
+
+        # 如果没有保存的版本或找不到匹配版本，让用户选择
+        puts "\n可用的Unity主版本:"
+        major_versions.each_with_index do |v, i|
+          puts "#{i + 1}. #{v}"
+        end
+
+        print "\n请选择Unity主版本 (1-#{major_versions.length}): "
+        choice = gets.chomp.to_i
+
+        if choice < 1 || choice > major_versions.length
+          raise Informative, "无效的选择"
         end
 
-        # 按版本号排序，取最新的2021.3.x版本
-        selected_unity = unity_versions.sort_by { |v| Gem::Version.new(v[:version]) }.last
-        puts "Selected Unity version: #{selected_unity[:version]}"
+        selected_major_version = major_versions[choice - 1]
+        
+        # 保存选择的主版本号
+        config.unity_version = selected_major_version
+        config.save
+
+        # 在选定主版本下选择最新的版本
+        matching_versions = unity_versions.select { |v| v[:version].start_with?(selected_major_version) }
+        selected_unity = matching_versions.sort_by { |v| Gem::Version.new(v[:version]) }.last
+        
         selected_unity[:path]
       end
 
@@ -103,7 +172,7 @@ module Pindo
           cmd_args << value.to_s if value
         end
 
-        puts "Executing Unity command: #{cmd_args.join(' ')}"
+        puts "Unity command: #{cmd_args.join(' ')}"
         stdout, stderr, status = Open3.capture3(*cmd_args)
         
         {
@@ -151,8 +220,8 @@ module Pindo
           content = File.read(version_path)
           if content =~ /m_EditorVersion: (.*)/
             version = $1.strip
-            unless version.start_with?(TARGET_UNITY_VERSION)
-              raise "Project Unity version (#{version}) does not match required version (#{TARGET_UNITY_VERSION}.x)"
+            unless version.start_with?(PINDO_UNITY_VERSION)
+              raise "Project Unity version (#{version}) does not match required version (#{PINDO_UNITY_VERSION}.x)"
             end
             version
           else
@@ -174,6 +243,18 @@ module Pindo
         
         true
       end
+
+      def unity_project?(project_path)
+        # 检查关键Unity工程文件和目录是否存在
+        project_settings_path = File.join(project_path, "ProjectSettings")
+        assets_path = File.join(project_path, "Assets")
+        packages_path = File.join(project_path, "Packages")
+        
+        File.directory?(project_settings_path) && 
+        File.directory?(assets_path) && 
+        File.directory?(packages_path) &&
+        File.exist?(File.join(project_settings_path, "ProjectSettings.asset"))
+      end
     end
   end
 end

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -145,6 +145,7 @@ module Pindo
         end
 
         def start_upload(app_info_obj:nil, ipa_file_upload:nil, description:nil)
+
                 if !ipa_file_upload.nil? && File.extname(ipa_file_upload).eql?(".app")
                     mac_app_path = ipa_file_upload
                     ipa_base_dir = File.dirname(ipa_file_upload)
@@ -165,6 +166,7 @@ module Pindo
                     end
                 end
 
+
                 unless !ipa_file_upload.nil? && File.exist?(ipa_file_upload)
                     return
                 end
@@ -172,42 +174,9 @@ module Pindo
                 args_ipa_file_dir = File.expand_path(File::dirname(ipa_file_upload))
                 ipa_file_upload=File.join(args_ipa_file_dir, File.basename(ipa_file_upload))
                 current_project_dir = Dir.pwd
+                description = get_description_from_git(current_project_dir:current_project_dir)
+                description = " " if description.empty?
 
-                if description.nil? && is_git_directory?(local_repo_dir: current_project_dir)
-                    current_git_root_path = git_root_directory(local_repo_dir: current_project_dir)
-                    xcodeproj_file_name = Dir.glob(File.join(current_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-                    if !xcodeproj_file_name.nil? && !xcodeproj_file_name.empty? && File.exist?(xcodeproj_file_name)
-                        project_obj = Xcodeproj::Project.open(xcodeproj_file_name)
-                        main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
-                        provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase.split(" ")
-                        if provisioning_profile_name.include?("adhoc")
-                            description = git!(%W(-C #{current_project_dir} show -s --format=commit::%H)).strip
-                        elsif provisioning_profile_name.include?("development")
-                            cliff_toml_path = File.join(current_git_root_path, "cliff.toml")
-                            if File.exist?(cliff_toml_path)
-                                begin
-                                    `git-cliff --version`
-                                    git_cliff_installed = $?.success?
-                                    if git_cliff_installed
-                                        temp_dir = Dir.pwd
-                                        Dir.chdir(current_git_root_path)
-                                        description = `git-cliff -c #{cliff_toml_path} --latest -o -`.strip
-                                        description = " " if description.empty?
-                                        Dir.chdir(temp_dir)
-                                    else
-                                        description = " "
-                                    end
-                                rescue StandardError => e
-                                    description = " "
-                                end
-                            else
-                                description = " "
-                            end             
-                        elsif provisioning_profile_name.include?("appstore")
-                            description = "提交包重签名"
-                        end
-                    end
-                end
 
                 addtach_file = nil
                 if ipa_file_upload.include?(File.join(current_project_dir, "build")) && File.exist?(File.join(current_project_dir, "VMData"))
@@ -551,50 +520,50 @@ module Pindo
         end
 
 
-        def get_description()
-            comment_array = []
-            puts "请输入备注信息(按Esc结束):"
-            loop do
-
-              line = STDIN.gets.chomp
-              comment_array << line
-
-              key = STDIN.getch
-              break if key == "\e"  # Break the loop if Esc key is pressed
+        def get_description_from_git(current_project_dir:nil)
+            description = nil
+            if !current_project_dir.nil? && is_git_directory?(local_repo_dir: current_project_dir)
+                current_git_root_path = git_root_directory(local_repo_dir: current_project_dir)
+                
+                # dev 打包情况的备注
+                cliff_toml_path = File.join(current_git_root_path, "cliff.toml")
+                if File.exist?(cliff_toml_path)
+                    begin
+                        `git-cliff --version`
+                        git_cliff_installed = $?.success?
+                        if git_cliff_installed
+                            temp_dir = Dir.pwd
+                            Dir.chdir(current_git_root_path)
+                            description = `git-cliff -c #{cliff_toml_path} --latest -o -`.strip
+                            Dir.chdir(temp_dir)
+                        end
+                    rescue StandardError => e
+                    end
+                end 
             end
-            puts "================================="
-            puts "输入结束,输入内容为:"
-            puts "================================="
-            comment_str = comment_array.join("\n")
-            puts comment_array
-            puts "================================="
-            return comment_str
+            return description
         end
 
         def modify_coment(app_info_obj:nil, version_item_obj:nil)
 
-            comment_str = get_description()
-            puts
-            puts "确修改信息:"
-            puts
-            puts  "================================="
-            puts "App: #{app_info_obj["appName"]}"
-            puts "版本: #{version_item_obj["appVersion"]} (build #{version_item_obj["build"]})"
-            puts "Build号: #{version_item_obj["incId"]}"
-            puts "bundleId: #{version_item_obj["bundleId"]}"
-            puts "上传时间: #{version_item_obj["updateTime"]}"
+            current_project_dir = Dir.pwd
+            comment_str = get_description_from_git(current_project_dir:current_project_dir)
+            puts "=========================================="
             puts
-            puts "旧备注: \n#{version_item_obj["description"]}"
+            puts "#{comment_str}"
             puts
-            puts "修改备注: \n#{comment_str.strip}"
-            puts  "================================="
+            puts "=========================================="
             puts
-            answer = agree("确认修改备注信息(Y/n)?:")
-            unless answer
-                raise Informative, "暂停修改！！"
+
+            if comment_str.nil? || comment_str.empty?
+                Funlog.instance.fancyinfo_error("没有找到git备注信息，无法修改pgyer备注！")
+            else
+                Funlog.instance.fancyinfo_start("开始修复pgyer备注...")
+                @pgyer_client.post_update_upload_comment(appId:app_info_obj["appId"], id:version_item_obj["id"], comment:comment_str.strip)
+                Funlog.instance.fancyinfo_start("pgyer备注已经修改！")
             end
 
-            @pgyer_client.post_update_upload_comment(appId:app_info_obj["appId"], id:version_item_obj["id"], comment:comment_str.strip)
+            
 
             puts "备注信息修改成功！！"
 

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.9.0"
+  	VERSION = "4.9.1"
 
   	class VersionCheck
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.9.1
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -240,7 +240,6 @@ files:
 - lib/pindo/client/pgyerclient.rb
 - lib/pindo/client/pgyeruploadclient.rb
 - lib/pindo/client/tgateclient.rb
-- lib/pindo/client/unityhelper.rb
 - lib/pindo/command.rb
 - lib/pindo/command/android.rb
 - lib/pindo/command/android/debug.rb
@@ -284,7 +283,7 @@ files:
 - lib/pindo/command/dev/createbuild.rb
 - lib/pindo/command/dev/debug.rb
 - lib/pindo/command/dev/pgyercert.rb
-- lib/pindo/command/dev/pub.rb
+- lib/pindo/command/dev/tag.rb
 - lib/pindo/command/env.rb
 - lib/pindo/command/env/dreamstudio.rb
 - lib/pindo/command/env/quarkenv.rb
@@ -346,8 +345,10 @@ files:
 - lib/pindo/module/appstore/appstore_metadata_connect_api_helper.rb
 - lib/pindo/module/appstore/appstore_metadata_fastlane_helper.rb
 - lib/pindo/module/appstore/iap_tier.json
+- lib/pindo/module/build/buildhelper.rb
 - lib/pindo/module/build/commonconfuseproj.rb
 - lib/pindo/module/build/swarkhelper.rb
+- lib/pindo/module/build/unityhelper.rb
 - lib/pindo/module/cert/certhelper.rb
 - lib/pindo/module/cert/keychainhelper.rb
 - lib/pindo/module/cert/pemhelper.rb

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

@@ -1,171 +0,0 @@
-require 'fileutils'
-
-module Pindo
-  class Command
-    class Dev < Command
-      class Pub < Dev
-
-          self.summary = '发布代码,添加tag,添加发布信息,并合并到发布分支'
-
-          self.description = <<-DESC
-              发布代码,添加tag,添加发布信息,并合并到发布分支。用法：在当前代码仓库下执行pindo dev pub
-          DESC
-
-          self.arguments = [
-
-          ]
-
-          def self.options
-            [
-            ].concat(super)
-            end
-
-            def initialize(argv)
-
-                super
-                @additional_args = argv.remainder!
-            end
-
-          def run
-
-              release_branch = "master"
-              current_project_dir = Dir.pwd
-
-              process_need_add_files(project_dir:current_project_dir)
-
-              answer = agree("是否添加发布备注信息?(Y/n)")
-              if answer
-                add_release_info(project_dir:current_project_dir)
-              end
-              
-              answer = agree("是否将代码合并到master分支?(Y/n)")
-
-              if answer
-                  current_branch = git!(%W(-C #{current_project_dir} rev-parse --abbrev-ref HEAD)).strip
-                  coding_branch = current_branch
-                  merge_to_release_branch(project_dir:current_project_dir, release_branch:release_branch, coding_branch:coding_branch)
-                  add_release_tag(project_dir:current_project_dir)
-              end
-   
-
-          end
-
-          def add_release_info(project_dir:nil)
-              
-              puts 
-              puts "输入Release 备注:"
-              description = PgyerHelper.share_instace.get_description()
-              File.open("#{project_dir}/.release_info", 'w') { |f| f.write(description) }
-              git_addpush_repo(path:project_dir, message:"update release info", commit_file_params:[".release_info"])           
-
-          end
-
-          def add_release_tag(project_dir:nil)
-
-              time_str =  Time.now.strftime('%Y_%m_%d')
-              tag_name = "dev_" + time_str
-              remove_tag(local_repo_dir:project_dir, tag_name:tag_name)
-              result = add_tag(local_repo_dir:project_dir, tag_name:tag_name)
-
-              puts
-              puts "已经为当前仓库添加tag: #{tag_name}"
-              puts "仓库路径:#{project_dir}"
-              puts
-
-          end
-
-
-          def merge_to_release_branch(project_dir:nil, release_branch:nil, coding_branch:nil)
-
-                current_project_dir = project_dir
-
-
-                if !coding_branch.eql?(release_branch)
-
-                    coding_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{coding_branch})).strip
-                    release_branch_commit_id = "111"
-                      
-                      if remote_branch_exists?(local_repo_dir: current_project_dir, branch:release_branch)
-                            if local_branch_exists?(local_repo_dir: current_project_dir, branch:release_branch)
-                                puts "存在#{release_branch}远程分支"
-                                puts "存在#{release_branch}本地分支"
-                                git!(%W(-C #{current_project_dir} checkout #{release_branch}))
-                            else
-                                puts "存在#{release_branch}远程分支"
-                                puts "不存在#{release_branch}本地分支"
-                                git!(%W(-C #{current_project_dir} checkout -b #{release_branch} origin/#{release_branch}))
-                            end
-
-                            git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
-                            git!(%W(-C #{current_project_dir} pull))
-                            # git!(%W(-C #{current_project_dir} merge #{coding_branch} --quiet))
-                            res_data = Executable.capture_command('git', %W(merge #{coding_branch}), :capture => :out)
-
-                            conflict_filelist = git!(%W(-C #{current_project_dir} diff --name-only --diff-filter=U --relative))
-                            if !conflict_filelist.nil? && conflict_filelist.size > 0
-                                puts "合并代码冲突， 冲突文件如下："
-
-                                raise Informative, "请手动处理冲突的文件！！！"
-
-                            else
-                                git!(%W(-C #{current_project_dir} push))
-
-
-                                puts ""
-                                puts "===================================="
-                                puts "代码已经合并到#{release_branch}分支"
-                                puts "===================================="
-                                puts ""
-                                release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
-                            end
-
-                      else
-                            if local_branch_exists?(local_repo_dir: current_project_dir, branch:release_branch)
-                                puts "不存在#{release_branch}远程分支"
-                                puts "存在#{release_branch}本地分支"
-                                git!(%W(-C #{current_project_dir} checkout #{release_branch}))
-                                git!(%W(-C #{current_project_dir} checkout -b #{release_branch}_temp))
-                                git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
-                                git!(%W(-C #{current_project_dir} branch -D #{release_branch}))
-                            else
-                                puts "不存在#{release_branch}远程分支"
-                                puts "不存在#{release_branch}本地分支"
-                            end
-
-                            git!(%W(-C #{current_project_dir} checkout -b #{release_branch}))
-                            git!(%W(-C #{current_project_dir} push origin #{release_branch}))
-                            git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
-
-
-                            puts ""
-                            puts "===================================="
-                            puts "代码已经合并到#{release_branch}分支"
-                            puts "===================================="
-                            puts ""
-                            release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
-                      end
-
-
-                      git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
-                      if !release_branch_commit_id.eql?(coding_branch_commit_id)
-                          git!(%W(-C #{current_project_dir} merge #{release_branch}))
-                          puts
-                          puts "已将#{release_branch}合并到#{coding_branch}"
-                          puts
-                      end
-
-                else
-                            puts ""
-                            puts "===================================="
-                            puts "代码处于#{coding_branch}分支,无需合并"
-                            puts "===================================="
-                            puts ""
-                end
-
-          end
-
-
-      end
-    end
-  end
-end