Move HugoSites to hugolib

It will get more involved in the build process in a minute.

See #2309

diff --git a/commands/hugo.go b/commands/hugo.go
index 6168d0a83e461eb6c28b0d64cf88a91c252bc5d1..b8e4ea6430b86ed0cccfab2273a3cc5bd900d948 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -46,20 +46,10 @@ import (
        "github.com/spf13/viper"
 )
 
-type HugoSites []*hugolib.Site
-
-// Reset resets the sites, making it ready for a full rebuild.
-// TODO(bep) multilingo
-func (h HugoSites) Reset() {
-       for i, s := range h {
-               h[i] = s.Reset()
-       }
-}
-
 // Hugo represents the Hugo sites to build. This variable is exported as it
 // is used by at least one external library (the Hugo caddy plugin). We should
 // provide a cleaner external API, but until then, this is it.
-var Hugo HugoSites
+var Hugo hugolib.HugoSites
 
 // Reset resets Hugo ready for a new full build. This is mainly only useful
 // for benchmark testing etc. via the CLI commands.

diff --git a/commands/multilingual.go b/commands/multilingual.go
index 9afb562ba9f1583d9ea320deecd1b1a43dc14cef..7c43d15bcf9addfde04aecb39a612030ec160941 100644 (file)
--- a/commands/multilingual.go
+++ b/commands/multilingual.go
@@ -11,8 +11,8 @@ import (
        "github.com/spf13/viper"
 )
 
-func readMultilingualConfiguration() (HugoSites, error) {
-       h := make(HugoSites, 0)
+func readMultilingualConfiguration() (hugolib.HugoSites, error) {
+       h := make(hugolib.HugoSites, 0)
        multilingual := viper.GetStringMap("Multilingual")
        if len(multilingual) == 0 {
                // TODO(bep) multilingo langConfigsList = append(langConfigsList, hugolib.NewLanguage("en"))

diff --git a/hugolib/hugo.go b/hugolib/hugo.go
deleted file mode 100644 (file)
index 77bf548..0000000
--- a/hugolib/hugo.go
+++ /dev/null
@@ -1,49 +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.
-
-package hugolib
-
-import (
-       "fmt"
-       "html/template"
-
-       "github.com/spf13/hugo/helpers"
-)
-
-var (
-       // CommitHash contains the current Git revision. Use make to build to make
-       // sure this gets set.
-       CommitHash string
-
-       // BuildDate contains the date of the current build.
-       BuildDate string
-)
-
-var hugoInfo *HugoInfo
-
-// HugoInfo contains information about the current Hugo environment
-type HugoInfo struct {
-       Version    string
-       Generator  template.HTML
-       CommitHash string
-       BuildDate  string
-}
-
-func init() {
-       hugoInfo = &HugoInfo{
-               Version:    helpers.HugoVersion(),
-               CommitHash: CommitHash,
-               BuildDate:  BuildDate,
-               Generator:  template.HTML(fmt.Sprintf(`<meta name="generator" content="Hugo %s" />`, helpers.HugoVersion())),
-       }
-}

diff --git a/hugolib/hugo_info.go b/hugolib/hugo_info.go
new file mode 100644 (file)
index 0000000..77bf548
--- /dev/null
+++ b/hugolib/hugo_info.go
@@ -0,0 +1,49 @@
+// 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.
+
+package hugolib
+
+import (
+       "fmt"
+       "html/template"
+
+       "github.com/spf13/hugo/helpers"
+)
+
+var (
+       // CommitHash contains the current Git revision. Use make to build to make
+       // sure this gets set.
+       CommitHash string
+
+       // BuildDate contains the date of the current build.
+       BuildDate string
+)
+
+var hugoInfo *HugoInfo
+
+// HugoInfo contains information about the current Hugo environment
+type HugoInfo struct {
+       Version    string
+       Generator  template.HTML
+       CommitHash string
+       BuildDate  string
+}
+
+func init() {
+       hugoInfo = &HugoInfo{
+               Version:    helpers.HugoVersion(),
+               CommitHash: CommitHash,
+               BuildDate:  BuildDate,
+               Generator:  template.HTML(fmt.Sprintf(`<meta name="generator" content="Hugo %s" />`, helpers.HugoVersion())),
+       }
+}

diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
new file mode 100644 (file)
index 0000000..cc6b4ca
--- /dev/null
+++ b/hugolib/hugo_sites.go
@@ -0,0 +1,25 @@
+// Copyright 2016-present 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.
+
+package hugolib
+
+// HugoSites represents the sites to build. Each site represents a language.
+type HugoSites []*Site
+
+// Reset resets the sites, making it ready for a full rebuild.
+// TODO(bep) multilingo
+func (h HugoSites) Reset() {
+       for i, s := range h {
+               h[i] = s.Reset()
+       }
+}