pindo 4.8.8 → 4.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05280c1e438cd48e755e5a943dcb80296ebacec092a3cdd92997141206eeb49e'
-  data.tar.gz: e3c127d77c032834b54dfee874f9c79499b217afa67e61c99b96bca34d355384
+  metadata.gz: 3d618bb3feb5391c7e4c64105f4f34e72fd542421da102a97e7436ed5d02261c
+  data.tar.gz: 829babd10a742d61b622e248aa79429c6930f084dfcf90206540fe0fd9b64cf5
 SHA512:
-  metadata.gz: 9184262c10bbd7aeec778658d9b267d1fa613dc5065e55bd0f5d3313dbff55dc19e08cb40218eaad9b3a45b4bb583686e67daf810f7f797ccc24b9fa48a5f07d
-  data.tar.gz: fd7d0b9a6ff225f2ff1f9bcac2557ba1146a1f96e8c6478af12198f3bdcb43b3ac3cce7d512b6a66ce6553e7045247607ad24d04fd459cf759b0c44a5920a9fc
+  metadata.gz: f443d03a4934fc8ac2d31ec39bb3ad861a62c28bdd6542a434511cfe1d92f0cb8a6e35736809414e5b564fcec86b0d6393e65d70cec686cd64e518a334ac0277
+  data.tar.gz: dd3b27fbcbc5b0392371d6e84feb14a9ece7241b940d7bfc162651d3eee3dd0a74998a5631bb5bb6d9c3115c222d4efff7de3f7df9cb24e85835ba101676ee46

data/lib/pindo/base/githelper.rb

@@ -19,6 +19,27 @@ module Pindo
 
       end
 
+      def is_git_directory?(local_repo_dir: nil)
+        args = local_repo_dir ? %W(-C #{local_repo_dir} rev-parse --is-inside-work-tree) : %w(rev-parse --is-inside-work-tree)
+        begin
+          git!(args)
+          true
+        rescue StandardError => e
+          false
+        end
+      end
+
+      def git_root_directory(local_repo_dir: nil)
+        return nil unless is_git_directory?(local_repo_dir: local_repo_dir)
+        
+        args = local_repo_dir ? %W(-C #{local_repo_dir} rev-parse --show-toplevel) : %w(rev-parse --show-toplevel)
+        begin
+          git!(args).strip
+        rescue StandardError => e
+          nil
+        end
+      end
+      
       def add_branch(local_repo_dir: nil, branch: nil)
 
           current=Dir.pwd

data/lib/pindo/client/unityhelper.rb

@@ -0,0 +1,179 @@
+require 'open3'
+require 'json'
+require 'singleton'
+
+module Pindo
+  module Client
+    class UnityHelper
+      include Singleton
+
+      UNITY_MAC_PATHS = [
+        "/Applications/Unity/Unity.app/Contents/MacOS/Unity",
+        "/Applications/Unity/Hub/Editor/*/Unity.app/Contents/MacOS/Unity"
+      ]
+
+      UNITY_WINDOWS_PATHS = [
+        "C:/Program Files/Unity/Editor/Unity.exe",
+        "C:/Program Files/Unity/Hub/Editor/*/Unity.exe"
+      ]
+
+      TARGET_UNITY_VERSION = "2021.3"
+
+      class << self
+        def share_instance
+          instance
+        end
+      end
+
+      def find_unity_path
+        paths = case RUBY_PLATFORM
+                when /darwin/
+                  UNITY_MAC_PATHS
+                when /mswin|mingw|windows/
+                  UNITY_WINDOWS_PATHS
+                else
+                  raise "Unsupported platform: #{RUBY_PLATFORM}"
+                end
+
+        unity_versions = []
+
+        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)
+                unity_versions << {
+                  path: expanded_path,
+                  version: version
+                }
+              end
+            end
+          elsif File.exist?(path)
+            version = extract_version_from_path(path)
+            if version && version.start_with?(TARGET_UNITY_VERSION)
+              unity_versions << {
+                path: path,
+                version: version
+              }
+            end
+          end
+        end
+
+        if unity_versions.empty?
+          raise "No Unity #{TARGET_UNITY_VERSION} found in standard locations"
+        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_unity[:path]
+      end
+
+      private
+
+      def extract_version_from_path(path)
+        # macOS路径格式: /Applications/Unity/Hub/Editor/2021.3.45f1/Unity.app/Contents/MacOS/Unity
+        # Windows路径格式: C:/Program Files/Unity/Hub/Editor/2021.3.45f1/Editor/Unity.exe
+        if match = path.match(/Editor\/([\d.]+[a-zA-Z]\d+)\//)
+          match[1]
+        else
+          nil
+        end
+      end
+
+      public
+
+      def execute_unity_command(project_path, method_name, additional_args = {})
+        unity_path = find_unity_path
+        
+        cmd_args = [
+          unity_path,
+          "-batchmode",
+          "-quit",
+          "-projectPath",
+          project_path.to_s,
+          "-executeMethod",
+          method_name
+        ]
+
+        # Add any additional arguments
+        additional_args.each do |key, value|
+          cmd_args << "-#{key}"
+          cmd_args << value.to_s if value
+        end
+
+        puts "Executing Unity command: #{cmd_args.join(' ')}"
+        stdout, stderr, status = Open3.capture3(*cmd_args)
+        
+        {
+          success: status.success?,
+          stdout: stdout,
+          stderr: stderr,
+          exit_status: status.exitstatus,
+          unity_version: extract_version_from_path(unity_path)
+        }
+      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
+
+        result = execute_unity_command(project_path, build_method, additional_args)
+        
+        if result[:success]
+          puts "Unity build completed successfully"
+          puts "Using Unity version: #{result[:unity_version]}"
+          puts result[:stdout]
+        else
+          puts "Unity build failed"
+          puts "Unity version: #{result[:unity_version]}"
+          puts result[:stderr]
+          raise "Unity build failed with status: #{result[:exit_status]}"
+        end
+
+        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")
+        if File.exist?(version_path)
+          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)"
+            end
+            version
+          else
+            raise "Could not parse Unity version from #{version_path}"
+          end
+        else
+          raise "Project version file not found at #{version_path}"
+        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
+    end
+  end
+end

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

@@ -77,13 +77,12 @@ module Pindo
                     config = FastlaneCore::Configuration.create(Gym::Options.available_options, gym_options)
                     Gym::Manager.new.work(config)
 
-
-
                     pindo_new_project_dir = Dir.pwd
                     build_path = File.join(pindo_new_project_dir, "build", "*.ipa")
                     ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-
+                    
                     if !ipa_file_upload.nil? && !app_info_obj.nil?
+                        
                         description = nil
                         result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
                         if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?

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

@@ -44,6 +44,7 @@ module Pindo
                 # 命令的选项列表
                 def self.options
                     [
+                        ['--bundleid', '指定打包的bundleID'],
                         # 指定上传到蒲公英的项目
                         ['--proj',   '指定上传到测试平台的项目名称'],
                         # 上传编译包
@@ -59,7 +60,8 @@ module Pindo
                     @args_adhoc_flag = argv.flag?('adhoc', false)  
                     @args_upload_flag = argv.flag?('upload', false)  
                     @args_send_flag = argv.flag?('send', false)  
-                    @args_proj_name = argv.option('proj')
+                    @args_proj_name = argv.option('proj')  
+                    @args_bundle_id = argv.option('bundleid')
 
                     if @args_send_flag
                         @args_upload_flag = true
@@ -77,10 +79,14 @@ module Pindo
                 def run
                     
                     mainapp_bundleid= nil
-                    if @args_deploy_flag
-                        mainapp_bundleid = get_selected_deploy_bundleid()
+                    if @args_bundle_id
+                        mainapp_bundleid = @args_bundle_id
                     else
-                        mainapp_bundleid = get_selected_dev_bundleid()
+                        if @args_deploy_flag
+                            mainapp_bundleid = get_selected_deploy_bundleid()
+                        else
+                            mainapp_bundleid = get_selected_dev_bundleid()
+                        end
                     end
 
                     app_info_obj = nil

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

@@ -41,6 +41,7 @@ module Pindo
 
                 ]
 
+
                 # 命令的选项列表
                 def self.options
                     [
@@ -50,6 +51,7 @@ module Pindo
                         ['--upload', '上传编译后的APK到测试平台'],
                         # 发送通知
                         ['--send',   '上传成功后发送测试通知']
+                        
                     ].concat(super)
                 end
 

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

@@ -3,11 +3,15 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
+require 'pindo/client/unityhelper'
 
 module Pindo
     class Command
         class Unity < Command
             class Ipa < Unity
+
+                include Appselect
+
                 # Unity IPA包编译和上传命令
                 self.summary = '编译Unity工程生成iOS IPA并支持上传到测试平台'
 
@@ -54,6 +58,7 @@ module Pindo
                     @args_proj_name = argv.option('proj')
                     @args_upload_flag = argv.flag?('upload', false)
                     @args_send_flag = argv.flag?('send', false)
+                    @args_deploy_flag = argv.flag?('deploy', false)
 
                     if @args_send_flag
                         @args_upload_flag = true
@@ -62,10 +67,81 @@ module Pindo
                     super
                 end
 
+                def export_ios_project(project_path)
+                    begin
+                      # 获取 UnityHelper 实例
+                      unity_helper = Pindo::Client::UnityHelper.share_instance
+                    
+                      # 准备额外的参数
+                      additional_args = {
+                        'platform' => 'iOS'
+                      }
+
+                      # 执行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:"
+                        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
+                    
+                    app_info_obj = nil
+                    if @args_upload_flag 
+                        proj_name = @args_proj_name
+                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+                    end
+                    puts app_info_obj
+
+                    mainapp_bundleid= nil
+                    if @args_deploy_flag
+                        mainapp_bundleid = get_selected_deploy_bundleid()
+                    else
+                        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, "Builds/iOS")
+                    args_temp = []
+                    
+                    args_temp << "--bundleid=#{mainapp_bundleid}"
+                    
+                    if @args_upload_flag 
+                        args_temp << "--proj=#{app_info_obj["appName"]}"
+                        args_temp << "--upload"
+                    end
+                    if @args_send_flag
+                        args_temp << "--send"
+                    end
+                    Dir.chdir(pindo_ios_project_dir)
+
+                    Pindo::Command::Ios::Debug::run(args_temp)
 
-                    puts "ipa "
 
                 end
 

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

@@ -172,21 +172,44 @@ 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
-                if description.nil? && File.exist?(File.join(current_project_dir, ".git"))
-                    description = git!(%W(-C #{current_project_dir} show -s --format=commit::%H)).strip
+                puts "+++++1 current_project_dir = #{current_project_dir}"
+
+                if description.nil? && is_git_directory?(local_repo_dir: current_project_dir)
+                    puts "+++++2 current_project_dir = #{current_project_dir}"
+
+                    current_git_root_path = git_root_directory(local_repo_dir: current_project_dir)
+                    puts "+++++3 current_git_root_path = #{current_git_root_path}"
+
                     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)
+                        puts "+++++4 xcodeproj_file_name = #{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")
-                            if File.exist?(File.join(current_project_dir, ".release_info"))
-                                description = File.read(File.join(current_project_dir, ".release_info"))
+                            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 = git!(%W(-C #{current_project_dir} show -s --format=%h::%s)).strip
-                            end
+                                description = " "
+                            end             
                         elsif provisioning_profile_name.include?("appstore")
                             description = "提交包重签名"
                         end

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.8.8"
+  	VERSION = "4.8.9"
 
   	class VersionCheck
 

data/lib/pindo.rb

@@ -13,6 +13,7 @@ module Pindo
 	require 'pindo/command'
 	require 'pindo/version'
 
+
 	class PindoApp
 
 		def run(argv)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.8.8
+  version: 4.8.9
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-02-14 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -240,6 +240,7 @@ 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