pindo 4.9.2 → 4.9.3

data/lib/pindo/command/ios.rb

@@ -1,7 +1,7 @@
 
-require 'pindo/command/ios/cert'
-require 'pindo/command/ios/build'
 require 'pindo/command/ios/debug'
+require 'pindo/command/ios/build'
+require 'pindo/command/ios/autobuild'
 require 'pindo/command/ios/adhoc'
 require 'pindo/command/ios/autoresign'
 require 'pindo/command/ios/applovin'

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

@@ -4,6 +4,7 @@ require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/build/unityhelper'
+require 'pindo/module/build/buildhelper'
 
 module Pindo
     class Command
@@ -11,7 +12,8 @@ module Pindo
             class Ipa < Unity
 
                 include Appselect
-
+                
+                include Pindo::Githelper
                 # Unity IPA包编译和上传命令
                 self.summary = '编译Unity工程生成iOS IPA并支持上传到测试平台'
 
@@ -71,61 +73,34 @@ module Pindo
 
                     super
                 end
-
-                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,
-                        'GoodUnityBuild.BuildManager.BatchBuild',
-                        additional_args
-                      )
-                  
-                      if result[:success]
-                        puts "Unity iOS library build completed successfully"
-                        puts "Unity version: #{result[:unity_version]}"
-                        puts "Output: #{pindo_ios_project_dir}"
-                        puts result[:stdout]
-                        return true
-                      else
-                        puts "Unity iOS library build failed"
-                        puts "Unity version: #{result[:unity_version]}"
-                        puts "Error:"
-                        puts result[:stderr]
-                        raise "Build failed with status: #{result[:exit_status]}"
-                      end
-                  
-                    rescue => e
-                      puts "Error during Unity build: #{e.message}"
-                      puts e.backtrace
-                      return false
-                    end
-                end
                 
 
                 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
-                    
+
+                    if @args_upload_flag
+                        build_helper = Pindo::BuildHelper.share_instance
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_unity_project_dir)
+                        if is_need_add_tag
+                            Pindo::Command::Dev::Tag::run(tag_action_parms) 
+                        end
+                    end
+
+                    project_unity_version = unity_helper.get_unity_version(pindo_unity_project_dir)
+                    project_unity_major_version = project_unity_version.split('.')[0..1].join('.')
+                    puts
+                    puts "工程的Unity版本: #{project_unity_version}"
+                    unity_exe_path = unity_helper.find_unity_path(unity_major_version:project_unity_major_version, force_change_version: @force_select_unity)
+                    puts "选择的Unity路径: #{unity_exe_path}"
+                    puts
+
                     app_info_obj = nil
                     if @args_upload_flag 
                         proj_name = @args_proj_name
@@ -140,21 +115,19 @@ module Pindo
                         mainapp_bundleid = get_selected_dev_bundleid()
                     end
 
-                    
-                    pindo_ios_project_dir = File.join(pindo_unity_project_dir, "GoodPlatform/iOS")
-                    # 准备额外的参数
-                    additional_args = {
-                        'platform' => 'iOS'
-                    }
-                    if @args_base_flag
-                        pindo_ios_project_dir = File.join(pindo_unity_project_dir, "GoodPlatform/BaseiOS")
-                        additional_args = {
-                            'platform' => 'iOS',
-                            'buildtype' => 'library'
-                        }
+                    isLibrary = @args_base_flag
+
+                    ios_export_lib_dir = File.join(pindo_unity_project_dir, "GoodPlatform/BaseiOS")
+                    if File.directory?(ios_export_lib_dir)
+                        isLibrary = true
                     end
 
-                    export_ios_project(pindo_unity_project_dir, pindo_ios_project_dir, additional_args)
+                    pindo_ios_project_dir = File.join(pindo_unity_project_dir, "GoodPlatform/iOS")
+                    if isLibrary
+                        pindo_ios_project_dir = ios_export_lib_dir
+                    end
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_unity_project_dir, platform:'iOS', isLibrary:isLibrary)
+                    
                     
                     args_temp = []
                     args_temp << "--bundleid=#{mainapp_bundleid}"
@@ -168,14 +141,8 @@ module Pindo
                     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)
+                    Pindo::Command::Ios::Autobuild::run(args_temp)
 
 
                 end

data/lib/pindo/command.rb

@@ -44,7 +44,6 @@ module Pindo
         require 'pindo/command/pgyer'
         require 'pindo/command/setup'
         require 'pindo/command/repo'
-        require 'pindo/command/upgrade'
         require 'pindo/command/ipa'
         require 'pindo/command/appstore'
         require 'pindo/command/unity'

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

@@ -3,10 +3,10 @@ require 'fileutils'
 require 'xcodeproj' # 用于iOS项目检查
 
 module Pindo
-  module Module
-    module Build
+
       class BuildHelper
         include Singleton
+        include Pindo::Githelper
 
         class << self
           def share_instance
@@ -14,6 +14,51 @@ module Pindo
           end
         end
 
+        def check_is_need_add_tag?(project_path)
+          tag_action_parms = nil
+          is_need_add_tag = false
+        
+          if is_git_directory?(local_repo_dir: project_path)
+            current_git_root_path = git_root_directory(local_repo_dir: project_path)
+            latest_tag = get_latest_version_tag(project_dir: current_git_root_path)
+            
+            unless is_tag_at_head?(git_root_dir: current_git_root_path, tag_name: latest_tag)
+              cli = HighLine.new
+              menu_options = {
+                "新增版本号,打新Tag" => -> { 
+                  tag_action_parms = []
+                  :new_tag 
+                },
+                "将上次的Tag删除重新打Tag" => -> { 
+                  tag_action_parms = []
+                  tag_action_parms << "--retag"
+                  :recreate_tag 
+                },
+                "不需要Tag继续编译且上传，手动修改上传备注" => -> { 
+                  puts ""
+                  :continue_without_tag 
+                },
+                "终止退出编译" => -> { 
+                  raise Informative, "终止退出编译!"
+                  :exit 
+                }
+              }
+              
+              result = cli.choose do |menu|
+                menu.header = "当前代码并没有打Tag,上传的Changelog需要Tag"
+                menu.prompt = "请选中打Tag的方式, 请输入选项(1/2/3...):"
+                menu_options.each do |option, action|
+                  menu.choice(option) { action.call }
+                end
+              end
+              
+              is_need_add_tag = !tag_action_parms.nil?
+            end
+          end
+        
+          return [is_need_add_tag, tag_action_parms]
+        end
+
         def unity_project?(project_path)
           # 检查Unity工程的关键文件和目录
           project_settings_path = File.join(project_path, "ProjectSettings")
@@ -138,6 +183,5 @@ module Pindo
           end
         end
       end
-    end
-  end
+
 end 

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

@@ -25,7 +25,8 @@ module Pindo
         end
       end
 
-      def find_unity_path(change_unity_version:false)
+      def find_unity_path(unity_major_version:nil, force_change_version:false)
+
         paths = case RUBY_PLATFORM
                 when /darwin/
                   UNITY_MAC_PATHS
@@ -42,101 +43,44 @@ module Pindo
             Dir.glob(path).each do |expanded_path|
               version = extract_version_from_path(expanded_path)
               if version
+                major_version = version.split('.')[0..1].join('.')
                 unity_versions << {
                   path: expanded_path,
-                  version: version
+                  version: version,
+                  major_version: major_version
                 }
               end
             end
           elsif File.exist?(path)
             version = extract_version_from_path(path)
+            major_version = version.split('.')[0..1].join('.')
             if version
               unity_versions << {
                 path: path,
-                version: version
+                version: version,
+                major_version: major_version
               }
             end
           end
         end
-
+        
         if unity_versions.empty?
           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::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::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]
+        unity_versions.sort_by! { |v| v[:major_version] }
+        select_unity_versions = unity_versions.select! { |v| v[:major_version] == unity_major_version } if unity_major_version
+        if select_unity_versions.empty?
+          if force_change_version
+            return unity_versions.last[:path]
+          else
+            raise Informative, "未找到匹配的Unity版本"
+            return nil
           end
+        else
+          return select_unity_versions.first[:path]
         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
-
-        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
 
       private
@@ -153,17 +97,19 @@ module Pindo
 
       public
 
-      def execute_unity_command(project_path, method_name, additional_args = {})
-        unity_path = find_unity_path
+      def execute_unity_command(unity_exe_full_path, project_path, additional_args = {})
+        if unity_exe_full_path.nil?
+          raise Informative, "Unity path not found!"
+        end
         
         cmd_args = [
-          unity_path,
+          unity_exe_full_path,
           "-batchmode",
           "-quit",
           "-projectPath",
           project_path.to_s,
           "-executeMethod",
-          method_name
+          "GoodUnityBuild.BuildManager.BatchBuild"
         ]
 
         # Add any additional arguments
@@ -179,17 +125,17 @@ module Pindo
           success: status.success?,
           stdout: stdout,
           stderr: stderr,
-          exit_status: status.exitstatus,
-          unity_version: extract_version_from_path(unity_path)
+          exit_status: status.exitstatus
         }
       end
 
-      def build_project(project_path, build_method, platform: nil, output_path: nil)
-        additional_args = {}
-        additional_args[:buildTarget] = platform if platform
-        additional_args[:outputPath] = output_path if output_path
+      
+      def build_project(unity_exe_full_path:nil, project_path:nil, platform: nil, isLibrary: false)
 
-        result = execute_unity_command(project_path, build_method, additional_args)
+        additional_args = {}
+        additional_args[:platform] = platform if platform
+        additional_args[:buildtype] = 'library' if isLibrary
+        result = execute_unity_command(unity_exe_full_path, project_path, additional_args)
         
         if result[:success]
           puts "Unity build completed successfully"
@@ -205,14 +151,6 @@ module Pindo
         result
       end
 
-      def get_project_settings(project_path)
-        settings_path = File.join(project_path, "ProjectSettings", "ProjectSettings.asset")
-        if File.exist?(settings_path)
-          File.read(settings_path)
-        else
-          raise "Project settings file not found at #{settings_path}"
-        end
-      end
 
       def get_unity_version(project_path)
         version_path = File.join(project_path, "ProjectSettings", "ProjectVersion.txt")
@@ -232,17 +170,6 @@ module Pindo
         end
       end
 
-      def verify_unity_version(project_path)
-        project_version = get_unity_version(project_path)
-        unity_path = find_unity_path
-        editor_version = extract_version_from_path(unity_path)
-        
-        if project_version != editor_version
-          raise "Project Unity version (#{project_version}) does not match Editor version (#{editor_version})"
-        end
-        
-        true
-      end
 
       def unity_project?(project_path)
         # 检查关键Unity工程文件和目录是否存在

data/lib/pindo/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.9.2
+  version: 4.9.3
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-02-21 00:00:00.000000000 Z
+date: 2025-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -298,9 +298,9 @@ files:
 - lib/pindo/command/ios.rb
 - lib/pindo/command/ios/adhoc.rb
 - lib/pindo/command/ios/applovin.rb
+- lib/pindo/command/ios/autobuild.rb
 - lib/pindo/command/ios/autoresign.rb
 - lib/pindo/command/ios/build.rb
-- lib/pindo/command/ios/cert.rb
 - lib/pindo/command/ios/debug.rb
 - lib/pindo/command/ipa.rb
 - lib/pindo/command/ipa/autoresign.rb
@@ -327,7 +327,6 @@ files:
 - lib/pindo/command/unity.rb
 - lib/pindo/command/unity/apk.rb
 - lib/pindo/command/unity/ipa.rb
-- lib/pindo/command/upgrade.rb
 - lib/pindo/command/utils.rb
 - lib/pindo/command/utils/boss.rb
 - lib/pindo/command/utils/clearcert.rb

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

@@ -1,164 +0,0 @@
-require 'fileutils'
-
-module Pindo
-  class Command
-    class Ios < Command
-      class Cert < Ios
-        
-            include Appselect
-            
-            include XcodeCertHelper
-            self.summary = '更新iOS证书并使用新证书设置Xcode工程'
-            self.description = <<-DESC
-                更新iOS证书并使用新证书设置Xcode工程。
-                
-                支持功能:
-
-                    * 更新iOS证书
-
-                    * 设置Xcode工程证书
-
-                    * 支持开发和发布证书
-
-                使用示例:
-
-                    $ pindo ios cert                    # 更新开发证书
-
-                    $ pindo ios cert --deploy           # 更新发布bundle id
-
-                    $ pindo ios cert --adhoc            # 更新adhoc证书
-
-                    $ pindo ios cert --macos            # 更新macos平台证书
-
-            DESC
-
-            self.arguments = [
-
-            ]
-  
-            # 命令选项
-            def self.options
-              [
-                ['--deploy', '默认使用开发环境的bundle id,使用此选项切换为发布环境的bundle id'],
-                ['--adhoc', '默认使用开发证书,使用此选项切换为adhoc证书'],
-                ['--macos', '指定为macOS平台的证书'],
-                ['--upload', '生成用于上传到蒲公英平台的证书'],
-              ].concat(super)
-            end
-
-            def initialize(argv)
-              @args_adhoc_flag = argv.flag?('adhoc', false)
-              @args_deploy_flag = argv.flag?('deploy', false)
-              @args_macos_flag = argv.flag?('macos', false)
-              @upload_flag = argv.flag?('upload', false)
-              super 
-            end
-
-
-            def run
-
-              mainapp_bundleid= nil
-              if @args_deploy_flag
-                mainapp_bundleid = get_selected_deploy_bundleid()
-              else
-                mainapp_bundleid = get_selected_dev_bundleid()
-              end
-
-              args_temp = []
-              args_temp << mainapp_bundleid
-              Pindo::Command::Deploy::Pullconfig::run(args_temp)
-
-
-              project_dir = Dir.pwd
-              Dir.chdir(project_dir)
-              config_json_file = File.join(project_dir,"config.json")
-              Cert::modify_cert_with_project(project_dir:project_dir, config_file:config_json_file)
-
-              args_temp = []
-              if @args_adhoc_flag
-                  args_temp << "--adhoc"
-              else
-                  args_temp << "--dev"
-              end
-
-
-
-              project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-              if !project_fullname.nil?
-                  project_obj = Xcodeproj::Project.open(project_fullname)
-                  project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
-                  if !project_build_platform.nil? && project_build_platform.eql?("macosx")
-                    @args_macos_flag = true
-                  end
-              end
-
-              if @args_macos_flag
-                args_temp << "--macos"
-              end
-
-              if @upload_flag
-                args_temp << "--upload"
-              end
-              
-              Pindo::Command::Deploy::Cert::run(args_temp)
-
-            end
-
-            def self.modify_cert_with_project(project_dir:nil, config_file:nil)
-
-              project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-              if !project_fullname.nil?
-
-                    entitlements_plist_path = nil
-                    project_obj = Xcodeproj::Project.open(project_fullname)
-                    project_obj.targets.each do |target|
-                        if target.product_type.to_s.eql?("com.apple.product-type.application") then
-                            temp_entitlements_file = target.build_configurations.first.build_settings['CODE_SIGN_ENTITLEMENTS']
-                            if !temp_entitlements_file.nil? && !temp_entitlements_file.empty?
-                              entitlements_plist_path = File.join(project_dir, temp_entitlements_file)
-                            end
-                        end
-                    end
-
-                    # puts entitlements_plist_path
-                    if !entitlements_plist_path.nil? && File.exist?(entitlements_plist_path)
-                        config_json = nil
-                        if File.exist?(config_file)
-                            config_json = JSON.parse(File.read(config_file))
-                        end
-
-                        entitlements_plist_dict = Xcodeproj::Plist.read_from_path(entitlements_plist_path)
-
-                        if entitlements_plist_dict["com.apple.developer.icloud-container-identifiers"].nil?
-                            if !config_json.nil? && !config_json["app_info"]['app_icloud_id'].nil?
-                              config_json["app_info"].delete('app_icloud_id')
-                            end
-                        end
-
-                        if entitlements_plist_dict["com.apple.security.application-groups"].nil?
-                            if !config_json.nil? && !config_json["app_info"]['app_group_id'].nil?
-                              config_json["app_info"].delete('app_group_id')
-                            end
-                        end
-
-                        # puts JSON.pretty_generate(config_json)
-                        if !config_json.nil?
-                            File.open(config_file, "w") do |f|
-                              f.write(JSON.pretty_generate(config_json))
-                            end
-                          
-                        end
-
-                    end
-
-              end
-
-
-            end
-
-
-      end
-    end
-  end
-end
-