@noahyu/cd-cli 1.1.0 → 1.1.1

package/dist/src/index.js

@@ -75,8 +75,10 @@ async function deploy(config) {
         spinner.succeed('服务器连接成功');
         await cleanTempLinks(ssh, config.server.deployPath, buildDirName);
         spinner.start('检查部署环境...');
-        await handleExistingDeployDir(ssh, config.server.deployPath, buildDirName);
-        spinner.succeed('部署环境检查完成');
+        await handleExistingDeployDir(ssh, config.server.deployPath, buildDirName, spinner);
+        if (spinner.isSpinning) {
+            spinner.succeed('部署环境检查完成');
+        }
         const versionDirName = `${buildDirName}-${version}`;
         const versionPath = join(config.server.deployPath, versionDirName);
         const currentLinkPath = join(config.server.deployPath, buildDirName);
@@ -486,7 +488,7 @@ async function cleanTempLinks(ssh, deployPath, buildDirName) {
         console.warn(chalk.yellow(`⚠️ 清理临时链接时出现警告: ${error}`));
     }
 }
-async function handleExistingDeployDir(ssh, deployPath, buildDirName) {
+async function handleExistingDeployDir(ssh, deployPath, buildDirName, spinner) {
     const currentLinkPath = join(deployPath, buildDirName);
     const checkResult = await ssh.execCommand(`test -e ${currentLinkPath}`);
     if (checkResult.code !== 0) {
@@ -500,6 +502,7 @@ async function handleExistingDeployDir(ssh, deployPath, buildDirName) {
     const fileType = typeResult.stdout.trim();
     if (fileType.includes('directory') || fileType === 'directory') {
         const backupPath = `${currentLinkPath}.backup.${Date.now()}`;
+        spinner.stop();
         console.log(chalk.yellow(`⚠️ 检测到已存在的目录: ${currentLinkPath}`));
         console.log(chalk.blue(`📁 将备份到: ${backupPath}`));
         const answers = await inquirer.prompt([
@@ -513,18 +516,25 @@ async function handleExistingDeployDir(ssh, deployPath, buildDirName) {
         if (!answers.proceed) {
             throw new Error('用户取消部署');
         }
+        spinner.start('正在备份已存在的目录...');
         const backupResult = await ssh.execCommand(`mv ${currentLinkPath} ${backupPath}`);
         if (backupResult.code !== 0) {
             throw new Error(`备份目录失败: ${backupResult.stderr}`);
         }
+        spinner.stop();
         console.log(chalk.green(`✅ 目录已备份到: ${backupPath}`));
     }
     else {
         const backupPath = `${currentLinkPath}.backup.${Date.now()}`;
+        spinner.stop();
+        console.log(chalk.yellow(`⚠️ 检测到已存在的文件: ${currentLinkPath}`));
+        console.log(chalk.blue(`📁 将备份到: ${backupPath}`));
+        spinner.start('正在备份已存在的文件...');
         const backupResult = await ssh.execCommand(`mv ${currentLinkPath} ${backupPath}`);
         if (backupResult.code !== 0) {
             throw new Error(`备份文件失败: ${backupResult.stderr}`);
         }
+        spinner.stop();
         console.log(chalk.green(`✅ 文件已备份到: ${backupPath}`));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noahyu/cd-cli",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Global CLI tool for simple project deployment with version management",
   "type": "module",
   "main": "./dist/bin/cli.js",