Merge pull request cli#2460 from cli/spell-check-fixes

mislav · web-flow · commit d6c9004d64db · 2020-11-23T13:22:01.000+01:00
Spell check fixes
diff --git a/api/cache.go b/api/cache.go
@@ -19,7 +19,7 @@ import (
 func makeCachedClient(httpClient *http.Client, cacheTTL time.Duration) *http.Client {
 	cacheDir := filepath.Join(os.TempDir(), "gh-cli-cache")
 	return &http.Client{
-		Transport: CacheReponse(cacheTTL, cacheDir)(httpClient.Transport),
+		Transport: CacheResponse(cacheTTL, cacheDir)(httpClient.Transport),
 	}
 }
 
@@ -39,8 +39,8 @@ func isCacheableResponse(res *http.Response) bool {
 	return res.StatusCode < 500 && res.StatusCode != 403
 }
 
-// CacheReponse produces a RoundTripper that caches HTTP responses to disk for a specified amount of time
-func CacheReponse(ttl time.Duration, dir string) ClientOption {
+// CacheResponse produces a RoundTripper that caches HTTP responses to disk for a specified amount of time
+func CacheResponse(ttl time.Duration, dir string) ClientOption {
 	fs := fileStorage{
 		dir: dir,
 		ttl: ttl,
diff --git a/api/cache_test.go b/api/cache_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func Test_CacheReponse(t *testing.T) {
+func Test_CacheResponse(t *testing.T) {
 	counter := 0
 	fakeHTTP := funcTripper{
 		roundTrip: func(req *http.Request) (*http.Response, error) {
@@ -32,7 +32,7 @@ func Test_CacheReponse(t *testing.T) {
 	}
 
 	cacheDir := filepath.Join(t.TempDir(), "gh-cli-cache")
-	httpClient := NewHTTPClient(ReplaceTripper(fakeHTTP), CacheReponse(time.Minute, cacheDir))
+	httpClient := NewHTTPClient(ReplaceTripper(fakeHTTP), CacheResponse(time.Minute, cacheDir))
 
 	do := func(method, url string, body io.Reader) (string, error) {
 		req, err := http.NewRequest(method, url, body)
diff --git a/context/remote_test.go b/context/remote_test.go
@@ -28,11 +28,11 @@ func Test_Remotes_FindByName(t *testing.T) {
 	eq(t, err, nil)
 	eq(t, r.Name, "upstream")
 
-	r, err = list.FindByName("nonexist", "*")
+	r, err = list.FindByName("nonexistent", "*")
 	eq(t, err, nil)
 	eq(t, r.Name, "mona")
 
-	_, err = list.FindByName("nonexist")
+	_, err = list.FindByName("nonexistent")
 	eq(t, err, errors.New(`no GitHub remotes found`))
 }
 
diff --git a/git/ssh_config_test.go b/git/ssh_config_test.go
@@ -25,7 +25,7 @@ func Test_sshParse(t *testing.T) {
 	`))
 	eq(t, m["foo"], "example.com")
 	eq(t, m["bar"], "%bar.net%")
-	eq(t, m["nonexist"], "")
+	eq(t, m["nonexistent"], "")
 }
 
 func Test_Translator(t *testing.T) {
diff --git a/internal/config/config_file_test.go b/internal/config/config_file_test.go
@@ -90,7 +90,7 @@ example.com:
 	val, err = config.Get("github.com", "git_protocol")
 	eq(t, err, nil)
 	eq(t, val, "ssh")
-	val, err = config.Get("nonexist.io", "git_protocol")
+	val, err = config.Get("nonexistent.io", "git_protocol")
 	eq(t, err, nil)
 	eq(t, val, "ssh")
 }
diff --git a/internal/docs/man_test.go b/internal/docs/man_test.go
@@ -106,7 +106,7 @@ func TestGenManSeeAlso(t *testing.T) {
 	}
 }
 
-func TestManPrintFlagsHidesShortDeperecated(t *testing.T) {
+func TestManPrintFlagsHidesShortDeprecated(t *testing.T) {
 	c := &cobra.Command{}
 	c.Flags().StringP("foo", "f", "default", "Foo flag")
 	_ = c.Flags().MarkShorthandDeprecated("foo", "don't use it no more")
diff --git a/internal/run/stub.go b/internal/run/stub.go
@@ -39,7 +39,7 @@ func Stub() (*CommandStubber, func(T)) {
 			return
 		}
 		t.Helper()
-		t.Errorf("umatched stubs (%d): %s", len(unmatched), strings.Join(unmatched, ", "))
+		t.Errorf("unmatched stubs (%d): %s", len(unmatched), strings.Join(unmatched, ", "))
 	}
 }
 
diff --git a/pkg/cmd/issue/create/create_test.go b/pkg/cmd/issue/create/create_test.go
@@ -145,7 +145,7 @@ func TestIssueCreate_nonLegacyTemplate(t *testing.T) {
 	as, teardown := prompt.InitAskStubber()
 	defer teardown()
 
-	// tmeplate
+	// template
 	as.Stub([]*prompt.QuestionStub{
 		{
 			Name:  "index",
diff --git a/pkg/cmd/pr/create/regexp_writer_test.go b/pkg/cmd/pr/create/regexp_writer_test.go
@@ -93,14 +93,14 @@ func Test_Write(t *testing.T) {
 		{
 			name: "multiple lines removed",
 			input: input{
-				in:   []string{"begining line\nremove this whole line\nremove this one also\nnot this one"},
+				in:   []string{"beginning line\nremove this whole line\nremove this one also\nnot this one"},
 				re:   regexp.MustCompile("(?s)^remove.*$"),
 				repl: "",
 			},
 			output: output{
 				wantsErr: false,
-				out:      "begining line\nnot this one",
-				length:   70,
+				out:      "beginning line\nnot this one",
+				length:   71,
 			},
 		},
 		{
diff --git a/pkg/cmd/pr/review/review_test.go b/pkg/cmd/pr/review/review_test.go
@@ -319,7 +319,7 @@ func TestPRReview(t *testing.T) {
 		{`--request-changes -b"bad"`, "REQUEST_CHANGES", "bad"},
 		{`--approve`, "APPROVE", ""},
 		{`--approve -b"hot damn"`, "APPROVE", "hot damn"},
-		{`--comment --body "i donno"`, "COMMENT", "i donno"},
+		{`--comment --body "i dunno"`, "COMMENT", "i dunno"},
 	}
 
 	for _, kase := range cases {
diff --git a/pkg/cmd/pr/view/view.go b/pkg/cmd/pr/view/view.go
@@ -214,7 +214,7 @@ type reviewerState struct {
 func formattedReviewerState(cs *iostreams.ColorScheme, reviewer *reviewerState) string {
 	state := reviewer.State
 	if state == dismissedReviewState {
-		// Show "DISMISSED" review as "COMMENTED", since "dimissed" only makes
+		// Show "DISMISSED" review as "COMMENTED", since "dismissed" only makes
 		// sense when displayed in an events timeline but not in the final tally.
 		state = commentedReviewState
 	}
diff --git a/pkg/cmd/repo/create/http_test.go b/pkg/cmd/repo/create/http_test.go
@@ -17,7 +17,7 @@ func Test_RepoCreate(t *testing.T) {
 	reg.StubResponse(200, bytes.NewBufferString(`{}`))
 
 	input := repoCreateInput{
-		Description: "roasted chesnuts",
+		Description: "roasted chestnuts",
 		HomepageURL: "http://example.com",
 	}
 
@@ -39,8 +39,8 @@ func Test_RepoCreate(t *testing.T) {
 
 	bodyBytes, _ := ioutil.ReadAll(reg.Requests[0].Body)
 	_ = json.Unmarshal(bodyBytes, &reqBody)
-	if description := reqBody.Variables.Input["description"].(string); description != "roasted chesnuts" {
-		t.Errorf("expected description to be %q, got %q", "roasted chesnuts", description)
+	if description := reqBody.Variables.Input["description"].(string); description != "roasted chestnuts" {
+		t.Errorf("expected description to be %q, got %q", "roasted chestnuts", description)
 	}
 	if homepage := reqBody.Variables.Input["homepageUrl"].(string); homepage != "http://example.com" {
 		t.Errorf("expected homepageUrl to be %q, got %q", "http://example.com", homepage)
diff --git a/pkg/cmd/repo/garden/garden.go b/pkg/cmd/repo/garden/garden.go
@@ -190,7 +190,7 @@ func gardenRun(opts *GardenOptions) error {
 	oldTTYCommand := exec.Command("stty", sttyFileArg, "/dev/tty", "-g")
 	oldTTYSettings, err := oldTTYCommand.CombinedOutput()
 	if err != nil {
-		fmt.Fprintln(out, "getting TTY setings failed:", string(oldTTYSettings))
+		fmt.Fprintln(out, "getting TTY settings failed:", string(oldTTYSettings))
 		return err
 	}
 
diff --git a/pkg/cmd/root/help.go b/pkg/cmd/root/help.go
@@ -35,7 +35,7 @@ func rootUsageFunc(command *cobra.Command) error {
 	return nil
 }
 
-func rootFlagErrrorFunc(cmd *cobra.Command, err error) error {
+func rootFlagErrorFunc(cmd *cobra.Command, err error) error {
 	if err == pflag.ErrHelp {
 		return err
 	}
diff --git a/pkg/cmd/root/root.go b/pkg/cmd/root/root.go
@@ -59,7 +59,7 @@ func NewCmdRoot(f *cmdutil.Factory, version, buildDate string) *cobra.Command {
 	cmd.PersistentFlags().Bool("help", false, "Show help for command")
 	cmd.SetHelpFunc(helpHelper)
 	cmd.SetUsageFunc(rootUsageFunc)
-	cmd.SetFlagErrorFunc(rootFlagErrrorFunc)
+	cmd.SetFlagErrorFunc(rootFlagErrorFunc)
 
 	formattedVersion := versionCmd.Format(version, buildDate)
 	cmd.SetVersionTemplate(formattedVersion)

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`func makeCachedClient(httpClient http.Client, cacheTTL time.Duration) http.Client {`
`20`	`20`	`cacheDir := filepath.Join(os.TempDir(), "gh-cli-cache")`
`21`	`21`	`return &http.Client{`
`22`		`- Transport: CacheReponse(cacheTTL, cacheDir)(httpClient.Transport),`
	`22`	`+ Transport: CacheResponse(cacheTTL, cacheDir)(httpClient.Transport),`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`@@ -39,8 +39,8 @@ func isCacheableResponse(res *http.Response) bool {`
`39`	`39`	`return res.StatusCode < 500 && res.StatusCode != 403`
`40`	`40`	`}`
`41`	`41`
`42`		`-// CacheReponse produces a RoundTripper that caches HTTP responses to disk for a specified amount of time`
`43`		`-func CacheReponse(ttl time.Duration, dir string) ClientOption {`
	`42`	`+// CacheResponse produces a RoundTripper that caches HTTP responses to disk for a specified amount of time`
	`43`	`+func CacheResponse(ttl time.Duration, dir string) ClientOption {`
`44`	`44`	`fs := fileStorage{`
`45`	`45`	`dir: dir,`
`46`	`46`	`ttl: ttl,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"github.com/stretchr/testify/require"`
`15`	`15`	`)`
`16`	`16`
`17`		`-func Test_CacheReponse(t *testing.T) {`
	`17`	`+func Test_CacheResponse(t *testing.T) {`
`18`	`18`	`counter := 0`
`19`	`19`	`fakeHTTP := funcTripper{`
`20`	`20`	`roundTrip: func(req http.Request) (http.Response, error) {`
`@@ -32,7 +32,7 @@ func Test_CacheReponse(t *testing.T) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`cacheDir := filepath.Join(t.TempDir(), "gh-cli-cache")`
`35`		`- httpClient := NewHTTPClient(ReplaceTripper(fakeHTTP), CacheReponse(time.Minute, cacheDir))`
	`35`	`+ httpClient := NewHTTPClient(ReplaceTripper(fakeHTTP), CacheResponse(time.Minute, cacheDir))`
`36`	`36`
`37`	`37`	`do := func(method, url string, body io.Reader) (string, error) {`
`38`	`38`	`req, err := http.NewRequest(method, url, body)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func Test_sshParse(t *testing.T) {`
`25`	`25`	`))
`26`	`26`	`eq(t, m["foo"], "example.com")`
`27`	`27`	`eq(t, m["bar"], "%bar.net%")`
`28`		`- eq(t, m["nonexist"], "")`
	`28`	`+ eq(t, m["nonexistent"], "")`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func Test_Translator(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ example.com:`
`90`	`90`	`val, err = config.Get("github.com", "git_protocol")`
`91`	`91`	`eq(t, err, nil)`
`92`	`92`	`eq(t, val, "ssh")`
`93`		`- val, err = config.Get("nonexist.io", "git_protocol")`
	`93`	`+ val, err = config.Get("nonexistent.io", "git_protocol")`
`94`	`94`	`eq(t, err, nil)`
`95`	`95`	`eq(t, val, "ssh")`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func TestGenManSeeAlso(t *testing.T) {`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`-func TestManPrintFlagsHidesShortDeperecated(t *testing.T) {`
	`109`	`+func TestManPrintFlagsHidesShortDeprecated(t *testing.T) {`
`110`	`110`	`c := &cobra.Command{}`
`111`	`111`	`c.Flags().StringP("foo", "f", "default", "Foo flag")`
`112`	`112`	`_ = c.Flags().MarkShorthandDeprecated("foo", "don't use it no more")`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func Stub() (*CommandStubber, func(T)) {`
`39`	`39`	`return`
`40`	`40`	`}`
`41`	`41`	`t.Helper()`
`42`		`- t.Errorf("umatched stubs (%d): %s", len(unmatched), strings.Join(unmatched, ", "))`
	`42`	`+ t.Errorf("unmatched stubs (%d): %s", len(unmatched), strings.Join(unmatched, ", "))`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func TestIssueCreate_nonLegacyTemplate(t *testing.T) {`
`145`	`145`	`as, teardown := prompt.InitAskStubber()`
`146`	`146`	`defer teardown()`
`147`	`147`
`148`		`- // tmeplate`
	`148`	`+ // template`
`149`	`149`	`as.Stub([]*prompt.QuestionStub{`
`150`	`150`	`{`
`151`	`151`	`Name: "index",`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ func TestPRReview(t *testing.T) {`
`319`	`319`	{`--request-changes -b"bad"`, "REQUEST_CHANGES", "bad"},
`320`	`320`	{`--approve`, "APPROVE", ""},
`321`	`321`	{`--approve -b"hot damn"`, "APPROVE", "hot damn"},
`322`		- {`--comment --body "i donno"`, "COMMENT", "i donno"},
	`322`	+ {`--comment --body "i dunno"`, "COMMENT", "i dunno"},
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`for _, kase := range cases {`