Merge pull request #18 from optim-corp/topic/console

optim-kazuhiro-seida · web-flow · commit b80cc62283f2 · 2021-05-25T09:59:40.000+09:00
update console
diff --git a/cli/account/me.go b/cli/account/me.go
@@ -13,7 +13,7 @@ import (
 
 var (
 	listUtility = utils.ListUtility
-	fPrintln    = utils.Fprintln
+	fPrintln    = utils.Console.Fprintln
 	str         = cnv.MustStr
 	assert      = utils.EAssert
 )
diff --git a/cli/device/init.go b/cli/device/init.go
@@ -8,11 +8,9 @@ import (
 
 var (
 	listUtility  = utils.ListUtility
-	fPrintln     = utils.Fprintln
+	fPrintln     = utils.Console.Fprintln
 	is           = utils.Is
-	println      = utils.Println
-	print        = utils.Print
-	printf       = utils.Printf
+	printf       = utils.Console.Printf
 	assert       = utils.EAssert
 	lifecycleDir = models.LifecycleDir
 	path         = ftil.Path
diff --git a/cli/filestorage/init.go b/cli/filestorage/init.go
@@ -9,8 +9,8 @@ var (
 	is          = utils.Is
 	listUtility = utils.ListUtility
 	spaceRight  = utils.SpaceRight
-	fPrintln    = utils.Fprintln
-	fPrintf     = utils.Fprintf
+	fPrintln    = utils.Console.Fprintln
+	fPrintf     = utils.Console.Fprintf
 	path        = ftil.Path
 	assert      = utils.EAssert
 )
diff --git a/cli/geography/init.go b/cli/geography/init.go
@@ -3,11 +3,9 @@ package geography
 import "github.com/optim-corp/cios-cli/utils"
 
 var (
-	println     = utils.Println
-	print       = utils.Print
-	printf      = utils.Printf
+	printf      = utils.Console.Printf
 	listUtility = utils.ListUtility
-	fPrintln    = utils.Fprintln
-	fPrintf     = utils.Fprintf
+	fPrintln    = utils.Console.Fprintln
+	fPrintf     = utils.Console.Fprintf
 	assert      = utils.EAssert
 )
diff --git a/cli/group/group.go b/cli/group/group.go
@@ -23,8 +23,8 @@ var (
 	is          = utils.Is
 	listUtility = utils.ListUtility
 	spaceRight  = utils.SpaceRight
-	fPrintln    = utils.Fprintln
-	fPrintf     = utils.Fprintf
+	fPrintln    = utils.Console.Fprintln
+	fPrintf     = utils.Console.Fprintf
 	assert      = utils.EAssert
 )
 
diff --git a/cli/publishsubscribe/init.go b/cli/publishsubscribe/init.go
@@ -8,14 +8,13 @@ import (
 )
 
 var (
-	print        = utils.Print
-	printf       = utils.Printf
+	printf       = utils.Console.Printf
 	out          = utils.Out
 	is           = utils.Is
 	listUtility  = utils.ListUtility
-	fPrintln     = utils.Fprintln
-	fPrintf      = utils.Fprintf
-	fPrint       = utils.Fprint
+	fPrintln     = utils.Console.Fprintln
+	fPrintf      = utils.Console.Fprintf
+	fPrint       = utils.Console.Fprint
 	datastoreDir = models.DatastoreDir
 	path         = ftil.Path
 	assert       = utils.EAssert
diff --git a/cli/resourceowner/resourceowner.go b/cli/resourceowner/resourceowner.go
@@ -16,8 +16,8 @@ var (
 	out         = utils.Out
 	listUtility = utils.ListUtility
 	spaceRight  = utils.SpaceRight
-	fPrintln    = utils.Fprintln
-	fPrintf     = utils.Fprintf
+	fPrintln    = utils.Console.Fprintln
+	fPrintf     = utils.Console.Fprintf
 	assert      = utils.EAssert
 )
 
diff --git a/cli/tool/init.go b/cli/tool/init.go
@@ -1,26 +1,26 @@
 package tool
 
 import (
+	"fmt"
+
 	"github.com/fcfcqloow/go-advance/ftil"
 	"github.com/optim-corp/cios-cli/models"
 	"github.com/optim-corp/cios-cli/utils"
 )
 
 var (
-	config              models.Config
 	accountFile         ftil.FileService
 	configFile          ftil.FileService
 	timestampFormatFile ftil.FileService
 	configPath          = models.ConfigPath
 	accountPath         = models.AccountPath
 	timestampFormatPath = models.TimestampFormatFilePath
 	listUtility         = utils.ListUtility
-	fPrintln            = utils.Fprintln
-	fPrint              = utils.Fprint
-	println             = utils.Println
-	printf              = utils.Printf
-	print               = utils.Print
+	fPrintln            = utils.Console.Fprintln
+	fPrint              = utils.Console.Fprint
+	printf              = utils.Console.Printf
 	path                = ftil.Path
+	println             = fmt.Println
 	assert              = utils.EAssert
 	is                  = utils.Is
 )
diff --git a/cli/videostreams/init.go b/cli/videostreams/init.go
@@ -1,23 +1,10 @@
 package video
 
 import (
-	"github.com/fcfcqloow/go-advance/ftil"
-	"github.com/optim-corp/cios-cli/models"
 	"github.com/optim-corp/cios-cli/utils"
 )
 
 var (
-	out         = utils.Out
-	is          = utils.Is
-	listUtility = utils.ListUtility
-	spaceRight  = utils.SpaceRight
-	fPrintln    = utils.Fprintln
-	fPrintf     = utils.Fprintf
-	fPrint      = utils.Fprint
-	println     = utils.Println
-	printf      = utils.Printf
-	print       = utils.Print
-	dir         = models.Dir
-	path        = ftil.Path
-	assert      = utils.EAssert
+	out    = utils.Out
+	fPrint = utils.Console.Fprint
 )
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/optim-corp/cios-cli
 
-go 1.14
+go 1.16
 
 require (
 	github.com/atotto/clipboard v0.1.2
diff --git a/utils/assert.go b/utils/assert.go
@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/fcfcqloow/go-advance/log"
@@ -39,14 +40,14 @@ func (self Assert) NoneErrAssert(e error) Assert {
 }
 func (self Assert) NoneErrPrintln(str ...interface{}) Assert {
 	if self.Err == nil {
-		Println(str...)
+		fmt.Println(str...)
 	}
 	return self
 }
 
 func (self Assert) NoneErrPrint(str ...interface{}) Assert {
 	if self.Err == nil {
-		Print(str...)
+		fmt.Print(str...)
 	}
 	return self
 }
diff --git a/utils/console.go b/utils/console.go
@@ -60,7 +60,7 @@ func FOutStructJson(object interface{}) {
 		if err != nil {
 			log.Error(err.Error())
 		} else {
-			Fprintln(result)
+			Console.Fprintln(result)
 		}
 	}
 }
@@ -82,7 +82,7 @@ func FOutStructJsonSlim(object interface{}) {
 	if err != nil {
 		log.Error(err.Error())
 	} else {
-		Fprintln(body)
+		Console.Fprintln(body)
 	}
 }
 func OutStructJsonSlim(object interface{}) {
diff --git a/utils/init.go b/utils/init.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"bufio"
-	"fmt"
 	"os"
 	"runtime"
 )
@@ -13,6 +12,7 @@ var (
 	IsWindows = (runtime.GOOS == "windows")
 	IsLinux   = (runtime.GOOS == "linux")
 	IsMac     = (runtime.GOOS == "darwin")
+	Console   = out{}
 )
 
 type (
@@ -24,22 +24,3 @@ type (
 		Err error
 	}
 )
-
-func Fprintln(v ...interface{}) {
-	fmt.Fprintln(Out, v...)
-}
-func Fprint(v ...interface{}) {
-	fmt.Fprint(Out, v...)
-}
-func Fprintf(format string, v ...interface{}) {
-	fmt.Fprintf(Out, format, v...)
-}
-func Println(v ...interface{}) {
-	fmt.Println(v...)
-}
-func Print(v ...interface{}) {
-	fmt.Print(v...)
-}
-func Printf(format string, v ...interface{}) {
-	fmt.Printf(format, v...)
-}
diff --git a/utils/stdout.go b/utils/stdout.go
@@ -0,0 +1,29 @@
+package utils
+
+import (
+	"bufio"
+	"fmt"
+)
+
+type out struct{ writer *bufio.Writer }
+
+func (o *out) Fprintln(v ...interface{}) {
+	fmt.Fprintln(o.writer, v...)
+}
+func (o *out) Fprint(v ...interface{}) {
+	fmt.Fprint(o.writer, v...)
+}
+func (o *out) Fprintf(format string, v ...interface{}) {
+	fmt.Fprintf(o.writer, format, v...)
+}
+func (o *out) Printf(format string, v ...interface{}) {
+	fmt.Printf(format, v...)
+}
+
+func (o *out) Flush() error {
+	return o.writer.Flush()
+}
+
+func (o *out) F() {
+	o.Flush()
+}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`var (`
`15`	`15`	`listUtility = utils.ListUtility`
`16`		`- fPrintln = utils.Fprintln`
	`16`	`+ fPrintln = utils.Console.Fprintln`
`17`	`17`	`str = cnv.MustStr`
`18`	`18`	`assert = utils.EAssert`
`19`	`19`	`)`