mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-29 09:02:06 -05:00
9f5a92078a
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
137 lines
3.4 KiB
Go
137 lines
3.4 KiB
Go
// Copyright 2018 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 commands
|
|
|
|
import (
|
|
"bytes"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/gohugoio/hugo/create"
|
|
"github.com/gohugoio/hugo/helpers"
|
|
"github.com/gohugoio/hugo/hugolib"
|
|
"github.com/spf13/afero"
|
|
"github.com/spf13/cobra"
|
|
jww "github.com/spf13/jwalterweatherman"
|
|
)
|
|
|
|
var _ cmder = (*newCmd)(nil)
|
|
|
|
type newCmd struct {
|
|
contentEditor string
|
|
contentType string
|
|
|
|
*baseBuilderCmd
|
|
}
|
|
|
|
func (b *commandsBuilder) newNewCmd() *newCmd {
|
|
cmd := &cobra.Command{
|
|
Use: "new [path]",
|
|
Short: "Create new content for your site",
|
|
Long: `Create a new content file and automatically set the date and title.
|
|
It will guess which kind of file to create based on the path provided.
|
|
|
|
You can also specify the kind with ` + "`-k KIND`" + `.
|
|
|
|
If archetypes are provided in your theme or site, they will be used.
|
|
|
|
Ensure you run this within the root directory of your site.`,
|
|
}
|
|
|
|
cc := &newCmd{baseBuilderCmd: b.newBuilderCmd(cmd)}
|
|
|
|
cmd.Flags().StringVarP(&cc.contentType, "kind", "k", "", "content type to create")
|
|
cmd.Flags().StringVar(&cc.contentEditor, "editor", "", "edit new content with this editor, if provided")
|
|
|
|
cmd.AddCommand(newNewSiteCmd().getCommand())
|
|
cmd.AddCommand(newNewThemeCmd().getCommand())
|
|
|
|
cmd.RunE = cc.newContent
|
|
|
|
return cc
|
|
}
|
|
|
|
func (n *newCmd) newContent(cmd *cobra.Command, args []string) error {
|
|
cfgInit := func(c *commandeer) error {
|
|
if cmd.Flags().Changed("editor") {
|
|
c.Set("newContentEditor", n.contentEditor)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
c, err := initializeConfig(true, false, &n.hugoBuilderCommon, n, cfgInit)
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if len(args) < 1 {
|
|
return newUserError("path needs to be provided")
|
|
}
|
|
|
|
createPath := args[0]
|
|
|
|
var kind string
|
|
|
|
createPath, kind = newContentPathSection(c.hugo, createPath)
|
|
|
|
if n.contentType != "" {
|
|
kind = n.contentType
|
|
}
|
|
|
|
return create.NewContent(c.hugo, kind, createPath)
|
|
}
|
|
|
|
func mkdir(x ...string) {
|
|
p := filepath.Join(x...)
|
|
|
|
err := os.MkdirAll(p, 0777) // before umask
|
|
if err != nil {
|
|
jww.FATAL.Fatalln(err)
|
|
}
|
|
}
|
|
|
|
func touchFile(fs afero.Fs, x ...string) {
|
|
inpath := filepath.Join(x...)
|
|
mkdir(filepath.Dir(inpath))
|
|
err := helpers.WriteToDisk(inpath, bytes.NewReader([]byte{}), fs)
|
|
if err != nil {
|
|
jww.FATAL.Fatalln(err)
|
|
}
|
|
}
|
|
|
|
func newContentPathSection(h *hugolib.HugoSites, path string) (string, string) {
|
|
// Forward slashes is used in all examples. Convert if needed.
|
|
// Issue #1133
|
|
createpath := filepath.FromSlash(path)
|
|
|
|
if h != nil {
|
|
for _, dir := range h.BaseFs.Content.Dirs {
|
|
createpath = strings.TrimPrefix(createpath, dir.Meta().Filename())
|
|
}
|
|
}
|
|
|
|
var section string
|
|
// assume the first directory is the section (kind)
|
|
if strings.Contains(createpath[1:], helpers.FilePathSeparator) {
|
|
parts := strings.Split(strings.TrimPrefix(createpath, helpers.FilePathSeparator), helpers.FilePathSeparator)
|
|
if len(parts) > 0 {
|
|
section = parts[0]
|
|
}
|
|
|
|
}
|
|
|
|
return createpath, section
|
|
}
|