GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-10 23:12:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: modify logging logic of summary.

Browse Source
This commit is contained in:
xucong053
2022-02-14 16:41:18 +08:00
parent c57e32ec52
commit c33ff5b9f1
14 changed files with 151 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
internal/scaffold/main.go
View File

@@ -2,11 +2,9 @@ package scaffold
import (
"fmt"
"io/ioutil"
"os"
"os/exec"
"path"
"strings"
"github.com/httprunner/hrp/internal/builtin"
"github.com/httprunner/hrp/internal/ga"
@@ -30,20 +28,20 @@ func CreateScaffold(projectName string) error {
log.Info().Str("projectName", projectName).Msg("create new scaffold project")
// create project folders
if err := createFolder(projectName); err != nil {
if err := builtin.CreateFolder(projectName); err != nil {
return err
}
if err := createFolder(path.Join(projectName, "har")); err != nil {
if err := builtin.CreateFolder(path.Join(projectName, "har")); err != nil {
return err
}
if err := createFolder(path.Join(projectName, "testcases")); err != nil {
if err := builtin.CreateFolder(path.Join(projectName, "testcases")); err != nil {
return err
}
pluginDir := path.Join(projectName, "plugin")
if err := createFolder(pluginDir); err != nil {
if err := builtin.CreateFolder(pluginDir); err != nil {
return err
}
if err := createFolder(path.Join(projectName, "reports")); err != nil {
if err := builtin.CreateFolder(path.Join(projectName, "reports")); err != nil {
return err
}
@@ -62,66 +60,33 @@ func CreateScaffold(projectName string) error {
// create debugtalk.go
pluginFile := path.Join(pluginDir, "debugtalk.go")
if err := createFile(pluginFile, demoPlugin); err != nil {
if err := builtin.CreateFile(pluginFile, demoPlugin); err != nil {
return err
}
// create go mod
if err := execCommand(exec.Command("go", "mod", "init", "plugin"), pluginDir); err != nil {
if err := builtin.ExecCommand(exec.Command("go", "mod", "init", "plugin"), pluginDir); err != nil {
return err
}
// download plugin dependency
if err := execCommand(exec.Command("go", "get", "github.com/httprunner/hrp/plugin"), pluginDir); err != nil {
if err := builtin.ExecCommand(exec.Command("go", "get", "github.com/httprunner/hrp/plugin"), pluginDir); err != nil {
return err
}
// build plugin debugtalk.bin
if err := execCommand(exec.Command("go", "build", "-o", path.Join("..", "debugtalk.bin"), "debugtalk.go"), pluginDir); err != nil {
if err := builtin.ExecCommand(exec.Command("go", "build", "-o", path.Join("..", "debugtalk.bin"), "debugtalk.go"), pluginDir); err != nil {
return err
}
// create .gitignore
if err := createFile(path.Join(projectName, ".gitignore"), demoIgnoreContent); err != nil {
if err := builtin.CreateFile(path.Join(projectName, ".gitignore"), demoIgnoreContent); err != nil {
return err
}
// create .env
if err := createFile(path.Join(projectName, ".env"), demoEnvContent); err != nil {
if err := builtin.CreateFile(path.Join(projectName, ".env"), demoEnvContent); err != nil {
return err
}
return nil
}
func execCommand(cmd *exec.Cmd, cwd string) error {
log.Info().Str("cmd", cmd.String()).Str("cwd", cwd).Msg("exec command")
cmd.Dir = cwd
output, err := cmd.CombinedOutput()
out := strings.TrimSpace(string(output))
if err != nil {
log.Error().Err(err).Str("output", out).Msg("exec command failed")
} else if len(out) != 0 {
log.Info().Str("output", out).Msg("exec command success")
}
return err
}
func createFolder(folderPath string) error {
log.Info().Str("path", folderPath).Msg("create folder")
err := os.MkdirAll(folderPath, os.ModePerm)
if err != nil {
log.Error().Err(err).Msg("create folder failed")
return err
}
return nil
}
func createFile(filePath string, data string) error {
log.Info().Str("path", filePath).Msg("create file")
err := ioutil.WriteFile(filePath, []byte(data), 0o644)
if err != nil {
log.Error().Err(err).Msg("create file failed")
return err
}
return nil
}