Merge pull request #372 from devlights/devlights/pkg-371

cmd/trygolang 以下の処理も pkg/command に移動

Author: devlights

cmd/trygolang/main.go

@@ -59,9 +59,9 @@ func main() {
 
 	var cmd command.Cmd
 	if args.ExampleName != "" {
-		cmd = NewRunOnceCommand(NewRunOnceArgs(args.ExampleName, mapping))
+		cmd = command.NewRunOnceCommand(command.NewRunOnceArgs(args.ExampleName, mapping))
 	} else {
-		cmd = NewRunLoopCommand(NewRunLoopArgs(args, mapping))
+		cmd = command.NewRunLoopCommand(command.NewRunLoopArgs(args.OneTime, mapping))
 	}
 
 	if err := cmd.Run(); err != nil {

cmd/trygolang/errs.go pkg/command/errs.gocmd/trygolang/errs.go renamed to pkg/command/errs.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"fmt"

cmd/trygolang/exec.go pkg/command/exec.gocmd/trygolang/exec.go renamed to pkg/command/exec.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"fmt"

cmd/trygolang/runloop.go pkg/command/runloop.gocmd/trygolang/runloop.go renamed to pkg/command/runloop.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"bufio"
@@ -18,15 +18,15 @@ type (
 
 	// RunLoopArgs -- RunLoopCommand の引数データを表します.
 	RunLoopArgs struct {
-		MainArgs *Args                   // 引数
-		Mapping  mappings.ExampleMapping // マッピング情報
+		OneTime bool                    // 一回実行で完了するかどうか
+		Mapping mappings.ExampleMapping // マッピング情報
 	}
 )
 
 // NewRunLoopArgs -- 新しい RunLoopArgs を生成して返します.
-func NewRunLoopArgs(mainArgs *Args, mapping mappings.ExampleMapping) *RunLoopArgs {
+func NewRunLoopArgs(oneTime bool, mapping mappings.ExampleMapping) *RunLoopArgs {
 	a := new(RunLoopArgs)
-	a.MainArgs = mainArgs
+	a.OneTime = oneTime
 	a.Mapping = mapping
 	return a
 }
@@ -41,8 +41,8 @@ func NewRunLoopCommand(args *RunLoopArgs) *RunLoopCommand {
 // Run -- 実行します.
 func (c *RunLoopCommand) Run() error {
 	var (
-		mainArgs = c.Args.MainArgs
-		mapping  = c.Args.Mapping
+		oneTime = c.Args.OneTime
+		mapping = c.Args.Mapping
 	)
 
 	fmt.Print("ENTER EXAMPLE NAME: ")
@@ -104,7 +104,7 @@ func (c *RunLoopCommand) Run() error {
 			}
 		}
 
-		if mainArgs.OneTime {
+		if oneTime {
 			break
 		}
 

cmd/trygolang/runonce.go pkg/command/runonce.gocmd/trygolang/runonce.go renamed to pkg/command/runonce.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"github.com/devlights/try-golang/pkg/mappings"