glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2025-05-06 05:17:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into forkMaster

Browse source
This commit is contained in:
Raphael Tiersch 2017-07-31 16:02:47 +02:00
commit 832cc94e04
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cobra/cmd/add_test.go
View file

@ -22,9 +22,13 @@ func TestGoldenAddCmd(t *testing.T) {
// Initialize the project at first. // Initialize the project at first.
initializeProject(project) initializeProject(project)
defer os.RemoveAll(project.AbsPath()) defer os.RemoveAll(project.AbsPath())
defer viper.Set("year", nil)
viper.Set("year", 2017) // For reproducible builds viper.Set("author", "NAME HERE <EMAIL ADDRESS>")
viper.Set("license", "apache")
viper.Set("year", 2017)
defer viper.Set("author", nil)
defer viper.Set("license", nil)
defer viper.Set("year", nil)
// Then add the "test" command. // Then add the "test" command.
cmdName := "test" cmdName := "test"

8
cobra/cmd/init_test.go
View file

@ -18,9 +18,13 @@ func TestGoldenInitCmd(t *testing.T) {
projectName := "github.com/spf13/testproject" projectName := "github.com/spf13/testproject"
project := NewProject(projectName) project := NewProject(projectName)
defer os.RemoveAll(project.AbsPath()) defer os.RemoveAll(project.AbsPath())
defer viper.Set("year", nil)
viper.Set("year", 2017) // For reproducible builds viper.Set("author", "NAME HERE <EMAIL ADDRESS>")
viper.Set("license", "apache")
viper.Set("year", 2017)
defer viper.Set("author", nil)
defer viper.Set("license", nil)
defer viper.Set("year", nil)
os.Args = []string{"cobra", "init", projectName} os.Args = []string{"cobra", "init", projectName}
if err := rootCmd.Execute(); err != nil { if err := rootCmd.Execute(); err != nil {

2
cobra/cmd/licenses.go
View file

@ -78,7 +78,7 @@ func getLicense() License {
func copyrightLine() string { func copyrightLine() string {
author := viper.GetString("author") author := viper.GetString("author")
year := viper.GetString("year") // For reproducible builds year := viper.GetString("year") // For tests.
if year == "" { if year == "" {
year = time.Now().Format("2006") year = time.Now().Format("2006")
} }