Add AutoReporter to use default if not in Goland

README.md

@@ -7,13 +7,22 @@ Goland to get a list of output.
 This reporter will trick test2json into outputting the Ginkgo specs similar to
 `go test` output.
 
+![Ginkgo output in Goland's "Run" window](https://gist.githubusercontent.com/BenChapman/19215f014f3ef0db3c3cd0b46da4d929/raw/18801f7f19a26ea19ba48a1c95d5e068396f7dd7/image1.png)
+
 ## Usage
 
-In your suite replace `RunSpecs(t, "Integration Suite")` with the following
+In your suite replace `RunSpecs(t, "Integration Suite")` with the following:
 
 ```go
-
-golandReporter := golandreporter.NewReporter()
+golandReporter := golandreporter.NewGolandReporter()
 RunSpecsWithCustomReporters(t, "Integration Suite", []Reporter{golangReporter})
+```
 
+If you want to retain normal Ginkgo formatting when using it from the CLI the
+best option is to use an environment variable in your Run Configuration, and
+use it like this:
+
+```go
+RunSpecsWithCustomReporters(t, "Integration Suite", []Reporter{golandreporter.NewAutoGolandReporter})
 ```
+

golandreporter.go

@@ -2,18 +2,30 @@ package golandreporter
 
 import (
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/onsi/ginkgo/config"
+	"github.com/onsi/ginkgo/reporters"
+	"github.com/onsi/ginkgo/reporters/stenographer"
 	"github.com/onsi/ginkgo/types"
 )
 
 type GolandReporter struct{}
 
-func NewGolandReporter() GolandReporter {
+func NewGolandReporter() reporters.Reporter {
 	return GolandReporter{}
 }
 
+func NewAutoGolandReporter() reporters.Reporter {
+	if strings.Contains(os.Getenv("OLDPWD"), "Goland") {
+		return NewGolandReporter()
+	} else {
+		stenographer := stenographer.New(!config.DefaultReporterConfig.NoColor, config.GinkgoConfig.FlakeAttempts > 1)
+		return reporters.NewDefaultReporter(config.DefaultReporterConfig, stenographer)
+	}
+}
+
 func (g GolandReporter) SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary) {
 
 }