easyci 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad95be0f7bbfcd56c10ee8bb7cc8593b50e169601b2ed7c1f9be37ba8def4cd4
-  data.tar.gz: b1e0b30cb955bf1139c25049d783e1edd56f45743f5e835421f63cab9c048cff
+  metadata.gz: 93e85d54f39687dd87189fe75a8f2500e6ac30e6195b1579d0a9f26145a0d53e
+  data.tar.gz: 844a0177557c48cbb462e7cb369e8c69c48e0b9d23b534593f5a388f1ddaee43
 SHA512:
-  metadata.gz: f835032e51afb9bc6ccf19993a9a933d49827c18a51188502d73c73ac8e26a90f91f21095f0e552c1dde85014ce9812e3375644ab8245dc89d4ec2201055d857
-  data.tar.gz: 4765d4151b5252ba1e6f1cebb1744ff7453acd46876511fb2fa08c5b5ec16c07c0ba257e50d700142da4063e6804a992873cbb125b9ddbd55031b469dde65074
+  metadata.gz: 23b253fac7ea57d0f50fdfca93b4108dc264a036307e42e2f124ff7467c4655856a8426fc289b4d76d8e437831595417c4220385f5b141a3aaca98ea0af37857
+  data.tar.gz: 6acd0d3b11ed1c80b6cfddd59074df5b664c61edc56da7f2b1ee6f230edc18beceaf84655bd8b3c19565ca64115e8819fbea3c5d0992636656d46df4e6794694

data/lib/easyci/command/unitydraw.rb

@@ -78,7 +78,7 @@ module EasyCI
         unity_path = find_unity_path(runner_dir)
         puts "运行Unity截图任务..." 
         FileUtils.chdir(runner_dir)
-        system("#{unity_path} -projectPath  #{runner_dir} -executeMethod  -logFile screenshot-log.txt")
+        system("#{unity_path} -projectPath  #{runner_dir} -executeMethod SpineAutoImporter.CIRunner -logFile screenshot-log.txt")
         
         # 压缩截图
         puts "开始压缩截图..." 

data/lib/easyci/unity_exe_helper.rb

@@ -17,12 +17,33 @@ module EasyCI
       "/opt/unity/hub/editor/*/Editor/Unity"
     ]
 
+    # 从路径中提取Unity版本号
+    # @param path [String] Unity可执行文件路径
+    # @return [String, nil] 提取的版本号，如果无法提取则返回nil
+    def self.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
+      # 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
+
     # 查找Unity可执行文件路径
     # @param project_path [String] Unity项目路径
     # @param verbose [Boolean] 是否显示详细信息
     # @return [String] Unity可执行文件路径
     def self.find_unity_executable(project_path = nil, verbose = false)
-      unity_path = nil
       project_version = nil
       
       # 如果提供了项目路径，尝试从ProjectVersion.txt中读取版本
@@ -37,117 +58,131 @@ module EasyCI
         end
       end
       
-      # 如果找到项目版本，尝试定位对应的Unity
+      if project_version.nil?
+        puts "未找到项目Unity版本信息" if verbose
+      end
+
+      # 如果找到了项目版本，提取主要版本号（例如：2021.3）
+      unity_major_version = nil
       if project_version
-        # 检查macOS路径
-        if RUBY_PLATFORM =~ /darwin/
-          mac_path = "/Applications/Unity/Hub/Editor/#{project_version}/Unity.app/Contents/MacOS/Unity"
-          if File.exist?(mac_path)
-            unity_path = mac_path
-            puts "找到匹配版本的Unity: #{unity_path}" if verbose
-          end
-        # 检查Windows路径
-        elsif RUBY_PLATFORM =~ /mswin|mingw|cygwin/
-          win_path = "C:/Program Files/Unity/Hub/Editor/#{project_version}/Editor/Unity.exe"
-          if File.exist?(win_path)
-            unity_path = win_path
-            puts "找到匹配版本的Unity: #{unity_path}" if verbose
+        unity_major_version = project_version.split('.')[0..1].join('.')
+        puts "项目Unity主要版本: #{unity_major_version}" if verbose
+      end
+      
+      # 获取所有可能的Unity版本及路径
+      unity_versions = []
+      
+      # 获取当前平台的Unity路径集合
+      paths = case RUBY_PLATFORM
+              when /darwin/
+                UNITY_MAC_PATHS
+              when /mswin|mingw|cygwin/
+                UNITY_WINDOWS_PATHS
+              when /linux/
+                UNITY_LINUX_PATHS
+              else
+                []
+              end
+      
+      # 查找所有可用的Unity版本
+      paths.each do |path|
+        if path.include?("*")
+          Dir.glob(path).each do |expanded_path|
+            version = extract_version_from_path(expanded_path)
+            if version
+              major_version = version.split('.')[0..1].join('.')
+              unity_versions << {
+                path: expanded_path,
+                version: version,
+                major_version: major_version
+              }
+              puts "找到Unity版本: #{version} 路径: #{expanded_path}" if verbose
+            end
           end
-        # 检查Linux路径
-        elsif RUBY_PLATFORM =~ /linux/
-          linux_path = "/opt/unity/hub/editor/#{project_version}/Editor/Unity"
-          if File.exist?(linux_path)
-            unity_path = linux_path
-            puts "找到匹配版本的Unity: #{unity_path}" if verbose
+        elsif File.exist?(path)
+          version = extract_version_from_path(path)
+          if version
+            major_version = version.split('.')[0..1].join('.')
+            unity_versions << {
+              path: path,
+              version: version,
+              major_version: major_version
+            }
+            puts "找到Unity版本: #{version} 路径: #{path}" if verbose
           end
         end
       end
       
-      # 如果没有找到匹配版本，尝试查找最新版本
-      if unity_path.nil?
-        puts "没有找到匹配的Unity版本，尝试查找最新版本" if verbose
-        unity_path = find_latest_unity(verbose)
+      if unity_versions.empty?
+        puts "未找到任何Unity版本" if verbose
+        raise "未找到任何Unity版本，请确保Unity已正确安装"
       end
       
-      # 如果仍然找不到，抛出错误
-      raise "无法找到Unity可执行文件，请确保Unity已正确安装" if unity_path.nil?
-      
-      unity_path
-    end
-    
-    # 查找最新版本的Unity
-    # @param verbose [Boolean] 是否显示详细信息
-    # @return [String] Unity可执行文件路径
-    def self.find_latest_unity(verbose = false)
-      # 检查macOS路径
-      if RUBY_PLATFORM =~ /darwin/
-        hub_path = "/Applications/Unity/Hub/Editor"
-        if Dir.exist?(hub_path)
-          # 获取所有版本并按版本号排序
-          versions = Dir.entries(hub_path).select { |e| e =~ /[\d\.]+/ }.sort_by do |v|
-            v.split('.').map(&:to_i)
-          end
-          
-          if versions.any?
-            latest_version = versions.last
-            mac_path = "#{hub_path}/#{latest_version}/Unity.app/Contents/MacOS/Unity"
-            if File.exist?(mac_path)
-              puts "使用最新Unity版本 #{latest_version}: #{mac_path}" if verbose
-              return mac_path
-            end
-          end
+      # 如果找到项目版本，尝试精确匹配
+      if project_version
+        # 1. 精确匹配版本号
+        exact_matches = unity_versions.select { |v| v[:version] == project_version }
+        if !exact_matches.empty?
+          unity_path = exact_matches.first[:path]
+          puts "找到精确匹配的Unity版本 #{project_version}: #{unity_path}" if verbose
+          return unity_path
         end
         
-        # 查找传统路径
-        traditional_path = "/Applications/Unity/Unity.app/Contents/MacOS/Unity"
-        if File.exist?(traditional_path)
-          puts "使用传统路径Unity: #{traditional_path}" if verbose
-          return traditional_path
-        end
-      # 检查Windows路径
-      elsif RUBY_PLATFORM =~ /mswin|mingw|cygwin/
-        hub_path = "C:/Program Files/Unity/Hub/Editor"
-        if Dir.exist?(hub_path)
-          versions = Dir.entries(hub_path).select { |e| e =~ /[\d\.]+/ }.sort_by do |v|
-            v.split('.').map(&:to_i)
-          end
+        # 2. 如果没有精确匹配，尝试按主要版本号匹配（如2021.3.x）
+        if unity_major_version
+          major_matches = unity_versions.select { |v| v[:major_version] == unity_major_version }
           
-          if versions.any?
-            latest_version = versions.last
-            win_path = "#{hub_path}/#{latest_version}/Editor/Unity.exe"
-            if File.exist?(win_path)
-              puts "使用最新Unity版本 #{latest_version}: #{win_path}" if verbose
-              return win_path
+          if !major_matches.empty?
+            # 按版本号排序
+            sorted_versions = major_matches.sort_by do |v|
+              # 解析版本号为数组，如 "2021.3.45f1" => [2021, 3, 45, 1]
+              if v[:version] =~ /(\d+)\.(\d+)\.(\d+)f(\d+)/
+                [$1.to_i, $2.to_i, $3.to_i, $4.to_i]
+              else
+                [0, 0, 0, 0]
+              end
             end
-          end
-        end
-        
-        # 查找传统路径
-        traditional_path = "C:/Program Files/Unity/Editor/Unity.exe"
-        if File.exist?(traditional_path)
-          puts "使用传统路径Unity: #{traditional_path}" if verbose
-          return traditional_path
-        end
-      # 检查Linux路径
-      elsif RUBY_PLATFORM =~ /linux/
-        hub_path = "/opt/unity/hub/editor"
-        if Dir.exist?(hub_path)
-          versions = Dir.entries(hub_path).select { |e| e =~ /[\d\.]+/ }.sort_by do |v|
-            v.split('.').map(&:to_i)
-          end
-          
-          if versions.any?
-            latest_version = versions.last
-            linux_path = "#{hub_path}/#{latest_version}/Editor/Unity"
-            if File.exist?(linux_path)
-              puts "使用最新Unity版本 #{latest_version}: #{linux_path}" if verbose
-              return linux_path
+            
+            # 标准版本（如2021.3.45f1）优先于特殊版本（如2021.3.45f1c1）
+            standard_versions = sorted_versions.select { |v| v[:version] =~ /^[\d\.]+f\d+$/ }
+            
+            if !standard_versions.empty?
+              unity_path = standard_versions.last[:path]  # 取最新的标准版本
+              puts "找到主要版本号匹配的标准Unity版本 #{standard_versions.last[:version]}: #{unity_path}" if verbose
+              return unity_path
+            else
+              unity_path = sorted_versions.last[:path]  # 取最新版本
+              puts "找到主要版本号匹配的Unity版本 #{sorted_versions.last[:version]}: #{unity_path}" if verbose
+              return unity_path
             end
           end
         end
       end
       
-      nil
+      # 3. 如果没有找到匹配的版本，使用最新版本
+      puts "未找到匹配项目版本的Unity，将使用最新可用版本" if verbose
+      
+      # 按版本号排序
+      sorted_all_versions = unity_versions.sort_by do |v|
+        if v[:version] =~ /(\d+)\.(\d+)\.(\d+)f(\d+)/
+          [$1.to_i, $2.to_i, $3.to_i, $4.to_i]
+        else
+          [0, 0, 0, 0]
+        end
+      end
+      
+      # 标准版本优先
+      standard_versions = sorted_all_versions.select { |v| v[:version] =~ /^[\d\.]+f\d+$/ }
+      
+      if !standard_versions.empty?
+        unity_path = standard_versions.last[:path]  # 取最新的标准版本
+        puts "使用最新标准Unity版本 #{standard_versions.last[:version]}: #{unity_path}" if verbose
+        return unity_path
+      else
+        unity_path = sorted_all_versions.last[:path]  # 取最新版本
+        puts "使用最新可用Unity版本 #{sorted_all_versions.last[:version]}: #{unity_path}" if verbose
+        return unity_path
+      end
     end
     
     # 验证Unity可执行文件路径是否有效

data/lib/easyci/version.rb

@@ -1,3 +1,3 @@
 module EasyCI
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyci
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Wade