Merge pull request #2 from gotray/initial

fix ci on windows

Author: cpunion

.github/workflows/go.yml

@@ -31,6 +31,29 @@ jobs:
         with:
           go-version: 1.23
 
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+          update-environment: true
+
+      - name: Generate Python pkg-config for windows (patch)
+        if: matrix.os == 'windows-latest'
+        run: |
+          mkdir -p $PKG_CONFIG_PATH
+          cp .github/assets/python3-embed.pc $PKG_CONFIG_PATH/
+
+      - name: Install tiny-pkg-config for windows (patch)
+        if: matrix.os == 'windows-latest'
+        run: |
+          set -x
+          curl -L https://github.com/cpunion/tiny-pkg-config/releases/download/v0.2.0/tiny-pkg-config_Windows_x86_64.zip -o /tmp/tiny-pkg-config.zip
+          unzip /tmp/tiny-pkg-config.zip -d $HOME/bin
+          mv $HOME/bin/tiny-pkg-config.exe $HOME/bin/pkg-config.exe
+          echo $PKG_CONFIG_PATH
+          cat $PKG_CONFIG_PATH/python3-embed.pc
+          pkg-config --libs python3-embed
+          pkg-config --cflags python3-embed
+
       - name: Build
         run: go install -v ./...
 

cmd/init.go

@@ -54,10 +54,10 @@ var initCmd = &cobra.Command{
 If no path is provided, it will initialize in the current directory.
 
 Example:
-  gopy init
-  gopy init my-project
-  gopy init --debug my-project
-  gopy init -v my-project`,
+  got init
+  got init my-project
+  got init --debug my-project
+  got init -v my-project`,
 	Run: func(cmd *cobra.Command, args []string) {
 		// Get project path
 		projectPath := "."
@@ -111,7 +111,7 @@ Example:
 		fmt.Printf("\n%s\n", bold("Successfully initialized go-python project in "+projectPath))
 		fmt.Println("\nNext steps:")
 		fmt.Println("1. cd", projectPath)
-		fmt.Println("2. gopy run .")
+		fmt.Println("2. got run .")
 	},
 }
 

cmd/internal/create/templates/.gitignore cmd/internal/create/_templates/.gitignorecmd/internal/create/templates/.gitignore renamed to cmd/internal/create/_templates/.gitignore

@@ -12,7 +12,7 @@ import (
 	"github.com/fatih/color"
 )
 
-//go:embed templates/*
+//go:embed _templates/*
 var templates embed.FS
 
 var (
@@ -52,18 +52,18 @@ func Project(projectPath string, verbose bool) error {
 	overwriteAll := false
 
 	// Walk through template files and copy them
-	err := fs.WalkDir(templates, "templates", func(path string, d fs.DirEntry, err error) error {
+	err := fs.WalkDir(templates, "_templates", func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
 
 		// Skip the templates root directory
-		if path == "templates" {
+		if path == "_templates" {
 			return nil
 		}
 
 		// Get relative path from templates directory
-		relPath, err := filepath.Rel("templates", path)
+		relPath, err := filepath.Rel("_templates", path)
 		if err != nil {
 			return err
 		}

cmd/internal/create/templates/main.go cmd/internal/create/_templates/main.gocmd/internal/create/templates/main.go renamed to cmd/internal/create/_templates/main.go

@@ -9,7 +9,7 @@ import (
 // setupTestDir creates a temporary directory for testing
 func setupTestDir(t *testing.T) string {
 	t.Helper()
-	dir, err := os.MkdirTemp("", "gopy-test-*")
+	dir, err := os.MkdirTemp("", "got-test-*")
 	if err != nil {
 		t.Fatalf("failed to create temp dir: %v", err)
 	}

cmd/internal/create/create.go

@@ -22,7 +22,7 @@ func getCacheDir() (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("failed to get user home directory: %v", err)
 	}
-	cacheDir := filepath.Join(homeDir, ".gopy", "cache")
+	cacheDir := filepath.Join(homeDir, ".got", "cache")
 	if err := os.MkdirAll(cacheDir, 0755); err != nil {
 		return "", fmt.Errorf("failed to create cache directory: %v", err)
 	}

cmd/internal/create/create_test.go

@@ -54,7 +54,7 @@ func installGoDeps(projectPath string) error {
 	}()
 
 	fmt.Println("Installing Go dependencies...")
-	getCmd := exec.Command("go", "get", "-u", "github.com/gotray/go-python")
+	getCmd := exec.Command("go", "mod", "tidy")
 	getCmd.Stdout = os.Stdout
 	getCmd.Stderr = os.Stderr
 	if err := getCmd.Run(); err != nil {

cmd/internal/install/archive.go

@@ -144,7 +144,7 @@ func TestGetCacheDir(t *testing.T) {
 			return
 		}
 
-		want := filepath.Join(tmpDir, ".gopy", "cache")
+		want := filepath.Join(tmpDir, ".got", "cache")
 		if got != want {
 			t.Errorf("getCacheDir() = %v, want %v", got, want)
 		}

cmd/internal/install/deps.go

@@ -76,7 +76,7 @@ func FindProjectRoot(dir string) (string, error) {
 	}
 	parentDir := filepath.Dir(dir)
 	if parentDir == dir {
-		return "", fmt.Errorf("failed to find Gopy project")
+		return "", fmt.Errorf("failed to find Got project")
 	}
 	return FindProjectRoot(parentDir)
 }
@@ -89,7 +89,7 @@ func RunCommand(command string, args []string) error {
 	}
 	projectRoot, err := FindProjectRoot(wd)
 	if err != nil {
-		return fmt.Errorf("should run this command in a Gopy project: %v", err)
+		return fmt.Errorf("should run this command in a Got project: %v", err)
 	}
 	env.SetBuildEnv(projectRoot)