github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Always use RFC3339 for version date format.

Browse source 
Fixes #695 reported by @synful.

- No longer tries to load a configuration.
- Because of this the version tests are no longer necessary.
This commit is contained in:
Austin Ziegler 2014-12-05 23:11:43 -05:00 committed by bep
parent a0d956c2ad
commit 27840932a5
2 changed files with 2 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
commands/version.go
View file

@ -22,7 +22,6 @@ import (
"bitbucket.org/kardianos/osext"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
var timeLayout string // the layout for time.Time
@ -37,7 +36,6 @@ var version = &cobra.Command{
Short: "Print the version number of Hugo",
Long: `All software has versions. This is Hugo's`,
Run: func(cmd *cobra.Command, args []string) {
InitializeConfig()
if buildDate == "" {
setBuildDate() // set the build date from executable's mdate
} else {
@ -70,39 +68,12 @@ func setBuildDate() {
return
}
t := fi.ModTime()
buildDate = t.Format(getDateFormat())
buildDate = t.Format(time.RFC3339)
}
// formatBuildDate formats the buildDate according to the value in
// .Params.DateFormat, if it's set.
func formatBuildDate() {
t, _ := time.Parse("2006-01-02T15:04:05", buildDate)
buildDate = t.Format(getDateFormat())
}
// getDateFormat gets the dateFormat value from Params. The dateFormat should
// be a valid time layout. If it isn't set, time.RFC3339 is used.
func getDateFormat() string {
params := viper.Get("params")
if params == nil {
return time.RFC3339
}
// var typMapIfaceIface = reflect.TypeOf(map[interface{}{}]interface{}{})
// var typMapStringIface = reflect.TypeOf(map[string]interface{}{})
parms := map[string]interface{}{}
switch params.(type) {
case map[interface{}]interface{}:
for k, v := range params.(map[interface{}]interface{}) {
parms[k.(string)] = v
}
case map[string]interface{}:
parms = params.(map[string]interface{})
}
layout := parms["DateFormat"]
if layout == nil || layout == "" {
return time.RFC3339
}
return layout.(string)
buildDate = t.Format(time.RFC3339)
}

71
commands/version_test.go
View file

@ -1,71 +0,0 @@
package commands
import (
"io/ioutil"
"testing"
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
)
// config json
var JSONConfig = []byte(`{
"params": {
"DateFormat": "Jan 2 2006"
}
}`)
// config toml
var TOMLConfig = []byte(`
[params]
DateFormat = "Jan 2 2006"
`)
// config yaml
var YAMLConfig = []byte(`
params:
DateFormat: "Jan 2 2006"
`)
var config map[string]interface{} = make(map[string]interface{})
func TestGetDateFormatJSON(t *testing.T) {
jsonFile, _ := ioutil.TempFile("", "config.json")
fname := jsonFile.Name()
jsonFile.Write(JSONConfig)
jsonFile.Close()
viper.SetConfigFile(fname)
viper.SetConfigType("json")
viper.ReadInConfig()
dateFmt := getDateFormat()
assert.Equal(t, "Jan 2 2006", dateFmt)
}
func TestGetDateFormatTOML(t *testing.T) {
viper.Reset()
tomlFile, _ := ioutil.TempFile("", "config.toml")
fname := tomlFile.Name()
tomlFile.Write(TOMLConfig)
tomlFile.Close()
viper.SetConfigFile(fname)
viper.SetConfigType("toml")
viper.ReadInConfig()
dateFmt := getDateFormat()
assert.Equal(t, "Jan 2 2006", dateFmt)
}
func TestGetDateFormatYAML(t *testing.T) {
viper.Reset()
yamlFile, _ := ioutil.TempFile("", "config.yaml")
fname := yamlFile.Name()
yamlFile.Write(YAMLConfig)
yamlFile.Close()
viper.SetConfigFile(fname)
viper.SetConfigType("yaml")
viper.ReadInConfig()
dateFmt := getDateFormat()
assert.Equal(t, "Jan 2 2006", dateFmt)
}