vgo - update golden templates

cobra/cmd/init_test.go

@@ -13,6 +13,7 @@ func TestGoldenInitCmd(t *testing.T) {
 		AbsolutePath: fmt.Sprintf("%s/testproject", wd),
 		PkgName:      "github.com/spf13/testproject",
 		Legal:        getLicense(),
+		Copyright:    copyrightLine(),
 		Viper:        true,
 		AppName:      "testproject",
 	}

cobra/cmd/testdata/main.go.golden

@@ -1,21 +1,22 @@
-// Copyright © 2017 NAME HERE <EMAIL ADDRESS>
+/*
-//
+Copyright © 2019 NAME HERE <EMAIL ADDRESS>
-// 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.
 
+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 main
 
 import "github.com/spf13/testproject/cmd"
 
 func main() {
-	cmd.Execute()
+  cmd.Execute()
 }

cobra/cmd/testdata/root.go.golden

@@ -1,89 +1,97 @@
-// Copyright © 2017 NAME HERE <EMAIL ADDRESS>
+/*
-//
+Copyright © 2019 NAME HERE <EMAIL ADDRESS>
-// 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.
 
+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 (
-	"fmt"
+  "fmt"
-	"os"
+  "os"
+  "github.com/spf13/cobra"
+
+  homedir "github.com/mitchellh/go-homedir"
+  "github.com/spf13/viper"
 
-	homedir "github.com/mitchellh/go-homedir"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
+
 var cfgFile string
 
+
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:   "testproject",
+  Use:   "testproject",
-	Short: "A brief description of your application",
+  Short: "A brief description of your application",
-	Long: `A longer description that spans multiple lines and likely contains
+  Long: `A longer description that spans multiple lines and likely contains
 examples and usage of using your application. For example:
 
 Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
-	// Uncomment the following line if your bare application
+  // Uncomment the following line if your bare application
-	// has an action associated with it:
+  // has an action associated with it:
-	//	Run: func(cmd *cobra.Command, args []string) { },
+  //	Run: func(cmd *cobra.Command, args []string) { },
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	if err := rootCmd.Execute(); err != nil {
+  if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
+    fmt.Println(err)
-		os.Exit(1)
+    os.Exit(1)
-	}
+  }
 }
 
 func init() {
-	cobra.OnInitialize(initConfig)
+  cobra.OnInitialize(initConfig)
 
-	// Here you will define your flags and configuration settings.
+  // Here you will define your flags and configuration settings.
-	// Cobra supports persistent flags, which, if defined here,
+  // Cobra supports persistent flags, which, if defined here,
-	// will be global for your application.
+  // will be global for your application.
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.testproject.yaml)")
 
-	// Cobra also supports local flags, which will only run
+  rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.testproject.yaml)")
-	// when this action is called directly.
+
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+
+  // Cobra also supports local flags, which will only run
+  // when this action is called directly.
+  rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
 
+
 // initConfig reads in config file and ENV variables if set.
 func initConfig() {
-	if cfgFile != "" {
+  if cfgFile != "" {
-		// Use config file from the flag.
+    // Use config file from the flag.
-		viper.SetConfigFile(cfgFile)
+    viper.SetConfigFile(cfgFile)
-	} else {
+  } else {
-		// Find home directory.
+    // Find home directory.
-		home, err := homedir.Dir()
+    home, err := homedir.Dir()
-		if err != nil {
+    if err != nil {
-			fmt.Println(err)
+      fmt.Println(err)
-			os.Exit(1)
+      os.Exit(1)
-		}
+    }
 
-		// Search config in home directory with name ".testproject" (without extension).
+    // Search config in home directory with name ".testproject" (without extension).
-		viper.AddConfigPath(home)
+    viper.AddConfigPath(home)
-		viper.SetConfigName(".testproject")
+    viper.SetConfigName(".testproject")
-	}
+  }
 
-	viper.AutomaticEnv() // read in environment variables that match
+  viper.AutomaticEnv() // read in environment variables that match
 
-	// If a config file is found, read it in.
+  // If a config file is found, read it in.
-	if err := viper.ReadInConfig(); err == nil {
+  if err := viper.ReadInConfig(); err == nil {
-		fmt.Println("Using config file:", viper.ConfigFileUsed())
+    fmt.Println("Using config file:", viper.ConfigFileUsed())
-	}
+  }
 }
+

cobra/tpl/main.go

@@ -1,8 +1,7 @@
 package tpl
 
 func MainTemplate() []byte {
-	return []byte(`
+	return []byte(`/*
-/*
 {{ .Copyright }}
 {{ if .Legal.Header }}{{ .Legal.Header }}{{ end }}
 */
@@ -17,8 +16,7 @@ func main() {
 }
 
 func RootTemplate() []byte {
-	return []byte(`
+	return []byte(`/*
-/*
 {{ .Copyright }}
 {{ if .Legal.Header }}{{ .Legal.Header }}{{ end }}
 */