pindo 4.8.9 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d618bb3feb5391c7e4c64105f4f34e72fd542421da102a97e7436ed5d02261c
-  data.tar.gz: 829babd10a742d61b622e248aa79429c6930f084dfcf90206540fe0fd9b64cf5
+  metadata.gz: c74254c898c4aed8258d9c19ab0e74bdbce31fd1e3744e145c2ad1ec7e9112c7
+  data.tar.gz: a06a58190d7de3995e41939902fddbc1b104faed1e8c8c6cf210f505a84adfec
 SHA512:
-  metadata.gz: f443d03a4934fc8ac2d31ec39bb3ad861a62c28bdd6542a434511cfe1d92f0cb8a6e35736809414e5b564fcec86b0d6393e65d70cec686cd64e518a334ac0277
-  data.tar.gz: dd3b27fbcbc5b0392371d6e84feb14a9ece7241b940d7bfc162651d3eee3dd0a74998a5631bb5bb6d9c3115c222d4efff7de3f7df9cb24e85835ba101676ee46
+  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
@@ -48,7 +48,9 @@ module Pindo
                     [
                         ['--proj',   '指定上传到测试平台的项目名称'],
                         ['--upload', '上传编译后的IPA到测试平台'],
-                        ['--send',   '上传成功后发送测试通知']
+                        ['--send',   '上传成功后发送测试通知'],
+                        ['--base',   'Unity工程编译lib模式'],
+                        ['--unity-version', '切换Unity版本']
                     ].concat(super)
                 end
 
@@ -59,6 +61,9 @@ module Pindo
                     @args_upload_flag = argv.flag?('upload', false)
                     @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
@@ -67,16 +72,16 @@ module Pindo
                     super
                 end
 
-                def export_ios_project(project_path)
-                    begin
-                      # 获取 UnityHelper 实例
-                      unity_helper = Pindo::Client::UnityHelper.share_instance
-                    
-                      # 准备额外的参数
-                      additional_args = {
-                        'platform' => 'iOS'
-                      }
+                def export_ios_project(project_path, pindo_ios_project_dir, additional_args)
+
+                    # 获取 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,
@@ -87,7 +92,7 @@ module Pindo
                       if result[:success]
                         puts "Unity iOS library build completed successfully"
                         puts "Unity version: #{result[:unity_version]}"
-                        puts "Output:"
+                        puts "Output: #{pindo_ios_project_dir}"
                         puts result[:stdout]
                         return true
                       else
@@ -107,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 
@@ -122,15 +140,25 @@ module Pindo
                         mainapp_bundleid = get_selected_dev_bundleid()
                     end
 
-                    pindo_unity_project_dir = Dir.pwd
-                    export_ios_project(pindo_unity_project_dir)
-
+                    
+                    pindo_ios_project_dir = File.join(pindo_unity_project_dir, "Platform/iOS")
+                    # 准备额外的参数
+                    additional_args = {
+                        'platform' => 'iOS'
+                    }
+                    if @args_base_flag
+                        pindo_ios_project_dir = File.join(pindo_unity_project_dir, "Platform/BaseiOS")
+                        additional_args = {
+                            'platform' => 'iOS',
+                            'buildtype' => 'library'
+                        }
+                    end
 
-                    pindo_ios_project_dir = File.join(pindo_unity_project_dir, "Builds/iOS")
-                    args_temp = []
+                    export_ios_project(pindo_unity_project_dir, pindo_ios_project_dir, additional_args)
                     
+                    args_temp = []
                     args_temp << "--bundleid=#{mainapp_bundleid}"
-                    
+
                     if @args_upload_flag 
                         args_temp << "--proj=#{app_info_obj["appName"]}"
                         args_temp << "--upload"
@@ -138,10 +166,18 @@ module Pindo
                     if @args_send_flag
                         args_temp << "--send"
                     end
+                    
                     Dir.chdir(pindo_ios_project_dir)
+                    if @args_base_flag
+                        `chmod 777 #{pindo_ios_project_dir}`
+                    else
+                        `chmod 777 #{pindo_ios_project_dir}/Unity`
+                    end
+                    
 
                     Pindo::Command::Ios::Debug::run(args_temp)
 
+  
 
                 end