fix: provider

This commit is contained in:
Rogee
2024-12-19 17:57:23 +08:00
parent 4702873975
commit e007535972
4 changed files with 88 additions and 18 deletions

View File

@@ -1,6 +1,8 @@
package gomod
import (
"bufio"
"errors"
"fmt"
"os"
"path/filepath"
@@ -40,7 +42,7 @@ func Parse(modPath string) error {
goMod = &GoMod{file: f, modules: make(map[string]ModuleInfo)}
for _, require := range f.Require {
if !require.Indirect {
if require.Indirect {
continue
}
@@ -94,22 +96,33 @@ func getPackageName(pkg, version string) (string, error) {
return "", err
}
packagePattern := regexp.MustCompile(`package\s+(\w+)`)
packagePattern := regexp.MustCompile(`^package\s+(\w+)$`)
getFilePackageName := func(file string) (string, error) {
// 读取文件内容
f, err := os.Open(file)
if err != nil {
return "", err
}
defer f.Close()
scanner := bufio.NewScanner(f)
for scanner.Scan() {
line := scanner.Text()
if matches := packagePattern.FindStringSubmatch(line); matches != nil {
return matches[1], nil
}
}
return "", errors.New("no match")
}
if len(files) > 0 {
for _, file := range files {
if strings.HasSuffix(file, "_test.go") {
continue
}
// 读取文件内容
content, err := os.ReadFile(file)
if err != nil {
return "", err
}
packageName := packagePattern.FindStringSubmatch(string(content))
if len(packageName) == 2 {
return packageName[1], nil
if name, err := getFilePackageName(file); err == nil {
return name, nil
}
}
}

View File

@@ -1,6 +1,9 @@
package gomod
import (
"bufio"
"os"
"regexp"
"testing"
"github.com/rogeecn/fabfile"
@@ -21,12 +24,39 @@ func Test_ParseGoMod(t *testing.T) {
func Test_getPackageName(t *testing.T) {
Convey("Test getPackageName", t, func() {
Convey("", func() {
Convey("github.com/redis/go-redis/v9@v9.7.0", func() {
name, err := getPackageName("github.com/redis/go-redis/v9", "v9.7.0")
So(err, ShouldBeNil)
So(name, ShouldEqual, "redis")
})
Convey("github.com/redis/go-redis/v9@v9.7.0", func() {
name, err := getPackageName("github.com/redis/go-redis/v9", "v9.7.0")
So(err, ShouldBeNil)
So(name, ShouldEqual, "redis")
})
Convey("github.com/pkg/errors@v0.9.1", func() {
name, err := getPackageName("github.com/pkg/errors", "v0.9.1")
So(err, ShouldBeNil)
So(name, ShouldEqual, "errors")
})
})
}
func Test_file(t *testing.T) {
Convey("Test file", t, func() {
Convey("Test file", func() {
packagePattern := regexp.MustCompile(`^package\s+(\w+)$`)
file := "/root/go/pkg/mod/github.com/redis/go-redis/v9@v9.7.0/acl_commands.go"
// read file line by line
f, err := os.Open(file)
So(err, ShouldBeNil)
defer f.Close()
scanner := bufio.NewScanner(f)
for scanner.Scan() {
line := scanner.Text()
if matches := packagePattern.FindStringSubmatch(line); matches != nil {
t.Logf("Matched package name: %s", matches[1])
}
}
So(scanner.Err(), ShouldBeNil)
})
})
}