mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-23 18:02:28 +00:00
2650fa772b
Given this content:
```bash
archetypes
├── default.md
└── post-bundle
├── bio.md
├── images
│ └── featured.jpg
└── index.md
```
```bash
hugo new --kind post-bundle post/my-post
```
Will create a new folder in `/content/post/my-post` with the same set of files as in the `post-bundle` archetypes folder.
This commit also improves the archetype language detection, so, if you use template code in your content files, the `.Site` you get is for the correct language. This also means that it is now possible to translate strings defined in the `i18n` bundles, e.g. `{{ i18n "hello" }}`.
Fixes #4535
128 lines
3.4 KiB
Go
128 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 (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/gohugoio/hugo/hugofs"
|
|
"github.com/spf13/viper"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// Issue #1133
|
|
func TestNewContentPathSectionWithForwardSlashes(t *testing.T) {
|
|
p, s := newContentPathSection(nil, "/post/new.md")
|
|
assert.Equal(t, filepath.FromSlash("/post/new.md"), p)
|
|
assert.Equal(t, "post", s)
|
|
}
|
|
|
|
func checkNewSiteInited(fs *hugofs.Fs, basepath string, t *testing.T) {
|
|
|
|
paths := []string{
|
|
filepath.Join(basepath, "layouts"),
|
|
filepath.Join(basepath, "content"),
|
|
filepath.Join(basepath, "archetypes"),
|
|
filepath.Join(basepath, "static"),
|
|
filepath.Join(basepath, "data"),
|
|
filepath.Join(basepath, "config.toml"),
|
|
}
|
|
|
|
for _, path := range paths {
|
|
_, err := fs.Source.Stat(path)
|
|
require.NoError(t, err)
|
|
}
|
|
}
|
|
|
|
func TestDoNewSite(t *testing.T) {
|
|
n := newNewSiteCmd()
|
|
basepath := filepath.Join("base", "blog")
|
|
_, fs := newTestCfg()
|
|
|
|
require.NoError(t, n.doNewSite(fs, basepath, false))
|
|
|
|
checkNewSiteInited(fs, basepath, t)
|
|
}
|
|
|
|
func TestDoNewSite_noerror_base_exists_but_empty(t *testing.T) {
|
|
basepath := filepath.Join("base", "blog")
|
|
_, fs := newTestCfg()
|
|
n := newNewSiteCmd()
|
|
|
|
require.NoError(t, fs.Source.MkdirAll(basepath, 777))
|
|
|
|
require.NoError(t, n.doNewSite(fs, basepath, false))
|
|
}
|
|
|
|
func TestDoNewSite_error_base_exists(t *testing.T) {
|
|
basepath := filepath.Join("base", "blog")
|
|
_, fs := newTestCfg()
|
|
n := newNewSiteCmd()
|
|
|
|
require.NoError(t, fs.Source.MkdirAll(basepath, 777))
|
|
_, err := fs.Source.Create(filepath.Join(basepath, "foo"))
|
|
require.NoError(t, err)
|
|
// Since the directory already exists and isn't empty, expect an error
|
|
require.Error(t, n.doNewSite(fs, basepath, false))
|
|
|
|
}
|
|
|
|
func TestDoNewSite_force_empty_dir(t *testing.T) {
|
|
basepath := filepath.Join("base", "blog")
|
|
_, fs := newTestCfg()
|
|
n := newNewSiteCmd()
|
|
|
|
require.NoError(t, fs.Source.MkdirAll(basepath, 777))
|
|
|
|
require.NoError(t, n.doNewSite(fs, basepath, true))
|
|
|
|
checkNewSiteInited(fs, basepath, t)
|
|
}
|
|
|
|
func TestDoNewSite_error_force_dir_inside_exists(t *testing.T) {
|
|
basepath := filepath.Join("base", "blog")
|
|
_, fs := newTestCfg()
|
|
n := newNewSiteCmd()
|
|
|
|
contentPath := filepath.Join(basepath, "content")
|
|
|
|
require.NoError(t, fs.Source.MkdirAll(contentPath, 777))
|
|
require.Error(t, n.doNewSite(fs, basepath, true))
|
|
}
|
|
|
|
func TestDoNewSite_error_force_config_inside_exists(t *testing.T) {
|
|
basepath := filepath.Join("base", "blog")
|
|
_, fs := newTestCfg()
|
|
n := newNewSiteCmd()
|
|
|
|
configPath := filepath.Join(basepath, "config.toml")
|
|
require.NoError(t, fs.Source.MkdirAll(basepath, 777))
|
|
_, err := fs.Source.Create(configPath)
|
|
require.NoError(t, err)
|
|
|
|
require.Error(t, n.doNewSite(fs, basepath, true))
|
|
}
|
|
|
|
func newTestCfg() (*viper.Viper, *hugofs.Fs) {
|
|
|
|
v := viper.New()
|
|
fs := hugofs.NewMem(v)
|
|
|
|
v.SetFs(fs.Source)
|
|
|
|
return v, fs
|
|
|
|
}
|