Merge pull request #398 from devlights/rename-tutorial-dir

devlights · web-flow · commit 3d878e816d44 · 2021-05-27T13:34:23.000+09:00
Rename internal/turorial to internal/gotour
diff --git a/internal/builder/builder.go b/internal/builder/builder.go
@@ -4,7 +4,7 @@ import (
 	"github.com/devlights/try-golang/internal/effectivego"
 	"github.com/devlights/try-golang/internal/examples/advanced"
 	"github.com/devlights/try-golang/internal/examples/basic"
-	"github.com/devlights/try-golang/internal/tutorial"
+	"github.com/devlights/try-golang/internal/gotour"
 	"github.com/devlights/try-golang/pkg/mappings"
 )
 
@@ -16,7 +16,7 @@ func BuildMappings() mappings.ExampleMapping {
 		advanced.NewRegister(),
 		basic.NewRegister(),
 		effectivego.NewRegister(),
-		tutorial.NewRegister(),
+		gotour.NewRegister(),
 	)
 
 	return m
diff --git a/internal/gotour/doc.go b/internal/gotour/doc.go
@@ -1,5 +1,5 @@
 /*
-Package tutorial -- Tour of Go (https://tour.golang.org/) の サンプルが配置されているパッケージです。
+Package gotour -- Tour of Go (https://tour.golang.org/) の サンプルが配置されているパッケージです。
 
 Go の プログラムは、パッケージで構成される。
 規約により、パッケージ名はimportパスの最後の要素の名前となる。
@@ -19,4 +19,4 @@ https://blog.golang.org/godoc-documenting-go-code
 https://qiita.com/lufia/items/97acb391c26f967048f1
 https://qiita.com/shibukawa/items/8c70fdd1972fad76a5ce
 */
-package tutorial
+package gotour
diff --git a/internal/gotour/examples.go b/internal/gotour/examples.go
@@ -0,0 +1,77 @@
+package gotour
+
+import (
+	"github.com/devlights/try-golang/internal/gotour/gotour01"
+	"github.com/devlights/try-golang/internal/gotour/gotour02"
+	"github.com/devlights/try-golang/internal/gotour/gotour03"
+	"github.com/devlights/try-golang/internal/gotour/gotour04"
+	"github.com/devlights/try-golang/internal/gotour/gotour05"
+	"github.com/devlights/try-golang/internal/gotour/gotour06"
+	"github.com/devlights/try-golang/internal/gotour/gotour07"
+	"github.com/devlights/try-golang/internal/gotour/gotour08"
+	"github.com/devlights/try-golang/internal/gotour/gotour09"
+	"github.com/devlights/try-golang/internal/gotour/gotour10"
+	"github.com/devlights/try-golang/internal/gotour/gotour11"
+	"github.com/devlights/try-golang/internal/gotour/gotour12"
+	"github.com/devlights/try-golang/internal/gotour/gotour13"
+	"github.com/devlights/try-golang/internal/gotour/gotour14"
+	"github.com/devlights/try-golang/internal/gotour/gotour15"
+	"github.com/devlights/try-golang/internal/gotour/gotour16"
+	"github.com/devlights/try-golang/internal/gotour/gotour17"
+	"github.com/devlights/try-golang/internal/gotour/gotour18"
+	"github.com/devlights/try-golang/internal/gotour/gotour19"
+	"github.com/devlights/try-golang/internal/gotour/gotour20"
+	"github.com/devlights/try-golang/internal/gotour/gotour21"
+	"github.com/devlights/try-golang/internal/gotour/gotour22"
+	"github.com/devlights/try-golang/internal/gotour/gotour23"
+	"github.com/devlights/try-golang/internal/gotour/gotour24"
+	"github.com/devlights/try-golang/internal/gotour/gotour25"
+	"github.com/devlights/try-golang/internal/gotour/gotour26"
+	"github.com/devlights/try-golang/internal/gotour/gotour27"
+	"github.com/devlights/try-golang/internal/gotour/gotour28"
+	"github.com/devlights/try-golang/internal/gotour/gotour29"
+	"github.com/devlights/try-golang/pkg/mappings"
+)
+
+type (
+	gotourExampleRegister struct{}
+)
+
+// NewRegister は、gotour パッケージ用の lib.Register を返します.
+func NewRegister() mappings.Register {
+	r := new(gotourExampleRegister)
+	return r
+}
+
+// Regist は、gotour パッケージ配下に存在するサンプルを登録します.
+func (r *gotourExampleRegister) Regist(m mappings.ExampleMapping) {
+	m["gotour_helloworld"] = gotour01.HelloWorld
+	m["gotour_import"] = gotour02.Import
+	m["gotour_scope"] = gotour03.Scope
+	m["gotour_functions"] = gotour04.Functions
+	m["gotour_basictypes"] = gotour05.BasicTypes
+	m["gotour_zerovalue"] = gotour06.ZeroValue
+	m["gotour_typeconvert_basictypes"] = gotour07.TypeConvertBasicTypes
+	m["gotour_const"] = gotour08.Constant
+	m["gotour_forloop"] = gotour09.ForLoop
+	m["gotour_if"] = gotour10.If
+	m["gotour_switch"] = gotour11.Switch
+	m["gotour_defer"] = gotour12.Defer
+	m["gotour_pointer"] = gotour13.Pointer
+	m["gotour_struct"] = gotour14.Struct
+	m["gotour_array"] = gotour15.Array
+	m["gotour_slice"] = gotour16.Slice
+	m["gotour_map"] = gotour17.Map
+	m["gotour_method"] = gotour18.Method
+	m["gotour_interface"] = gotour19.Interface
+	m["gotour_empty_interface"] = gotour20.EmptyInterface
+	m["gotour_type_assertion"] = gotour21.TypeAssertion
+	m["gotour_type_switch"] = gotour22.TypeSwitch
+	m["gotour_stringer"] = gotour23.Stringer
+	m["gotour_error"] = gotour24.Error
+	m["gotour_reader"] = gotour25.Reader
+	m["gotour_goroutine"] = gotour26.Goroutine
+	m["gotour_channels"] = gotour27.Channels
+	m["gotour_select"] = gotour28.Select
+	m["gotour_mutex"] = gotour29.Mutex
+}
diff --git a/internal/gotour/gotour01/tutorial_gotour_01_helloworld.go b/internal/gotour/gotour01/tutorial_gotour_01_helloworld.go
@@ -1,4 +1,4 @@
-package tutorial01
+package gotour01
 
 import (
 	"fmt"
diff --git a/internal/gotour/gotour02/tutorial_gotour_02_import.go b/internal/gotour/gotour02/tutorial_gotour_02_import.go
@@ -1,4 +1,4 @@
-package tutorial02
+package gotour02
 
 // 利用するパッケージのimportを記載する。
 // 複数のimportがある場合は、以下のようにグループ化して記述することができる。
diff --git a/internal/gotour/gotour03/tutorial_gotour_03_scope.go b/internal/gotour/gotour03/tutorial_gotour_03_scope.go
@@ -1,4 +1,4 @@
-package tutorial03
+package gotour03
 
 import "fmt"
 
diff --git a/internal/gotour/gotour04/tutorial_gotour_04_functions.go b/internal/gotour/gotour04/tutorial_gotour_04_functions.go
@@ -1,4 +1,4 @@
-package tutorial04
+package gotour04
 
 import "fmt"
 
diff --git a/internal/gotour/gotour05/tutorial_gotour_05_basictypes.go b/internal/gotour/gotour05/tutorial_gotour_05_basictypes.go
@@ -1,4 +1,4 @@
-package tutorial05
+package gotour05
 
 import "fmt"
 
diff --git a/internal/gotour/gotour06/tutorial_gotour_06_zerovalue.go b/internal/gotour/gotour06/tutorial_gotour_06_zerovalue.go
@@ -1,4 +1,4 @@
-package tutorial06
+package gotour06
 
 import (
 	"fmt"
diff --git a/internal/gotour/gotour07/tutorial_gotour_07_typeconvert_basictypes.go b/internal/gotour/gotour07/tutorial_gotour_07_typeconvert_basictypes.go
@@ -1,4 +1,4 @@
-package tutorial07
+package gotour07
 
 import "fmt"
 
diff --git a/internal/gotour/gotour08/tutorial_gotour_08_constant.go b/internal/gotour/gotour08/tutorial_gotour_08_constant.go
@@ -1,4 +1,4 @@
-package tutorial08
+package gotour08
 
 import "fmt"
 
diff --git a/internal/gotour/gotour09/tutorial_gotour_09_forloop.go b/internal/gotour/gotour09/tutorial_gotour_09_forloop.go
@@ -1,4 +1,4 @@
-package tutorial09
+package gotour09
 
 import (
 	"fmt"
diff --git a/internal/gotour/gotour10/tutorial_gotour_10_if.go b/internal/gotour/gotour10/tutorial_gotour_10_if.go
@@ -1,4 +1,4 @@
-package tutorial10
+package gotour10
 
 import (
 	"fmt"
diff --git a/internal/gotour/gotour11/tutorial_gotour_11_switch.go b/internal/gotour/gotour11/tutorial_gotour_11_switch.go
@@ -1,4 +1,4 @@
-package tutorial11
+package gotour11
 
 import (
 	"fmt"
diff --git a/internal/gotour/gotour12/tutorial_gotour_12_defer.go b/internal/gotour/gotour12/tutorial_gotour_12_defer.go
@@ -1,4 +1,4 @@
-package tutorial12
+package gotour12
 
 import "fmt"
 
diff --git a/internal/gotour/gotour13/tutorial_gotour_13_pointer.go b/internal/gotour/gotour13/tutorial_gotour_13_pointer.go
@@ -1,4 +1,4 @@
-package tutorial13
+package gotour13
 
 import "fmt"
 
diff --git a/internal/gotour/gotour14/tutorial_gotour_14_struct.go b/internal/gotour/gotour14/tutorial_gotour_14_struct.go
@@ -1,4 +1,4 @@
-package tutorial14
+package gotour14
 
 import "fmt"
 
diff --git a/internal/gotour/gotour15/tutorial_gotour_15_array.go b/internal/gotour/gotour15/tutorial_gotour_15_array.go
@@ -1,4 +1,4 @@
-package tutorial15
+package gotour15
 
 import "fmt"
 
diff --git a/internal/gotour/gotour16/tutorial_gotour_16_slice.go b/internal/gotour/gotour16/tutorial_gotour_16_slice.go
@@ -1,4 +1,4 @@
-package tutorial16
+package gotour16
 
 import "fmt"
 
diff --git a/internal/gotour/gotour17/tutorial_gotour_17_map.go b/internal/gotour/gotour17/tutorial_gotour_17_map.go
@@ -1,4 +1,4 @@
-package tutorial17
+package gotour17
 
 import "fmt"
 
diff --git a/internal/gotour/gotour18/tutorial_gotour_18_method.go b/internal/gotour/gotour18/tutorial_gotour_18_method.go
@@ -1,4 +1,4 @@
-package tutorial18
+package gotour18
 
 import "fmt"
 
diff --git a/internal/gotour/gotour19/tutorial_gotour_19_interface.go b/internal/gotour/gotour19/tutorial_gotour_19_interface.go
@@ -1,4 +1,4 @@
-package tutorial19
+package gotour19
 
 import "fmt"
 
diff --git a/internal/gotour/gotour20/tutorial_gotour_20_empty_interface.go b/internal/gotour/gotour20/tutorial_gotour_20_empty_interface.go
@@ -1,4 +1,4 @@
-package tutorial20
+package gotour20
 
 import "fmt"
 
diff --git a/internal/gotour/gotour21/tutorial_gotour_21_typeassertion.go b/internal/gotour/gotour21/tutorial_gotour_21_typeassertion.go
@@ -1,4 +1,4 @@
-package tutorial21
+package gotour21
 
 import (
 	"fmt"
diff --git a/internal/gotour/gotour22/tutorial_gotour_22_typeswitch.go b/internal/gotour/gotour22/tutorial_gotour_22_typeswitch.go
@@ -1,4 +1,4 @@
-package tutorial22
+package gotour22
 
 import "fmt"
 
diff --git a/internal/gotour/gotour23/tutorial_gotour_23_stringer.go b/internal/gotour/gotour23/tutorial_gotour_23_stringer.go
@@ -1,4 +1,4 @@
-package tutorial23
+package gotour23
 
 import (
 	"fmt"
diff --git a/internal/gotour/gotour24/tutorial_gotour_24_error.go b/internal/gotour/gotour24/tutorial_gotour_24_error.go
@@ -1,4 +1,4 @@
-package tutorial24
+package gotour24
 
 import (
 	"errors"
diff --git a/internal/gotour/gotour25/tutorial_gotour_25_reader.go b/internal/gotour/gotour25/tutorial_gotour_25_reader.go
@@ -1,4 +1,4 @@
-package tutorial25
+package gotour25
 
 import (
 	"errors"
diff --git a/internal/gotour/gotour26/tutorial_gotour_26_goroutine.go b/internal/gotour/gotour26/tutorial_gotour_26_goroutine.go
@@ -1,4 +1,4 @@
-package tutorial26
+package gotour26
 
 import (
 	"fmt"
diff --git a/internal/gotour/gotour27/tutorial_gotour_27_channels.go b/internal/gotour/gotour27/tutorial_gotour_27_channels.go
@@ -1,4 +1,4 @@
-package tutorial27
+package gotour27
 
 import (
 	"fmt"
diff --git a/internal/gotour/gotour28/tutorial_gotour_28_select.go b/internal/gotour/gotour28/tutorial_gotour_28_select.go
@@ -1,4 +1,4 @@
-package tutorial28
+package gotour28
 
 import (
 	"context"
diff --git a/internal/gotour/gotour29/tutorial_gotour_29_mutex.go b/internal/gotour/gotour29/tutorial_gotour_29_mutex.go
@@ -1,4 +1,4 @@
-package tutorial29
+package gotour29
 
 import (
 	"fmt"
diff --git a/internal/tutorial/examples.go b/internal/tutorial/examples.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tutorial01`
	`1`	`+package gotour01`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tutorial02`
	`1`	`+package gotour02`
`2`	`2`
`3`	`3`	`// 利用するパッケージのimportを記載する。`
`4`	`4`	`// 複数のimportがある場合は、以下のようにグループ化して記述することができる。`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tutorial03`
	`1`	`+package gotour03`
`2`	`2`
`3`	`3`	`import "fmt"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tutorial04`
	`1`	`+package gotour04`
`2`	`2`
`3`	`3`	`import "fmt"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tutorial05`
	`1`	`+package gotour05`
`2`	`2`
`3`	`3`	`import "fmt"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tutorial06`
	`1`	`+package gotour06`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tutorial07`
	`1`	`+package gotour07`
`2`	`2`
`3`	`3`	`import "fmt"`
`4`	`4`