From: Bjørn Erik Pedersen Date: Wed, 27 Jul 2016 08:03:45 +0000 (+0200) Subject: Move HugoSites to hugolib X-Git-Tag: v0.17~147 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5b9c2a40f180587de037122e3cd9ac0f3ce64f5e;p=brevno-suite%2Fhugo 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 6168d0a8..b8e4ea64 100644 --- 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 9afb562b..7c43d15b 100644 --- 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 index 77bf5480..00000000 --- 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(``, helpers.HugoVersion())), - } -} diff --git a/hugolib/hugo_info.go b/hugolib/hugo_info.go new file mode 100644 index 00000000..77bf5480 --- /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(``, helpers.HugoVersion())), + } +} diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go new file mode 100644 index 00000000..cc6b4ca1 --- /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() + } +}