update latest codes

Author: qdriven

cmd/git/update_org_status.go

@@ -142,33 +142,20 @@ func updateLocalFile(orgName, sectionContent string) error {
 		outputPath = ".github/README.md"
 	}
 
-	// Ensure directory exists
-	dir := filepath.Dir(outputPath)
-	if err := os.MkdirAll(dir, 0755); err != nil {
-		return fmt.Errorf("failed to create directory %s: %w", dir, err)
+	// Update the specified output file
+	if err := writeReadmeFile(outputPath, orgName, sectionContent); err != nil {
+		return err
 	}
 
-	// Read existing content or create new
-	var newContent string
-	if _, err := os.Stat(outputPath); err == nil {
-		// File exists, update section
-		existingContent, err := os.ReadFile(outputPath)
-		if err != nil {
-			return fmt.Errorf("failed to read existing file: %w", err)
+	// Also update profile/README.md if output is under a .github directory
+	outputDir := filepath.Dir(outputPath)
+	if filepath.Base(outputDir) == ".github" {
+		profilePath := filepath.Join(outputDir, "profile", "README.md")
+		if err := writeReadmeFile(profilePath, orgName, sectionContent); err != nil {
+			return err
 		}
-		newContent = updateSectionInContent(string(existingContent), sectionContent, updateOrgStatusSection)
-	} else {
-		// File doesn't exist, create full README
-		newContent = generateFullREADME(orgName, sectionContent)
 	}
 
-	// Write file
-	if err := os.WriteFile(outputPath, []byte(newContent), 0644); err != nil {
-		return fmt.Errorf("failed to write README: %w", err)
-	}
-
-	fmt.Printf("Updated: %s\n", outputPath)
-
 	// Git operations (unless skipped)
 	if !updateOrgStatusSkipPush {
 		if err := gitCommitAndPush(outputPath, orgName); err != nil {
@@ -198,36 +185,18 @@ func updateDotGitHubRepo(orgName, sectionContent string) error {
 		return fmt.Errorf("failed to clone .github repository: %w\nNote: Make sure the .github repository exists and is accessible", err)
 	}
 
-	// Determine README path (profile/README.md or README.md)
-	readmePath := filepath.Join(repoDir, "profile", "README.md")
-	if _, err := os.Stat(readmePath); os.IsNotExist(err) {
-		readmePath = filepath.Join(repoDir, "README.md")
+	// Update both README.md and profile/README.md
+	paths := []string{
+		filepath.Join(repoDir, "README.md"),
+		filepath.Join(repoDir, "profile", "README.md"),
 	}
 
-	// Read existing content or create new
-	var newContent string
-	if _, err := os.Stat(readmePath); err == nil {
-		existingContent, err := os.ReadFile(readmePath)
-		if err != nil {
-			return fmt.Errorf("failed to read existing README: %w", err)
+	for _, readmePath := range paths {
+		if err := writeReadmeFile(readmePath, orgName, sectionContent); err != nil {
+			return err
 		}
-		newContent = updateSectionInContent(string(existingContent), sectionContent, updateOrgStatusSection)
-	} else {
-		newContent = generateFullREADME(orgName, sectionContent)
-	}
-
-	// Ensure directory exists
-	if err := os.MkdirAll(filepath.Dir(readmePath), 0755); err != nil {
-		return fmt.Errorf("failed to create directory: %w", err)
 	}
 
-	// Write file
-	if err := os.WriteFile(readmePath, []byte(newContent), 0644); err != nil {
-		return fmt.Errorf("failed to write README: %w", err)
-	}
-
-	fmt.Printf("Updated: %s\n", readmePath)
-
 	// Git operations in .github repo
 	if updateOrgStatusSkipPush {
 		fmt.Println("Skipping git push (--skip-push used)")
@@ -273,6 +242,31 @@ func updateDotGitHubRepo(orgName, sectionContent string) error {
 	return nil
 }
 
+func writeReadmeFile(readmePath, orgName, sectionContent string) error {
+	// Ensure directory exists
+	if err := os.MkdirAll(filepath.Dir(readmePath), 0755); err != nil {
+		return fmt.Errorf("failed to create directory: %w", err)
+	}
+
+	var newContent string
+	if _, err := os.Stat(readmePath); err == nil {
+		existingContent, err := os.ReadFile(readmePath)
+		if err != nil {
+			return fmt.Errorf("failed to read existing README: %w", err)
+		}
+		newContent = updateSectionInContent(string(existingContent), sectionContent, updateOrgStatusSection)
+	} else {
+		newContent = generateFullREADME(orgName, sectionContent)
+	}
+
+	if err := os.WriteFile(readmePath, []byte(newContent), 0644); err != nil {
+		return fmt.Errorf("failed to write README: %w", err)
+	}
+
+	fmt.Printf("Updated: %s\n", readmePath)
+	return nil
+}
+
 func updateSectionInContent(content, newSection, sectionName string) string {
 	sectionHeader := "## " + sectionName
 

cmd/git/update_org_status_test.go

@@ -1,6 +1,8 @@
 package git
 
 import (
+	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -258,3 +260,119 @@ func TestSectionNameCustom(t *testing.T) {
 	// Reset to default
 	updateOrgStatusSection = "Project List"
 }
+
+func TestWriteReadmeFile(t *testing.T) {
+	updateOrgStatusSection = "Project List"
+	sectionContent := "## Project List\n\nNew project data.\n"
+
+	t.Run("creates new file when not exists", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		readmePath := filepath.Join(tmpDir, "README.md")
+
+		err := writeReadmeFile(readmePath, "testorg", sectionContent)
+		if err != nil {
+			t.Fatalf("writeReadmeFile failed: %v", err)
+		}
+
+		content, err := os.ReadFile(readmePath)
+		if err != nil {
+			t.Fatalf("failed to read created file: %v", err)
+		}
+
+		if !strings.Contains(string(content), "# Testorg") {
+			t.Error("Should contain generated title for new file")
+		}
+		if !strings.Contains(string(content), "New project data.") {
+			t.Error("Should contain section content")
+		}
+	})
+
+	t.Run("updates existing file section", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		readmePath := filepath.Join(tmpDir, "README.md")
+
+		existing := "# Test Org\n\n## Project List\nOld data.\n\n## Other\nOther section.\n"
+		os.WriteFile(readmePath, []byte(existing), 0644)
+
+		err := writeReadmeFile(readmePath, "testorg", sectionContent)
+		if err != nil {
+			t.Fatalf("writeReadmeFile failed: %v", err)
+		}
+
+		content, err := os.ReadFile(readmePath)
+		if err != nil {
+			t.Fatalf("failed to read updated file: %v", err)
+		}
+
+		result := string(content)
+		if strings.Contains(result, "Old data.") {
+			t.Error("Should replace old section content")
+		}
+		if !strings.Contains(result, "New project data.") {
+			t.Error("Should contain new section content")
+		}
+		if !strings.Contains(result, "## Other") {
+			t.Error("Should preserve other sections")
+		}
+	})
+
+	t.Run("creates directory if not exists", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		readmePath := filepath.Join(tmpDir, "profile", "README.md")
+
+		err := writeReadmeFile(readmePath, "testorg", sectionContent)
+		if err != nil {
+			t.Fatalf("writeReadmeFile failed: %v", err)
+		}
+
+		if _, err := os.Stat(readmePath); os.IsNotExist(err) {
+			t.Error("profile/README.md should be created")
+		}
+	})
+}
+
+func TestUpdateLocalFileUpdatesBothPaths(t *testing.T) {
+	updateOrgStatusSection = "Project List"
+	updateOrgStatusSkipPush = true
+
+	tmpDir := t.TempDir()
+
+	// Create .github directory structure
+	githubDir := filepath.Join(tmpDir, ".github")
+	profileDir := filepath.Join(githubDir, "profile")
+	os.MkdirAll(profileDir, 0755)
+
+	// Write existing files
+	readmeContent := "# Test\n\n## Project List\nOld.\n"
+	os.WriteFile(filepath.Join(githubDir, "README.md"), []byte(readmeContent), 0644)
+	os.WriteFile(filepath.Join(profileDir, "README.md"), []byte(readmeContent), 0644)
+
+	// Override output to use tmpDir
+	oldOutput := updateOrgStatusOutput
+	updateOrgStatusOutput = filepath.Join(githubDir, "README.md")
+	defer func() { updateOrgStatusOutput = oldOutput }()
+
+	sectionContent := "## Project List\n\nUpdated data.\n"
+	err := updateLocalFile("testorg", sectionContent)
+	if err != nil {
+		t.Fatalf("updateLocalFile failed: %v", err)
+	}
+
+	// Check README.md is updated
+	mainReadme, err := os.ReadFile(filepath.Join(githubDir, "README.md"))
+	if err != nil {
+		t.Fatalf("failed to read README.md: %v", err)
+	}
+	if !strings.Contains(string(mainReadme), "Updated data.") {
+		t.Error("README.md should be updated with new section content")
+	}
+
+	// Check profile/README.md is also updated
+	profileReadme, err := os.ReadFile(filepath.Join(profileDir, "README.md"))
+	if err != nil {
+		t.Fatalf("failed to read profile/README.md: %v", err)
+	}
+	if !strings.Contains(string(profileReadme), "Updated data.") {
+		t.Error("profile/README.md should also be updated with new section content")
+	}
+}

tasks/features/git/git-org.md

@@ -0,0 +1,10 @@
+# Git Org Command
+
+## Task 1: Update Org Status Profiles
+
+1. 目前的问题是：如何更新组织的状态配置文件更新README.md文件
+2. 需要同时更新README.md文件和profile目录下面的README.md 文件
+
+verification:
+1. 检查README.md文件是否更新
+2. 检查profile目录下面的README.md 文件是否更新