Removing: example cannot be parsed correctly at this time

cv · cv · commit 15bd306cf955 · 2018-04-26T15:39:01.000-07:00
diff --git a/cli/cli.go b/cli/cli.go
@@ -253,7 +253,7 @@ func commandFromScript(path string) (*cobra.Command, error) {
 		RunE: execCommand,
 	}
 
-	example, err := exampleFrom(path, cmd)
+	example, err := exampleFrom(path)
 	if err != nil {
 		return nil, err
 	}
diff --git a/cli/cli_test.go b/cli/cli_test.go
@@ -155,7 +155,7 @@ func TestCommandFromScript(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, filepath.Base(f.Name()), c.Use)
 		assert.Equal(t, "blah", c.Short)
-		assert.Regexp(t, "  test-command-from-script(.*?) one two three", c.Example)
+		assert.Equal(t, "  one two three", c.Example)
 		assert.Equal(t, f.Name(), c.Annotations["Source"])
 	})
 }
diff --git a/cli/parsing.go b/cli/parsing.go
@@ -109,7 +109,7 @@ Looks for a line like this:
 # example: foo bar 1 2 3
 
 */
-func exampleFrom(path string, cmd *cobra.Command) (string, error) {
+func exampleFrom(path string) (string, error) {
 	file, err := os.Open(path)
 	if err != nil {
 		return "", err
@@ -127,7 +127,7 @@ func exampleFrom(path string, cmd *cobra.Command) (string, error) {
 		match := r.FindStringSubmatch(scanner.Text())
 		if len(match) == 2 {
 			logrus.Debug("Found example line: ", filepath.Join(path), ", set to: ", match[1])
-			return fmt.Sprintf("  %s %s", cmd.UseLine(), match[1]), nil
+			return fmt.Sprintf("  %s", match[1]), nil
 		}
 	}
 	return "", nil
diff --git a/cli/parsing_test.go b/cli/parsing_test.go
@@ -198,37 +198,21 @@ func TestUsageFrom(t *testing.T) {
 func TestExampleFrom(t *testing.T) {
 	var tests = []struct {
 		name     string
-		alias string
 		input    string
 		expected string
 	}{
 		{
 			"happy path",
-			"sd",
 			"#\n# example: blah\n#\n",
-			"  sd blah",
+			"  blah",
 		},
 		{
 			"missing",
-			"sd",
-			"#\n#\n#\n",
-			"",
-		},
-		{
-			"happy path (aliased)",
-			"foo",
-			"#\n# example: blah\n#\n",
-			"  foo blah",
-		},
-		{
-			"missing (aliased)",
-			"foo",
 			"#\n#\n#\n",
 			"",
 		},
 		{
 			"no input",
-			"sd",
 			"",
 			"",
 		},
@@ -245,7 +229,7 @@ func TestExampleFrom(t *testing.T) {
 				_ = os.Remove(f.Name())
 			}()
 
-			v, err := exampleFrom(f.Name(), &cobra.Command{Use: test.alias})
+			v, err := exampleFrom(f.Name())
 			assert.NoError(t, err)
 			assert.Equal(t, test.expected, v)
 		})

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ func commandFromScript(path string) (*cobra.Command, error) {`
`253`	`253`	`RunE: execCommand,`
`254`	`254`	`}`
`255`	`255`
`256`		`- example, err := exampleFrom(path, cmd)`
	`256`	`+ example, err := exampleFrom(path)`
`257`	`257`	`if err != nil {`
`258`	`258`	`return nil, err`
`259`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func TestCommandFromScript(t *testing.T) {`
`155`	`155`	`assert.NoError(t, err)`
`156`	`156`	`assert.Equal(t, filepath.Base(f.Name()), c.Use)`
`157`	`157`	`assert.Equal(t, "blah", c.Short)`
`158`		`- assert.Regexp(t, " test-command-from-script(.*?) one two three", c.Example)`
	`158`	`+ assert.Equal(t, " one two three", c.Example)`
`159`	`159`	`assert.Equal(t, f.Name(), c.Annotations["Source"])`
`160`	`160`	`})`
`161`	`161`	`}`