allow naming stdin gist files

vilmibm · vilmibm · commit b6502deb24e5 · 2020-09-14T10:33:29.000-05:00
diff --git a/pkg/cmd/gist/create/create.go b/pkg/cmd/gist/create/create.go
@@ -23,9 +23,10 @@ import (
 type CreateOptions struct {
 	IO *iostreams.IOStreams
 
-	Description string
-	Public      bool
-	Filenames   []string
+	Description      string
+	Public           bool
+	Filenames        []string
+	FilenameOverride string
 
 	HttpClient func() (*http.Client, error)
 }
@@ -84,6 +85,7 @@ func NewCmdCreate(f *cmdutil.Factory, runF func(*CreateOptions) error) *cobra.Co
 
 	cmd.Flags().StringVarP(&opts.Description, "desc", "d", "", "A description for this gist")
 	cmd.Flags().BoolVarP(&opts.Public, "public", "p", false, "List the gist publicly (default: private)")
+	cmd.Flags().StringVarP(&opts.FilenameOverride, "filename", "f", "", "Provide a filename to be used when reading from STDIN")
 	return cmd
 }
 
@@ -93,7 +95,7 @@ func createRun(opts *CreateOptions) error {
 		fileArgs = []string{"-"}
 	}
 
-	files, err := processFiles(opts.IO.In, fileArgs)
+	files, err := processFiles(opts.IO.In, opts.FilenameOverride, fileArgs)
 	if err != nil {
 		return fmt.Errorf("failed to collect files for posting: %w", err)
 	}
@@ -137,7 +139,7 @@ func createRun(opts *CreateOptions) error {
 	return nil
 }
 
-func processFiles(stdin io.ReadCloser, filenames []string) (map[string]string, error) {
+func processFiles(stdin io.ReadCloser, filenameOverride string, filenames []string) (map[string]string, error) {
 	fs := map[string]string{}
 
 	if len(filenames) == 0 {
@@ -149,7 +151,11 @@ func processFiles(stdin io.ReadCloser, filenames []string) (map[string]string, e
 		var content []byte
 		var err error
 		if f == "-" {
-			filename = fmt.Sprintf("gistfile%d.txt", i)
+			if filenameOverride != "" {
+				filename = filenameOverride
+			} else {
+				filename = fmt.Sprintf("gistfile%d.txt", i)
+			}
 			content, err = ioutil.ReadAll(stdin)
 			if err != nil {
 				return fs, fmt.Errorf("failed to read from stdin: %w", err)
diff --git a/pkg/cmd/gist/create/create_test.go b/pkg/cmd/gist/create/create_test.go
@@ -21,7 +21,7 @@ const (
 
 func Test_processFiles(t *testing.T) {
 	fakeStdin := strings.NewReader("hey cool how is it going")
-	files, err := processFiles(ioutil.NopCloser(fakeStdin), []string{"-"})
+	files, err := processFiles(ioutil.NopCloser(fakeStdin), "", []string{"-"})
 	if err != nil {
 		t.Fatalf("unexpected error processing files: %s", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ const (`
`21`	`21`
`22`	`22`	`func Test_processFiles(t *testing.T) {`
`23`	`23`	`fakeStdin := strings.NewReader("hey cool how is it going")`
`24`		`- files, err := processFiles(ioutil.NopCloser(fakeStdin), []string{"-"})`
	`24`	`+ files, err := processFiles(ioutil.NopCloser(fakeStdin), "", []string{"-"})`
`25`	`25`	`if err != nil {`
`26`	`26`	`t.Fatalf("unexpected error processing files: %s", err)`
`27`	`27`	`}`