diff --git a/cmd/root.go b/cmd/root.go index 1ef4d13c..2a692852 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -64,6 +64,8 @@ func LoadConfig(c *config.LuetConfig) error { return err } + NewSpinner() + if c.GetLogging().Path != "" { // TODO: Init logrus, etc. } diff --git a/pkg/compiler/backend/backend_suite_test.go b/pkg/compiler/backend/backend_suite_test.go index 3a636f33..c3835de2 100644 --- a/pkg/compiler/backend/backend_suite_test.go +++ b/pkg/compiler/backend/backend_suite_test.go @@ -18,11 +18,15 @@ package backend_test import ( "testing" + . "github.com/mudler/luet/cmd" + config "github.com/mudler/luet/pkg/config" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) func TestSolver(t *testing.T) { RegisterFailHandler(Fail) + LoadConfig(config.LuetCfg) RunSpecs(t, "Backend Suite") } diff --git a/pkg/compiler/compiler_suite_test.go b/pkg/compiler/compiler_suite_test.go index 242f57fd..506c24d8 100644 --- a/pkg/compiler/compiler_suite_test.go +++ b/pkg/compiler/compiler_suite_test.go @@ -18,11 +18,15 @@ package compiler_test import ( "testing" + . "github.com/mudler/luet/cmd" + config "github.com/mudler/luet/pkg/config" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) func TestSolver(t *testing.T) { RegisterFailHandler(Fail) + LoadConfig(config.LuetCfg) RunSpecs(t, "Compiler Suite") } diff --git a/pkg/helpers/helpers_suite_test.go b/pkg/helpers/helpers_suite_test.go index d314ffad..1cdc29ae 100644 --- a/pkg/helpers/helpers_suite_test.go +++ b/pkg/helpers/helpers_suite_test.go @@ -18,11 +18,15 @@ package helpers_test import ( "testing" + . "github.com/mudler/luet/cmd" + config "github.com/mudler/luet/pkg/config" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) func TestSolver(t *testing.T) { RegisterFailHandler(Fail) + LoadConfig(config.LuetCfg) RunSpecs(t, "Helpers Suite") } diff --git a/pkg/installer/client/client_suite_test.go b/pkg/installer/client/client_suite_test.go index 597891f5..7425fbaf 100644 --- a/pkg/installer/client/client_suite_test.go +++ b/pkg/installer/client/client_suite_test.go @@ -18,11 +18,15 @@ package client_test import ( "testing" + . "github.com/mudler/luet/cmd" + config "github.com/mudler/luet/pkg/config" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) func TestClient(t *testing.T) { RegisterFailHandler(Fail) + LoadConfig(config.LuetCfg) RunSpecs(t, "Client Suite") } diff --git a/pkg/installer/installer_suite_test.go b/pkg/installer/installer_suite_test.go index e14aee8c..7c7c514e 100644 --- a/pkg/installer/installer_suite_test.go +++ b/pkg/installer/installer_suite_test.go @@ -18,11 +18,15 @@ package installer_test import ( "testing" + . "github.com/mudler/luet/cmd" + config "github.com/mudler/luet/pkg/config" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) func TestInstaller(t *testing.T) { RegisterFailHandler(Fail) + LoadConfig(config.LuetCfg) RunSpecs(t, "Installer Suite") } diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go index 606af6af..83c0a54e 100644 --- a/pkg/logger/logger.go +++ b/pkg/logger/logger.go @@ -3,7 +3,6 @@ package logger import ( "fmt" "os" - "time" . "github.com/mudler/luet/pkg/config" @@ -12,7 +11,15 @@ import ( . "github.com/logrusorgru/aurora" ) -var s *spinner.Spinner = spinner.New(spinner.CharSets[22], 100*time.Millisecond) +var s *spinner.Spinner = nil + +func NewSpinner() { + if s == nil { + s = spinner.New( + spinner.CharSets[LuetCfg.GetGeneral().SpinnerCharset], + LuetCfg.GetGeneral().GetSpinnerMs()) + } +} func Spinner(i int) { @@ -46,8 +53,33 @@ func SpinnerStop() { } } +func level2Number(level string) int { + switch level { + case "error": + return 0 + case "warning": + return 1 + case "info": + return 2 + default: + return 3 + } +} + func msg(level string, msg ...interface{}) { var message string + var confLevel, msgLevel int + + if LuetCfg.GetGeneral().Debug { + confLevel = 3 + } else { + confLevel = level2Number(LuetCfg.GetLogging().Level) + } + msgLevel = level2Number(level) + if msgLevel > confLevel { + return + } + for _, m := range msg { message += " " + fmt.Sprintf("%v", m) } diff --git a/pkg/package/package_suite_test.go b/pkg/package/package_suite_test.go index edca8444..311d8ae1 100644 --- a/pkg/package/package_suite_test.go +++ b/pkg/package/package_suite_test.go @@ -18,11 +18,15 @@ package pkg_test import ( "testing" + . "github.com/mudler/luet/cmd" + config "github.com/mudler/luet/pkg/config" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) func TestSolver(t *testing.T) { RegisterFailHandler(Fail) + LoadConfig(config.LuetCfg) RunSpecs(t, "Package Suite") } diff --git a/pkg/repository/repository_suite_test.go b/pkg/repository/repository_suite_test.go index bdb5f294..3b484754 100644 --- a/pkg/repository/repository_suite_test.go +++ b/pkg/repository/repository_suite_test.go @@ -19,11 +19,15 @@ package repository_test import ( "testing" + . "github.com/mudler/luet/cmd" + config "github.com/mudler/luet/pkg/config" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) func TestSolver(t *testing.T) { RegisterFailHandler(Fail) + LoadConfig(config.LuetCfg) RunSpecs(t, "Repository Suite") } diff --git a/pkg/solver/solver_suite_test.go b/pkg/solver/solver_suite_test.go index c7548c56..49c201f3 100644 --- a/pkg/solver/solver_suite_test.go +++ b/pkg/solver/solver_suite_test.go @@ -18,11 +18,15 @@ package solver_test import ( "testing" + . "github.com/mudler/luet/cmd" + config "github.com/mudler/luet/pkg/config" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) func TestSolver(t *testing.T) { RegisterFailHandler(Fail) + LoadConfig(config.LuetCfg) RunSpecs(t, "Solver Suite") } diff --git a/pkg/tree/builder/gentoo/builder_suite_test.go b/pkg/tree/builder/gentoo/builder_suite_test.go index d2b6319b..e945f6df 100644 --- a/pkg/tree/builder/gentoo/builder_suite_test.go +++ b/pkg/tree/builder/gentoo/builder_suite_test.go @@ -18,11 +18,15 @@ package gentoo_test import ( "testing" + . "github.com/mudler/luet/cmd" + config "github.com/mudler/luet/pkg/config" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) func TestGentooBuilder(t *testing.T) { RegisterFailHandler(Fail) + LoadConfig(config.LuetCfg) RunSpecs(t, "Gentoo Suite") } diff --git a/pkg/tree/tree_suite_test.go b/pkg/tree/tree_suite_test.go index d75ebaf3..89bb04f5 100644 --- a/pkg/tree/tree_suite_test.go +++ b/pkg/tree/tree_suite_test.go @@ -18,11 +18,15 @@ package tree_test import ( "testing" + . "github.com/mudler/luet/cmd" + config "github.com/mudler/luet/pkg/config" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) func TestTree(t *testing.T) { RegisterFailHandler(Fail) + LoadConfig(config.LuetCfg) RunSpecs(t, "Tree Suite") }