easyci 1.1.0 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 113eafe943159d19560edb28ccc1d34194386b6a58072f9105128ed8015ad0cf
-  data.tar.gz: 161f61e90ffd504c193b04a13c5abc4654e7b8d1d2761257cf5789f93440915a
+  metadata.gz: 480eba74298dfe03c29f4122eb8eff6d8689463477fcdaa299df3a9732b02f21
+  data.tar.gz: 63a3252686696c5622a40e9a884a5f18b34f7654d5f7b23b5b7415d91320289b
 SHA512:
-  metadata.gz: 81dc6c108ba624d7d3ae75f2ac65b96a1ed00456b614cf8a78dbe796018c8452c80db6c7c8030feff960295a9848a4ed3451aacf5bc5e48373be293d7e62dff1
-  data.tar.gz: 1742a9e8803c8610a29b0c8696627380f1d13684c29c2281316c907eae6c29d5742af467c883d19df9dbff71daf4cd59071ba3a49e3fb8532485482551d35a9c
+  metadata.gz: dea00daaf62abc9c57f60931e96cd4f3cdd4302e1bc4ffc518173ed2e04113f857e764abae8a883476519e10e640b455e2ee0a79a34833b0419098e64c69ba7d
+  data.tar.gz: 917e420dceb7d09075fb576f4de2e8bb349ca7259bb326bae4ba1b2bcb489fc575c619ebadde47562cbee8f02df6d077319d6443ae8c2a2c6d5d3218770945a0

data/lib/easyci/command/unitydraw.rb

@@ -28,8 +28,6 @@ module EasyCI
         
         gitee_draw_dir = File.expand_path('~/Documents/gitee_draw')
         FileUtils.mkdir_p(gitee_draw_dir)
-
-        ssh_host_gitee_dreamstudio = ENV['SSH_HOST_GITEE_DREAMSTUDIO'] || 'gitee.com'
         
         gitee_repo = ENV['GITEE_REPO'] || 'fundesignexport/MagicSortDemoDesignExport'
         gitee_repo_name = gitee_repo.split('/').last
@@ -38,6 +36,15 @@ module EasyCI
           puts "GITEE_REPO 和 GITEE_BRANCH 不能为空"
           exit 1
         end
+        
+        ssh_host_gitee = 'gitee.com'
+        if !gitee_repo.empty? && gitee_repo.start_with?('fundesignexport')
+          ssh_host_gitee = 'gitee-fununitydraw'
+        elsif !gitee_repo.empty? && gitee_repo.start_with?('gooddesignexport')
+          ssh_host_gitee = 'gitee-joyunitydraw'
+        else
+          ssh_host_gitee = 'gitee.com'
+        end
 
         work_dir = File.join(gitee_draw_dir, gitee_repo_name)
         if File.exist?(work_dir)
@@ -67,7 +74,7 @@ module EasyCI
         
         runner_dir = File.join(work_dir, runner_repo_name)
         FileUtils.rm_rf(runner_dir) if File.exist?(runner_dir)
-        git_url = @use_https ? "https://gitee.com/#{@runner_repo}.git" : "git@#{ssh_host_gitee_dreamstudio}:#{@runner_repo}.git"
+        git_url = @use_https ? "https://gitee.com/#{@runner_repo}.git" : "git@#{ssh_host_gitee}:#{@runner_repo}.git"
         puts "git_url: #{git_url}"
         clone_runner_result = system("cd #{work_dir} && git clone --depth 1 -b #{runner_branch} #{git_url} #{runner_repo_name}")
         unless clone_runner_result
@@ -86,7 +93,7 @@ module EasyCI
         end
         FileUtils.mkdir_p(File.join(runner_dir, 'Assets'))
         puts "下载截图仓库..." 
-        git_url = @use_https ? "https://gitee.com/#{gitee_repo}.git" : "git@gitee.com:#{gitee_repo}.git"
+        git_url = @use_https ? "https://gitee.com/#{gitee_repo}.git" : "git@#{ssh_host_gitee}:#{gitee_repo}.git"
         puts "git_url: #{git_url}"
         gitee_repo_local_path = File.join(work_dir, gitee_repo_name)
         FileUtils.rm_rf(gitee_repo_local_path) if File.exist?(gitee_repo_local_path)
@@ -101,8 +108,8 @@ module EasyCI
           FileUtils.mkdir_p(resources_dir)
           FileUtils.cp_r(File.join(gitee_repo_local_path, '2D', '.'), resources_dir)
           FileUtils.cp_r(File.join(gitee_repo_local_path, 'Common/Font'), File.join(resources_dir, 'Fonts'))
-           # 安全复制 Languages 文件夹（如果存在）
-          languages_path = File.join(gitee_repo_local_path, 'Common/Languages')
+           # 安全复制 Language 文件夹（如果存在）
+          languages_path = File.join(gitee_repo_local_path, 'Common/Language')
           if Dir.exist?(languages_path)
             FileUtils.cp_r(languages_path, resources_dir)
           else
@@ -112,18 +119,52 @@ module EasyCI
           FileUtils.mv(File.join(gitee_repo_local_path, 'Resources'), resources_dir)
         end
 
+        # 如果 resources_dir 的FGUI目录下有Code文件夹，则删除
+        fgui_dir = File.join(resources_dir, 'FGUI')
+        if File.exist?(File.join(fgui_dir, 'Code'))
+          FileUtils.rm_rf(File.join(fgui_dir, 'Code'))
+        end
+
         # 运行Unity截图任务
         unity_path = find_unity_path(runner_dir)
         puts "运行Unity截图任务..." 
         FileUtils.chdir(runner_dir)
-        system("#{unity_path} -projectPath  #{runner_dir} -executeMethod SpineAutoImporter.CIRunner -logFile screenshot-log.txt")
+        system("mkdir -p ~/UnityTemp && TMPDIR=~/UnityTemp #{unity_path} -projectPath  #{runner_dir} -executeMethod SpineAutoImporter.CIRunner -logFile screenshot-log.txt")
         
         # 压缩截图
         puts "开始压缩截图..." 
         system("cd #{runner_dir} && find . -path \"*/Screenshots/*.png\" -exec pngquant --quality=70-95 --ext .png --force {} \\;")
         # 运行Node脚本（如果需要）
         puts "运行后处理脚本..."
-        system("cd #{runner_dir} && docker run --rm -v \"$(pwd):/app\" -w /app node:22.0.0 bash -c \"cd Scripts && export BUILD_FROM_PRO=#{gitee_repo_name} && yarn install && npx ts-node index.ts\"")
+        # 你想传入的变量前缀，比如 GITEE_ 
+        env_prefixes = ["GITEE_"]
+
+        # 构建 docker run 的 -e 参数
+        env_flags = ENV
+          .select { |k, _| env_prefixes.any? { |prefix| k.start_with?(prefix) } }
+          .map { |k, _| "-e #{k}" }
+          .join(" ")
+
+        # 可选：你也可以在这里补充额外变量
+        extra_env = {
+          "BUILD_FROM_PRO" => gitee_repo_name,
+          "BUILD_FROM_REPO" => gitee_repo
+        }
+        extra_env.each { |k, v| ENV[k] = v }
+
+        # 构建并执行命令
+        cmd = <<~CMD
+          cd #{runner_dir} && \
+          docker run --rm #{env_flags} \
+            -v "$(pwd):/app" \
+            -w /app \
+            node:22.0.0 bash -c "cd Scripts && yarn install && npx ts-node index.ts"
+        CMD
+
+        system(cmd)
+        puts "执行命令:\n#{cmd}"
+        # export  gitee_repo 和 gitee_repo_name
+        # system("cd #{runner_dir} && docker run --rm -v \"$(pwd):/app\" -w /app node:22.0.0 bash -c \"cd Scripts && export BUILD_FROM_PRO=#{gitee_repo_name} && export BUILD_FROM_REPO=#{gitee_repo} && yarn install && npx ts-node index.ts\"")
         
       end
       

data/lib/easyci/version.rb

@@ -1,5 +1,5 @@
 module EasyCI
 
-  VERSION = '1.1.0'
+  VERSION = '1.1.7'
   
 end 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: easyci
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.7
 platform: ruby
 authors:
 - Wade
 bindir: bin
 cert_chain: []
-date: 2025-06-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: EasyCI - 简单的CI工具集
 test_files: []