pindo 5.0.1 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c12e2695103232a1a958615880ab468e48d1715d56f7a7a2e45df807371291b3
-  data.tar.gz: be43d092dc28dc1c94a7ca317260fc8ab169847da2afffbb0dcd93d16fa8ca34
+  metadata.gz: fa8cf123e63f04932c88a6a895c05a81d4c8c71fa78c38bb03440b840408b425
+  data.tar.gz: 682c25d35dcae3f865c07608df7687c5da5408152b0677bb23fdf443f0027b6d
 SHA512:
-  metadata.gz: 62b4db62b22c8ab9ec0b62ae08affc923631642a1aebcb9ff3728232b585590aa7fccf98658171e37507ecda32cc9d38d35bbfbcb0a6f11c5654b3881237bfe3
-  data.tar.gz: b59beff4b0e5470786bd46a4ccfe5197e8e3ed7df9ce538d63df11e6d60208e2fa3b5b21e9cedd327657c0c44e8693820e91854d0a28f4900dafecfcb10d6d3b
+  metadata.gz: 1ec965bdecaac77916f6057a9ee15abb0981635a676150e4853259015690f61ca1d5f1f194e39cc16e8feeef861c6919e33c5b28559abc20caf5ae6ae6d2cf21
+  data.tar.gz: 66853e92ae567a42da0d9e56ac0a0972f45611ad2ac57086e040bf635fe95c49a6bfadbc49d2742c9b73832cea69e8dc79e152f7b0ecd316b3cc54c47e96ce87

data/lib/pindo/base/githelper.rb

@@ -487,12 +487,16 @@ module Pindo
         private
  
         def display_file_status(branch, files)
+            puts "========================================"
             puts "\n当前所在分支:#{branch}有下面这些文件没有提交："
+            puts
             puts "\n#{files}\n"
+            puts
+            puts "========================================"
         end
 
         def process_user_choice(project_dir, branch)
-            process_types = ["全部提交", "全部删除", "退出"]
+            process_types = ["全部提交", "全部删除", "先退出，手动来处理退出"]
             cli = HighLine.new
             menu_choice = "None"
             

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

@@ -95,10 +95,9 @@ module Pindo
                     end
 
                     project_unity_version = unity_helper.get_unity_version(pindo_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)
+                    unity_exe_path = unity_helper.find_unity_path(project_unity_version:project_unity_version, force_change_version: @force_select_unity)
                     puts "选择的Unity路径: #{unity_exe_path}"
                     puts
 

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

@@ -35,21 +35,23 @@ module Pindo
         def write_gitignore(git_root_dir)
           gitignore_path = File.join(git_root_dir, '.gitignore')
           gitignore_content = <<~GITIGNORE
-            # Build logs
+            # pindo_common_ignore_1.0.0
             build_ios.log
             feishu.json
             CHANGELOG.md
-
+            
             # Platform specific directories
             /GoodPlatform/iOS/config.json
             /GoodPlatform/iOS/*
+            /GoodPlatform/iOS/build/*
             /GoodPlatform/Android/*
-            /GoodPlatform/MacOS/*
             /GoodPlatform/BaseiOS/Unity/*
             /GoodPlatform/BaseiOS/Pods/
+            /GoodPlatform/BaseiOS/build/
+            /GoodPlatform/BaseiOS/config.json
             /GoodPlatform/BaseiOS/Podfile.lock
+
             /GoodPlatform/BaseAndroid/Unity/*
-            /GoodPlatform/BaseMac/Unity/*
           GITIGNORE
           # Append to existing .gitignore or create new one
           File.open(gitignore_path, 'a') do |f|

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

@@ -25,8 +25,13 @@ module Pindo
         end
       end
 
-      def find_unity_path(unity_major_version:nil, force_change_version:false)
+      def find_unity_path(project_unity_version:nil, force_change_version:false)
 
+        if project_unity_version.nil? || project_unity_version.empty?
+          raise "Project Unity version is nil or empty"
+        end 
+
+        unity_major_version = project_unity_version.split('.')[0..1].join('.')
         paths = case RUBY_PLATFORM
                 when /darwin/
                   UNITY_MAC_PATHS
@@ -68,9 +73,15 @@ module Pindo
           raise Informative, "未找到任何Unity版本"
         end
 
+        
+        select_unity_versions = unity_versions.select { |v| v[:version] == project_unity_version } || []
+        if !select_unity_versions.nil? && !select_unity_versions.empty? && select_unity_versions.length >= 1
+          return select_unity_versions.first[:path]
+        end 
+
         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 select_unity_versions.nil? || select_unity_versions.empty?
           if force_change_version
             return unity_versions.last[:path]
           else
@@ -87,12 +98,21 @@ module Pindo
 
       def extract_version_from_path(path)
         # macOS路径格式: /Applications/Unity/Hub/Editor/2021.3.45f1/Unity.app/Contents/MacOS/Unity
+        # macOS路径格式(变体): /Applications/Unity/Hub/Editor/2021.3.45f1c1/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
+        # Windows路径格式(变体): C:/Program Files/Unity/Hub/Editor/2021.3.45f1c1/Editor/Unity.exe
+        
+        # 尝试匹配 macOS 路径格式
+        if match = path.match(/Editor\/([\d.]+[a-zA-Z]\d+(?:c\d+)?)\//)
+          return match[1]
+        end
+        
+        # 尝试匹配 Windows 路径格式
+        if match = path.match(/([\d.]+[a-zA-Z]\d+(?:c\d+)?)\/Editor\//)
+          return match[1]
         end
+        
+        nil
       end
 
       public

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "5.0.1"
+  	VERSION = "5.0.3"
 
   	class VersionCheck
 
@@ -31,7 +31,7 @@ module Pindo
 						# 	Pindo::Command::Env::Upgrade::run([])
 						# end
 						puts
-						puts "最新版本是#{pindo_latest_version}目前可用, 可使用pindo upgrade 升级"
+						puts "最新版本是#{pindo_latest_version}目前可用, 可使用 gem install pindo 升级"
 						puts
 						puts  pindo_lates_update_info
 						puts
@@ -40,8 +40,9 @@ module Pindo
 				end
 
 			rescue Exception => e
-				puts "有异常错误,请使用pindo upgrade 升级"
-				puts
+				puts "有异常错误,请确认是否执行pindo setup 拉取最新配置, 更新配置任然有错误请执行gem install pindo 更新"
+				puts 
+
 
 			end
 		end
@@ -66,12 +67,12 @@ module Pindo
                     	puts "当前pindo版本 #{Pindo::VERSION}"
                     	puts "最新版本 #{pindo_latest_version}"
                     	puts "要求最低版本 #{pindo_mini_version}"
-                        raise Informative, "请使用pindo upgrade 升级!"
+                        raise Informative, "请使用 gem install pindo 升级!"
                     end
 				end
 
 			rescue Exception => e
-				raise Informative, "有异常错误,请使用pindo upgrade 升级!"
+				raise Informative, "有异常错误,请确认是否执行pindo setup 拉取最新配置, 更新配置任然有错误请执行gem install pindo 更新"
 			end
 		end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.3
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide