Merge remote-tracking branch 'upstream/master' into required_flags_func

.circleci/config.yml

@@ -1,15 +1,11 @@
-workflows:
+version: 2
-  version: 2
+
-  main:
+references:
-    jobs:
+  workspace: &workspace
-      - go-current
+    /go/src/github.com/spf13/cobra
-      - go-previous
+
-      - go-latest
+  run_tests: &run_tests
-base: &base
+    run:
-  working_directory: /go/src/github.com/spf13/cobra
-  steps:
-    - checkout
-    - run:
       name: "All Commands"
       command: |
         mkdir -p bin
@@ -18,21 +14,40 @@ base: &base
         go get -t -v ./...
         PATH=$PATH:$PWD/bin go test -v ./...
         go build
-          diff -u <(echo -n) <(gofmt -d -s .)
         if [ -z $NOVET ]; then
           diff -u <(echo -n) <(go tool vet . 2>&1 | grep -vE 'ExampleCommand|bash_completions.*Fprint');
         fi
-version: 2
+
 jobs:
   go-current:
     docker:
-      - image: circleci/golang:1.10.0
+      - image: circleci/golang:1.11
-    <<: *base
+    working_directory: *workspace
+    steps:
+      - checkout
+      - *run_tests
+      - run:
+          name: "Check formatting"
+          command: diff -u <(echo -n) <(gofmt -d -s .)
   go-previous:
     docker:
-      - image: circleci/golang:1.9.4
+      - image: circleci/golang:1.10
-    <<: *base
+    working_directory: *workspace
+    steps:
+      - checkout
+      - *run_tests
   go-latest:
     docker:
       - image: circleci/golang:latest
-    <<: *base
+    working_directory: *workspace
+    steps:
+      - checkout
+      - *run_tests
+
+workflows:
+  version: 2
+  main:
+    jobs:
+      - go-current
+      - go-previous
+      - go-latest

.travis.yml

@@ -2,9 +2,11 @@ language: go
 
 matrix:
   include:
-    - go: 1.9.4
+    - go: 1.10.x
-    - go: 1.10.0
+    - go: 1.11.x
     - go: tip
+    - go: 1.11.x
+      script: diff -u <(echo -n) <(gofmt -d -s .)
   allow_failures:
     - go: tip
 
@@ -15,7 +17,6 @@ before_install:
 script:
   - PATH=$PATH:$PWD/bin go test -v ./...
   - go build
-  - diff -u <(echo -n) <(gofmt -d -s .)
   - if [ -z $NOVET ]; then
       diff -u <(echo -n) <(go tool vet . 2>&1 | grep -vE 'ExampleCommand|bash_completions.*Fprint');
     fi

bash_completions.go

@@ -134,7 +134,7 @@ __%[1]s_handle_reply()
 			__%[1]s_custom_func
 		else
 			# otherwise fall back to unqualified for compatibility
-			declare -F ___custom_func >/dev/null && __custom_func
+			declare -F __custom_func >/dev/null && __custom_func
 		fi
     fi
 

bash_completions.md

@@ -109,7 +109,7 @@ Find more information at https://github.com/GoogleCloudPlatform/kubernetes.`,
 }
 ```
 
-The `BashCompletionFunction` option is really only valid/useful on the root command. Doing the above will cause `___kubectl_custom_func()` (`__<command-use>_custom_func()`) to be called when the built in processor was unable to find a solution. In the case of kubernetes a valid command might look something like `kubectl get pod [mypod]`. If you type `kubectl get pod [tab][tab]` the `__kubectl_customc_func()` will run because the cobra.Command only understood "kubectl" and "get." `__kubectl_custom_func()` will see that the cobra.Command is "kubectl_get" and will thus call another helper `__kubectl_get_resource()`.  `__kubectl_get_resource` will look at the 'nouns' collected. In our example the only noun will be `pod`.  So it will call `__kubectl_parse_get pod`.  `__kubectl_parse_get` will actually call out to kubernetes and get any pods.  It will then set `COMPREPLY` to valid pods!
+The `BashCompletionFunction` option is really only valid/useful on the root command. Doing the above will cause `__kubectl_custom_func()` (`__<command-use>_custom_func()`) to be called when the built in processor was unable to find a solution. In the case of kubernetes a valid command might look something like `kubectl get pod [mypod]`. If you type `kubectl get pod [tab][tab]` the `__kubectl_customc_func()` will run because the cobra.Command only understood "kubectl" and "get." `__kubectl_custom_func()` will see that the cobra.Command is "kubectl_get" and will thus call another helper `__kubectl_get_resource()`.  `__kubectl_get_resource` will look at the 'nouns' collected. In our example the only noun will be `pod`.  So it will call `__kubectl_parse_get pod`.  `__kubectl_parse_get` will actually call out to kubernetes and get any pods.  It will then set `COMPREPLY` to valid pods!
 
 ## Have the completions code complete your 'nouns'