From 9f5a92078a3f388b52d597b5a59af5c933a112d2 Mon Sep 17 00:00:00 2001 From: Bjørn Erik Pedersen Date: Fri, 3 May 2019 09:16:58 +0200 Subject: Add Hugo Modules This commit implements Hugo Modules. This is a broad subject, but some keywords include: * A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project. * A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects. * Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running. * Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions. * A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`. All of the above is backed by Go Modules. Fixes #5973 Fixes #5996 Fixes #6010 Fixes #5911 Fixes #5940 Fixes #6074 Fixes #6082 Fixes #6092 --- htesting/test_helpers.go | 39 ++++++++++++++++++ htesting/test_structs.go | 100 ----------------------------------------------- 2 files changed, 39 insertions(+), 100 deletions(-) create mode 100644 htesting/test_helpers.go delete mode 100644 htesting/test_structs.go (limited to 'htesting') diff --git a/htesting/test_helpers.go b/htesting/test_helpers.go new file mode 100644 index 000000000..dc303b2e5 --- /dev/null +++ b/htesting/test_helpers.go @@ -0,0 +1,39 @@ +// Copyright 2019 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 htesting + +import ( + "runtime" + "strings" + + "github.com/spf13/afero" +) + +// CreateTempDir creates a temp dir in the given filesystem and +// returns the dirnam and a func that removes it when done. +func CreateTempDir(fs afero.Fs, prefix string) (string, func(), error) { + tempDir, err := afero.TempDir(fs, "", prefix) + if err != nil { + return "", nil, err + } + + _, isOsFs := fs.(*afero.OsFs) + + if isOsFs && runtime.GOOS == "darwin" && !strings.HasPrefix(tempDir, "/private") { + // To get the entry folder in line with the rest. This its a little bit + // mysterious, but so be it. + tempDir = "/private" + tempDir + } + return tempDir, func() { fs.RemoveAll(tempDir) }, nil +} diff --git a/htesting/test_structs.go b/htesting/test_structs.go deleted file mode 100644 index 72dc7f3fc..000000000 --- a/htesting/test_structs.go +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright 2019 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 htesting - -import ( - "html/template" - "time" - - "github.com/gohugoio/hugo/common/hugo" - "github.com/gohugoio/hugo/langs" - "github.com/gohugoio/hugo/navigation" - "github.com/gohugoio/hugo/resources/page" - "github.com/spf13/viper" -) - -type testSite struct { - h hugo.Info - l *langs.Language -} - -func (t testSite) Hugo() hugo.Info { - return t.h -} - -func (t testSite) ServerPort() int { - return 1313 -} - -func (testSite) LastChange() (t time.Time) { - return -} - -func (t testSite) Title() string { - return "foo" -} - -func (t testSite) Sites() page.Sites { - return nil -} - -func (t testSite) IsServer() bool { - return false -} - -func (t testSite) Language() *langs.Language { - return t.l -} - -func (t testSite) Pages() page.Pages { - return nil -} - -func (t testSite) RegularPages() page.Pages { - return nil -} - -func (t testSite) Menus() navigation.Menus { - return nil -} - -func (t testSite) Taxonomies() interface{} { - return nil -} - -func (t testSite) BaseURL() template.URL { - return "" -} - -func (t testSite) Params() map[string]interface{} { - return nil -} - -func (t testSite) Data() map[string]interface{} { - return nil -} - -// NewTestHugoSite creates a new minimal test site. -func NewTestHugoSite() page.Site { - return testSite{ - h: hugo.NewInfo(hugo.EnvironmentProduction), - l: langs.NewLanguage("en", newTestConfig()), - } -} - -func newTestConfig() *viper.Viper { - v := viper.New() - v.Set("contentDir", "content") - return v -} -- cgit v1.2.3