easyci 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e16811fbe303dcd906e4dfbbb6d77d95467d9d7c91d67c6299c399677074565b
-  data.tar.gz: 25eba83f49c25ce27f04e040e37e210b1f4e70b5c2a94df60391cbf4d0cf07d8
+  metadata.gz: 52ad4bed8dabbcf19bc106286047500b3c77d76839a94d961ee7fde58ce2696a
+  data.tar.gz: f7464d713c16eba856835d656e429a3ead16d40b222a65afeb6a61817496fef2
 SHA512:
-  metadata.gz: 3f70f76959081795b47f8f12a75f52201c8613851f8588f08ce9c704f57c443143f8f25a24b8226fb37efdcf76faaeb8d602b17551c93c421888fcfc1bdf70f8
-  data.tar.gz: 0ff6bde5e2a75ae58bddd2f87772e4ff4853f3378d0b555b68272b7eb5499d0dd38259e7ed3f62c73e22d8e6f2c0e59822306f11d209ba321d18a44bfbea239b
+  metadata.gz: 232b65b1e8b19525263ef3eb631bc83d28f37df6eefb27cd324e2931863bc13a687c57870504bec20639a16ae4ac33952ab064ab913f3718c9e5c9d9d8667eeb
+  data.tar.gz: 634cf16b0860979ea83e74bc286c8eaf7472699876f91ef05f82d840313f17c2a23a998e1d3fbeaea57da8efd2150fe4623b25783b4b72bac42174409bb6b662

data/README.md

@@ -10,14 +10,37 @@ gem install easyci
 
 ## 使用方法
 
-### Unity依赖关系图
+### Unity依赖关系图与截图
 
-分析Unity项目并生成依赖关系图：
+#### 本地项目分析
+
+分析本地Unity项目并生成依赖关系图和截图：
 
 ```bash
-easyci unitydraw --project-path=/path/to/unity/project --output=dependencies.png
+easyci unitydraw --project-path=/path/to/unity/project --output=dependencies.png --execute-method=YourMethod.Execute
 ```
 
+#### Gitee仓库分析
+
+从Gitee仓库拉取项目并生成依赖关系图和截图：
+
+```bash
+easyci unitydraw --repo=username/repo --branch=master --compress
+```
+
+#### 完整选项
+
+unitydraw命令支持以下选项：
+
+- `--project-path=PATH`: 指定本地Unity项目路径
+- `--output=PATH`: 输出图形的路径
+- `--repo=REPO`: Gitee仓库路径，例如：bestwebprimary/MagicSortDemo
+- `--branch=BRANCH`: Gitee分支名称，默认为master
+- `--work-dir=DIR`: 工作目录，默认为~/gitee_draw
+- `--execute-method=METHOD`: Unity执行方法，默认为SpineAutoImporter.CIRunner
+- `--unity-path=PATH`: 指定Unity可执行文件路径，默认自动查找
+- `--compress`: 是否压缩生成的截图
+
 ### 自动构建
 
 自动构建项目：
@@ -26,6 +49,18 @@ easyci unitydraw --project-path=/path/to/unity/project --output=dependencies.png
 easyci autobuild --project-path=/path/to/project --build-target=iOS --output=/path/to/output --version=1.0.0
 ```
 
+## 特性
+
+### Unity可执行文件自动查找
+
+EasyCI内置了UnityExeHelper模块，可以根据项目信息自动查找匹配的Unity可执行文件：
+
+- 自动从ProjectVersion.txt文件中读取项目的Unity版本
+- 在标准安装路径中查找匹配版本的Unity
+- 支持macOS、Windows和Linux系统
+- 如果找不到匹配版本，会自动使用最新版本的Unity
+- 可以通过`--unity-path`选项手动指定Unity路径
+
 ## 选项
 
 全局选项：

data/lib/easyci/command/unitydraw.rb

@@ -1,37 +1,119 @@
+require 'fileutils'
+
 module EasyCI
   class Command
     class Unitydraw < Command
       self.summary = '绘制Unity项目图形'
-      self.description = '分析Unity项目并生成依赖关系图'
+      self.description = '分析Unity项目并生成依赖关系图和截图'
 
       def self.options
         [
-          ['--project-path=PATH', '指定Unity项目路径'],
-          ['--output=PATH', '输出图形的路径']
+          ['--runner-repo=REPO', 'Runner仓库路径，例如：mygroup/FGUIWorkRunner'],
+          ['--https', '使用HTTPS方式克隆仓库，默认使用SSH方式'],
         ].concat(super)
       end
 
       def initialize(argv)
-        @project_path = argv.option('project-path')
-        @output_path = argv.option('output')
         super
+        @runner_repo = argv.option('runner-repo')
+        @use_https = argv.flag?('https', false)
       end
 
       def validate!
         super
-        help! '必须提供项目路径' unless @project_path
       end
 
       def run
-        puts "分析Unity项目: #{@project_path}" if @verbose
-        # 这里是实际执行Unity项目分析和绘图的代码
-        puts "生成项目依赖图..."
-        # 模拟工作
-        sleep(1)
+        puts "开始Unity项目绘制流程..." 
+        
+        work_dir = File.expand_path('~/gitee_draw')
+        gitee_repo = ENV['GITEE_REPO'] || 'fundesignexport/MagicSortDemoDesignExport'
+        gitee_branch = ENV['GITEE_BRANCH'] || 'master'
+
+        # 如果未提供runner-repo参数，使用默认值
+        @runner_repo ||= ENV['GITEE_REPO'] || 'bestwebprimary/FGUIWorkRunner'
+
+        if gitee_repo.empty? || gitee_branch.empty?
+          puts "GITEE_REPO 和 GITEE_BRANCH 不能为空"
+          exit 1
+        end
+
+        
+        puts "gitee_repo: #{gitee_repo}"
+        puts "gitee_branch: #{gitee_branch}"
+        puts "work_dir: #{work_dir}"
+
+        # 清理工作目录
+        FileUtils.mkdir_p(work_dir)
+        runner_dir = File.join(work_dir, 'FGUIWorkRunner')
+        FileUtils.rm_rf(runner_dir) if File.exist?(runner_dir)
+        git_url = @use_https ? "https://gitee.com/#{@runner_repo}.git" : "git@gitee.com:#{@runner_repo}.git"
+        puts "git_url: #{git_url}"
+        clone_runner_result = system("cd #{work_dir} && git clone --depth 1 -b #{gitee_branch} #{git_url} FGUIWorkRunner")
+        unless clone_runner_result
+          puts "克隆Runner仓库失败，请检查网络和权限设置"
+          exit 1
+        end
+        unless File.exist?(runner_dir)
+          puts "Runner目录不存在，克隆可能失败"
+          exit 1
+        end
+        
+        FileUtils.chdir(runner_dir)
+        resources_dir = File.join(runner_dir, 'Assets/Resources')
+        if File.exist?(resources_dir)
+          FileUtils.rm_rf(resources_dir)
+        end
+        puts "下载截图仓库..." 
+        git_url = @use_https ? "https://gitee.com/#{gitee_repo}.git" : "git@gitee.com:#{gitee_repo}.git"
+        puts "git_url: #{git_url}"
+        clone_result = system("cd #{runner_dir} && git clone --depth 1 -b #{gitee_branch} #{git_url} Assets/Resources")
+
+        unless clone_result
+          puts "克隆Assets仓库失败，请检查网络和权限设置"
+          exit 1
+        end
+
+        # 运行Unity截图任务
+        unity_path = find_unity_path(runner_dir)
+        puts "运行Unity截图任务..." 
+        FileUtils.chdir(runner_dir)
+        system("#{unity_path} -projectPath . -executeMethod #{@execute_method} -logFile screenshot-log.txt")
+        
+        # 压缩截图
+        puts "开始压缩截图..." 
+        system("find . -path \"*/Screenshots/*.png\" -exec pngquant --quality=70-95 --ext .png --force {} \\;")
+        # 运行Node脚本（如果需要）
+        puts "运行后处理脚本..."
+        system("docker run --rm -v \"$(pwd):/app\" -w /app node:22.0.0 bash -c \"cd Scripts && yarn install && npx ts-node index.ts\"")
+        
+      end
+      
+      private
+      
+      def find_unity_path(project_path)
+        # 如果提供了Unity路径，验证它
+        if @unity_path && !@unity_path.empty?
+          if UnityExeHelper.valid_unity_path?(@unity_path)
+            puts "使用指定的Unity路径: #{@unity_path}" 
+            return @unity_path
+          else
+            puts "警告: 指定的Unity路径无效，将尝试自动查找" 
+          end
+        end
         
-        output = @output_path || "unity_dependencies.png"
-        puts "项目依赖图已生成至: #{output}"
+        # 使用UnityExeHelper查找Unity
+        begin
+          unity_path = UnityExeHelper.find_unity_executable(project_path, @verbose)
+          puts "找到Unity路径: #{unity_path}" 
+          return unity_path
+        rescue => e
+          puts "查找Unity路径失败: #{e.message}"
+          exit 1
+        end
+        return nil
       end
+      
     end
   end
 end 

data/lib/easyci/unity_exe_helper.rb

@@ -0,0 +1,164 @@
+module EasyCI
+  # UnityExeHelper模块，用于查找和验证Unity可执行文件路径
+  module UnityExeHelper
+    # 查找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中读取版本
+      if project_path && !project_path.empty?
+        version_file = File.join(project_path, 'ProjectSettings', 'ProjectVersion.txt')
+        if File.exist?(version_file)
+          content = File.read(version_file)
+          if content =~ /m_EditorVersion:\s*([\d\.]+[a-zA-Z\d]*)/
+            project_version = $1
+            puts "项目Unity版本: #{project_version}" if verbose
+          end
+        end
+      end
+      
+      # 如果找到项目版本，尝试定位对应的Unity
+      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
+          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
+          end
+        end
+      end
+      
+      # 如果没有找到匹配版本，尝试查找最新版本
+      if unity_path.nil?
+        puts "没有找到匹配的Unity版本，尝试查找最新版本" if verbose
+        unity_path = find_latest_unity(verbose)
+      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
+        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
+          
+          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
+            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
+            end
+          end
+        end
+      end
+      
+      nil
+    end
+    
+    # 验证Unity可执行文件路径是否有效
+    # @param unity_path [String] Unity可执行文件路径
+    # @return [Boolean] 是否有效
+    def self.valid_unity_path?(unity_path)
+      return false if unity_path.nil? || unity_path.empty?
+      File.exist?(unity_path) && File.executable?(unity_path)
+    end
+    
+    # 获取Unity版本信息
+    # @param unity_path [String] Unity可执行文件路径
+    # @return [String] Unity版本信息
+    def self.get_unity_version(unity_path)
+      return nil unless valid_unity_path?(unity_path)
+      
+      begin
+        # 使用-version参数获取版本信息
+        version_output = `"#{unity_path}" -version 2>&1`
+        if version_output =~ /([\d\.]+[a-zA-Z\d]*)/
+          return $1
+        end
+      rescue => e
+        puts "获取Unity版本信息失败: #{e.message}"
+      end
+      
+      nil
+    end
+  end
+end 

data/lib/easyci/version.rb

@@ -1,3 +1,3 @@
 module EasyCI
-  VERSION = '0.1.0'
+  VERSION = '0.4.0'
 end 

data/lib/easyci.rb

@@ -1,4 +1,5 @@
 require 'easyci/version'
+require 'easyci/unity_exe_helper'
 require 'easyci/command'
 require 'easyci/command/unitydraw'
 require 'easyci/command/autobuild'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyci
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Wade
@@ -80,6 +80,7 @@ files:
 - lib/easyci/command.rb
 - lib/easyci/command/autobuild.rb
 - lib/easyci/command/unitydraw.rb
+- lib/easyci/unity_exe_helper.rb
 - lib/easyci/version.rb
 homepage: https://github.com/yourusername/easyci
 licenses: