Merge branch 'master' into lynncyrin-patch-1

.github/workflows/cli.yml

@@ -0,0 +1,65 @@
+name: Run Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+      - v1
+
+env:
+  GO111MODULE: on
+  GOPROXY: https://proxy.golang.org
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        go: [1.11, 1.12, 1.13]
+    name: ${{ matrix.os }} @ Go ${{ matrix.go }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Set up Go ${{ matrix.go }}
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ matrix.go }}
+
+      - name: Set GOPATH and PATH
+        run: |
+          echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)"
+          echo "::add-path::$(dirname $GITHUB_WORKSPACE)/bin"
+        shell: bash
+
+      - name: Checkout Code
+        uses: actions/checkout@v1
+        with:
+          ref: ${{ github.ref }}
+
+      - name: Install Dependencies
+        run: |
+          mkdir -p $GOPATH/bin
+          curl -L -o $GOPATH/bin/gfmrun "https://github.com/urfave/gfmrun/releases/download/v1.2.14/gfmrun-$(go env GOOS)-amd64-v1.2.14"
+          chmod +x $GOPATH/bin/gfmrun
+          npm install markdown-toc
+
+      - name: Run Tests (v1)
+        if: contains(github.base_ref, 'v1')
+        run: |
+          go run build.go vet
+          go run build.go test
+          go run build.go gfmrun docs/v1/manual.md
+          go run build.go toc docs/v1/manual.md
+
+      - name: Run Tests (v2)
+        if: contains(github.base_ref, 'master')
+        run: |
+          go run build.go vet
+          go run build.go test
+          go run build.go gfmrun docs/v2/manual.md
+          go run build.go toc docs/v2/manual.md
+
+      - name: Send Coverage Report
+        if: success()
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        run: bash <(curl -s https://codecov.io/bash)

.gitignore

@@ -2,3 +2,4 @@
 *.orig
 node_modules/
 vendor
+.idea

.travis.yml

@@ -1,36 +0,0 @@
-language: go
-sudo: false
-dist: bionic
-osx_image: xcode10
-go:
-  - 1.11.x
-  - 1.12.x
-  - 1.13.x
-
-os:
-  - linux
-  - osx
-
-env:
-  GO111MODULE=on GOPROXY=https://proxy.golang.org
-
-cache:
-  directories:
-    - node_modules
-
-before_script:
-  - go get github.com/urfave/gfmrun/cmd/gfmrun
-  - go get golang.org/x/tools/cmd/goimports
-  - npm install markdown-toc
-  - go mod tidy
-
-script:
-  - go run build.go vet
-  - go run build.go test
-  - go run build.go gfmrun docs/v1/manual.md
-  - go run build.go toc docs/v1/manual.md
-  - go run build.go gfmrun docs/v2/manual.md
-  - go run build.go toc docs/v2/manual.md
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)

app_test.go

@@ -1451,7 +1451,6 @@ func TestApp_Run_CommandWithSubcommandHasHelpTopic(t *testing.T) {
 		}
 
 		output := buf.String()
-		//t.Logf("output: %q\n", buf.Bytes())
 
 		if strings.Contains(output, "No help topic for") {
 			t.Errorf("expect a help topic, got none: \n%q", output)
@@ -1718,7 +1717,6 @@ func TestApp_Run_Categories(t *testing.T) {
 	}
 
 	output := buf.String()
-	//t.Logf("output: %q\n", buf.Bytes())
 
 	if !strings.Contains(output, "1:\n     command1") {
 		t.Errorf("want buffer to include category %q, did not: \n%q", "1:\n     command1", output)

appveyor.yml

@@ -26,4 +26,4 @@ install:
 build_script:
   - go run build.go vet
   - go run build.go test
-  - go run build.go gfmrun docs/v1/manual.md
+  - go run build.go gfmrun docs/v1/manual.md