Merge pull request #459 from onsi/unfocus-exclude-vendor

Unfocus command excludes vendor folder

ginkgo/unfocus_command.go

@@ -3,7 +3,9 @@ package main
 import (
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"os/exec"
+	"strings"
 )
 
 func BuildUnfocusCommand() *Command {
@@ -32,9 +34,28 @@ func unfocusSpecs([]string, []string) {
 
 func unfocus(component string) {
 	fmt.Printf("Removing F%s...\n", component)
-	cmd := exec.Command("gofmt", fmt.Sprintf("-r=F%s -> %s", component, component), "-w", ".")
-	out, _ := cmd.CombinedOutput()
-	if string(out) != "" {
-		println(string(out))
+	files, err := ioutil.ReadDir(".")
+	if err != nil {
+		fmt.Println(err.Error())
+		return
+	}
+	for _, f := range files {
+		// Exclude "vendor" directory
+		if f.IsDir() && f.Name() == "vendor" {
+			continue
+		}
+		// Exclude non-go files in the current directory
+		if !f.IsDir() && !strings.HasSuffix(f.Name(), ".go") {
+			continue
+		}
+		// Recursively run `gofmt` otherwise
+		cmd := exec.Command("gofmt", fmt.Sprintf("-r=F%s -> %s", component, component), "-w", f.Name())
+		out, err := cmd.CombinedOutput()
+		if err != nil {
+			fmt.Println(err.Error())
+		}
+		if string(out) != "" {
+			fmt.Println(string(out))
+		}
 	}
 }

integration/_fixtures/focused_fixture/README.md

@@ -0,0 +1 @@
+This file should remain the same, regardless the fact that contains FIt, FDescribe, or FWhen.

integration/_fixtures/focused_fixture_with_vendor/focused_fixture_suite_test.go

@@ -0,0 +1,13 @@
+package focused_fixture_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestFocused_fixture(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Focused_fixture Suite")
+}

integration/_fixtures/focused_fixture_with_vendor/focused_fixture_test.go

@@ -0,0 +1,73 @@
+package focused_fixture_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/extensions/table"
+)
+
+var _ = Describe("FocusedFixture", func() {
+	FDescribe("focused", func() {
+		It("focused", func() {
+
+		})
+	})
+
+	FContext("focused", func() {
+		It("focused", func() {
+
+		})
+	})
+
+	FWhen("focused", func() {
+		It("focused", func() {
+
+		})
+	})
+
+	FIt("focused", func() {
+
+	})
+
+	FSpecify("focused", func() {
+
+	})
+
+	FMeasure("focused", func(b Benchmarker) {
+
+	}, 2)
+
+	FDescribeTable("focused",
+		func() {},
+		Entry("focused"),
+	)
+
+	DescribeTable("focused",
+		func() {},
+		FEntry("focused"),
+	)
+
+	Describe("not focused", func() {
+		It("not focused", func() {
+
+		})
+	})
+
+	Context("not focused", func() {
+		It("not focused", func() {
+
+		})
+	})
+
+	It("not focused", func() {
+
+	})
+
+	Measure("not focused", func(b Benchmarker) {
+
+	}, 2)
+
+	DescribeTable("not focused",
+		func() {},
+		Entry("not focused"),
+	)
+})

integration/_fixtures/focused_fixture_with_vendor/vendor/foo/bar/bar.go

@@ -0,0 +1,4 @@
+package vendored
+
+func FContext() {
+}

integration/_fixtures/focused_fixture_with_vendor/vendor/foo/foo.go

@@ -0,0 +1,4 @@
+package vendored
+
+func FIt() {
+}

integration/_fixtures/focused_fixture_with_vendor/vendor/vendored.go

@@ -0,0 +1,5 @@
+package vendored
+
+func FDescribe() int {
+	return 42
+}

integration/fail_test.go

@@ -11,7 +11,7 @@ var _ = Describe("Failing Specs", func() {
 
 	BeforeEach(func() {
 		pathToTest = tmpPath("failing")
-		copyIn("fail_fixture", pathToTest)
+		copyIn(fixturePath("fail_fixture"), pathToTest, false)
 	})
 
 	It("should fail in all the possible ways", func() {

integration/flags_test.go

@@ -17,7 +17,7 @@ var _ = Describe("Flags Specs", func() {
 
 	BeforeEach(func() {
 		pathToTest = tmpPath("flags")
-		copyIn("flags_tests", pathToTest)
+		copyIn(fixturePath("flags_tests"), pathToTest, false)
 	})
 
 	getRandomOrders := func(output string) []int {
@@ -158,7 +158,7 @@ var _ = Describe("Flags Specs", func() {
 
 	It("should fail fast when told to", func() {
 		pathToTest = tmpPath("fail")
-		copyIn("fail_fixture", pathToTest)
+		copyIn(fixturePath("fail_fixture"), pathToTest, false)
 		session := startGinkgo(pathToTest, "--failFast")
 		Eventually(session).Should(gexec.Exit(1))
 		output := string(session.Out.Contents())
@@ -181,7 +181,7 @@ var _ = Describe("Flags Specs", func() {
 
 	It("should perform a dry run when told to", func() {
 		pathToTest = tmpPath("fail")
-		copyIn("fail_fixture", pathToTest)
+		copyIn(fixturePath("fail_fixture"), pathToTest, false)
 		session := startGinkgo(pathToTest, "--dryRun", "-v")
 		Eventually(session).Should(gexec.Exit(0))
 		output := string(session.Out.Contents())
@@ -194,7 +194,7 @@ var _ = Describe("Flags Specs", func() {
 
 	regextest := func(regexOption string, skipOrFocus string) string {
 		pathToTest = tmpPath("passing")
-		copyIn("passing_ginkgo_tests", pathToTest)
+		copyIn(fixturePath("passing_ginkgo_tests"), pathToTest, false)
 		session := startGinkgo(pathToTest, regexOption, "--dryRun", "-v", skipOrFocus)
 		Eventually(session).Should(gexec.Exit(0))
 		return string(session.Out.Contents())

integration/integration_suite_test.go

@@ -51,29 +51,62 @@ func tmpPath(destination string) string {
 	return filepath.Join(tmpDir, destination)
 }
 
-func copyIn(fixture string, destination string) {
-	err := os.MkdirAll(destination, 0777)
-	Ω(err).ShouldNot(HaveOccurred())
+func fixturePath(name string) string {
+	return filepath.Join("_fixtures", name)
+}
+
+func copyIn(sourcePath, destinationPath string, recursive bool) {
+	err := os.MkdirAll(destinationPath, 0777)
+	Expect(err).NotTo(HaveOccurred())
 
-	filepath.Walk(filepath.Join("_fixtures", fixture), func(path string, info os.FileInfo, err error) error {
-		if info.IsDir() {
-			return nil
+	files, err := ioutil.ReadDir(sourcePath)
+	Expect(err).NotTo(HaveOccurred())
+	for _, f := range files {
+		srcPath := filepath.Join(sourcePath, f.Name())
+		dstPath := filepath.Join(destinationPath, f.Name())
+		if f.IsDir() {
+			if recursive {
+				copyIn(srcPath, dstPath, recursive)
+			}
+			continue
 		}
 
-		base := filepath.Base(path)
+		src, err := os.Open(srcPath)
 
-		src, err := os.Open(path)
-		Ω(err).ShouldNot(HaveOccurred())
+		Expect(err).NotTo(HaveOccurred())
 		defer src.Close()
 
-		dst, err := os.Create(filepath.Join(destination, base))
-		Ω(err).ShouldNot(HaveOccurred())
+		dst, err := os.Create(dstPath)
+		Expect(err).NotTo(HaveOccurred())
 		defer dst.Close()
 
 		_, err = io.Copy(dst, src)
-		Ω(err).ShouldNot(HaveOccurred())
-		return nil
-	})
+		Expect(err).NotTo(HaveOccurred())
+	}
+}
+
+func sameFile(filePath, otherFilePath string) bool {
+	content, readErr := ioutil.ReadFile(filePath)
+	Expect(readErr).NotTo(HaveOccurred())
+	otherContent, readErr := ioutil.ReadFile(otherFilePath)
+	Expect(readErr).NotTo(HaveOccurred())
+	Expect(string(content)).To(Equal(string(otherContent)))
+	return true
+}
+
+func sameFolder(sourcePath, destinationPath string) bool {
+	files, err := ioutil.ReadDir(sourcePath)
+	Expect(err).NotTo(HaveOccurred())
+	for _, f := range files {
+		srcPath := filepath.Join(sourcePath, f.Name())
+		dstPath := filepath.Join(destinationPath, f.Name())
+		if f.IsDir() {
+			sameFolder(srcPath, dstPath)
+			continue
+		}
+		Expect(sameFile(srcPath, dstPath)).To(BeTrue())
+	}
+	return true
 }
 
 func ginkgoCommand(dir string, args ...string) *exec.Cmd {

integration/interrupt_test.go

@@ -13,7 +13,7 @@ var _ = Describe("Interrupt", func() {
 	var pathToTest string
 	BeforeEach(func() {
 		pathToTest = tmpPath("hanging")
-		copyIn("hanging_suite", pathToTest)
+		copyIn(fixturePath("hanging_suite"), pathToTest, false)
 	})
 
 	Context("when interrupting a suite", func() {

integration/precompiled_test.go

@@ -16,7 +16,7 @@ var _ = Describe("ginkgo build", func() {
 
 	BeforeEach(func() {
 		pathToTest = tmpPath("passing_ginkgo_tests")
-		copyIn("passing_ginkgo_tests", pathToTest)
+		copyIn(fixturePath("passing_ginkgo_tests"), pathToTest, false)
 		session := startGinkgo(pathToTest, "build")
 		Eventually(session).Should(gexec.Exit(0))
 		output := string(session.Out.Contents())

integration/progress_test.go

@@ -15,7 +15,7 @@ var _ = Describe("Emitting progress", func() {
 	BeforeEach(func() {
 		args = []string{"--noColor"}
 		pathToTest = tmpPath("progress")
-		copyIn("progress_fixture", pathToTest)
+		copyIn(fixturePath("progress_fixture"), pathToTest, false)
 	})
 
 	JustBeforeEach(func() {