Put the Manager in its own package

3 files changed, 7 insertions, 8 deletions

diff --git a/conf/parser.go b/conf/parser.go
index 0e19338..29f8968 100644
--- a/conf/parser.go
+++ b/conf/parser.go
@@ -21,14 +21,12 @@ import (
 	"io"
 	"os"
 
+	"github.com/Shugyousha/stasher/manager"
 	"github.com/Shugyousha/stasher/registry"
 )
 
 // Having a Config to Manager function could be nice?  Or we could just
 // return a Manager from here which may be even better...
-type Config struct {
-}
-
 type parser struct {
 	s    scanner
 	last token
@@ -48,11 +46,11 @@ func newParser(s *scanner) *parser {
 	return p
 }
 
-func NewConfig(r io.Reader) *Config {
+func NewManagerFromConfig(r io.Reader) *manager.Manager {
 	p := newParser(newScanner(r))
 	p.startparsing()
 
-	return &Config{}
+	return &manager.Manager{}
 }
 
 func (p *parser) startparsing() {
diff --git a/main.go b/main.go
index 69677d5..8b2248a 100644
--- a/main.go
+++ b/main.go
@@ -9,6 +9,7 @@ import (
 	"github.com/Shugyousha/stasher/conf"
 	"github.com/Shugyousha/stasher/filter/str"
 	"github.com/Shugyousha/stasher/input/stdin"
+	"github.com/Shugyousha/stasher/manager"
 	"github.com/Shugyousha/stasher/output/stdout"
 )
 
@@ -19,13 +20,13 @@ func main() {
 		os.Exit(1)
 	}
 
-	c := conf.NewConfig(bufio.NewReader(f))
+	c := conf.NewManagerFromConfig(bufio.NewReader(f))
 	fmt.Fprintf(os.Stderr, "config: %#v\n", c)
 
 	ffmap := make(map[string]func(string) string, 10)
 	ffmap["F"] = func(s string) string { return strings.ToUpper(s) }
 
-	m := Manager{
+	m := manager.Manager{
 		Input:  stdin.New(nil),
 		Filter: str.New(ffmap),
 		Output: stdout.New(nil),
diff --git a/manager.go b/manager/manager.go
index d3d38fd..5bbd49f 100644
--- a/manager.go
+++ b/manager/manager.go
@@ -1,4 +1,4 @@
-package main
+package manager
 
 import (
 	"fmt"