Merge branch 'refs/heads/develop'

GeekTree0101 · GeekTree0101 · commit 3ce15442d6ee · 2021-08-29T15:41:23.000+09:00
diff --git a/internal/converter/creator.go b/internal/converter/creator.go
@@ -6,14 +6,14 @@ import (
 	"strings"
 )
 
-type Copyright interface {
+type Creator interface {
 	Get() (string, error)
 }
 
-type CopyrightImpl struct {
+type CreatorImpl struct {
 }
 
-func (c CopyrightImpl) Get() (string, error) {
+func (c CreatorImpl) Get() (string, error) {
 
 	gitUsername, err := c.getGitUsername()
 
@@ -30,7 +30,7 @@ func (c CopyrightImpl) Get() (string, error) {
 	return "", err
 }
 
-func (c CopyrightImpl) getGitUsername() (string, error) {
+func (c CreatorImpl) getGitUsername() (string, error) {
 
 	gitCmd := exec.Command("git", "config", "--global", "user.name")
 	nameBytes, err := gitCmd.Output()
diff --git a/internal/converter/creator_test.go b/internal/converter/creator_test.go
@@ -8,23 +8,23 @@ import (
 
 // MARK: - Test Double
 
-type CopyrightStub struct {
+type CreatorStub struct {
 	GetSuccessStub string
 	GetErrorStub   error
 }
 
-func (c CopyrightStub) Get() (string, error) {
+func (c CreatorStub) Get() (string, error) {
 
 	return c.GetSuccessStub, c.GetErrorStub
 }
 
 // MARK: - Test Case
 
-func TestCopyright(t *testing.T) {
+func TestCreator(t *testing.T) {
 
-	t.Run("get copyright", func(t *testing.T) {
+	t.Run("get Creator", func(t *testing.T) {
 		// given
-		sut := converter.CopyrightImpl{}
+		sut := converter.CreatorImpl{}
 
 		// when
 		out, err := sut.Get()
diff --git a/internal/converter/header.go b/internal/converter/header.go
@@ -10,19 +10,19 @@ import (
 )
 
 type HeaderConverter struct {
-	copyright             Copyright
+	creator               Creator
 	targetProjectName     string
 	copyrightDefaultValue string
 	date                  time.Time
 }
 
 func NewHeaderConverter(
-	copyright Copyright,
+	creator Creator,
 	config *model.Config,
 	date time.Time) *HeaderConverter {
 
 	return &HeaderConverter{
-		copyright:             copyright,
+		creator:               creator,
 		targetProjectName:     config.TargetProjectName,
 		copyrightDefaultValue: config.Copyright,
 		date:                  date,
@@ -37,18 +37,19 @@ func (header *HeaderConverter) Render(source string, sceneName string) string {
 
 	dateStr := fmt.Sprintf("%d/%d/%d", day, month, year)
 
-	copyright, err := header.copyright.Get()
+	creator, err := header.creator.Get()
 
 	if err != nil {
-		copyright = header.copyrightDefaultValue
+		creator = "clean-swift-scaffold"
 	}
 
 	var replacedSource string = source
 	replacedSource = strings.ReplaceAll(replacedSource, "__SCENE_NAME__", sceneName)
 	replacedSource = strings.ReplaceAll(replacedSource, "__TARGET_PROJECT_NAME__", header.targetProjectName)
 	replacedSource = strings.ReplaceAll(replacedSource, "__DATE__", dateStr)
 	replacedSource = strings.ReplaceAll(replacedSource, "__YEAR__", strconv.Itoa(year))
-	replacedSource = strings.ReplaceAll(replacedSource, "__COPYRIGHT__", copyright)
+	replacedSource = strings.ReplaceAll(replacedSource, "__COPYRIGHT__", header.copyrightDefaultValue)
+	replacedSource = strings.ReplaceAll(replacedSource, "__CREATOR__", creator)
 
 	return replacedSource
 }
diff --git a/internal/converter/header_test.go b/internal/converter/header_test.go
@@ -12,7 +12,7 @@ const dummySourceCode string = `//
 //  __SCENE_NAME__Model.swift
 //  __TARGET_PROJECT_NAME__
 //
-//  Created by clean-swift-scaffold on __DATE__.
+//  Created by __CREATOR__ on __DATE__.
 //  Copyright © __YEAR__ __COPYRIGHT__. All rights reserved.
 //
 
@@ -25,8 +25,8 @@ const expectedSourceCode string = `//
 //  ArticleDetailModel.swift
 //  Miro
 //
-//  Created by clean-swift-scaffold on 12/10/2020.
-//  Copyright © 2020 Geektree0101. All rights reserved.
+//  Created by Geektree0101 on 12/10/2020.
+//  Copyright © 2020 miro. All rights reserved.
 //
 
 enum ArticleDetailModel {
@@ -40,13 +40,13 @@ func TestHeader(t *testing.T) {
 		// given
 		config := model.Config{
 			TargetProjectName: "Miro",
-			Copyright:         "David Ha",
+			Copyright:         "miro",
 			TemplatePath:      "",
 		}
 
 		date := time.Date(2020, 10, 12, 0, 0, 0, 0, time.UTC)
 		sut := converter.NewHeaderConverter(
-			CopyrightStub{
+			CreatorStub{
 				GetSuccessStub: "Geektree0101",
 				GetErrorStub:   nil,
 			},
diff --git a/internal/converter/source_test.go b/internal/converter/source_test.go
@@ -15,15 +15,15 @@ func createSource() *converter.SourceConverter {
 
 	config := &model.Config{
 		TargetProjectName: "Miro",
-		Copyright:         "David Ha",
+		Copyright:         "miro",
 		TemplatePath:      "../../templates",
 		SourceDir:         "./Playground/Sources",
 		TestDir:           "./Playground/Tests",
 		Indentation:       2,
 	}
 
 	header := converter.NewHeaderConverter(
-		CopyrightStub{
+		CreatorStub{
 			GetSuccessStub: "Geektree0101",
 			GetErrorStub:   nil,
 		},
diff --git a/internal/gen/generator.go b/internal/gen/generator.go
@@ -48,7 +48,7 @@ func (gen *Generator) Run() error {
 		gen.flag.Name,
 		strings.Split(gen.flag.UsecasesString, ","),
 		converter.NewHeaderConverter(
-			converter.CopyrightImpl{},
+			converter.CreatorImpl{},
 			config,
 			today,
 		),
diff --git a/templates/src/Interactor.swift b/templates/src/Interactor.swift
@@ -2,7 +2,7 @@
 //  __SCENE_NAME__Interactor.swift
 //  __TARGET_PROJECT_NAME__
 //
-//  Created by clean-swift-scaffold on __DATE__.
+//  Created by __CREATOR__ on __DATE__.
 //  Copyright © __YEAR__ __COPYRIGHT__. All rights reserved.
 //
 
diff --git a/templates/src/Model.swift b/templates/src/Model.swift
@@ -2,7 +2,7 @@
 //  __SCENE_NAME__Model.swift
 //  __TARGET_PROJECT_NAME__
 //
-//  Created by clean-swift-scaffold on __DATE__.
+//  Created by __CREATOR__ on __DATE__.
 //  Copyright © __YEAR__ __COPYRIGHT__. All rights reserved.
 //
 
diff --git a/templates/src/Presenter.swift b/templates/src/Presenter.swift
@@ -2,7 +2,7 @@
 //  __SCENE_NAME__Presenter.swift
 //  __TARGET_PROJECT_NAME__
 //
-//  Created by clean-swift-scaffold on __DATE__.
+//  Created by __CREATOR__ on __DATE__.
 //  Copyright © __YEAR__ __COPYRIGHT__. All rights reserved.
 //
 
diff --git a/templates/src/Router.swift b/templates/src/Router.swift
@@ -2,7 +2,7 @@
 //  __SCENE_NAME__Router.swift
 //  __TARGET_PROJECT_NAME__
 //
-//  Created by clean-swift-scaffold on __DATE__.
+//  Created by __CREATOR__ on __DATE__.
 //  Copyright © __YEAR__ __COPYRIGHT__. All rights reserved.
 //
 
diff --git a/templates/src/ViewController.swift b/templates/src/ViewController.swift
@@ -2,7 +2,7 @@
 //  __SCENE_NAME__ViewController.swift
 //  __TARGET_PROJECT_NAME__
 //
-//  Created by clean-swift-scaffold on __DATE__.
+//  Created by __CREATOR__ on __DATE__.
 //  Copyright © __YEAR__ __COPYRIGHT__. All rights reserved.
 //
 
diff --git a/templates/test/Interactor.swift b/templates/test/Interactor.swift
@@ -2,7 +2,7 @@
 //  __SCENE_NAME__InteractorTests.swift
 //  __TARGET_PROJECT_NAME__Tests
 //
-//  Created by clean-swift-scaffold on __DATE__.
+//  Created by __CREATOR__ on __DATE__.
 //  Copyright © __YEAR__ __COPYRIGHT__. All rights reserved.
 //
 
diff --git a/templates/test/Presenter.swift b/templates/test/Presenter.swift
@@ -2,7 +2,7 @@
 //  __SCENE_NAME__PresenterTests.swift
 //  __TARGET_PROJECT_NAME__Tests
 //
-//  Created by clean-swift-scaffold on __DATE__.
+//  Created by __CREATOR__ on __DATE__.
 //  Copyright © __YEAR__ __COPYRIGHT__. All rights reserved.
 //
 
diff --git a/templates/test/ViewController.swift b/templates/test/ViewController.swift
@@ -2,7 +2,7 @@
 //  __SCENE_NAME__ViewControllerTests.swift
 //  __TARGET_PROJECT_NAME__Tests
 //
-//  Created by clean-swift-scaffold on __DATE__.
+//  Created by __CREATOR__ on __DATE__.
 //  Copyright © __YEAR__ __COPYRIGHT__. All rights reserved.
 //
 
diff --git a/test/ArticleDetailInteractor.swift b/test/ArticleDetailInteractor.swift
@@ -2,8 +2,8 @@
 //  ArticleDetailInteractor.swift
 //  Miro
 //
-//  Created by clean-swift-scaffold on 12/10/2020.
-//  Copyright © 2020 Geektree0101. All rights reserved.
+//  Created by Geektree0101 on 12/10/2020.
+//  Copyright © 2020 miro. All rights reserved.
 //
 
 import Foundation
diff --git a/test/ArticleDetailInteractorTests.swift b/test/ArticleDetailInteractorTests.swift
@@ -2,8 +2,8 @@
 //  ArticleDetailInteractorTests.swift
 //  MiroTests
 //
-//  Created by clean-swift-scaffold on 12/10/2020.
-//  Copyright © 2020 Geektree0101. All rights reserved.
+//  Created by Geektree0101 on 12/10/2020.
+//  Copyright © 2020 miro. All rights reserved.
 //
 
 import XCTest
diff --git a/test/ArticleDetailModel.swift b/test/ArticleDetailModel.swift
@@ -2,8 +2,8 @@
 //  ArticleDetailModel.swift
 //  Miro
 //
-//  Created by clean-swift-scaffold on 12/10/2020.
-//  Copyright © 2020 Geektree0101. All rights reserved.
+//  Created by Geektree0101 on 12/10/2020.
+//  Copyright © 2020 miro. All rights reserved.
 //
 
 enum ArticleDetailModel {
diff --git a/test/ArticleDetailPresenter.swift b/test/ArticleDetailPresenter.swift
@@ -2,8 +2,8 @@
 //  ArticleDetailPresenter.swift
 //  Miro
 //
-//  Created by clean-swift-scaffold on 12/10/2020.
-//  Copyright © 2020 Geektree0101. All rights reserved.
+//  Created by Geektree0101 on 12/10/2020.
+//  Copyright © 2020 miro. All rights reserved.
 //
 
 import UIKit
diff --git a/test/ArticleDetailPresenterTests.swift b/test/ArticleDetailPresenterTests.swift
@@ -2,8 +2,8 @@
 //  ArticleDetailPresenterTests.swift
 //  MiroTests
 //
-//  Created by clean-swift-scaffold on 12/10/2020.
-//  Copyright © 2020 Geektree0101. All rights reserved.
+//  Created by Geektree0101 on 12/10/2020.
+//  Copyright © 2020 miro. All rights reserved.
 //
 
 import XCTest
diff --git a/test/ArticleDetailRouter.swift b/test/ArticleDetailRouter.swift
@@ -2,8 +2,8 @@
 //  ArticleDetailRouter.swift
 //  Miro
 //
-//  Created by clean-swift-scaffold on 12/10/2020.
-//  Copyright © 2020 Geektree0101. All rights reserved.
+//  Created by Geektree0101 on 12/10/2020.
+//  Copyright © 2020 miro. All rights reserved.
 //
 
 import UIKit
diff --git a/test/ArticleDetailViewController.swift b/test/ArticleDetailViewController.swift
@@ -2,8 +2,8 @@
 //  ArticleDetailViewController.swift
 //  Miro
 //
-//  Created by clean-swift-scaffold on 12/10/2020.
-//  Copyright © 2020 Geektree0101. All rights reserved.
+//  Created by Geektree0101 on 12/10/2020.
+//  Copyright © 2020 miro. All rights reserved.
 //
 
 import UIKit
diff --git a/test/ArticleDetailViewControllerTests.swift b/test/ArticleDetailViewControllerTests.swift
@@ -2,8 +2,8 @@
 //  ArticleDetailViewControllerTests.swift
 //  MiroTests
 //
-//  Created by clean-swift-scaffold on 12/10/2020.
-//  Copyright © 2020 Geektree0101. All rights reserved.
+//  Created by Geektree0101 on 12/10/2020.
+//  Copyright © 2020 miro. All rights reserved.
 //
 
 import XCTest

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,14 @@ import (`
`6`	`6`	`"strings"`
`7`	`7`	`)`
`8`	`8`
`9`		`-type Copyright interface {`
	`9`	`+type Creator interface {`
`10`	`10`	`Get() (string, error)`
`11`	`11`	`}`
`12`	`12`
`13`		`-type CopyrightImpl struct {`
	`13`	`+type CreatorImpl struct {`
`14`	`14`	`}`
`15`	`15`
`16`		`-func (c CopyrightImpl) Get() (string, error) {`
	`16`	`+func (c CreatorImpl) Get() (string, error) {`
`17`	`17`
`18`	`18`	`gitUsername, err := c.getGitUsername()`
`19`	`19`
`@@ -30,7 +30,7 @@ func (c CopyrightImpl) Get() (string, error) {`
`30`	`30`	`return "", err`
`31`	`31`	`}`
`32`	`32`
`33`		`-func (c CopyrightImpl) getGitUsername() (string, error) {`
	`33`	`+func (c CreatorImpl) getGitUsername() (string, error) {`
`34`	`34`
`35`	`35`	`gitCmd := exec.Command("git", "config", "--global", "user.name")`
`36`	`36`	`nameBytes, err := gitCmd.Output()`