pindo 5.17.4 → 5.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c72f7acb18bc2b9f09eee1bd25386ac612a29ac7a37b5a4f35e9b56853f5c86
-  data.tar.gz: 196b9a7f836a67de966ff2f5e4a27dfe1805e0fa2098de6b767e865cbc386a68
+  metadata.gz: 2dc0ea199e9881c190ba29b0da86845f0f628d92e8d44fdc5276a00ab8945a23
+  data.tar.gz: 5c001a0004db9f0cfe726bbf20bfbd855c8cbdd65e35a63043cf62f059b4d513
 SHA512:
-  metadata.gz: 2ec1d2ba069d15615d2a209a1c8497ae43c0f88b4a072e74ba6020e169225d6e37e4f51163741cf3e15375f17004d6a53220aae2e70d482bcc2edf79da7a5d24
-  data.tar.gz: c7dc2c39a97a172654d6c9aad3132865dcf0a3b95122d9590477bd496d5a3e3d2338bfdfbf17ec47e9c849115bd614fb5e5c7939c3daff22fc43d4c9a4508fe1
+  metadata.gz: 3cf203666f973af0185f1a7cd0b700e918e6fe4a273ce5af2324cfa7e809c55ea2c6669b1678d54b0d3c851660d0021c3edd60d0a20253ab47f68b5b6df70ad2
+  data.tar.gz: 1dad5465cd43d8e974ba99c059f0f7a9995144c5af8c890c092c471fd677ca657bd024ffb677d42463b4ad27c6bc91644fba8acb5be86f1c360870de46d7413a

data/lib/pindo/command/android/autobuild.rb

@@ -70,19 +70,27 @@ module Pindo
 
                 $ pindo and autobuild --proj="My App"           # 指定项目名称
 
-                $ pindo and autobuild                           # 编译、打tag
+                $ pindo and autobuild                           # 编译、打 tag
 
                 $ pindo and autobuild --release                 # 编译 Release 包
 
-                $ pindo and autobuild --upload                  # 编译、打tag、上传、发上传消息
+                $ pindo and autobuild --upload                  # 编译、打 tag、上传、发上传消息
 
-                $ pindo and autobuild --media                   # 编译、打tag、上传、发上传消息、上传媒体附件
+                $ pindo and autobuild --media                   # 编译、打 tag、上传、发上传消息、上传媒体附件
 
-                $ pindo and autobuild --bind                    # 编译、打tag、上传、发上传消息、上传媒体附件 + 绑定包到工作流
+                $ pindo and autobuild --bind                    # 编译、打 tag、上传、发上传消息、上传媒体附件 + 绑定包到工作流
 
-                $ pindo and autobuild --send                    # 编译、打tag、上传、发上传消息、上传媒体附件、绑定包到工作流 + 发送群消息
+                $ pindo and autobuild --send                    # 编译、打 tag、上传、发上传消息、上传媒体附件、绑定包到工作流 + 发送群消息
 
                 $ pindo and autobuild --multi                   # 使用并发模式执行
+
+                $ pindo and autobuild --git-commit=skip         # 跳过 Git 提交检查（不处理未提交文件）
+
+                $ pindo and autobuild --git-commit=reset        # 重置未提交的更改
+
+                $ pindo and autobuild --git-commit=stash        # 暂存未提交的更改
+
+                $ pindo and autobuild --tag_type=none           # 不创建 Git Tag
         DESC
 
         # 定义此命令使用的参数项
@@ -133,6 +141,7 @@ module Pindo
           @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc])
           @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type])
           @args_tag_pre = @options[:tag_pre] || 'v'
+          # 解析 --git-commit 参数（不设置默认值，以便区分用户是否指定了参数）
           @args_git_commit = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit])
 
           super
@@ -211,11 +220,26 @@ module Pindo
 
             # 1. Git 提交任务
             # 提前询问用户如何处理未提交的文件
-            process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
-                project_dir: config[:project_path],
-                interactive: @args_git_commit.nil?,
-                default_process_type: @args_git_commit
-            )
+            # 如果用户指定了 --git-commit 参数，直接使用该参数；否则交互式询问
+            user_specified_git_commit = @options[:git_commit] != nil
+            
+            Funlog.instance.info("DEBUG: @options[:git_commit] = #{@options[:git_commit].inspect}")
+            Funlog.instance.info("DEBUG: @args_git_commit = #{@args_git_commit.inspect}")
+            Funlog.instance.info("DEBUG: user_specified_git_commit = #{user_specified_git_commit}")
+            
+            if user_specified_git_commit
+              # 用户指定了 --git-commit 参数，直接使用
+              process_type = @args_git_commit || Pindo::UncommittedFilesProcessType::SKIP
+              Funlog.instance.info("使用用户指定的 Git 提交处理方式：#{process_type}")
+            else
+              # 未指定参数，交互式询问
+              process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
+                  project_dir: config[:project_path],
+                  interactive: true,
+                  default_process_type: nil
+              )
+            end
+
             git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
               config[:project_path],
               release_branch: @args_release_branch,

data/lib/pindo/module/android/android_build_helper.rb

@@ -40,6 +40,11 @@ module Pindo
       # 2. 处理 Unity 作为 lib 的原生工程（Unity 放在 Unity 目录下）
       elsif Pindo::AndroidProjectHelper.unity_as_lib_android_project?(project_dir)
         puts "处理 Unity 作为 lib 的原生工程..."
+
+        # 确保主工程能继承 Unity 导出的关键 gradle.properties 配置
+        # 包括 android.aapt2FromMavenOverride 与 org.gradle.java.home
+        Pindo::AndroidProjectHelper.sync_gradle_properties_from_unity_to_main(project_dir)
+
         unity_dir = File.join(project_dir, "Unity")
 
         if File.directory?(unity_dir)

data/lib/pindo/module/android/android_project_helper.rb

@@ -273,6 +273,61 @@ module Pindo
         android_dir
       end
 
+      # 在 Unity 作为 lib 的工程中，将 Unity 根目录下 gradle.properties
+      # 中的关键配置同步到主工程的 gradle.properties 中
+      # 当前仅同步以下键：
+      # - android.aapt2FromMavenOverride
+      # - org.gradle.java.home
+      def sync_gradle_properties_from_unity_to_main(project_path)
+        return unless unity_as_lib_android_project?(project_path)
+
+        unity_gradle_properties = File.join(project_path, "Unity", "gradle.properties")
+        return unless File.exist?(unity_gradle_properties)
+
+        keys_to_sync = [
+          "android.aapt2FromMavenOverride",
+          "org.gradle.java.home",
+        ]
+
+        unity_values = {}
+        File.read(unity_gradle_properties).each_line do |line|
+          stripped = line.strip
+          next if stripped.empty? || stripped.start_with?("#", "!")
+
+          keys_to_sync.each do |key|
+            # 兼容前后有空格的 "key = value" 写法
+            if stripped =~ /^#{Regexp.escape(key)}\s*=\s*(.+)$/
+              unity_values[key] = Regexp.last_match(1).strip
+            end
+          end
+        end
+
+        return if unity_values.empty?
+
+        main_gradle_properties = File.join(project_path, "gradle.properties")
+        main_content = File.exist?(main_gradle_properties) ? File.read(main_gradle_properties) : ""
+        original_content = main_content.dup
+
+        keys_to_sync.each do |key|
+          value = unity_values[key]
+          next unless value
+
+          key_regex = /^#{Regexp.escape(key)}\s*=.*$/
+          if main_content =~ key_regex
+            # 替换已存在的配置行
+            main_content = main_content.gsub(key_regex, "#{key}=#{value}")
+          else
+            # 追加新的配置行
+            main_content << "\n" unless main_content.empty? || main_content.end_with?("\n")
+            main_content << "#{key}=#{value}\n"
+          end
+        end
+
+        return if main_content == original_content
+
+        File.write(main_gradle_properties, main_content)
+      end
+
       private
     end
   end

data/lib/pindo/module/cert/mode/base_cert_operator.rb

@@ -234,6 +234,8 @@ module Pindo
         project = Xcodeproj::Project.open(proj_fullname)
 
         project.targets.each do |target|
+          # 跳过非 native target（如 PBXAggregateTarget）
+          next unless target.respond_to?(:product_type)
           # 跳过 framework、library 等类型
           if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework]) ||
              target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:dynamic_library]) ||
@@ -286,6 +288,8 @@ module Pindo
         target_map = get_target_name_map
 
         project.targets.each do |target|
+          # 跳过非 native target（如 PBXAggregateTarget）
+          next unless target.respond_to?(:product_type)
           # 跳过 framework、library 等类型
           if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework]) ||
              target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:dynamic_library]) ||

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

@@ -746,6 +746,28 @@ module Pindo
                     Dir.chdir(current_project_dir)
                     ipa_file_upload = web_res_zip_fullname
                 end
+                if !ipa_file_upload.nil? &&
+                    File.extname(ipa_file_upload).downcase.eql?(".exe")
+
+                    windows_exe_path = File.expand_path(ipa_file_upload)
+                    windows_build_dir = File.dirname(windows_exe_path)
+                    windows_zip_dir = File.dirname(windows_build_dir)
+                    windows_build_name = File.basename(windows_exe_path, File.extname(windows_exe_path))
+                    windows_exe_name = File.basename(windows_exe_path)
+                    windows_zip_fullname = File.join(windows_zip_dir, windows_build_name + ".zip")
+
+                    if File.exist?(windows_zip_fullname)
+                        FileUtils.rm_rf(windows_zip_fullname)
+                    end
+
+                    current_project_dir = Dir.pwd
+                    Zip::File.open(windows_zip_fullname, Zip::File::CREATE) do |zipfile|
+                        Dir.chdir windows_build_dir
+                        zipfile.add(windows_exe_name, windows_exe_name)
+                    end
+                    Dir.chdir(current_project_dir)
+                    ipa_file_upload = windows_zip_fullname
+                end
                 unless !ipa_file_upload.nil? && File.exist?(ipa_file_upload)
                     return
                 end

data/lib/pindo/module/task/model/jps/jps_upload_task.rb

@@ -15,7 +15,7 @@ module Pindo
       end
 
       # 初始化上传任务
-      # @param file_type [String] 文件类型：'ipa' | 'apk' | 'html' | 'mac'
+      # @param file_type [String] 文件类型：'ipa' | 'apk' | 'html' | 'mac' | 'exe'
       # @param upload_path [String] 搜索文件的路径
       # @param upload_file [String] 要上传的文件（nil 表示自动查找）
       # @param options [Hash] 选项
@@ -24,7 +24,7 @@ module Pindo
       # @option options [String] :project_name 项目名称（可选）
       # @option options [String] :upload_desc 上传描述（可选）
       def initialize(file_type, upload_path, upload_file, options = {})
-        @file_type = file_type        # 'ipa' | 'apk' | 'html' | 'mac'
+        @file_type = file_type        # 'ipa' | 'apk' | 'html' | 'mac' | 'exe'
         @upload_path = upload_path    # 搜索文件的路径
         @upload_file = upload_file    # 要上传的文件（nil 表示自动查找）
         @upload_desc = options[:upload_desc]  # 上传描述
@@ -41,6 +41,8 @@ module Pindo
                  "上传 WebGL包"
                when 'mac'
                  "上传 macOS App包"
+               when 'exe'
+                 "上传 Windows EXE包"
                else
                  "上传 #{file_type.upcase}"
                end
@@ -149,6 +151,8 @@ module Pindo
           File.join(@upload_path, "**", "*.html")
         when 'mac'
           File.join(@upload_path, "**", "*.app")
+        when 'exe'
+          File.join(@upload_path, "**", "*.exe")
         else
           raise "不支持的文件类型: #{@file_type}"
         end

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

@@ -255,6 +255,8 @@ module Pindo
           project_obj = Xcodeproj::Project.open(xcodeproj_file)
 
           project_obj.targets.each do |target|
+            # 跳过非 native target（如 PBXAggregateTarget）
+            next unless target.respond_to?(:product_type)
             if target.product_type.to_s == "com.apple.product-type.application"
               temp_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
               return File.join(project_dir, temp_info) if temp_info

data/lib/pindo/module/xcode/res/xcode_res_handler.rb

@@ -15,7 +15,7 @@ module Pindo
         def get_xcodeproj_icon_path()
 
             icon_path = nil
-            select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+            select_target = @project_obj.targets.select { |target| target.respond_to?(:product_type) && target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
 
             project_dir = @project_obj.project_dir
   
@@ -91,7 +91,7 @@ module Pindo
 
         def get_xcodeproj_imessage_icon_path
             icon_path = nil
-            select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:messages_extension])  }.first
+            select_target = @project_obj.targets.select { |target| target.respond_to?(:product_type) && target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:messages_extension])  }.first
             project_dir = @project_obj.project_dir
             if !select_target.nil?
                 file_refs = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") } || []
@@ -170,7 +170,7 @@ module Pindo
 
             launchimg_path = nil
             assets_path = nil
-            select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+            select_target = @project_obj.targets.select { |target| target.respond_to?(:product_type) && target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
             project_dir = @project_obj.project_dir
             if !select_target.nil?
                 assets_objs = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") } || []

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

@@ -36,6 +36,8 @@ module Pindo
 
             project_obj = Xcodeproj::Project.open(project_fullname)
             project_obj.targets.each do |target|
+                # 跳过非 native target（如 PBXAggregateTarget）
+                next unless target.respond_to?(:product_type)
                 if target.product_type.to_s.eql?("com.apple.product-type.application")
                     temp_info_file = target.build_configurations.first.build_settings['INFOPLIST_FILE']
                     if temp_info_file && !temp_info_file.empty?
@@ -137,6 +139,8 @@ module Pindo
 
             project_obj = Xcodeproj::Project.open(project_fullname)
             project_obj.targets.each do |target|
+                # 跳过非 native target（如 PBXAggregateTarget）
+                next unless target.respond_to?(:product_type)
                 if target.product_type.to_s.eql?("com.apple.product-type.application")
                     temp_info_file = target.build_configurations.first.build_settings['INFOPLIST_FILE']
                     if temp_info_file && !temp_info_file.empty?
@@ -206,6 +210,8 @@ module Pindo
 
             project_obj = Xcodeproj::Project.open(project_fullname)
             project_obj.targets.each do |target|
+                # 跳过非 native target（如 PBXAggregateTarget）
+                next unless target.respond_to?(:product_type)
                 if target.product_type.to_s.eql?("com.apple.product-type.application")
                     temp_info_file = target.build_configurations.first.build_settings['INFOPLIST_FILE']
                     if temp_info_file && !temp_info_file.empty?
@@ -295,6 +301,8 @@ module Pindo
                 # 更新所有application类型target的版本号
                 updated_targets = []
                 project.targets.each do |target|
+                    # 跳过非 native target（如 PBXAggregateTarget）
+                    next unless target.respond_to?(:product_type)
                     # 只处理application类型的target
                     if target.product_type.to_s.eql?("com.apple.product-type.application")
                         target.build_configurations.each do |config|
@@ -384,6 +392,8 @@ module Pindo
             project_obj = Xcodeproj::Project.open(project_fullname)
 
             project_obj.targets.each do |target|
+                # 跳过非 native target（如 PBXAggregateTarget）
+                next unless target.respond_to?(:product_type)
                 if target.product_type.to_s.eql?("com.apple.product-type.application")
                     temp_entitlements_file = target.build_configurations.first.build_settings['CODE_SIGN_ENTITLEMENTS']
                     if temp_entitlements_file && !temp_entitlements_file.empty?

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

@@ -95,7 +95,7 @@ module Pindo
 
             project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
             project_obj = Xcodeproj::Project.open(project_fullname)
-            select_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+            select_target = project_obj.targets.select { |target| target.respond_to?(:product_type) && target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
             file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("GoogleService-Info.plist") }.first
 
             if !file_ref.nil?
@@ -143,6 +143,8 @@ module Pindo
             end
 
             project_obj.targets.each do |target|
+                # 跳过非 native target（如 PBXAggregateTarget）
+                next unless target.respond_to?(:product_type)
 
                 exe_binary_name = config_json['app_info']['app_display_name']
                 exe_binary_name = exe_binary_name.gsub(/ /, '');
@@ -329,6 +331,8 @@ module Pindo
 
             info_plist_path = nil
             project_obj.targets.each do |target|
+                # 跳过非 native target（如 PBXAggregateTarget）
+                next unless target.respond_to?(:product_type)
                 temp_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
                 if !temp_info.nil?
                     info_plist_path = File.join(project_dir, temp_info)
@@ -513,7 +517,7 @@ module Pindo
             project_obj = Xcodeproj::Project.open(project_fullname)
 
             project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
-            main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) }.first
+            main_target = project_obj.targets.select { |target| target.respond_to?(:product_type) && 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
 
             # 确定构建类型和 iCloud 环境

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.17.4"
+  VERSION = "5.17.5"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'
@@ -557,4 +557,4 @@ module Pindo
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.17.4
+  version: 5.17.5
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2026-03-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -511,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.0.0
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 4.0.3
 specification_version: 4
 summary: easy work
 test_files: []