luzifer/update-gotools
1
0
Fork 0
mirror of https://github.com/Luzifer/update-gotools.git synced 2024-10-18 15:14:19 +00:00
Code Issues Releases Wiki Activity

Split execution functions to own file

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2018-02-20 21:33:16 +01:00
parent beca7dd6b1
commit 5ac553bcc2
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E
2 changed files with 73 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
executor.go Normal file
View file

@ -0,0 +1,73 @@
package main
import (
"io"
"os"
"os/exec"
"path"
"strings"
"github.com/Luzifer/go_helpers/str"
log "github.com/sirupsen/logrus"
)
func executeCommands(logEntry *log.Entry, commands [][]string) error {
for i, cmdCfg := range commands {
stderr := logEntry.WithFields(log.Fields{"cmd_id": i}).WriterLevel(log.ErrorLevel)
stdout := logEntry.WithFields(log.Fields{"cmd_id": i}).WriterLevel(log.InfoLevel)
defer stderr.Close()
defer stdout.Close()
if err := executeCommand(cmdCfg, stdout, stderr, cfgFile.Cwd); err != nil {
return err
}
}
return nil
}
func executeCommand(command []string, stdout, stderr io.Writer, cwd string) error {
env := []string{
strings.Join([]string{"GOPATH", cfgFile.GoPath}, "="),
strings.Join([]string{"PATH", os.Getenv("PATH")}, "="),
}
cmd := exec.Command(command[0], command[1:]...)
cmd.Dir = cwd
cmd.Env = env
cmd.Stdout = stdout
cmd.Stderr = stderr
return cmd.Run()
}
func executePackage(pkg pkgCfg, pkgLog *log.Entry) error {
pkgLog.Info("Started package installation")
stderr := pkgLog.WriterLevel(log.ErrorLevel)
stdout := pkgLog.WriterLevel(log.InfoLevel)
defer stderr.Close()
defer stdout.Close()
pkgLog.Debug("Fetching package using `go get`")
if err := executeCommand([]string{"go", "get", "-d", pkg.Name}, stdout, stderr, cfgFile.Cwd); err != nil {
return err
}
if !str.StringInSlice(pkg.Version, []string{"", "master"}) {
pkgLog.Debug("Resetting to specified version")
pkgPath := path.Join(os.Getenv("GOPATH"), "src", pkg.Name)
// Fetch required references
if err := executeCommand([]string{"git", "fetch", "-q", "--tags", "origin", pkg.Version}, stdout, stderr, pkgPath); err != nil {
return err
}
// Do the real reset
if err := executeCommand([]string{"git", "reset", "--hard", pkg.Version}, stdout, stderr, pkgPath); err != nil {
return err
}
}
pkgLog.Debug("Install package using `go install`")
return executeCommand([]string{"go", "install", pkg.Name}, stdout, stderr, cfgFile.Cwd)
}

66
main.go
View file

@ -2,17 +2,12 @@ package main
import ( import (
"fmt" "fmt"
"io"
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec"
"path"
"runtime" "runtime"
"strings"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
"github.com/Luzifer/go_helpers/str"
"github.com/Luzifer/rconfig" "github.com/Luzifer/rconfig"
homedir "github.com/mitchellh/go-homedir" homedir "github.com/mitchellh/go-homedir"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@ -155,64 +150,3 @@ func defaultConfig() (*configFile, error) {
PostCommands: [][]string{}, PostCommands: [][]string{},
}, nil }, nil
} }
func executeCommands(logEntry *log.Entry, commands [][]string) error {
for i, cmdCfg := range commands {
stderr := logEntry.WithFields(log.Fields{"cmd_id": i}).WriterLevel(log.ErrorLevel)
stdout := logEntry.WithFields(log.Fields{"cmd_id": i}).WriterLevel(log.InfoLevel)
defer stderr.Close()
defer stdout.Close()
if err := executeCommand(cmdCfg, stdout, stderr, cfgFile.Cwd); err != nil {
return err
}
}
return nil
}
func executeCommand(command []string, stdout, stderr io.Writer, cwd string) error {
env := []string{
strings.Join([]string{"GOPATH", cfgFile.GoPath}, "="),
strings.Join([]string{"PATH", os.Getenv("PATH")}, "="),
}
cmd := exec.Command(command[0], command[1:]...)
cmd.Dir = cwd
cmd.Env = env
cmd.Stdout = stdout
cmd.Stderr = stderr
return cmd.Run()
}
func executePackage(pkg pkgCfg, pkgLog *log.Entry) error {
pkgLog.Info("Started package installation")
stderr := pkgLog.WriterLevel(log.ErrorLevel)
stdout := pkgLog.WriterLevel(log.InfoLevel)
defer stderr.Close()
defer stdout.Close()
pkgLog.Debug("Fetching package using `go get`")
if err := executeCommand([]string{"go", "get", "-d", pkg.Name}, stdout, stderr, cfgFile.Cwd); err != nil {
return err
}
if !str.StringInSlice(pkg.Version, []string{"", "master"}) {
pkgLog.Debug("Resetting to specified version")
pkgPath := path.Join(os.Getenv("GOPATH"), "src", pkg.Name)
// Fetch required references
if err := executeCommand([]string{"git", "fetch", "-q", "--tags", "origin", pkg.Version}, stdout, stderr, pkgPath); err != nil {
return err
}
// Do the real reset
if err := executeCommand([]string{"git", "reset", "--hard", pkg.Version}, stdout, stderr, pkgPath); err != nil {
return err
}
}
pkgLog.Debug("Install package using `go install`")
return executeCommand([]string{"go", "install", pkg.Name}, stdout, stderr, cfgFile.Cwd)
}