@sk8metal/michi-cli 0.8.7 → 0.10.1

package/scripts/__tests__/multi-repo-config-schema.test.ts

@@ -37,6 +37,50 @@ describe('RepositorySchema', () => {
         expect(result.data.branch).toBe('main');
       }
     });
+
+    it('localPathが未指定の場合も受け入れる（オプショナル）', () => {
+      const repoWithoutLocalPath = {
+        name: 'my-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+      };
+
+      const result = RepositorySchema.safeParse(repoWithoutLocalPath);
+      expect(result.success).toBe(true);
+      if (result.success) {
+        expect(result.data.localPath).toBeUndefined();
+      }
+    });
+
+    it('Unix絶対パス（/path/to/repo）を受け入れる', () => {
+      const repoWithUnixPath = {
+        name: 'my-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: '/Users/user/repos/my-repo',
+      };
+
+      const result = RepositorySchema.safeParse(repoWithUnixPath);
+      expect(result.success).toBe(true);
+      if (result.success) {
+        expect(result.data.localPath).toBe('/Users/user/repos/my-repo');
+      }
+    });
+
+    it('Windows絶対パス（C:\\path\\to\\repo）を受け入れる', () => {
+      const repoWithWindowsPath = {
+        name: 'my-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: 'C:\\Users\\user\\repos\\my-repo',
+      };
+
+      const result = RepositorySchema.safeParse(repoWithWindowsPath);
+      expect(result.success).toBe(true);
+      if (result.success) {
+        expect(result.data.localPath).toBe('C:\\Users\\user\\repos\\my-repo');
+      }
+    });
   });
 
   describe('異常ケース', () => {
@@ -73,6 +117,68 @@ describe('RepositorySchema', () => {
       expect(result.success).toBe(false);
     });
   });
+
+  describe('localPathバリデーション', () => {
+    it('相対パス（./repo）を含む場合はエラー', () => {
+      const invalidRepo = {
+        name: 'my-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: './repos/my-repo',
+      };
+
+      const result = RepositorySchema.safeParse(invalidRepo);
+      expect(result.success).toBe(false);
+    });
+
+    it('相対パス（../repo）を含む場合はエラー', () => {
+      const invalidRepo = {
+        name: 'my-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: '../repos/my-repo',
+      };
+
+      const result = RepositorySchema.safeParse(invalidRepo);
+      expect(result.success).toBe(false);
+    });
+
+    it('Windowsの相対パス（.\\repo）を含む場合はエラー', () => {
+      const invalidRepo = {
+        name: 'my-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: '.\\repos\\my-repo',
+      };
+
+      const result = RepositorySchema.safeParse(invalidRepo);
+      expect(result.success).toBe(false);
+    });
+
+    it('空文字列の場合はエラー', () => {
+      const invalidRepo = {
+        name: 'my-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: '',
+      };
+
+      const result = RepositorySchema.safeParse(invalidRepo);
+      expect(result.success).toBe(false);
+    });
+
+    it('相対パス（repo/subdir）を含む場合はエラー', () => {
+      const invalidRepo = {
+        name: 'my-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: 'repos/my-repo',
+      };
+
+      const result = RepositorySchema.safeParse(invalidRepo);
+      expect(result.success).toBe(false);
+    });
+  });
 });
 
 describe('MultiRepoProjectSchema', () => {

package/scripts/__tests__/multi-repo-validator.test.ts

@@ -3,12 +3,17 @@
  * Task 11.1: バリデーション関数の単体テスト
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import * as fs from 'fs';
+import * as path from 'path';
+import { execSync } from 'child_process';
 import {
   validateProjectName,
   validateJiraKey,
   validateRepositoryUrl,
+  validateLocalPath,
 } from '../utils/multi-repo-validator.js';
+import type { Repository } from '../config/config-schema.js';
 
 describe('validateProjectName', () => {
   describe('正常ケース', () => {
@@ -522,3 +527,226 @@ describe('validateRepositoryUrl', () => {
     });
   });
 });
+
+describe('validateLocalPath', () => {
+  let tempDir: string;
+
+  beforeEach(() => {
+    // テスト用の一時ディレクトリを作成
+    tempDir = fs.mkdtempSync(path.join(process.cwd(), 'test-temp-'));
+  });
+
+  afterEach(() => {
+    // テスト用の一時ディレクトリを削除
+    if (fs.existsSync(tempDir)) {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  describe('localPath未設定ケース', () => {
+    it('localPathが未設定の場合、警告を返す', () => {
+      const repository: Repository = {
+        name: 'test-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        // localPath: undefined (省略)
+      };
+
+      const result = validateLocalPath(repository);
+
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toHaveLength(0);
+      expect(result.warnings).toHaveLength(1);
+      expect(result.warnings[0]).toContain(
+        "Repository 'test-repo' does not have localPath configured",
+      );
+      expect(result.exists).toBe(false);
+      expect(result.isGitRepository).toBe(false);
+      expect(result.currentBranch).toBeNull();
+      expect(result.branchMatches).toBe(false);
+      expect(result.hasUncommittedChanges).toBe(false);
+    });
+  });
+
+  describe('ディレクトリ存在確認', () => {
+    it('localPathが存在しない場合、エラーを返す', () => {
+      const nonExistentPath = path.join(tempDir, 'non-existent');
+      const repository: Repository = {
+        name: 'test-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: nonExistentPath,
+      };
+
+      const result = validateLocalPath(repository);
+
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toHaveLength(1);
+      expect(result.errors[0]).toContain('does not exist');
+      expect(result.exists).toBe(false);
+    });
+
+    it('localPathがファイルの場合、エラーを返す', () => {
+      const filePath = path.join(tempDir, 'test-file.txt');
+      fs.writeFileSync(filePath, 'test content');
+
+      const repository: Repository = {
+        name: 'test-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: filePath,
+      };
+
+      const result = validateLocalPath(repository);
+
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toHaveLength(1);
+      expect(result.errors[0]).toContain('is not a directory');
+      expect(result.exists).toBe(true);
+      expect(result.isGitRepository).toBe(false);
+    });
+  });
+
+  describe('Gitリポジトリ確認', () => {
+    it('Gitリポジトリではないディレクトリの場合、エラーを返す', () => {
+      const nonGitDir = path.join(tempDir, 'non-git-repo');
+      fs.mkdirSync(nonGitDir);
+
+      const repository: Repository = {
+        name: 'test-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: nonGitDir,
+      };
+
+      const result = validateLocalPath(repository);
+
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toHaveLength(1);
+      expect(result.errors[0]).toContain('is not a Git repository');
+      expect(result.exists).toBe(true);
+      expect(result.isGitRepository).toBe(false);
+    });
+
+    it('Gitリポジトリの場合、基本的なチェックを通過する', () => {
+      const gitDir = path.join(tempDir, 'git-repo');
+      fs.mkdirSync(gitDir);
+
+      // Gitリポジトリを初期化
+      execSync('git init', { cwd: gitDir });
+      execSync('git config user.email "test@example.com"', { cwd: gitDir });
+      execSync('git config user.name "Test User"', { cwd: gitDir });
+
+      // 初回コミットを作成（ブランチが作成されるため）
+      fs.writeFileSync(path.join(gitDir, 'README.md'), '# Test');
+      execSync('git add .', { cwd: gitDir });
+      execSync('git commit -m "Initial commit"', { cwd: gitDir });
+
+      // mainブランチに切り替え（git initでデフォルトブランチ名が異なる可能性があるため）
+      try {
+        execSync('git branch -M main', { cwd: gitDir });
+      } catch {
+        // すでにmainの場合は無視
+      }
+
+      const repository: Repository = {
+        name: 'test-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: gitDir,
+      };
+
+      const result = validateLocalPath(repository);
+
+      expect(result.isValid).toBe(true);
+      expect(result.errors).toHaveLength(0);
+      expect(result.exists).toBe(true);
+      expect(result.isGitRepository).toBe(true);
+      expect(result.currentBranch).toBe('main');
+      expect(result.branchMatches).toBe(true);
+      expect(result.hasUncommittedChanges).toBe(false);
+    });
+
+    it('ブランチが一致しない場合、警告を返す', () => {
+      const gitDir = path.join(tempDir, 'git-repo-branch-mismatch');
+      fs.mkdirSync(gitDir);
+
+      // Gitリポジトリを初期化
+      execSync('git init', { cwd: gitDir });
+      execSync('git config user.email "test@example.com"', { cwd: gitDir });
+      execSync('git config user.name "Test User"', { cwd: gitDir });
+
+      // 初回コミットを作成
+      fs.writeFileSync(path.join(gitDir, 'README.md'), '# Test');
+      execSync('git add .', { cwd: gitDir });
+      execSync('git commit -m "Initial commit"', { cwd: gitDir });
+
+      // developブランチに切り替え
+      execSync('git checkout -b develop', { cwd: gitDir });
+
+      const repository: Repository = {
+        name: 'test-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main', // 実際はdevelopブランチにいる
+        localPath: gitDir,
+      };
+
+      const result = validateLocalPath(repository);
+
+      expect(result.isValid).toBe(true); // 警告のみでエラーではない
+      expect(result.errors).toHaveLength(0);
+      expect(result.warnings.length).toBeGreaterThan(0);
+      expect(result.warnings.some((w) => w.includes('does not match'))).toBe(
+        true,
+      );
+      expect(result.exists).toBe(true);
+      expect(result.isGitRepository).toBe(true);
+      expect(result.currentBranch).toBe('develop');
+      expect(result.branchMatches).toBe(false);
+    });
+
+    it('未コミット変更がある場合、警告を返す', () => {
+      const gitDir = path.join(tempDir, 'git-repo-uncommitted');
+      fs.mkdirSync(gitDir);
+
+      // Gitリポジトリを初期化
+      execSync('git init', { cwd: gitDir });
+      execSync('git config user.email "test@example.com"', { cwd: gitDir });
+      execSync('git config user.name "Test User"', { cwd: gitDir });
+
+      // 初回コミットを作成
+      fs.writeFileSync(path.join(gitDir, 'README.md'), '# Test');
+      execSync('git add .', { cwd: gitDir });
+      execSync('git commit -m "Initial commit"', { cwd: gitDir });
+
+      // mainブランチに切り替え
+      try {
+        execSync('git branch -M main', { cwd: gitDir });
+      } catch {
+        // すでにmainの場合は無視
+      }
+
+      // 未コミットの変更を追加
+      fs.writeFileSync(path.join(gitDir, 'new-file.txt'), 'uncommitted');
+
+      const repository: Repository = {
+        name: 'test-repo',
+        url: 'https://github.com/owner/repo',
+        branch: 'main',
+        localPath: gitDir,
+      };
+
+      const result = validateLocalPath(repository);
+
+      expect(result.isValid).toBe(true); // 警告のみでエラーではない
+      expect(result.errors).toHaveLength(0);
+      expect(result.warnings.length).toBeGreaterThan(0);
+      expect(
+        result.warnings.some((w) => w.includes('uncommitted changes')),
+      ).toBe(true);
+      expect(result.exists).toBe(true);
+      expect(result.isGitRepository).toBe(true);
+      expect(result.hasUncommittedChanges).toBe(true);
+    });
+  });
+});

package/scripts/config/config-schema.ts

@@ -183,6 +183,26 @@ export const RepositorySchema = z.object({
       message: 'GitHub URL must be in format: https://github.com/{owner}/{repo}',
     }),
   branch: z.string().default('main'),
+  localPath: z
+    .string()
+    .optional()
+    .refine(
+      (path) => {
+        // localPath が指定されていない場合は検証スキップ
+        if (path === undefined) return true;
+        // 空文字列はエラー
+        if (path === '') return false;
+        // 絶対パスであることを検証（セキュリティ考慮）
+        // Unix系: '/' で始まる、Windows系: 'C:\' 等で始まる
+        const isUnixAbsolutePath = path.startsWith('/');
+        const isWindowsAbsolutePath = /^[A-Za-z]:\\/.test(path);
+        return isUnixAbsolutePath || isWindowsAbsolutePath;
+      },
+      {
+        message:
+          'localPath must be an absolute path (Unix: /path/to/repo, Windows: C:\\path\\to\\repo)',
+      },
+    ),
 });
 
 /**

package/scripts/utils/multi-repo-validator.ts

@@ -2,9 +2,14 @@
  * multi-repo-validator.ts
  * Multi-Repo機能のバリデーションユーティリティ
  *
- * プロジェクト名、JIRAキー、リポジトリURLのバリデーションとセキュリティチェックを行います。
+ * プロジェクト名、JIRAキー、リポジトリURL、localPathのバリデーションとセキュリティチェックを行います。
  */
 
+import * as fs from 'fs';
+import * as path from 'path';
+import { execSync } from 'child_process';
+import type { Repository } from '../config/config-schema.js';
+
 /**
  * バリデーション結果
  */
@@ -14,6 +19,17 @@ export interface ValidationResult {
   warnings: string[];
 }
 
+/**
+ * LocalPathバリデーション結果（詳細情報付き）
+ */
+export interface LocalPathValidationResult extends ValidationResult {
+  exists: boolean;
+  isGitRepository: boolean;
+  currentBranch: string | null;
+  branchMatches: boolean;
+  hasUncommittedChanges: boolean;
+}
+
 /**
  * プロジェクト名のバリデーション
  * セキュリティ対策: パストラバーサル、相対パス、制御文字をチェック
@@ -139,3 +155,146 @@ export function validateRepositoryUrl(url: string): ValidationResult {
     warnings,
   };
 }
+
+/**
+ * LocalPathのバリデーション
+ * ディレクトリ存在、Gitリポジトリ、ブランチ、未コミット変更をチェック
+ *
+ * @param repository - リポジトリ設定
+ * @returns バリデーション結果（詳細情報付き）
+ */
+export function validateLocalPath(
+  repository: Repository,
+): LocalPathValidationResult {
+  const errors: string[] = [];
+  const warnings: string[] = [];
+
+  // 初期値
+  let exists = false;
+  let isGitRepository = false;
+  let currentBranch: string | null = null;
+  let branchMatches = false;
+  let hasUncommittedChanges = false;
+
+  // 1. localPath設定確認
+  if (!repository.localPath) {
+    warnings.push(
+      `Repository '${repository.name}' does not have localPath configured`,
+    );
+    return {
+      isValid: false,
+      errors,
+      warnings,
+      exists,
+      isGitRepository,
+      currentBranch,
+      branchMatches,
+      hasUncommittedChanges,
+    };
+  }
+
+  const localPath = repository.localPath;
+
+  // 2. ディレクトリ存在確認
+  try {
+    const stats = fs.statSync(localPath);
+    if (!stats.isDirectory()) {
+      errors.push(
+        `localPath '${localPath}' exists but is not a directory`,
+      );
+      return {
+        isValid: false,
+        errors,
+        warnings,
+        exists: true,
+        isGitRepository,
+        currentBranch,
+        branchMatches,
+        hasUncommittedChanges,
+      };
+    }
+    exists = true;
+  } catch (_error) {
+    errors.push(`localPath '${localPath}' does not exist`);
+    return {
+      isValid: false,
+      errors,
+      warnings,
+      exists,
+      isGitRepository,
+      currentBranch,
+      branchMatches,
+      hasUncommittedChanges,
+    };
+  }
+
+  // 3. Gitリポジトリ確認
+  const gitDir = path.join(localPath, '.git');
+  if (!fs.existsSync(gitDir)) {
+    errors.push(
+      `localPath '${localPath}' is not a Git repository (no .git directory)`,
+    );
+    return {
+      isValid: false,
+      errors,
+      warnings,
+      exists,
+      isGitRepository,
+      currentBranch,
+      branchMatches,
+      hasUncommittedChanges,
+    };
+  }
+  isGitRepository = true;
+
+  // 4. ブランチ確認
+  try {
+    currentBranch = execSync('git branch --show-current', {
+      cwd: localPath,
+      encoding: 'utf-8',
+    }).trim();
+
+    if (currentBranch !== repository.branch) {
+      warnings.push(
+        `Current branch '${currentBranch}' does not match configured branch '${repository.branch}'`,
+      );
+      branchMatches = false;
+    } else {
+      branchMatches = true;
+    }
+  } catch (error) {
+    warnings.push(
+      `Failed to get current branch: ${error instanceof Error ? error.message : String(error)}`,
+    );
+  }
+
+  // 5. 未コミット変更確認
+  try {
+    const statusOutput = execSync('git status --porcelain', {
+      cwd: localPath,
+      encoding: 'utf-8',
+    }).trim();
+
+    if (statusOutput.length > 0) {
+      warnings.push(
+        `Repository '${repository.name}' has uncommitted changes`,
+      );
+      hasUncommittedChanges = true;
+    }
+  } catch (error) {
+    warnings.push(
+      `Failed to check uncommitted changes: ${error instanceof Error ? error.message : String(error)}`,
+    );
+  }
+
+  return {
+    isValid: errors.length === 0,
+    errors,
+    warnings,
+    exists,
+    isGitRepository,
+    currentBranch,
+    branchMatches,
+    hasUncommittedChanges,
+  };
+}