commands: Fix the config command

It now also accepts the `-s` (source) flag.

See #4598

diff --git a/commands/commands_test.go b/commands/commands_test.go
index 4eab9b99f791c357c07e67a405c9303ab562a8cd..7e590bea03220b47d2e190e0e46f40f077b1de11 100644 (file)
--- a/commands/commands_test.go
+++ b/commands/commands_test.go
@@ -51,6 +51,7 @@ func TestCommands(t *testing.T) {
                // no args = hugo build
                {nil, []string{sourceFlag}, ""},
                {nil, []string{sourceFlag, "--renderToMemory"}, ""},
+               {[]string{"config"}, []string{sourceFlag}, ""},
                {[]string{"benchmark"}, []string{sourceFlag, "-n=1"}, ""},
                {[]string{"convert", "toTOML"}, []string{sourceFlag, "-o=" + filepath.Join(dirOut, "toml")}, ""},
                {[]string{"convert", "toYAML"}, []string{sourceFlag, "-o=" + filepath.Join(dirOut, "yaml")}, ""},

diff --git a/commands/config.go b/commands/config.go
new file mode 100644 (file)
index 0000000..951b575
--- /dev/null
+++ b/commands/config.go
@@ -0,0 +1,77 @@
+// Copyright 2015 The Hugo Authors. All rights reserved.
+//
+// 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.Print the version number of Hug
+
+package commands
+
+import (
+       "reflect"
+       "sort"
+
+       "github.com/spf13/cobra"
+       jww "github.com/spf13/jwalterweatherman"
+       "github.com/spf13/viper"
+)
+
+var _ cmder = (*configCmd)(nil)
+
+type configCmd struct {
+       hugoBuilderCommon
+       *baseCmd
+}
+
+func newConfigCmd() *configCmd {
+       cc := &configCmd{}
+       cc.baseCmd = newBaseCmd(&cobra.Command{
+               Use:   "config",
+               Short: "Print the site configuration",
+               Long:  `Print the site configuration, both default and custom settings.`,
+               RunE:  cc.printConfig,
+       })
+
+       cc.cmd.Flags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
+
+       return cc
+}
+
+func (c *configCmd) printConfig(cmd *cobra.Command, args []string) error {
+       cfg, err := initializeConfig(false, &c.hugoBuilderCommon, c, nil)
+
+       if err != nil {
+               return err
+       }
+
+       allSettings := cfg.Cfg.(*viper.Viper).AllSettings()
+
+       var separator string
+       if allSettings["metadataformat"] == "toml" {
+               separator = " = "
+       } else {
+               separator = ": "
+       }
+
+       var keys []string
+       for k := range allSettings {
+               keys = append(keys, k)
+       }
+       sort.Strings(keys)
+       for _, k := range keys {
+               kv := reflect.ValueOf(allSettings[k])
+               if kv.Kind() == reflect.String {
+                       jww.FEEDBACK.Printf("%s%s\"%+v\"\n", k, separator, allSettings[k])
+               } else {
+                       jww.FEEDBACK.Printf("%s%s%+v\n", k, separator, allSettings[k])
+               }
+       }
+
+       return nil
+}

diff --git a/commands/list_config.go b/commands/list_config.go
deleted file mode 100644 (file)
index 32b739d..0000000
--- a/commands/list_config.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015 The Hugo Authors. All rights reserved.
-//
-// 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.Print the version number of Hug
-
-package commands
-
-import (
-       "reflect"
-       "sort"
-
-       "github.com/spf13/cobra"
-       jww "github.com/spf13/jwalterweatherman"
-       "github.com/spf13/viper"
-)
-
-var _ cmder = (*configCmd)(nil)
-
-type configCmd struct {
-       *baseCmd
-}
-
-func newConfigCmd() *configCmd {
-       cc := &configCmd{}
-       cc.baseCmd = newBaseCmd(&cobra.Command{
-               Use:   "config",
-               Short: "Print the site configuration",
-               Long:  `Print the site configuration, both default and custom settings.`,
-               RunE:  cc.printConfig,
-       })
-
-       return cc
-}
-
-func (c *configCmd) printConfig(cmd *cobra.Command, args []string) error {
-       cfg, err := initializeConfig(false, nil, c, nil)
-
-       if err != nil {
-               return err
-       }
-
-       allSettings := cfg.Cfg.(*viper.Viper).AllSettings()
-
-       var separator string
-       if allSettings["metadataformat"] == "toml" {
-               separator = " = "
-       } else {
-               separator = ": "
-       }
-
-       var keys []string
-       for k := range allSettings {
-               keys = append(keys, k)
-       }
-       sort.Strings(keys)
-       for _, k := range keys {
-               kv := reflect.ValueOf(allSettings[k])
-               if kv.Kind() == reflect.String {
-                       jww.FEEDBACK.Printf("%s%s\"%+v\"\n", k, separator, allSettings[k])
-               } else {
-                       jww.FEEDBACK.Printf("%s%s%+v\n", k, separator, allSettings[k])
-               }
-       }
-
-       return nil
-}