pindo 4.8.7 → 4.8.9

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

@@ -0,0 +1,152 @@
+require 'highline/import'
+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并支持上传到测试平台'
+
+                # 详细说明
+                self.description = <<-DESC
+                    编译Unity工程生成iOS IPA并支持上传到测试平台。
+                    
+                    支持功能:
+
+                        * 编译生成IPA
+
+                        * 上传到测试平台  
+
+                        * 发送测试通知
+
+                    使用示例:
+
+                        $ pindo unity ipa                    # 编译IPA
+
+                        $ pindo unity ipa --upload           # 编译并上传
+
+                        $ pindo unity ipa --send             # 编译上传并发送通知
+
+                        $ pindo unity ipa --proj=myapp       # 指定项目名称
+                DESC
+
+                # 命令参数
+                self.arguments = [
+                    # 暂无参数
+                ]
+
+                # 命令选项
+                def self.options
+                    [
+                        ['--proj',   '指定上传到测试平台的项目名称'],
+                        ['--upload', '上传编译后的IPA到测试平台'],
+                        ['--send',   '上传成功后发送测试通知']
+                    ].concat(super)
+                end
+
+
+                def initialize(argv)
+
+                    @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
+                    end
+
+                    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)
+
+
+                end
+
+
+            end
+        end
+    end
+end

data/lib/pindo/command/unity.rb

@@ -0,0 +1,16 @@
+
+
+require 'pindo/command/unity/ipa'
+require 'pindo/command/unity/apk'
+
+
+module Pindo
+  class Command
+    
+    class Unity < Command
+      self.abstract_command = true
+      self.summary = 'Unity相关命令'
+    end
+
+  end
+end

data/lib/pindo/command.rb

@@ -47,7 +47,9 @@ module Pindo
         require 'pindo/command/upgrade'
         require 'pindo/command/ipa'
         require 'pindo/command/appstore'
-
+        require 'pindo/command/unity'
+        require 'pindo/command/ios'
+        require 'pindo/command/android'
 
         attr_accessor :args_help_flag
         alias_method :args_help_flag?, :args_help_flag

data/lib/pindo/module/appselect.rb

@@ -130,6 +130,10 @@ module Pindo
           puts
           puts "选择的bundle id是: #{menu_choice}"
           puts
+          if menu_choice.eql?("com.heroneverdie101.*")
+            menu_choice = "com.heroneverdie101"
+          end
+          
           return menu_choice;
           
         end

data/lib/pindo/module/cert/xcodecerthelper.rb

@@ -160,7 +160,7 @@ module Pindo
                             end
 
                             if !provisioning_info.nil?
-                                config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
+                                config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"] unless provisioning_info["bundle_id"].eql?("com.heroneverdie101.*")
                                 config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
                                 config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]'] = provisioning_info['profile_name']
                             end
@@ -184,7 +184,7 @@ module Pindo
                                 config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Distribution"
                             end
                             if !provisioning_info.nil?
-                                config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
+                                config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"] unless provisioning_info["bundle_id"].eql?("com.heroneverdie101.*")
                                 config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
                                 config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]'] = provisioning_info['profile_name']
                             end

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

@@ -168,24 +168,48 @@ module Pindo
                 unless !ipa_file_upload.nil? && File.exist?(ipa_file_upload)
                     return
                 end
+                
                 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
@@ -215,7 +239,9 @@ module Pindo
                     Dir.chdir current_project_dir
                 end
 
-
+                if description.nil? || description.length <= 0
+                    description = " "
+                end
                 puts
                 puts "上传项目: #{app_info_obj["appName"]}"
                 print "上传备注: "
@@ -277,6 +303,20 @@ module Pindo
             wechat_msg_url
         end
 
+        def send_apptest_msg(appId:nil, appVersionId:nil, chatEnv: nil, receiveType:nil)
+            
+            Funlog.instance.fancyinfo_start("正在发送飞书消息...")
+            result =  @pgyer_client.post_message(appId:appId, appVersionId:appVersionId, chatEnv: chatEnv, receiveType:receiveType)
+
+            if !result.nil? && result["code"] == 200 && result["data"] == "success"
+                Funlog.instance.fancyinfo_success("测试信息已经发送飞书!")
+                return true
+            else
+                Funlog.instance.fancyinfo_error("未发送飞书测试信息！")
+                return false
+            end
+        
+        end
 
         def send_apptest_wechat_msg(msg_data:nil, wechat_url:nil)
 

data/lib/pindo/module/xcode/xcodehelper.rb

@@ -124,7 +124,7 @@ module Pindo
             config.build_settings['CODE_SIGN_IDENTITY'] = "iPhone Developer"
             config.build_settings['DEVELOPMENT_TEAM'] = "9WX2E4VC26"
             config.build_settings['PROVISIONING_PROFILE'] = ""
-            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = bundle_id
+            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] =  bundle_id unless bundle_id.eql?("com.heroneverdie101.*")
             config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = "match Development " + bundle_id
             # config.build_settings['TARGETED_DEVICE_FAMILY'] = "1,2"
             if is_extention

data/lib/pindo/options/deployoptions.rb

@@ -61,6 +61,7 @@ module Pindo
             attr_accessor :config_json
             attr_accessor :additional_args
 
+
             def self.options
                 [
                     ['--u=', 'input apple id'],
@@ -200,6 +201,9 @@ module Pindo
 
                     if @config_json['app_info'] && @config_json['app_info']['app_identifier']
                         @deploy_identifier = @config_json['app_info']['app_identifier']
+                        if @deploy_identifier.eql?("com.heroneverdie101")
+                            @deploy_identifier = "com.heroneverdie101.*"
+                        end
                     end
 
                     if @config_json['app_info'] && @config_json['app_info']['app_identifier_pushcontent']

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.8.7"
+  	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,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.8.7
+  version: 4.8.9
 platform: ruby
 authors:
 - wade
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -241,7 +240,10 @@ 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
 - lib/pindo/command/appstore.rb
 - lib/pindo/command/appstore/iap.rb
 - lib/pindo/command/appstore/itcapp.rb
@@ -288,6 +290,19 @@ files:
 - lib/pindo/command/env/quarkenv.rb
 - lib/pindo/command/env/swarkenv.rb
 - lib/pindo/command/env/workhard.rb
+- lib/pindo/command/gplay.rb
+- lib/pindo/command/gplay/iap.rb
+- lib/pindo/command/gplay/itcapp.rb
+- lib/pindo/command/gplay/metadata.rb
+- lib/pindo/command/gplay/screenshots.rb
+- lib/pindo/command/gplay/upload.rb
+- lib/pindo/command/ios.rb
+- lib/pindo/command/ios/adhoc.rb
+- lib/pindo/command/ios/applovin.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
 - lib/pindo/command/ipa/import.rb
@@ -310,6 +325,9 @@ files:
 - lib/pindo/command/repo/login.rb
 - lib/pindo/command/repo/search.rb
 - lib/pindo/command/setup.rb
+- 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
@@ -350,7 +368,6 @@ homepage: https://gitee.com/test/pindo.git
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -365,8 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 3
 summary: easy work
 test_files: []