Refactor runner/loop.go

Author: devlights

.gitignore

@@ -69,6 +69,6 @@ fabric.properties
 
 tags
 
-trygolang
+bin/
 .target
 chinook.db

Makefile

@@ -17,15 +17,9 @@ CMD_PKG=$(PKG_NAME)/cmd/trygolang
 
 EXAMPLE=""
 
-ifdef ComSpec
-	RM_CMD=del
-	BIN_NAME=.\trygolang.exe
-	BIN_DIR=.\cmd\trygolang
-else
-	RM_CMD=rm -f
-	BIN_NAME=./trygolang
-	BIN_DIR=./cmd/trygolang
-endif
+RM_CMD=rm -f
+BIN_NAME=trygolang
+BIN_DIR=bin
 
 .PHONY: all
 all: clean build test
@@ -47,7 +41,7 @@ _download_sqlite3_database:
 
 .PHONY: build
 build: prepare
-	$(GOBUILD) -race -o $(BIN_NAME) $(CMD_PKG)
+	$(GOBUILD) -race -o bin/$(BIN_NAME) $(CMD_PKG)
 
 .PHONY: test
 test: prepare
@@ -56,7 +50,7 @@ test: prepare
 .PHONY: clean
 clean: prepare
 	$(GOCLEAN) -i $(CMD_PKG)
-	$(RM_CMD) $(BIN_NAME)
+	$(RM_CMD) $(BIN_DIR)/$(BIN_NAME)
 
 .PHONY: install
 install: prepare

cmd/trygolang/main.go

@@ -61,7 +61,7 @@ func main() {
 	if args.ExampleName != "" {
 		r = runner.NewOnce(runner.NewOnceArgs(args.ExampleName, mapping))
 	} else {
-		r = runner.NewLoop(runner.NewLoopArgs(args.OneTime, mapping))
+		r = runner.NewLoop(runner.NewLoopArgs(os.Stdin, args.OneTime, mapping))
 	}
 
 	if err := r.Run(); err != nil {

runner/loop.go

@@ -3,7 +3,7 @@ package runner
 import (
 	"bufio"
 	"fmt"
-	"os"
+	"io"
 	"sort"
 	"strings"
 
@@ -18,14 +18,16 @@ type (
 
 	// LoopArgs -- Loop の引数データを表します.
 	LoopArgs struct {
+		In      io.Reader              // 入力
 		OneTime bool                   // 一回実行で完了するかどうか
 		Mapping mapping.ExampleMapping // マッピング情報
 	}
 )
 
 // NewLoopArgs -- 新しい LoopArgs を生成して返します.
-func NewLoopArgs(oneTime bool, m mapping.ExampleMapping) *LoopArgs {
+func NewLoopArgs(in io.Reader, oneTime bool, m mapping.ExampleMapping) *LoopArgs {
 	a := new(LoopArgs)
+	a.In = in
 	a.OneTime = oneTime
 	a.Mapping = m
 	return a
@@ -41,13 +43,14 @@ func NewLoop(args *LoopArgs) *Loop {
 // Run -- 実行します.
 func (c *Loop) Run() error {
 	var (
+		in = c.Args.In
 		oneTime = c.Args.OneTime
 		mapping = c.Args.Mapping
 	)
 
 	fmt.Print("ENTER EXAMPLE NAME: ")
 
-	stdinScanner := bufio.NewScanner(os.Stdin)
+	stdinScanner := bufio.NewScanner(in)
 	for stdinScanner.Scan() {
 		var (
 			numberOfCandidate int