Skip to content

Commit

Permalink
Add command completion fixes #16
Browse files Browse the repository at this point in the history
  • Loading branch information
gtseres committed Apr 12, 2018
1 parent 044014f commit a3f3e0d
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 17 deletions.
37 changes: 20 additions & 17 deletions cmd/skaffold/app/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,30 @@ var (
overwrite bool
)

var rootCmd = &cobra.Command{
Use: "skaffold",
Short: "A tool that facilitates continuous development for Kubernetes applications.",
}

func NewSkaffoldCommand(out, err io.Writer) *cobra.Command {
c := &cobra.Command{
Use: "skaffold",
Short: "A tool that facilitates continuous development for Kubernetes applications.",
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
if err := SetUpLogs(err, v); err != nil {
return err
}
logrus.Infof("Skaffold %+v", version.Get())
return nil
},

rootCmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
if err := SetUpLogs(err, v); err != nil {
return err
}
logrus.Infof("Skaffold %+v", version.Get())
return nil
}

c.AddCommand(NewCmdVersion(out))
c.AddCommand(NewCmdRun(out))
c.AddCommand(NewCmdDev(out))
c.AddCommand(NewCmdFix(out))
c.AddCommand(NewCmdDocker(out))
rootCmd.AddCommand(NewCmdCompletion(out))
rootCmd.AddCommand(NewCmdVersion(out))
rootCmd.AddCommand(NewCmdRun(out))
rootCmd.AddCommand(NewCmdDev(out))
rootCmd.AddCommand(NewCmdFix(out))
rootCmd.AddCommand(NewCmdDocker(out))

c.PersistentFlags().StringVarP(&v, "verbosity", "v", constants.DefaultLogLevel.String(), "Log level (debug, info, warn, error, fatal, panic")
return c
rootCmd.PersistentFlags().StringVarP(&v, "verbosity", "v", constants.DefaultLogLevel.String(), "Log level (debug, info, warn, error, fatal, panic")
return rootCmd
}

func AddRunDevFlags(cmd *cobra.Command) {
Expand Down
44 changes: 44 additions & 0 deletions cmd/skaffold/app/cmd/completion.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
Copyright 2018 Google LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package cmd

import (
"io"
"os"
"github.com/spf13/cobra"
)

// completionCmd represents the completion command
var completionCmd = &cobra.Command{
Use: "completion",
Short: "Generate shell completion scripts",
Long: `To enable command completion run
eval "$(skaffold completion bash)"
To configure bash shell completion for all your sessions, add the following to your
~/.bashrc or ~/.bash_profile:
eval "$(skaffold completion bash)"`,
Run: func(cmd *cobra.Command, args []string) {
rootCmd.GenBashCompletion(os.Stdout);
},
}

func NewCmdCompletion(out io.Writer) *cobra.Command {
return completionCmd
}

0 comments on commit a3f3e0d

Please sign in to comment.