Browse Source

remove logger from package main

Casey DeLorme 8 years ago
parent
commit
d5126a4e1c
2 changed files with 5 additions and 19 deletions
  1. 3 13
      cmd/staticmd/main.go
  2. 2 6
      cmd/staticmd/main_test.go

+ 3 - 13
cmd/staticmd/main.go

@@ -18,23 +18,15 @@ type generator interface {
 	Generate() error
 }
 
-type logger interface {
-	Error(string, ...interface{})
-}
-
-func configure() (generator, logger) {
-
-	// get current directory
+func configure() generator {
 	cwd, _ := getwd()
 
-	// prepare staticmd with dependencies & defaults
 	smd := &staticmd.Generator{
 		Logger: &log.Logger{},
 		Input:  cwd,
 		Output: filepath.Join(cwd, "public/"),
 	}
 
-	// prepare cli options
 	appOptions := option.App{Description: "command line tool for generating deliverable static content"}
 	appOptions.Flag("template", "path to the template file", "--template", "-t")
 	appOptions.Flag("input", "path to the markdown files", "--input", "-i")
@@ -45,20 +37,18 @@ func configure() (generator, logger) {
 	appOptions.Example("-t template.tmpl -i src/ -o out/ -r")
 	flags := appOptions.Parse()
 
-	// apply flags
 	smd.TemplateFile, _ = maps.String(flags, smd.TemplateFile, "template")
 	smd.Input, _ = maps.String(flags, smd.Input, "input")
 	smd.Output, _ = maps.String(flags, smd.Output, "output")
 	smd.Book, _ = maps.Bool(flags, smd.Book, "book")
 	smd.Relative, _ = maps.Bool(flags, smd.Relative, "relative")
 
-	return smd, smd.Logger
+	return smd
 }
 
 func main() {
-	smd, l := configure()
+	smd := configure()
 	if err := smd.Generate(); err != nil {
-		l.Error("generator failed (%s)", err)
 		exit(1)
 	}
 }

+ 2 - 6
cmd/staticmd/main_test.go

@@ -18,10 +18,6 @@ type mockGenerator struct{}
 
 func (self *mockGenerator) Generate() error { return mockError }
 
-type mockLogger struct{}
-
-func (self *mockLogger) Error(_ string, _ ...interface{}) {}
-
 func TestPlacebo(_ *testing.T) {}
 
 func TestMain(_ *testing.T) {
@@ -35,8 +31,8 @@ func TestConfigure(t *testing.T) {
 	os.Args = []string{"-t", "afile", "-i", "/in/", "-o", "/out/", "-b", "-r"}
 
 	// run configure & check results
-	s, l := configure()
-	if s == nil || l == nil {
+	s := configure()
+	if s == nil {
 		t.FailNow()
 	}