pindo 4.8.9 → 4.9.1

data/lib/pindo/config/pindouserlocalconfig.rb

@@ -1,4 +1,3 @@
-
 require 'fileutils'
 require 'json'
 
@@ -115,5 +114,22 @@ module Pindo
       end
     end
 
+    def save
+      @pindo_user_local_config_json = @pindo_user_local_config_json || {}
+      File.open(@pindo_user_local_config_file, "w") do |file|
+        file.write(JSON.pretty_generate(@pindo_user_local_config_json))
+        file.close
+      end
+    end
+
+    def unity_version
+      @pindo_user_local_config_json['unity_version'] if @pindo_user_local_config_json
+    end
+
+    def unity_version=(version)
+      @pindo_user_local_config_json = @pindo_user_local_config_json || {}
+      @pindo_user_local_config_json['unity_version'] = version
+    end
+
   end
 end

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

@@ -0,0 +1,143 @@
+require 'singleton'
+require 'fileutils'
+require 'xcodeproj' # 用于iOS项目检查
+
+module Pindo
+  module Module
+    module Build
+      class BuildHelper
+        include Singleton
+
+        class << self
+          def share_instance
+            instance
+          end
+        end
+
+        def unity_project?(project_path)
+          # 检查Unity工程的关键文件和目录
+          project_settings_path = File.join(project_path, "ProjectSettings")
+          assets_path = File.join(project_path, "Assets")
+          packages_path = File.join(project_path, "Packages")
+          
+          # Unity工程必须包含这些目录和文件
+          File.directory?(project_settings_path) && 
+          File.directory?(assets_path) && 
+          File.directory?(packages_path) &&
+          File.exist?(File.join(project_settings_path, "ProjectSettings.asset"))
+        end
+
+        def ios_project?(project_path)
+          # 检查iOS工程的关键文件
+          xcodeproj_files = Dir.glob(File.join(project_path, "*.xcodeproj"))
+          workspace_files = Dir.glob(File.join(project_path, "*.xcworkspace"))
+          
+          # 至少要有.xcodeproj文件或.xcworkspace文件
+          return false if xcodeproj_files.empty? && workspace_files.empty?
+          
+          if !xcodeproj_files.empty?
+            # 检查.xcodeproj内部结构
+            project_file = File.join(xcodeproj_files.first, "project.pbxproj")
+            return true if File.exist?(project_file)
+          end
+          
+          if !workspace_files.empty?
+            # 检查.xcworkspace内部结构
+            contents_file = File.join(workspace_files.first, "contents.xcworkspacedata")
+            return true if File.exist?(contents_file)
+          end
+          
+          false
+        end
+
+        def android_project?(project_path)
+          # 检查Android工程的关键文件和目录
+          gradle_file = File.exist?(File.join(project_path, "build.gradle"))
+          settings_gradle = File.exist?(File.join(project_path, "settings.gradle"))
+          app_dir = File.directory?(File.join(project_path, "app"))
+          
+          # Android Studio项目结构
+          if gradle_file && settings_gradle && app_dir
+            app_gradle = File.exist?(File.join(project_path, "app", "build.gradle"))
+            app_manifest = File.exist?(File.join(project_path, "app", "src", "main", "AndroidManifest.xml"))
+            return true if app_gradle && app_manifest
+          end
+          
+          # 传统Eclipse项目结构
+          if File.directory?(File.join(project_path, "src"))
+            manifest = File.join(project_path, "AndroidManifest.xml")
+            return true if File.exist?(manifest)
+          end
+          
+          false
+        end
+
+        def project_type(project_path)
+          raise ArgumentError, "项目路径不能为空" if project_path.nil? || project_path.empty?
+          raise ArgumentError, "项目路径不存在: #{project_path}" unless File.directory?(project_path)
+          
+          return :unity if unity_project?(project_path)
+          return :ios if ios_project?(project_path)
+          return :android if android_project?(project_path)
+          :unknown
+        end
+
+        def project_type_name(project_path)
+          case project_type(project_path)
+          when :unity
+            "Unity"
+          when :ios
+            "iOS"
+          when :android
+            "Android"
+          else
+            "Unknown"
+          end
+        end
+
+        def get_project_name(project_path)
+          case project_type(project_path)
+          when :unity
+            File.basename(project_path)
+          when :ios
+            xcodeproj = Dir.glob(File.join(project_path, "*.xcodeproj")).first
+            File.basename(xcodeproj, ".xcodeproj") if xcodeproj
+          when :android
+            settings_gradle = File.join(project_path, "settings.gradle")
+            if File.exist?(settings_gradle)
+              content = File.read(settings_gradle)
+              if content =~ /rootProject\.name\s*=\s*['"](.+)['"]/
+                $1
+              else
+                File.basename(project_path)
+              end
+            else
+              File.basename(project_path)
+            end
+          else
+            File.basename(project_path)
+          end
+        end
+
+        def get_project_version(project_path)
+          case project_type(project_path)
+          when :unity
+            version_file = File.join(project_path, "ProjectSettings", "ProjectVersion.txt")
+            if File.exist?(version_file)
+              content = File.read(version_file)
+              if content =~ /m_EditorVersion: (.*)/
+                $1.strip
+              end
+            end
+          when :ios
+            # 从Info.plist获取版本号
+            nil
+          when :android
+            # 从build.gradle获取版本号
+            nil
+          end
+        end
+      end
+    end
+  end
+end 

data/lib/pindo/{client → module/build}/unityhelper.rb

@@ -17,7 +17,7 @@ module Pindo
         "C:/Program Files/Unity/Hub/Editor/*/Unity.exe"
       ]
 
-      TARGET_UNITY_VERSION = "2021.3"
+      PINDO_UNITY_VERSION = "2021.3"
 
       class << self
         def share_instance
@@ -25,7 +25,7 @@ module Pindo
         end
       end
 
-      def find_unity_path
+      def find_unity_path(change_unity_version:false)
         paths = case RUBY_PLATFORM
                 when /darwin/
                   UNITY_MAC_PATHS
@@ -40,9 +40,8 @@ module Pindo
         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)
+              if version
                 unity_versions << {
                   path: expanded_path,
                   version: version
@@ -51,7 +50,7 @@ module Pindo
             end
           elsif File.exist?(path)
             version = extract_version_from_path(path)
-            if version && version.start_with?(TARGET_UNITY_VERSION)
+            if version
               unity_versions << {
                 path: path,
                 version: version
@@ -61,12 +60,82 @@ module Pindo
         end
 
         if unity_versions.empty?
-          raise "No Unity #{TARGET_UNITY_VERSION} found in standard locations"
+          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::Config::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::Config::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]
+          end
+        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
 
-        # 按版本号排序，取最新的2021.3.x版本
-        selected_unity = unity_versions.sort_by { |v| Gem::Version.new(v[:version]) }.last
-        puts "Selected Unity version: #{selected_unity[:version]}"
+        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
 
@@ -103,7 +172,7 @@ module Pindo
           cmd_args << value.to_s if value
         end
 
-        puts "Executing Unity command: #{cmd_args.join(' ')}"
+        puts "Unity command: #{cmd_args.join(' ')}"
         stdout, stderr, status = Open3.capture3(*cmd_args)
         
         {
@@ -151,8 +220,8 @@ module Pindo
           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)"
+            unless version.start_with?(PINDO_UNITY_VERSION)
+              raise "Project Unity version (#{version}) does not match required version (#{PINDO_UNITY_VERSION}.x)"
             end
             version
           else
@@ -174,6 +243,18 @@ module Pindo
         
         true
       end
+
+      def unity_project?(project_path)
+        # 检查关键Unity工程文件和目录是否存在
+        project_settings_path = File.join(project_path, "ProjectSettings")
+        assets_path = File.join(project_path, "Assets")
+        packages_path = File.join(project_path, "Packages")
+        
+        File.directory?(project_settings_path) && 
+        File.directory?(assets_path) && 
+        File.directory?(packages_path) &&
+        File.exist?(File.join(project_settings_path, "ProjectSettings.asset"))
+      end
     end
   end
 end

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

@@ -145,6 +145,7 @@ module Pindo
         end
 
         def start_upload(app_info_obj:nil, ipa_file_upload:nil, description:nil)
+
                 if !ipa_file_upload.nil? && File.extname(ipa_file_upload).eql?(".app")
                     mac_app_path = ipa_file_upload
                     ipa_base_dir = File.dirname(ipa_file_upload)
@@ -165,6 +166,7 @@ module Pindo
                     end
                 end
 
+
                 unless !ipa_file_upload.nil? && File.exist?(ipa_file_upload)
                     return
                 end
@@ -172,49 +174,9 @@ 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
-                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")
-                            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 = " "
-                            end             
-                        elsif provisioning_profile_name.include?("appstore")
-                            description = "提交包重签名"
-                        end
-                    end
-                end
+                description = get_description_from_git(current_project_dir:current_project_dir)
+                description = " " if description.empty?
+
 
                 addtach_file = nil
                 if ipa_file_upload.include?(File.join(current_project_dir, "build")) && File.exist?(File.join(current_project_dir, "VMData"))
@@ -558,50 +520,50 @@ module Pindo
         end
 
 
-        def get_description()
-            comment_array = []
-            puts "请输入备注信息(按Esc结束):"
-            loop do
-
-              line = STDIN.gets.chomp
-              comment_array << line
-
-              key = STDIN.getch
-              break if key == "\e"  # Break the loop if Esc key is pressed
+        def get_description_from_git(current_project_dir:nil)
+            description = nil
+            if !current_project_dir.nil? && is_git_directory?(local_repo_dir: current_project_dir)
+                current_git_root_path = git_root_directory(local_repo_dir: current_project_dir)
+                
+                # dev 打包情况的备注
+                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
+                            Dir.chdir(temp_dir)
+                        end
+                    rescue StandardError => e
+                    end
+                end 
             end
-            puts "================================="
-            puts "输入结束,输入内容为:"
-            puts "================================="
-            comment_str = comment_array.join("\n")
-            puts comment_array
-            puts "================================="
-            return comment_str
+            return description
         end
 
         def modify_coment(app_info_obj:nil, version_item_obj:nil)
 
-            comment_str = get_description()
-            puts
-            puts "确修改信息:"
+            current_project_dir = Dir.pwd
+            comment_str = get_description_from_git(current_project_dir:current_project_dir)
+            puts "=========================================="
             puts
-            puts  "================================="
-            puts "App: #{app_info_obj["appName"]}"
-            puts "版本: #{version_item_obj["appVersion"]} (build #{version_item_obj["build"]})"
-            puts "Build号: #{version_item_obj["incId"]}"
-            puts "bundleId: #{version_item_obj["bundleId"]}"
-            puts "上传时间: #{version_item_obj["updateTime"]}"
+            puts "#{comment_str}"
             puts
-            puts "旧备注: \n#{version_item_obj["description"]}"
+            puts "=========================================="
             puts
-            puts "修改备注: \n#{comment_str.strip}"
-            puts  "================================="
-            puts
-            answer = agree("确认修改备注信息(Y/n)?:")
-            unless answer
-                raise Informative, "暂停修改！！"
+
+            if comment_str.nil? || comment_str.empty?
+                Funlog.instance.fancyinfo_error("没有找到git备注信息，无法修改pgyer备注！")
+            else
+                Funlog.instance.fancyinfo_start("开始修复pgyer备注...")
+                @pgyer_client.post_update_upload_comment(appId:app_info_obj["appId"], id:version_item_obj["id"], comment:comment_str.strip)
+                Funlog.instance.fancyinfo_start("pgyer备注已经修改！")
             end
 
-            @pgyer_client.post_update_upload_comment(appId:app_info_obj["appId"], id:version_item_obj["id"], comment:comment_str.strip)
+            
 
             puts "备注信息修改成功！！"
 

data/lib/pindo/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.8.9
+  version: 4.9.1
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -240,7 +240,6 @@ 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
@@ -284,7 +283,7 @@ files:
 - lib/pindo/command/dev/createbuild.rb
 - lib/pindo/command/dev/debug.rb
 - lib/pindo/command/dev/pgyercert.rb
-- lib/pindo/command/dev/pub.rb
+- lib/pindo/command/dev/tag.rb
 - lib/pindo/command/env.rb
 - lib/pindo/command/env/dreamstudio.rb
 - lib/pindo/command/env/quarkenv.rb
@@ -346,8 +345,10 @@ files:
 - lib/pindo/module/appstore/appstore_metadata_connect_api_helper.rb
 - lib/pindo/module/appstore/appstore_metadata_fastlane_helper.rb
 - lib/pindo/module/appstore/iap_tier.json
+- lib/pindo/module/build/buildhelper.rb
 - lib/pindo/module/build/commonconfuseproj.rb
 - lib/pindo/module/build/swarkhelper.rb
+- lib/pindo/module/build/unityhelper.rb
 - lib/pindo/module/cert/certhelper.rb
 - lib/pindo/module/cert/keychainhelper.rb
 - lib/pindo/module/cert/pemhelper.rb