docs: Add Netlify badge if on Netlify

Most obvius benefit of this is to include CSS partials with css file suffix into HTML templates.

A valid workaround would be to rename the file `mystyles.html`, but that doesn't work too good for external editors etc.

The css partial is  a method used in some themes before Hugo 0.20, but then it stopped working.

This commit reintroduces that behaviour.

Note that the regular layout lookups for text templates, i.e. "single.json" will be
prefixed with "_text/" on lookup and will only match in the text collection.

Fixes #3273

.circleci/config.yml

@@ -1,50 +0,0 @@
-defaults: &defaults
-  working_directory: /go/src/github.com/gohugoio
-  docker:
-      - image: bepsays/ci-goreleaser:0.79.0-2
-    
-version: 2
-jobs:
-  build:
-    <<: *defaults
-    steps:
-      - checkout:
-          path: hugo
-      - run:
-            command: |
-                go get -d github.com/magefile/mage/...
-                git clone git@github.com:gohugoio/hugoDocs.git
-                cd hugo
-                mage vendor
-                mage check
-      - persist_to_workspace:
-          root: .
-          paths: .
-  release:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: /go/src/github.com/gohugoio
-      - run:
-            command: |
-                    cd hugo
-                    git config --global user.email "bjorn.erik.pedersen+hugoreleaser@gmail.com"
-                    git config --global user.name "hugoreleaser"
-                    go run -tags release main.go release -r ${CIRCLE_BRANCH}
-
-workflows:
-  version: 2
-  release:
-      jobs:  
-        - build:
-            filters:
-              branches:
-                only: /release-.*/
-        - hold:
-            type: approval
-            requires:
-              - build
-        - release:
-            context: org-global
-            requires:
-              - hold

.dockerignore

@@ -1,8 +0,0 @@
-*.md
-*.log
-*.txt
-.git
-.github
-.circleci
-docs
-examples

.gitattributes

@@ -1,8 +0,0 @@
-# Text files have auto line endings
-* text=auto
-
-# Go source files always have LF line endings
-*.go text eol=lf
-
-# SVG files should not be modified
-*.svg -text

.github/SUPPORT.md

@@ -1,3 +0,0 @@
-### Asking Support Questions
-
-We have an active [discussion forum](https://discourse.gohugo.io) where users and developers can ask questions. Please don't use the GitHub issue tracker to ask questions.

.github/stale.yml

@@ -1,23 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 120
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 30
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - Keep
-  - Security
-# Label to use when marking an issue as stale
-staleLabel: Stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. The resources of the Hugo team are limited, and so we are asking for your help.
-
-  If this is a **bug** and you can still reproduce this error on the <code>master</code> branch, please reply with all of the information you have about it in order to keep the issue open.
-
-  If this is a **feature request**, and you feel that it is still relevant and valuable, please tell us why.
-
-  This issue will automatically be closed in the near future if no further activity occurs. Thank you for all your contributions.
-  
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.gitignore

@@ -1,21 +1,17 @@
-hugo
-docs/public*
-/.idea
-hugo.exe
-*.test
-*.prof
-nohup.out
-cover.out
-*.swp
-*.swo
-.DS_Store
-*~
+hugo
+docs/public*
+/.idea
+hugo.exe
+*.test
+*.prof
+nohup.out
+cover.out
+*.swp
+*.swo
+.DS_Store
+*~
 vendor/*/
 *.bench
-*.debug
 coverage*.out
 
-dock.sh
-
-GoBuilds
-dist
+GoBuilds

.goxc.json

@@ -0,0 +1,6 @@
+{
+	"ArtifactsDest": "GoBuilds/",
+	"OutPath": "{{.Dest}}{{.PS}}{{.AppName}}{{.PS}}{{.Version}}{{.PS}}{{.AppName}}_{{.Version}}_{{.Os}}_{{.Arch}}{{.Ext}}",
+	"BuildConstraints": "linux windows darwin freebsd netbsd openbsd dragonfly",
+	"ConfigVersion": "0.9"
+}

.travis.yml

@@ -1,13 +1,8 @@
 language: go
-sudo: false
-dist: trusty
-env:
-  HUGO_BUILD_TAGS="extended"
-git:
-  depth: false
+sudo: required
 go:
-  - 1.9.7
-  - "1.10.3"
+  - 1.7.5
+  - 1.8.1
   - tip
 os:
   - linux
@@ -17,14 +12,12 @@ matrix:
     - go: tip
   fast_finish: true
 install:
-  - go get github.com/magefile/mage
-  - mage -v vendor
+  - make vendor
 script:
-  - mage -v test
-  - mage -v check
-  - mage -v hugo
+  - make hugo-race check
   - ./hugo -s docs/
   - ./hugo --renderToMemory -s docs/
 before_install:
-  - gem install asciidoctor
-  - type asciidoctor
+  # gem install must be run with sudo on OSX
+  - sudo gem install asciidoctor | gem install asciidoctor
+  - sudo pip install docutils

CONTRIBUTING.md

@@ -5,11 +5,7 @@ organization, tutorials, blog posts, bug reports, issues, feature requests,
 feature implementations, pull requests, answering questions on the forum,
 helping to manage issues, etc.
 
-The Hugo community and maintainers are [very active](https://github.com/gohugoio/hugo/pulse/monthly) and helpful, and the project benefits greatly from this activity. We created a [step by step guide](https://gohugo.io/tutorials/how-to-contribute-to-hugo/) if you're unfamiliar with GitHub or contributing to open source projects in general.
-
-*Note that this repository only contains the actual source code of Hugo. For **only** documentation-related pull requests / issues please refer to the [hugoDocs](https://github.com/gohugoio/hugoDocs) repository.*
-
-*Changes to the codebase **and** related documentation, e.g. for a new feature, should still use a single pull request.*
+The Hugo community and maintainers are [very active](https://github.com/spf13/hugo/pulse/monthly) and helpful, and the project benefits greatly from this activity. We created a [step by step guide](https://gohugo.io/tutorials/how-to-contribute-to-hugo/) if you're unfamiliar with GitHub or contributing to open source projects in general.
 
 ## Table of Contents
 
@@ -26,54 +22,38 @@ The Hugo community and maintainers are [very active](https://github.com/gohugoio
 
 ## Asking Support Questions
 
-We have an active [discussion forum](https://discourse.gohugo.io) where users and developers can ask questions.
+We have an active [discussion forum](http://discuss.gohugo.io) where users and developers can ask questions.
 Please don't use the GitHub issue tracker to ask questions.
 
 ## Reporting Issues
 
 If you believe you have found a defect in Hugo or its documentation, use
-the GitHub [issue tracker](https://github.com/gohugoio/hugo/issues) to report
-the problem to the Hugo maintainers. If you're not sure if it's a bug or not,
-start by asking in the [discussion forum](https://discourse.gohugo.io).
-When reporting the issue, please provide the version of Hugo in use (`hugo
-version`) and your operating system.
-
-## Code Contribution
-
-Hugo has become a fully featured static site generator, so any new functionality must:
-
-* be useful to many.
-* fit naturally into _what Hugo does best._
-* strive not to break existing sites.
-* close or update an open [Hugo issue](https://github.com/gohugoio/hugo/issues)
-
-If it is of some complexity, the contributor is expected to maintain and support the new future (answer questions on the forum, fix any bugs etc.).
-
-It is recommended to open up a discussion on the [Hugo Forum](https://discourse.gohugo.io/) to get feedback on your idea before you begin. If you are submitting a complex feature, create a small design proposal on the [Hugo issue tracker](https://github.com/gohugoio/hugo/issues) before you start.
-
-
-**Bug fixes are, of course, always welcome.**
-
-
+the GitHub [issue tracker](https://github.com/spf13/hugo/issues) to report the problem to the Hugo maintainers.
+If you're not sure if it's a bug or not, start by asking in the [discussion forum](http://discuss.gohugo.io).
+When reporting the issue, please provide the version of Hugo in use (`hugo version`) and your operating system.
 
 ## Submitting Patches
 
-The Hugo project welcomes all contributors and contributions regardless of skill or experience level. If you are interested in helping with the project, we will help you with your contribution.
+The Hugo project welcomes all contributors and contributions regardless of skill or experience level.
+If you are interested in helping with the project, we will help you with your contribution.
+Hugo is a very active project with many contributions happening daily.
+Because we want to create the best possible product for our users and the best contribution experience for our developers,
+we have a set of guidelines which ensure that all contributions are acceptable.
+The guidelines are not intended as a filter or barrier to participation.
+If you are unfamiliar with the contribution process, the Hugo team will help you and teach you how to bring your contribution in accordance with the guidelines.
 
 ### Code Contribution Guidelines
 
-Because we want to create the best possible product for our users and the best contribution experience for our developers, we have a set of guidelines which ensure that all contributions are acceptable. The guidelines are not intended as a filter or barrier to participation. If you are unfamiliar with the contribution process, the Hugo team will help you and teach you how to bring your contribution in accordance with the guidelines.
-
 To make the contribution process as seamless as possible, we ask for the following:
 
 * Go ahead and fork the project and make your changes.  We encourage pull requests to allow for review and discussion of code changes.
 * When you’re ready to create a pull request, be sure to:
-    * Sign the [CLA](https://cla-assistant.io/gohugoio/hugo).
+    * Sign the [CLA](https://cla-assistant.io/spf13/hugo).
     * Have test cases for the new code. If you have questions about how to do this, please ask in your pull request.
     * Run `go fmt`.
     * Add documentation if you are adding new features or changing functionality.  The docs site lives in `/docs`.
     * Squash your commits into a single commit. `git rebase -i`. It’s okay to force update your pull request with `git push -f`.
-    * Ensure that `mage check` succeeds. [Travis CI](https://travis-ci.org/gohugoio/hugo) (Linux and macOS) and [AppVeyor](https://ci.appveyor.com/project/gohugoio/hugo/branch/master) (Windows) will fail the build if `mage check` fails.
+    * Ensure that `make check` succeeds. [Travis CI](https://travis-ci.org/spf13/hugo) (Linux and macOS) and [AppVeyor](https://ci.appveyor.com/project/spf13/hugo/branch/master) (Windows) will fail the build if `make check` fails.
     * Follow the **Git Commit Message Guidelines** below.
 
 ### Git Commit Message Guidelines
@@ -85,11 +65,11 @@ the most important part being that each commit message should have a title/subje
 Also, if your commit references one or more GitHub issues, always end your commit message body with *See #1234* or *Fixes #1234*.
 Replace *1234* with the GitHub issue ID. The last example will close the issue when the commit is merged into *master*.
 
-Sometimes it makes sense to prefix the commit message with the package name (or docs folder) all lowercased ending with a colon.
+Sometimes it makes sense to prefix the commit message with the packagename (or docs folder) all lowercased ending with a colon.
 That is fine, but the rest of the rules above apply.
 So it is "tpl: Add emojify template func", not "tpl: add emojify template func.", and "docs: Document emoji", not "doc: document emoji."
 
-Please use a short and descriptive branch name, e.g. **NOT** "patch-1". It's very common but creates a naming conflict each time when a submission is pulled for a review.
+Please consider to use a short and descriptive branch name, e.g. **NOT** "patch-1". It's very common but creates a naming conflict each time when a submission is pulled for a review.
 
 An example:
 
@@ -104,42 +84,42 @@ new default function more useful for Hugo users.
 Fixes #1949
 ```
 
-###  Fetching the Sources From GitHub
+### Vendored Dependencies
+
+Hugo uses [govendor](https://github.com/kardianos/govendor) to vendor dependencies, but we don't commit the vendored packages themselves to the Hugo git repository.
+Therefore, a simple `go get` is not supported since `go get` is not vendor-aware.
+You **must use govendor** to fetch and manage Hugo's dependencies.
+
+### Fetch the Sources From GitHub
+
+```
+go get github.com/kardianos/govendor
+govendor get github.com/spf13/hugo
+```
+
+### Using Git Remotes
 
 Due to the way Go handles package imports, the best approach for working on a
 Hugo fork is to use Git Remotes.  Here's a simple walk-through for getting
 started:
 
-1. Get the Hugo source:
+1. Fetch the Hugo sources as described above.
+
+1. Change to the Hugo source directory:
 
-    ```bash
-    go get -u -v -d github.com/gohugoio/hugo
     ```
-
-1. Install Mage:
-
-    ```bash
-    go get github.com/magefile/mage
+    cd $HOME/go/src/github.com/spf13/hugo
     ```
 
-1. Change to the Hugo source directory and fetch the dependencies:
-
-    ```bash
-    cd $HOME/go/src/github.com/gohugoio/hugo
-    mage vendor
-    ```
-
-    Note that Hugo uses [Go Dep](https://github.com/golang/dep) to vendor dependencies, rather than a simple `go get`. We don't commit the vendored packages themselves to the Hugo git repository. The call to `mage vendor` takes care of all this for you.
-
 1. Create a new branch for your changes (the branch name is arbitrary):
 
-    ```bash
+    ```
     git checkout -b iss1234
     ```
 
 1. After making your changes, commit them to your new branch:
 
-    ```bash
+    ```
     git commit -a -v
     ```
 
@@ -147,65 +127,35 @@ started:
 
 1. Add your fork as a new remote (the remote name, "fork" in this example, is arbitrary):
 
-    ```bash
+    ```
     git remote add fork git://github.com/USERNAME/hugo.git
     ```
 
 1. Push the changes to your new remote:
 
-    ```bash
+    ```
     git push --set-upstream fork iss1234
     ```
 
 1. You're now ready to submit a PR based upon the new branch in your forked repository.
 
-### Building Hugo with Your Changes
-
-Hugo uses [mage](https://github.com/magefile/mage) to sync vendor dependencies, build Hugo, run the test suite and other things. You must run mage from the Hugo directory.
+### Build Hugo with Your Changes
 
 ```bash
-cd $HOME/go/src/github.com/gohugoio/hugo
+cd $HOME/go/src/github.com/spf13/hugo
+make hugo
+# or to install in $HOME/go/bin:
+make install
 ```
 
-To build Hugo: 
-
-```bash
-mage hugo
-```
-
-To install hugo in `$HOME/go/bin`:
-
-```bash
-mage install
-```
-
-To run the tests:
-
-```bash
-mage hugoRace
-mage -v check
-```
-
-To list all available commands along with descriptions:
-
-```bash
-mage -l
-```
-
-**Note:** From Hugo 0.43 we have added a build tag, `extended` that adds **SCSS support**. This needs a C compiler installed to build. You can enable this when building by:
-
-```bash
-HUGO_BUILD_TAGS=extended mage install
-````
-
 ### Updating the Hugo Sources
 
 If you want to stay in sync with the Hugo repository, you can easily pull down
 the source changes, but you'll need to keep the vendored packages up-to-date as
 well.
 
-```bash
+```
 git pull
-mage vendor
+make vendor
 ```
 

Dockerfile

@@ -1,27 +1,17 @@
-# GitHub:       https://github.com/gohugoio
-# Twitter:      https://twitter.com/gohugoio
-# Website:      https://gohugo.io/
+FROM golang:1.8-alpine
 
-FROM golang:1.10.3-alpine3.7 AS build
+ENV GOPATH /go
+ENV USER root
 
-ENV CGO_ENABLED=0
-ENV GOOS=linux
+RUN apk update && apk add git make
 
-WORKDIR /go/src/github.com/gohugoio/hugo
-RUN apk add --no-cache \
-    git \
-    musl-dev && \
-  go get github.com/golang/dep/cmd/dep
-COPY . /go/src/github.com/gohugoio/hugo/
-RUN dep ensure -vendor-only && \
-  go install -ldflags '-s -w'
+# pre-install known dependencies before the source, so we don't redownload them whenever the source changes
+RUN go get github.com/kardianos/govendor \
+ && govendor get github.com/spf13/hugo
 
-# ---
+COPY . $GOPATH/src/github.com/spf13/hugo
 
-FROM scratch
-COPY --from=build /go/bin/hugo /hugo
-WORKDIR /site
-VOLUME  /site
-EXPOSE  1313
-ENTRYPOINT [ "/hugo" ]
-CMD [ "--help" ]
+RUN cd $GOPATH/src/github.com/spf13/hugo \
+ 	&& make install test
+
+ENTRYPOINT "/bin/sh"

Gopkg.lock

@@ -1,715 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  digest = "1:f6a10073544cc0bd1eb9fd9f8d9bf4644971910a0f8393d51b5b4d286e554849"
-  name = "github.com/BurntSushi/locker"
-  packages = ["."]
-  pruneopts = ""
-  revision = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"
-
-[[projects]]
-  branch = "master"
-  digest = "1:fe421c7102aa7290dc831e2772971a2c74155013b68c2769c0da44383f7aa6be"
-  name = "github.com/BurntSushi/toml"
-  packages = ["."]
-  pruneopts = ""
-  revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"
-
-[[projects]]
-  digest = "1:8e47871087b94913898333f37af26732faaab30cdb41571136cf7aec9921dae7"
-  name = "github.com/PuerkitoBio/purell"
-  packages = ["."]
-  pruneopts = ""
-  revision = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
-  version = "v1.1.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:331a419049c2be691e5ba1d24342fc77c7e767a80c666a18fd8a9f7b82419c1c"
-  name = "github.com/PuerkitoBio/urlesc"
-  packages = ["."]
-  pruneopts = ""
-  revision = "de5bf2ad457846296e2031421a34e2568e304e35"
-
-[[projects]]
-  branch = "master"
-  digest = "1:587118db822769eb67defc43c6d9363f4d6f615106fa6f510c668b78063e21bc"
-  name = "github.com/alecthomas/assert"
-  packages = ["."]
-  pruneopts = ""
-  revision = "405dbfeb8e38effee6e723317226e93fff912d06"
-
-[[projects]]
-  digest = "1:055c07e4af5ddccc93ad394e04e85ca76c3cb2e067b18b97ac3ffd49cb04a339"
-  name = "github.com/alecthomas/chroma"
-  packages = [
-    ".",
-    "formatters",
-    "formatters/html",
-    "lexers",
-    "lexers/a",
-    "lexers/b",
-    "lexers/c",
-    "lexers/circular",
-    "lexers/d",
-    "lexers/e",
-    "lexers/f",
-    "lexers/g",
-    "lexers/h",
-    "lexers/i",
-    "lexers/internal",
-    "lexers/j",
-    "lexers/k",
-    "lexers/l",
-    "lexers/m",
-    "lexers/n",
-    "lexers/o",
-    "lexers/p",
-    "lexers/q",
-    "lexers/r",
-    "lexers/s",
-    "lexers/t",
-    "lexers/v",
-    "lexers/w",
-    "lexers/x",
-    "lexers/y",
-    "styles",
-  ]
-  pruneopts = ""
-  revision = "5d7fef2ae60b501bbf28d476c3f273b8017d8261"
-  version = "v0.5.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:ba0a389824c3c3d378f5f334370524b7d04b5a5ccedce7dd2da05ae8d3868609"
-  name = "github.com/alecthomas/colour"
-  packages = ["."]
-  pruneopts = ""
-  revision = "60882d9e27213e8552dcff6328914fe4c2b44bc9"
-
-[[projects]]
-  branch = "master"
-  digest = "1:1b12d492967d13ec7360082e12a1eb6e1be195baa5c83f23b371a490a40decda"
-  name = "github.com/alecthomas/repr"
-  packages = ["."]
-  pruneopts = ""
-  revision = "ead21651dde39fea129e6e4a612c675693d0f4ff"
-
-[[projects]]
-  digest = "1:05d0e4ae6b8d0273647964fe26762e3345d5d196aaeb858838e75336703451ba"
-  name = "github.com/bep/debounce"
-  packages = ["."]
-  pruneopts = ""
-  revision = "844797fa1dd9ba969d71b62797ff19d1e49d4eac"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:da56e55c4bf803e26ff8ece34f7b54727fdf053fbb2b50f92043e41ab2ef1e78"
-  name = "github.com/bep/gitmap"
-  packages = ["."]
-  pruneopts = ""
-  revision = "ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:50f18fd801868be859fa7fdddfc3a56ec41b562176f84db31b2b78cedb530326"
-  name = "github.com/bep/go-tocss"
-  packages = [
-    "scss",
-    "scss/libsass",
-    "tocss",
-  ]
-  pruneopts = ""
-  revision = "2abb118dc8688b6c7df44e12f4152c2bded9b19c"
-  version = "v0.5.0"
-
-[[projects]]
-  digest = "1:d814bbb551582d8f27085f6a9d941024ef20c3bee0132da6f9841c062cf338de"
-  name = "github.com/chaseadamsio/goorgeous"
-  packages = ["."]
-  pruneopts = ""
-  revision = "dcf1ef873b8987bf12596fe6951c48347986eb2f"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:5b5e11b56adf922e0efc8856f86420a3467607975ff8ecb54bb0bac318c1548f"
-  name = "github.com/cpuguy83/go-md2man"
-  packages = ["md2man"]
-  pruneopts = ""
-  revision = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"
-  version = "v1.0.6"
-
-[[projects]]
-  branch = "master"
-  digest = "1:8f6c36ee73ded871996ada894e20dfecde56557d08b4d1849d5489076679971f"
-  name = "github.com/danwakefield/fnmatch"
-  packages = ["."]
-  pruneopts = ""
-  revision = "cbb64ac3d964b81592e64f957ad53df015803288"
-
-[[projects]]
-  digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
-  name = "github.com/davecgh/go-spew"
-  packages = ["spew"]
-  pruneopts = ""
-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:b218908776d4939d4ecfd8ae87918d17b01b491e219d09bedf24b4aeb0f0b7e9"
-  name = "github.com/disintegration/imaging"
-  packages = ["."]
-  pruneopts = ""
-  revision = "dd50a3ee9985ccd313a2f03c398fcaedc96dc707"
-  version = "v1.2.4"
-
-[[projects]]
-  digest = "1:556b75e96f02319585d253d262c4ce5dfdf4b28be474f1e0877c5f4f9b10cf9e"
-  name = "github.com/dlclark/regexp2"
-  packages = [
-    ".",
-    "syntax",
-  ]
-  pruneopts = ""
-  revision = "487489b64fb796de2e55f4e8a4ad1e145f80e957"
-  version = "v1.1.6"
-
-[[projects]]
-  branch = "master"
-  digest = "1:f0cd82a11574a06f08e22bf3c2ba0c259f4c84f73d95d011d7024b78febe17e9"
-  name = "github.com/eknkc/amber"
-  packages = [
-    ".",
-    "parser",
-  ]
-  pruneopts = ""
-  revision = "cdade1c073850f4ffc70a829e31235ea6892853b"
-
-[[projects]]
-  digest = "1:e5c807ac3b60699ccec9263f6eec756251b17e78582eb149f90ac345d9e58327"
-  name = "github.com/fortytw2/leaktest"
-  packages = ["."]
-  pruneopts = ""
-  revision = "a5ef70473c97b71626b9abeda80ee92ba2a7de9e"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:eb53021a8aa3f599d29c7102e65026242bdedce998a54837dc67f14b6a97c5fd"
-  name = "github.com/fsnotify/fsnotify"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-  version = "v1.4.7"
-
-[[projects]]
-  digest = "1:9ab1b1c637d7c8f49e39d8538a650d7eb2137b076790cff69d160823b505964c"
-  name = "github.com/gobwas/glob"
-  packages = [
-    ".",
-    "compiler",
-    "match",
-    "syntax",
-    "syntax/ast",
-    "syntax/lexer",
-    "util/runes",
-    "util/strings",
-  ]
-  pruneopts = ""
-  revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
-  version = "v0.2.3"
-
-[[projects]]
-  digest = "1:64d212c703a2b94054be0ce470303286b177ad260b2f89a307e3d1bb6c073ef6"
-  name = "github.com/gorilla/websocket"
-  packages = ["."]
-  pruneopts = ""
-  revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
-  version = "v1.2.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:4423ee95d6ee30bb22f680445c58889bb5b91e1b955405bf34374a053784a8a2"
-  name = "github.com/hashicorp/go-immutable-radix"
-  packages = ["."]
-  pruneopts = ""
-  revision = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf"
-
-[[projects]]
-  branch = "master"
-  digest = "1:9c776d7d9c54b7ed89f119e449983c3f24c0023e75001d6092442412ebca6b94"
-  name = "github.com/hashicorp/golang-lru"
-  packages = ["simplelru"]
-  pruneopts = ""
-  revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
-
-[[projects]]
-  branch = "master"
-  digest = "1:9b7c5846d70f425d7fe279595e32a20994c6075e87be03b5c367ed07280877c5"
-  name = "github.com/hashicorp/hcl"
-  packages = [
-    ".",
-    "hcl/ast",
-    "hcl/parser",
-    "hcl/printer",
-    "hcl/scanner",
-    "hcl/strconv",
-    "hcl/token",
-    "json/parser",
-    "json/scanner",
-    "json/token",
-  ]
-  pruneopts = ""
-  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
-
-[[projects]]
-  digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
-  name = "github.com/inconshreveable/mousetrap"
-  packages = ["."]
-  pruneopts = ""
-  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-  version = "v1.0"
-
-[[projects]]
-  digest = "1:dddb389214f3ebf7c1f885d0e1f9498a17608f4a9b623c827cafb3c5f91f9ac4"
-  name = "github.com/jdkato/prose"
-  packages = [
-    "internal/util",
-    "transform",
-  ]
-  pruneopts = ""
-  revision = "20d3663d4bc9dd10d75abcde9d92e04b4861c674"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:41ea0e53c25c1c7f51b3ff6589bcf586a0fb548caceeb6a5dd60b91ed19ea801"
-  name = "github.com/kyokomi/emoji"
-  packages = ["."]
-  pruneopts = ""
-  revision = "2e9a9507333f3ee28f3fab88c2c3aba34455d734"
-  version = "v1.5.1"
-
-[[projects]]
-  digest = "1:901c7dc16a166e57e940dee1350511ba5cb5e61eeca858edb76d21b65f9b7cff"
-  name = "github.com/magefile/mage"
-  packages = [
-    "mg",
-    "sh",
-  ]
-  pruneopts = ""
-  revision = "2f974307b636f59c13b88704cf350a4772fef271"
-  version = "v1.0.2"
-
-[[projects]]
-  digest = "1:961dc3b1d11f969370533390fdf203813162980c858e1dabe827b60940c909a5"
-  name = "github.com/magiconair/properties"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c2353362d570a7bfa228149c62842019201cfb71"
-  version = "v1.8.0"
-
-[[projects]]
-  digest = "1:fd46423a2fe75d52968baf37471b99e6f05cea3ac29c756128ead26af34e1c35"
-  name = "github.com/markbates/inflect"
-  packages = ["."]
-  pruneopts = ""
-  revision = "a12c3aec81a6a938bf584a4bac567afed9256586"
-
-[[projects]]
-  digest = "1:78229b46ddb7434f881390029bd1af7661294af31f6802e0e1bedaad4ab0af3c"
-  name = "github.com/mattn/go-isatty"
-  packages = ["."]
-  pruneopts = ""
-  revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-  version = "v0.0.3"
-
-[[projects]]
-  digest = "1:81e673df85e765593a863f67cba4544cf40e8919590f04d67664940786c2b61a"
-  name = "github.com/mattn/go-runewidth"
-  packages = ["."]
-  pruneopts = ""
-  revision = "9e777a8366cce605130a531d2cd6363d07ad7317"
-  version = "v0.0.2"
-
-[[projects]]
-  digest = "1:bb98cbb82602cde3cafa5e2ee9b8fb1de3d57d490c09f0988d7edf2b30afec2d"
-  name = "github.com/miekg/mmark"
-  packages = ["."]
-  pruneopts = ""
-  revision = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"
-  version = "v1.3.6"
-
-[[projects]]
-  branch = "master"
-  digest = "1:0de0f377aeccd41384e883c59c6f184c9db01c96db33a2724a1eaadd60f92629"
-  name = "github.com/mitchellh/hashstructure"
-  packages = ["."]
-  pruneopts = ""
-  revision = "2bca23e0e452137f789efbc8610126fd8b94f73b"
-
-[[projects]]
-  branch = "master"
-  digest = "1:f43ed2c836208c14f45158fd01577c985688a4d11cf9fd475a939819fef3b321"
-  name = "github.com/mitchellh/mapstructure"
-  packages = ["."]
-  pruneopts = ""
-  revision = "f15292f7a699fcc1a38a80977f80a046874ba8ac"
-
-[[projects]]
-  branch = "master"
-  digest = "1:a21a59f6adec3256fd6f5bd0377cb95ff8128d3ab716fae9944e71b017c68b49"
-  name = "github.com/muesli/smartcrop"
-  packages = [
-    ".",
-    "options",
-  ]
-  pruneopts = ""
-  revision = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464"
-
-[[projects]]
-  digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
-  name = "github.com/nicksnyder/go-i18n"
-  packages = [
-    "i18n/bundle",
-    "i18n/language",
-    "i18n/translation",
-  ]
-  pruneopts = ""
-  revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
-  version = "v1.10.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:816e800c7b5689e114c0dc6acf494553d1e7a52575764c5d6de67fb32bd8bbb2"
-  name = "github.com/olekukonko/tablewriter"
-  packages = ["."]
-  pruneopts = ""
-  revision = "d4647c9c7a84d847478d890b816b7d8b62b0b279"
-
-[[projects]]
-  digest = "1:894aef961c056b6d85d12bac890bf60c44e99b46292888bfa66caf529f804457"
-  name = "github.com/pelletier/go-toml"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411"
-  name = "github.com/pmezard/go-difflib"
-  packages = ["difflib"]
-  pruneopts = ""
-  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:3f5b207bd1428aeb3d4bdb65f787236883a5d2d2dd154af011a078b0732d4de9"
-  name = "github.com/russross/blackfriday"
-  packages = ["."]
-  pruneopts = ""
-  revision = "46c73eb196baff5bb07288f245b223bd1a30fba6"
-
-[[projects]]
-  digest = "1:354988e51f0b9061a2d6b94e84ede12be35bc09ee3be23f61c9d18246b0c2c24"
-  name = "github.com/sanity-io/litter"
-  packages = ["."]
-  pruneopts = ""
-  revision = "ae543b7ba8fd6af63e4976198f146e1348ae53c1"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8"
-  name = "github.com/sergi/go-diff"
-  packages = ["diffmatchpatch"]
-  pruneopts = ""
-  revision = "1744e2970ca51c86172c8190fadad617561ed6e7"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:606fa779c7a80ab6a9ec5836cd12759f86cd6e1d82d5d60cf7ec5133e78c6cf8"
-  name = "github.com/shurcooL/sanitized_anchor_name"
-  packages = ["."]
-  pruneopts = ""
-  revision = "86672fcb3f950f35f2e675df2240550f2a50762f"
-
-[[projects]]
-  digest = "1:7ba2551c9a8de293bc575dbe2c0d862c52252d26f267f784547f059f512471c8"
-  name = "github.com/spf13/afero"
-  packages = [
-    ".",
-    "mem",
-  ]
-  pruneopts = ""
-  revision = "787d034dfe70e44075ccc060d346146ef53270ad"
-  version = "v1.1.1"
-
-[[projects]]
-  digest = "1:d0b38ba6da419a6d4380700218eeec8623841d44a856bb57369c172fbf692ab4"
-  name = "github.com/spf13/cast"
-  packages = ["."]
-  pruneopts = ""
-  revision = "8965335b8c7107321228e3e3702cab9832751bac"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:a1403cc8a94b8d7956ee5e9694badef0e7b051af289caad1cf668331e3ffa4f6"
-  name = "github.com/spf13/cobra"
-  packages = [
-    ".",
-    "doc",
-  ]
-  pruneopts = ""
-  revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"
-  version = "v0.0.3"
-
-[[projects]]
-  branch = "master"
-  digest = "1:7c00f445c89f468abd5ab86546ba1fa11bac66e63325ade8ca05aa7220791fc7"
-  name = "github.com/spf13/fsync"
-  packages = ["."]
-  pruneopts = ""
-  revision = "12a01e648f05a938100a26858d2d59a120307a18"
-
-[[projects]]
-  branch = "master"
-  digest = "1:104517520aab91164020ab6524a5d6b7cafc641b2e42ac6236f6ac1deac4f66a"
-  name = "github.com/spf13/jwalterweatherman"
-  packages = ["."]
-  pruneopts = ""
-  revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
-
-[[projects]]
-  branch = "master"
-  digest = "1:5082c0d57a199dabc0868010784039249af0932fad2990b51ad9404c9a6b6e5d"
-  name = "github.com/spf13/nitro"
-  packages = ["."]
-  pruneopts = ""
-  revision = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"
-
-[[projects]]
-  digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d"
-  name = "github.com/spf13/pflag"
-  packages = ["."]
-  pruneopts = ""
-  revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
-  version = "v1.0.1"
-
-[[projects]]
-  digest = "1:a3018c5a423d6cfacf5c6e736ad07637494728fb446390e3f34cacae9e80a529"
-  name = "github.com/spf13/viper"
-  packages = ["."]
-  pruneopts = ""
-  revision = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75"
-  name = "github.com/stretchr/testify"
-  packages = [
-    "assert",
-    "require",
-  ]
-  pruneopts = ""
-  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
-  version = "v1.2.2"
-
-[[projects]]
-  digest = "1:0308279931f894a1ba11e7d354d346c96ead9c7539a4fff1fce030845ec6c780"
-  name = "github.com/tdewolff/minify"
-  packages = [
-    ".",
-    "css",
-    "html",
-    "js",
-    "json",
-    "svg",
-    "xml",
-  ]
-  pruneopts = ""
-  revision = "8d72a4127ae33b755e95bffede9b92e396267ce2"
-  version = "v2.3.5"
-
-[[projects]]
-  digest = "1:6e64aa755995f3185ee55306ada462999775b8faae39aec142b3fd54248dd5ee"
-  name = "github.com/tdewolff/parse"
-  packages = [
-    ".",
-    "buffer",
-    "css",
-    "html",
-    "js",
-    "json",
-    "strconv",
-    "svg",
-    "xml",
-  ]
-  pruneopts = ""
-  revision = "d739d6fccb0971177e06352fea02d3552625efb1"
-  version = "v2.3.3"
-
-[[projects]]
-  branch = "master"
-  digest = "1:be92e3574c94090ee4659d49a4ab156301fd62c2bdad831ca52ad7ce3ee91e2e"
-  name = "github.com/wellington/go-libsass"
-  packages = ["libs"]
-  pruneopts = ""
-  revision = "615eaa47ef794d037c1906a0eb7bf85375a5decf"
-
-[[projects]]
-  digest = "1:bf83d7fb8e87f39806ce3550657a8a31bbeb96a35eb105bd98e7362559fba27f"
-  name = "github.com/yosssi/ace"
-  packages = ["."]
-  pruneopts = ""
-  revision = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56"
-  version = "v0.0.5"
-
-[[projects]]
-  branch = "master"
-  digest = "1:0960a9f676f505c50b45b2db87151ef60991c6f4764083b02acfabf09bcdc5cc"
-  name = "golang.org/x/image"
-  packages = [
-    "bmp",
-    "draw",
-    "math/f64",
-    "riff",
-    "tiff",
-    "tiff/lzw",
-    "vp8",
-    "vp8l",
-    "webp",
-  ]
-  pruneopts = ""
-  revision = "c73c2afc3b812cdd6385de5a50616511c4a3d458"
-
-[[projects]]
-  branch = "master"
-  digest = "1:b970d5e8b11b4c8927a06298566eb8daf66a009702688b4142cc2a961e374e91"
-  name = "golang.org/x/net"
-  packages = [
-    "context",
-    "idna",
-  ]
-  pruneopts = ""
-  revision = "f4c29de78a2a91c00474a2e689954305c350adf9"
-
-[[projects]]
-  branch = "master"
-  digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1"
-  name = "golang.org/x/sync"
-  packages = ["errgroup"]
-  pruneopts = ""
-  revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"
-
-[[projects]]
-  branch = "master"
-  digest = "1:41e7b97b66e984325fed9d6cd43ca9e2efdd3c711980916ad444667d633f13f1"
-  name = "golang.org/x/sys"
-  packages = ["unix"]
-  pruneopts = ""
-  revision = "2be389f392cd91df245b41638f818a1c041f0c08"
-
-[[projects]]
-  branch = "master"
-  digest = "1:243aef9eafbe63eb8ca74de9497597832721201e92a9203078173d90a494456c"
-  name = "golang.org/x/text"
-  packages = [
-    "collate",
-    "collate/build",
-    "internal/colltab",
-    "internal/gen",
-    "internal/language",
-    "internal/language/compact",
-    "internal/tag",
-    "internal/triegen",
-    "internal/ucd",
-    "language",
-    "secure/bidirule",
-    "transform",
-    "unicode/bidi",
-    "unicode/cldr",
-    "unicode/norm",
-    "unicode/rangetable",
-    "width",
-  ]
-  pruneopts = ""
-  revision = "cb6730876b985e110843c1842a7a63a63677cf08"
-
-[[projects]]
-  branch = "v2"
-  digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
-  name = "gopkg.in/yaml.v2"
-  packages = ["."]
-  pruneopts = ""
-  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = [
-    "github.com/BurntSushi/locker",
-    "github.com/BurntSushi/toml",
-    "github.com/PuerkitoBio/purell",
-    "github.com/alecthomas/assert",
-    "github.com/alecthomas/chroma",
-    "github.com/alecthomas/chroma/formatters",
-    "github.com/alecthomas/chroma/formatters/html",
-    "github.com/alecthomas/chroma/lexers",
-    "github.com/alecthomas/chroma/styles",
-    "github.com/bep/debounce",
-    "github.com/bep/gitmap",
-    "github.com/bep/go-tocss/scss",
-    "github.com/bep/go-tocss/scss/libsass",
-    "github.com/bep/go-tocss/tocss",
-    "github.com/chaseadamsio/goorgeous",
-    "github.com/disintegration/imaging",
-    "github.com/eknkc/amber",
-    "github.com/fortytw2/leaktest",
-    "github.com/fsnotify/fsnotify",
-    "github.com/gobwas/glob",
-    "github.com/gorilla/websocket",
-    "github.com/hashicorp/go-immutable-radix",
-    "github.com/jdkato/prose/transform",
-    "github.com/kyokomi/emoji",
-    "github.com/magefile/mage/mg",
-    "github.com/magefile/mage/sh",
-    "github.com/markbates/inflect",
-    "github.com/miekg/mmark",
-    "github.com/mitchellh/hashstructure",
-    "github.com/mitchellh/mapstructure",
-    "github.com/muesli/smartcrop",
-    "github.com/nicksnyder/go-i18n/i18n/bundle",
-    "github.com/nicksnyder/go-i18n/i18n/language",
-    "github.com/olekukonko/tablewriter",
-    "github.com/russross/blackfriday",
-    "github.com/sanity-io/litter",
-    "github.com/spf13/afero",
-    "github.com/spf13/cast",
-    "github.com/spf13/cobra",
-    "github.com/spf13/cobra/doc",
-    "github.com/spf13/fsync",
-    "github.com/spf13/jwalterweatherman",
-    "github.com/spf13/nitro",
-    "github.com/spf13/pflag",
-    "github.com/spf13/viper",
-    "github.com/stretchr/testify/assert",
-    "github.com/stretchr/testify/require",
-    "github.com/tdewolff/minify",
-    "github.com/tdewolff/minify/css",
-    "github.com/tdewolff/minify/html",
-    "github.com/tdewolff/minify/js",
-    "github.com/tdewolff/minify/json",
-    "github.com/tdewolff/minify/svg",
-    "github.com/tdewolff/minify/xml",
-    "github.com/yosssi/ace",
-    "golang.org/x/image/webp",
-    "golang.org/x/net/context",
-    "golang.org/x/sync/errgroup",
-    "golang.org/x/text/transform",
-    "golang.org/x/text/unicode/norm",
-    "gopkg.in/yaml.v2",
-  ]
-  solver-name = "gps-cdcl"
-  solver-version = 1

Gopkg.toml

@@ -1,171 +0,0 @@
-
-
-[[constraint]]
-  name = "github.com/BurntSushi/toml"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/PuerkitoBio/purell"
-  version = "1.1.0"
-
-[[constraint]]
-  name = "github.com/alecthomas/chroma"
-  version = "^0.5.0"
-
-[[constraint]]
-  name = "github.com/bep/gitmap"
-  version = "^1.0.0"
-  
-[[constraint]]
-  version = "v0.5.0"
-  name = "github.com/bep/go-tocss"
-
-[[override]]
-   branch = "master"
-   name = "github.com/wellington/go-libsass"
- 
-[[constraint]]
- name = "github.com/chaseadamsio/goorgeous"
- version = "^1.1.0"
-
-[[constraint]]
- name = "github.com/disintegration/imaging"
- version = "~v1.2.4"
-
-[[constraint]]
-  name = "github.com/magefile/mage"
-  version = "v1"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/eknkc/amber"
-
-[[constraint]]
-  name = "github.com/fortytw2/leaktest"
-  version = "1.1.0"
-
-[[constraint]]
-  name = "github.com/fsnotify/fsnotify"
-  version = "^1.4.0"
-
-[[constraint]]
-  name = "github.com/gorilla/websocket"
-  version = "1.2.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/hashicorp/go-immutable-radix"
-
-[[constraint]]
-  name = "github.com/jdkato/prose"
-  version = "1.1.0"
-
-[[constraint]]
-  name = "github.com/kyokomi/emoji"
-  version = "1.5.0"
-
-[[constraint]]
-  name = "github.com/markbates/inflect"
-  revision = "a12c3aec81a6a938bf584a4bac567afed9256586"
-
-[[constraint]]
-  name = "github.com/miekg/mmark"
-  version = "^1.3.6"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/mitchellh/mapstructure"
-
-[[constraint]]
-  name = "github.com/nicksnyder/go-i18n"
-  version = "^1.10.0"
-
-[[constraint]]
-  name = "github.com/russross/blackfriday"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/spf13/afero"
-  version = "^1.1.0"
-
-[[constraint]]
-  name = "github.com/spf13/cast"
-  version = "^1.1.0"
-
-[[constraint]]
-  version = "^0.0.1"
-  name = "github.com/spf13/cobra"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/spf13/fsync"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/spf13/jwalterweatherman"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/spf13/nitro"
-
-[[constraint]]
-  name = "github.com/spf13/pflag"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/spf13/viper"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.1.4"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/olekukonko/tablewriter"
-
-[[constraint]]
-  name = "github.com/yosssi/ace"
-  version = "^0.0.5"
-
-[[constraint]]
-  branch = "master"
-  name = "golang.org/x/image"
-
-[[constraint]]
-  branch = "master"
-  name = "golang.org/x/text"
-
-[[constraint]]
-  branch = "v2"
-  name = "gopkg.in/yaml.v2"
-
-[[constraint]]
-  name = "github.com/gobwas/glob"
-  version = "0.2.2"
-
-
-[[constraint]]
-  name = "github.com/muesli/smartcrop"
-  branch = "master"
-
-
-[[constraint]]
-  name = "github.com/sanity-io/litter"
-  version = "1.1.0"
-
-[[constraint]]
-  name = "github.com/bep/debounce"
-  version = "^1.1.0"
-
-[[constraint]]
-  name = "github.com/tdewolff/minify"
-  version = "^2.3.5"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/BurntSushi/locker"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/mitchellh/hashstructure"

LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.

Makefile

@@ -0,0 +1,80 @@
+# A Self-Documenting Makefile: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
+
+PACKAGE = github.com/spf13/hugo
+COMMIT_HASH = `git rev-parse --short HEAD 2>/dev/null`
+BUILD_DATE = `date +%FT%T%z`
+LDFLAGS = -ldflags "-X ${PACKAGE}/hugolib.CommitHash=${COMMIT_HASH} -X ${PACKAGE}/hugolib.BuildDate=${BUILD_DATE}"
+NOGI_LDFLAGS = -ldflags "-X ${PACKAGE}/hugolib.BuildDate=${BUILD_DATE}"
+
+.PHONY: vendor docker check fmt lint test test-race vet test-cover-html help
+.DEFAULT_GOAL := help
+
+vendor: ## Install govendor and sync Hugo's vendored dependencies
+	go get github.com/kardianos/govendor
+	govendor sync ${PACKAGE}
+
+hugo: vendor ## Build hugo binary
+	go build ${LDFLAGS} ${PACKAGE}
+
+hugo-race: vendor ## Build hugo binary with race detector enabled
+	go build -race ${LDFLAGS} ${PACKAGE}
+
+install: vendor ## Install hugo binary
+	go install ${LDFLAGS} ${PACKAGE}
+
+hugo-no-gitinfo: LDFLAGS = ${NOGI_LDFLAGS}
+hugo-no-gitinfo: vendor hugo ## Build hugo without git info
+
+docker: ## Build hugo Docker container
+	docker build -t hugo .
+	docker rm -f hugo-build || true
+	docker run --name hugo-build hugo ls /go/bin
+	docker cp hugo-build:/go/bin/hugo .
+	docker rm hugo-build
+
+govendor: vendor # Deprecated: use "vendor" target
+get: vendor # Deprecated: use "vendor"
+gitinfo: hugo # Deprecated: use "hugo" target
+install-gitinfo: install # Deprecated: use "install" target
+no-git-info: hugo-no-gitinfo # Deprecated: use "hugo-no-gitinfo" target
+
+check: test-race test386 fmt vet ## Run tests and linters
+
+test386: ## Run tests in 32-bit mode
+	GOARCH=386 govendor test +local
+
+test: ## Run tests
+	govendor test +local
+
+test-race: ## Run tests with race detector
+	govendor test -race +local
+
+fmt: ## Run gofmt linter
+	@for d in `govendor list -no-status +local | sed 's/github.com.spf13.hugo/./'` ; do \
+		if [ "`gofmt -l $$d/*.go | tee /dev/stderr`" ]; then \
+			echo "^ improperly formatted go files" && echo && exit 1; \
+		fi \
+	done
+
+lint: ## Run golint linter
+	@for d in `govendor list -no-status +local | sed 's/github.com.spf13.hugo/./'` ; do \
+		if [ "`golint $$d | tee /dev/stderr`" ]; then \
+			echo "^ golint errors!" && echo && exit 1; \
+		fi \
+	done
+
+vet: ## Run go vet linter
+	@if [ "`govendor vet +local | tee /dev/stderr`" ]; then \
+		echo "^ go vet errors!" && echo && exit 1; \
+	fi
+
+test-cover-html: PACKAGES = $(shell govendor list -no-status +local | sed 's/github.com.spf13.hugo/./')
+test-cover-html: ## Generate test coverage report
+	echo "mode: count" > coverage-all.out
+	$(foreach pkg,$(PACKAGES),\
+		govendor test -coverprofile=coverage.out -covermode=count $(pkg);\
+		tail -n +2 coverage.out >> coverage-all.out;)
+	go tool cover -html=coverage-all.out
+
+help:
+	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

README.md

@@ -1,40 +1,41 @@
-![Hugo](https://raw.githubusercontent.com/gohugoio/hugoDocs/master/static/img/hugo-logo.png)
+![Hugo](https://raw.githubusercontent.com/spf13/hugo/master/docs/static/img/hugo-logo.png)
 
-A Fast and Flexible Static Site Generator built with love by [bep](https://github.com/bep), [spf13](http://spf13.com/) and [friends](https://github.com/gohugoio/hugo/graphs/contributors) in [Go][].
+A Fast and Flexible Static Site Generator built with love by [spf13](http://spf13.com/) and [friends](https://github.com/spf13/hugo/graphs/contributors) in [Go][].
 
 [Website](https://gohugo.io) |
-[Forum](https://discourse.gohugo.io) |
-[Developer Chat (no support)](https://gitter.im/gohugoio/hugo) |
+[Forum](https://discuss.gohugo.io) |
+[Developer Chat (no support)](https://gitter.im/spf13/hugo) |
 [Documentation](https://gohugo.io/overview/introduction/) |
 [Installation Guide](https://gohugo.io/overview/installing/) |
 [Contribution Guide](CONTRIBUTING.md) |
-[Twitter](https://twitter.com/gohugoio)
+[Twitter](http://twitter.com/gohugoio)
 
-[![GoDoc](https://godoc.org/github.com/gohugoio/hugo?status.svg)](https://godoc.org/github.com/gohugoio/hugo)
-[![Linux and macOS Build Status](https://api.travis-ci.org/gohugoio/hugo.svg?branch=master&label=Linux+and+macOS+build "Linux and macOS Build Status")](https://travis-ci.org/gohugoio/hugo)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/a5mr220vsd091kua?svg=true&label=Windows+build "Windows Build Status")](https://ci.appveyor.com/project/bep/hugo/branch/master)
-[![Dev chat at https://gitter.im/gohugoio/hugo](https://img.shields.io/badge/gitter-developer_chat-46bc99.svg)](https://gitter.im/spf13/hugo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Go Report Card](https://goreportcard.com/badge/github.com/gohugoio/hugo)](https://goreportcard.com/report/github.com/gohugoio/hugo)
+[![GoDoc](https://godoc.org/github.com/spf13/hugo?status.svg)](https://godoc.org/github.com/spf13/hugo)
+[![Linux and macOS Build Status](https://api.travis-ci.org/spf13/hugo.svg?branch=master&label=Linux+and+macOS+build "Linux and macOS Build Status")](https://travis-ci.org/spf13/hugo)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/n2mo912b8s2505e8/branch/master?svg=true&label=Windows+build "Windows Build Status")](https://ci.appveyor.com/project/spf13/hugo/branch/master)
+[![Dev chat at https://gitter.im/spf13/hugo](https://img.shields.io/badge/gitter-developer_chat-46bc99.svg)](https://gitter.im/spf13/hugo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Go Report Card](https://goreportcard.com/badge/github.com/spf13/hugo)](https://goreportcard.com/report/github.com/spf13/hugo)
 
 ## Overview
 
 Hugo is a static HTML and CSS website generator written in [Go][].
-It is optimized for speed, ease of use, and configurability.
+It is optimized for speed, easy use and configurability.
 Hugo takes a directory with content and templates and renders them into a full HTML website.
 
-Hugo relies on Markdown files with front matter for metadata, and you can run Hugo from any directory.
+Hugo relies on Markdown files with front matter for meta data.
+And you can run Hugo from any directory.
 This works well for shared hosts and other systems where you don’t have a privileged account.
 
 Hugo renders a typical website of moderate size in a fraction of a second.
 A good rule of thumb is that each piece of content renders in around 1 millisecond.
 
-Hugo is designed to work well for any kind of website including blogs, tumbles, and docs.
+Hugo is designed to work well for any kind of website including blogs, tumbles and docs.
 
 #### Supported Architectures
 
-Currently, we provide pre-built Hugo binaries for Windows, Linux, FreeBSD, NetBSD, macOS (Darwin), and [Android](https://gist.github.com/bep/a0d8a26cf6b4f8bc992729b8e50b480b) for x64, i386 and ARM architectures.
+Currently, we provide pre-built Hugo binaries for Windows, Linux, FreeBSD, NetBSD and macOS (Darwin) and [Android](https://gist.github.com/bep/a0d8a26cf6b4f8bc992729b8e50b480b) for x64, i386 and ARM architectures.
 
-Hugo may also be compiled from source wherever the Go compiler tool chain can run, e.g. for other operating systems including DragonFly BSD, OpenBSD, Plan 9, and Solaris.
+Hugo may also be compiled from source wherever the Go compiler tool chain can run, e.g. for other operating systems including DragonFly BSD, OpenBSD, Plan 9 and Solaris.
 
 **Complete documentation is available at [Hugo Documentation][].**
 
@@ -43,7 +44,7 @@ Hugo may also be compiled from source wherever the Go compiler tool chain can ru
 If you want to use Hugo as your site generator, simply install the Hugo binaries.
 The Hugo binaries have no external dependencies.
 
-To contribute to the Hugo source code or documentation, you should [fork the Hugo GitHub project](https://github.com/gohugoio/hugo#fork-destination-box) and clone it to your local machine.
+To contribute to the Hugo source code or documentation, you should [fork the Hugo GitHub project](https://github.com/spf13/hugo#fork-destination-box) and clone it to your local machine.
 
 Finally, you can install the Hugo source code with `go`, build the binaries yourself, and run Hugo that way.
 Building the binaries is an easy task for an experienced `go` getter.
@@ -54,36 +55,16 @@ Use the [installation instructions in the Hugo documentation](https://gohugo.io/
 
 ### Build and Install the Binaries from Source (Advanced Install)
 
-#### Prerequisite Tools
+Add Hugo and its package dependencies to your go `src` directory.
 
-* [Git](https://git-scm.com/)
-* [Go (latest or previous version)](https://golang.org/dl/)
+    go get -v github.com/spf13/hugo
 
-#### Vendored Dependencies
+Once the `get` completes, you should find your new `hugo` (or `hugo.exe`) executable sitting inside `$GOPATH/bin/`.
 
-Hugo uses [dep](https://github.com/golang/dep) to vendor dependencies, but we don't commit the vendored packages themselves to the Hugo git repository. Therefore, a simple `go get` is _not_ supported because the command is not vendor aware.
+To update Hugo’s dependencies, use `go get` with the `-u` option.
 
-The simplest way is to use [mage](https://github.com/magefile/mage) (a Make alternative for Go projects.)
+    go get -u -v github.com/spf13/hugo
 
-#### Fetch from GitHub
-
-```bash
-go get github.com/magefile/mage
-go get -d github.com/gohugoio/hugo
-cd ${GOPATH:-$HOME/go}/src/github.com/gohugoio/hugo
-mage vendor
-mage install
-```
-
-**If you are a Windows user, substitute the `$HOME` environment variable above with `%USERPROFILE%`.**
-	
-## The Hugo Documentation
-
-The Hugo documentation now lives in its own repository, see https://github.com/gohugoio/hugoDocs. But we do keep a version of that documentation as a `git subtree` in this repository. To build the sub folder `/docs` as a Hugo site, you need to clone this repo:
-
-```bash
-git clone git@github.com:gohugoio/hugo.git
-```
 ## Contributing to Hugo
 
 For a complete guide to contributing to Hugo, see the [Contribution Guide](CONTRIBUTING.md).
@@ -93,18 +74,18 @@ organization, tutorials, blog posts, bug reports, issues, feature requests,
 feature implementations, pull requests, answering questions on the forum,
 helping to manage issues, etc.
 
-The Hugo community and maintainers are [very active](https://github.com/gohugoio/hugo/pulse/monthly) and helpful, and the project benefits greatly from this activity.
+The Hugo community and maintainers are [very active](https://github.com/spf13/hugo/pulse/monthly) and helpful, and the project benefits greatly from this activity.
 
 ### Asking Support Questions
 
-We have an active [discussion forum](https://discourse.gohugo.io) where users and developers can ask questions.
+We have an active [discussion forum](http://discuss.gohugo.io) where users and developers can ask questions.
 Please don't use the GitHub issue tracker to ask questions.
 
 ### Reporting Issues
 
 If you believe you have found a defect in Hugo or its documentation, use
 the GitHub issue tracker to report the problem to the Hugo maintainers.
-If you're not sure if it's a bug or not, start by asking in the [discussion forum](https://discourse.gohugo.io).
+If you're not sure if it's a bug or not, start by asking in the [discussion forum](http://discuss.gohugo.io).
 When reporting the issue, please provide the version of Hugo in use (`hugo version`).
 
 ### Submitting Patches
@@ -112,7 +93,6 @@ When reporting the issue, please provide the version of Hugo in use (`hugo versi
 The Hugo project welcomes all contributors and contributions regardless of skill or experience level.
 If you are interested in helping with the project, we will help you with your contribution.
 Hugo is a very active project with many contributions happening daily.
-
 Because we want to create the best possible product for our users and the best contribution experience for our developers,
 we have a set of guidelines which ensure that all contributions are acceptable.
 The guidelines are not intended as a filter or barrier to participation.

appveyor.yml

@@ -1,24 +1,17 @@
-image: Visual Studio 2015
-
 init:
-  - set PATH=%PATH%;C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;%GOPATH%\bin
+  - copy c:\MinGW\bin\mingw32-make.exe c:\MinGW\bin\make.exe
+  - set PATH=%PATH%;C:\MinGW\bin;%GOPATH%\bin
   - go version
   - go env
 
-environment:
-  GOPATH: C:\GOPATH\
-  HUGO_BUILD_TAGS: extended
-
 # clones and cd's to path
-clone_folder: C:\GOPATH\src\github.com\gohugoio\hugo
+clone_folder: C:\GOPATH\src\github.com\spf13\hugo
 
 install:
-#  - gem install asciidoctor
+  - gem install asciidoctor
   - pip install docutils
-  - go get github.com/magefile/mage
 
 build_script:
-  - mage vendor hugoRace
-  - mage -v check
+  - make hugo-race check
   - hugo -s docs/
   - hugo --renderToMemory -s docs/

bench.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-# allow user to override go executable by running as GOEXE=xxx make ...
-GOEXE="${GOEXE-go}"
 
 # Convenience script to
 # - For a given branch
@@ -28,10 +26,10 @@ BRANCH=$1
 PACKAGE=$2
 
 git checkout $BRANCH
-"${GOEXE}" test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-$BRANCH.txt
+go test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-$BRANCH.txt
 
 git checkout master
-"${GOEXE}" test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-master.txt
+go test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-master.txt
 
 
-benchcmp /tmp/bench-$PACKAGE-master.txt /tmp/bench-$PACKAGE-$BRANCH.txt
+benchcmp /tmp/bench-$PACKAGE-master.txt /tmp/bench-$PACKAGE-$BRANCH.txt

benchSite.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# allow user to override go executable by running as GOEXE=xxx make ...
-GOEXE="${GOEXE-go}"
-
-# Send in a regexp mathing the benchmarks you want to run, i.e. './benchSite.sh "YAML"'. 
-# Note the quotes, which will be needed for more complex expressions.
-# The above will run all variations, but only for front matter YAML.
-
-echo "Running with BenchmarkSiteBuilding/${1}"
-
-"${GOEXE}" test -run="NONE" -bench="BenchmarkSiteBuilding/${1}" -test.benchmem=true ./hugolib -memprofile mem.prof -count 3 -cpuprofile cpu.prof

bepdock.sh

@@ -1,2 +0,0 @@
-# Temp script used to test new builds.
- docker run --rm --mount type=bind,source="$(pwd)",target=/go/src/github.com/gohugoio/hugo -w /go/src/github.com/gohugoio/hugo  -i -t bepsays/ci-goreleaser:latest /bin/bash

cache/partitioned_lazy_cache.go

@@ -1,99 +0,0 @@
-// Copyright 2017-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 cache
-
-import (
-	"sync"
-)
-
-// Partition represents a cache partition where Load is the callback
-// for when the partition is needed.
-type Partition struct {
-	Key  string
-	Load func() (map[string]interface{}, error)
-}
-
-// Lazy represents a lazily loaded cache.
-type Lazy struct {
-	initSync sync.Once
-	initErr  error
-	cache    map[string]interface{}
-	load     func() (map[string]interface{}, error)
-}
-
-// NewLazy creates a lazy cache with the given load func.
-func NewLazy(load func() (map[string]interface{}, error)) *Lazy {
-	return &Lazy{load: load}
-}
-
-func (l *Lazy) init() error {
-	l.initSync.Do(func() {
-		c, err := l.load()
-		l.cache = c
-		l.initErr = err
-
-	})
-
-	return l.initErr
-}
-
-// Get initializes the cache if not already initialized, then looks up the
-// given key.
-func (l *Lazy) Get(key string) (interface{}, bool, error) {
-	l.init()
-	if l.initErr != nil {
-		return nil, false, l.initErr
-	}
-	v, found := l.cache[key]
-	return v, found, nil
-}
-
-// PartitionedLazyCache is a lazily loaded cache paritioned by a supplied string key.
-type PartitionedLazyCache struct {
-	partitions map[string]*Lazy
-}
-
-// NewPartitionedLazyCache creates a new NewPartitionedLazyCache with the supplied
-// partitions.
-func NewPartitionedLazyCache(partitions ...Partition) *PartitionedLazyCache {
-	lazyPartitions := make(map[string]*Lazy, len(partitions))
-	for _, partition := range partitions {
-		lazyPartitions[partition.Key] = NewLazy(partition.Load)
-	}
-	cache := &PartitionedLazyCache{partitions: lazyPartitions}
-
-	return cache
-}
-
-// Get initializes the partition if not already done so, then looks up the given
-// key in the given partition, returns nil if no value found.
-func (c *PartitionedLazyCache) Get(partition, key string) (interface{}, error) {
-	p, found := c.partitions[partition]
-
-	if !found {
-		return nil, nil
-	}
-
-	v, found, err := p.Get(key)
-	if err != nil {
-		return nil, err
-	}
-
-	if found {
-		return v, nil
-	}
-
-	return nil, nil
-
-}

cache/partitioned_lazy_cache_test.go

@@ -1,138 +0,0 @@
-// Copyright 2017-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 cache
-
-import (
-	"errors"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestNewPartitionedLazyCache(t *testing.T) {
-	t.Parallel()
-
-	assert := require.New(t)
-
-	p1 := Partition{
-		Key: "p1",
-		Load: func() (map[string]interface{}, error) {
-			return map[string]interface{}{
-				"p1_1":   "p1v1",
-				"p1_2":   "p1v2",
-				"p1_nil": nil,
-			}, nil
-		},
-	}
-
-	p2 := Partition{
-		Key: "p2",
-		Load: func() (map[string]interface{}, error) {
-			return map[string]interface{}{
-				"p2_1": "p2v1",
-				"p2_2": "p2v2",
-				"p2_3": "p2v3",
-			}, nil
-		},
-	}
-
-	cache := NewPartitionedLazyCache(p1, p2)
-
-	v, err := cache.Get("p1", "p1_1")
-	assert.NoError(err)
-	assert.Equal("p1v1", v)
-
-	v, err = cache.Get("p1", "p2_1")
-	assert.NoError(err)
-	assert.Nil(v)
-
-	v, err = cache.Get("p1", "p1_nil")
-	assert.NoError(err)
-	assert.Nil(v)
-
-	v, err = cache.Get("p2", "p2_3")
-	assert.NoError(err)
-	assert.Equal("p2v3", v)
-
-	v, err = cache.Get("doesnotexist", "p1_1")
-	assert.NoError(err)
-	assert.Nil(v)
-
-	v, err = cache.Get("p1", "doesnotexist")
-	assert.NoError(err)
-	assert.Nil(v)
-
-	errorP := Partition{
-		Key: "p3",
-		Load: func() (map[string]interface{}, error) {
-			return nil, errors.New("Failed")
-		},
-	}
-
-	cache = NewPartitionedLazyCache(errorP)
-
-	v, err = cache.Get("p1", "doesnotexist")
-	assert.NoError(err)
-	assert.Nil(v)
-
-	_, err = cache.Get("p3", "doesnotexist")
-	assert.Error(err)
-
-}
-
-func TestConcurrentPartitionedLazyCache(t *testing.T) {
-	t.Parallel()
-
-	assert := require.New(t)
-
-	var wg sync.WaitGroup
-
-	p1 := Partition{
-		Key: "p1",
-		Load: func() (map[string]interface{}, error) {
-			return map[string]interface{}{
-				"p1_1":   "p1v1",
-				"p1_2":   "p1v2",
-				"p1_nil": nil,
-			}, nil
-		},
-	}
-
-	p2 := Partition{
-		Key: "p2",
-		Load: func() (map[string]interface{}, error) {
-			return map[string]interface{}{
-				"p2_1": "p2v1",
-				"p2_2": "p2v2",
-				"p2_3": "p2v3",
-			}, nil
-		},
-	}
-
-	cache := NewPartitionedLazyCache(p1, p2)
-
-	for i := 0; i < 100; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			for j := 0; j < 10; j++ {
-				v, err := cache.Get("p1", "p1_1")
-				assert.NoError(err)
-				assert.Equal("p1v1", v)
-			}
-		}()
-	}
-	wg.Wait()
-}

commands/benchmark.go

@@ -23,55 +23,53 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-type benchmarkCmd struct {
+var (
 	benchmarkTimes int
 	cpuProfileFile string
 	memProfileFile string
+)
 
-	*baseBuilderCmd
-}
-
-func (b *commandsBuilder) newBenchmarkCmd() *benchmarkCmd {
-	cmd := &cobra.Command{
-		Use:   "benchmark",
-		Short: "Benchmark Hugo by building a site a number of times.",
-		Long: `Hugo can build a site many times over and analyze the running process
+var benchmarkCmd = &cobra.Command{
+	Use:   "benchmark",
+	Short: "Benchmark Hugo by building a site a number of times.",
+	Long: `Hugo can build a site many times over and analyze the running process
 creating a benchmark.`,
-	}
-
-	c := &benchmarkCmd{baseBuilderCmd: b.newBuilderCmd(cmd)}
-
-	cmd.Flags().StringVar(&c.cpuProfileFile, "cpuprofile", "", "path/filename for the CPU profile file")
-	cmd.Flags().StringVar(&c.memProfileFile, "memprofile", "", "path/filename for the memory profile file")
-	cmd.Flags().IntVarP(&c.benchmarkTimes, "count", "n", 13, "number of times to build the site")
-	cmd.Flags().Bool("renderToMemory", false, "render to memory (only useful for benchmark testing)")
-
-	cmd.RunE = c.benchmark
-
-	return c
 }
 
-func (c *benchmarkCmd) benchmark(cmd *cobra.Command, args []string) error {
-	cfgInit := func(c *commandeer) error {
-		return nil
+func init() {
+	initHugoBuilderFlags(benchmarkCmd)
+	initBenchmarkBuildingFlags(benchmarkCmd)
+
+	benchmarkCmd.Flags().StringVar(&cpuProfileFile, "cpuprofile", "", "path/filename for the CPU profile file")
+	benchmarkCmd.Flags().StringVar(&memProfileFile, "memprofile", "", "path/filename for the memory profile file")
+	benchmarkCmd.Flags().IntVarP(&benchmarkTimes, "count", "n", 13, "number of times to build the site")
+
+	benchmarkCmd.RunE = benchmark
+}
+
+func benchmark(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig(benchmarkCmd)
+
+	if err != nil {
+		return err
 	}
 
-	comm, err := initializeConfig(true, false, &c.hugoBuilderCommon, c, cfgInit)
+	c, err := newCommandeer(cfg)
 	if err != nil {
 		return err
 	}
 
 	var memProf *os.File
-	if c.memProfileFile != "" {
-		memProf, err = os.Create(c.memProfileFile)
+	if memProfileFile != "" {
+		memProf, err = os.Create(memProfileFile)
 		if err != nil {
 			return err
 		}
 	}
 
 	var cpuProf *os.File
-	if c.cpuProfileFile != "" {
-		cpuProf, err = os.Create(c.cpuProfileFile)
+	if cpuProfileFile != "" {
+		cpuProf, err = os.Create(cpuProfileFile)
 		if err != nil {
 			return err
 		}
@@ -86,8 +84,8 @@ func (c *benchmarkCmd) benchmark(cmd *cobra.Command, args []string) error {
 	}
 
 	t := time.Now()
-	for i := 0; i < c.benchmarkTimes; i++ {
-		if err = comm.resetAndBuildSites(); err != nil {
+	for i := 0; i < benchmarkTimes; i++ {
+		if err = c.resetAndBuildSites(false); err != nil {
 			return err
 		}
 	}
@@ -107,9 +105,9 @@ func (c *benchmarkCmd) benchmark(cmd *cobra.Command, args []string) error {
 	totalMallocs := memStats.Mallocs - mallocs
 
 	jww.FEEDBACK.Println()
-	jww.FEEDBACK.Printf("Average time per operation: %vms\n", int(1000*totalTime.Seconds()/float64(c.benchmarkTimes)))
-	jww.FEEDBACK.Printf("Average memory allocated per operation: %vkB\n", totalMemAllocated/uint64(c.benchmarkTimes)/1024)
-	jww.FEEDBACK.Printf("Average allocations per operation: %v\n", totalMallocs/uint64(c.benchmarkTimes))
+	jww.FEEDBACK.Printf("Average time per operation: %vms\n", int(1000*totalTime.Seconds()/float64(benchmarkTimes)))
+	jww.FEEDBACK.Printf("Average memory allocated per operation: %vkB\n", totalMemAllocated/uint64(benchmarkTimes)/1024)
+	jww.FEEDBACK.Printf("Average allocations per operation: %v\n", totalMallocs/uint64(benchmarkTimes))
 
 	return nil
 }

commands/check.go

@@ -1,4 +1,4 @@
-// Copyright 2018 The Hugo Authors. All rights reserved.
+// 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.
@@ -11,24 +11,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !darwin
-
 package commands
 
 import (
 	"github.com/spf13/cobra"
 )
 
-var _ cmder = (*checkCmd)(nil)
-
-type checkCmd struct {
-	*baseCmd
-}
-
-func newCheckCmd() *checkCmd {
-	return &checkCmd{baseCmd: &baseCmd{cmd: &cobra.Command{
-		Use:   "check",
-		Short: "Contains some verification checks",
-	},
-	}}
+var checkCmd = &cobra.Command{
+	Use:   "check",
+	Short: "Contains some verification checks",
 }

commands/check_darwin.go

@@ -1,36 +0,0 @@
-// 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 (
-	"github.com/spf13/cobra"
-)
-
-var _ cmder = (*checkCmd)(nil)
-
-type checkCmd struct {
-	*baseCmd
-}
-
-func newCheckCmd() *checkCmd {
-	cc := &checkCmd{baseCmd: &baseCmd{cmd: &cobra.Command{
-		Use:   "check",
-		Short: "Contains some verification checks",
-	},
-	}}
-
-	cc.cmd.AddCommand(newLimitCmd().getCommand())
-
-	return cc
-}

commands/commandeer.go

@@ -1,4 +1,4 @@
-// Copyright 2018 The Hugo Authors. All rights reserved.
+// Copyright 2017 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.
@@ -14,64 +14,15 @@
 package commands
 
 import (
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/gohugoio/hugo/config"
-
-	"github.com/spf13/cobra"
-
-	"github.com/spf13/afero"
-
-	"github.com/gohugoio/hugo/hugolib"
-
-	"github.com/bep/debounce"
-	"github.com/gohugoio/hugo/common/types"
-	"github.com/gohugoio/hugo/deps"
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugofs"
-	"github.com/gohugoio/hugo/langs"
+	"github.com/spf13/hugo/deps"
+	"github.com/spf13/hugo/helpers"
+	"github.com/spf13/hugo/hugofs"
 )
 
-type commandeerHugoState struct {
-	*deps.DepsCfg
-	hugo     *hugolib.HugoSites
-	fsCreate sync.Once
-}
-
 type commandeer struct {
-	*commandeerHugoState
-
-	// Currently only set when in "fast render mode". But it seems to
-	// be fast enough that we could maybe just add it for all server modes.
-	changeDetector *fileChangeDetector
-
-	// We need to reuse this on server rebuilds.
-	destinationFs afero.Fs
-
-	h    *hugoBuilderCommon
-	ftch flagsToConfigHandler
-
-	visitedURLs *types.EvictingStringQueue
-
-	doWithCommandeer func(c *commandeer) error
-
-	// We watch these for changes.
-	configFiles []string
-
-	// Used in cases where we get flooded with events in server mode.
-	debounce func(f func())
-
-	serverPorts         []int
-	languagesConfigured bool
-	languages           langs.Languages
-
+	*deps.DepsCfg
+	pathSpec   *helpers.PathSpec
 	configured bool
-	paused     bool
 }
 
 func (c *commandeer) Set(key string, value interface{}) {
@@ -81,259 +32,31 @@ func (c *commandeer) Set(key string, value interface{}) {
 	c.Cfg.Set(key, value)
 }
 
+// PathSpec lazily creates a new PathSpec, as all the paths must
+// be configured before it is created.
+func (c *commandeer) PathSpec() *helpers.PathSpec {
+	c.configured = true
+	return c.pathSpec
+}
+
 func (c *commandeer) initFs(fs *hugofs.Fs) error {
-	c.destinationFs = fs.Destination
 	c.DepsCfg.Fs = fs
-
+	ps, err := helpers.NewPathSpec(fs, c.Cfg)
+	if err != nil {
+		return err
+	}
+	c.pathSpec = ps
 	return nil
 }
 
-func newCommandeer(mustHaveConfigFile, running bool, h *hugoBuilderCommon, f flagsToConfigHandler, doWithCommandeer func(c *commandeer) error, subCmdVs ...*cobra.Command) (*commandeer, error) {
-
-	var rebuildDebouncer func(f func())
-	if running {
-		// The time value used is tested with mass content replacements in a fairly big Hugo site.
-		// It is better to wait for some seconds in those cases rather than get flooded
-		// with rebuilds.
-		rebuildDebouncer, _, _ = debounce.New(4 * time.Second)
+func newCommandeer(cfg *deps.DepsCfg) (*commandeer, error) {
+	l := cfg.Language
+	if l == nil {
+		l = helpers.NewDefaultLanguage(cfg.Cfg)
 	}
-
-	c := &commandeer{
-		h:                   h,
-		ftch:                f,
-		commandeerHugoState: &commandeerHugoState{},
-		doWithCommandeer:    doWithCommandeer,
-		visitedURLs:         types.NewEvictingStringQueue(10),
-		debounce:            rebuildDebouncer,
-	}
-
-	return c, c.loadConfig(mustHaveConfigFile, running)
-}
-
-type fileChangeDetector struct {
-	sync.Mutex
-	current map[string]string
-	prev    map[string]string
-
-	irrelevantRe *regexp.Regexp
-}
-
-func (f *fileChangeDetector) OnFileClose(name, md5sum string) {
-	f.Lock()
-	defer f.Unlock()
-	f.current[name] = md5sum
-}
-
-func (f *fileChangeDetector) changed() []string {
-	if f == nil {
-		return nil
-	}
-	f.Lock()
-	defer f.Unlock()
-	var c []string
-	for k, v := range f.current {
-		vv, found := f.prev[k]
-		if !found || v != vv {
-			c = append(c, k)
-		}
-	}
-
-	return f.filterIrrelevant(c)
-}
-
-func (f *fileChangeDetector) filterIrrelevant(in []string) []string {
-	var filtered []string
-	for _, v := range in {
-		if !f.irrelevantRe.MatchString(v) {
-			filtered = append(filtered, v)
-		}
-	}
-	return filtered
-}
-
-func (f *fileChangeDetector) PrepareNew() {
-	if f == nil {
-		return
-	}
-
-	f.Lock()
-	defer f.Unlock()
-
-	if f.current == nil {
-		f.current = make(map[string]string)
-		f.prev = make(map[string]string)
-		return
-	}
-
-	f.prev = make(map[string]string)
-	for k, v := range f.current {
-		f.prev[k] = v
-	}
-	f.current = make(map[string]string)
-}
-
-func (c *commandeer) loadConfig(mustHaveConfigFile, running bool) error {
-
-	if c.DepsCfg == nil {
-		c.DepsCfg = &deps.DepsCfg{}
-	}
-
-	cfg := c.DepsCfg
-	c.configured = false
-	cfg.Running = running
-
-	var dir string
-	if c.h.source != "" {
-		dir, _ = filepath.Abs(c.h.source)
-	} else {
-		dir, _ = os.Getwd()
-	}
-
-	var sourceFs afero.Fs = hugofs.Os
-	if c.DepsCfg.Fs != nil {
-		sourceFs = c.DepsCfg.Fs.Source
-	}
-
-	doWithConfig := func(cfg config.Provider) error {
-
-		if c.ftch != nil {
-			c.ftch.flagsToConfig(cfg)
-		}
-
-		cfg.Set("workingDir", dir)
-
-		return nil
-	}
-
-	doWithCommandeer := func(cfg config.Provider) error {
-		c.Cfg = cfg
-		if c.doWithCommandeer == nil {
-			return nil
-		}
-		err := c.doWithCommandeer(c)
-		return err
-	}
-
-	config, configFiles, err := hugolib.LoadConfig(
-		hugolib.ConfigSourceDescriptor{Fs: sourceFs, Path: c.h.source, WorkingDir: dir, Filename: c.h.cfgFile},
-		doWithCommandeer,
-		doWithConfig)
-
+	ps, err := helpers.NewPathSpec(cfg.Fs, l)
 	if err != nil {
-		if mustHaveConfigFile {
-			return err
-		}
-		if err != hugolib.ErrNoConfigFile {
-			return err
-		}
-
+		return nil, err
 	}
-
-	c.configFiles = configFiles
-
-	if l, ok := c.Cfg.Get("languagesSorted").(langs.Languages); ok {
-		c.languagesConfigured = true
-		c.languages = l
-	}
-
-	// This is potentially double work, but we need to do this one more time now
-	// that all the languages have been configured.
-	if c.doWithCommandeer != nil {
-		if err := c.doWithCommandeer(c); err != nil {
-			return err
-		}
-	}
-
-	logger, err := c.createLogger(config)
-	if err != nil {
-		return err
-	}
-
-	cfg.Logger = logger
-
-	createMemFs := config.GetBool("renderToMemory")
-
-	if createMemFs {
-		// Rendering to memoryFS, publish to Root regardless of publishDir.
-		config.Set("publishDir", "/")
-	}
-
-	c.fsCreate.Do(func() {
-		fs := hugofs.NewFrom(sourceFs, config)
-
-		if c.destinationFs != nil {
-			// Need to reuse the destination on server rebuilds.
-			fs.Destination = c.destinationFs
-		} else if createMemFs {
-			// Hugo writes the output to memory instead of the disk.
-			fs.Destination = new(afero.MemMapFs)
-		}
-
-		doLiveReload := !c.h.buildWatch && !config.GetBool("disableLiveReload")
-		fastRenderMode := doLiveReload && !config.GetBool("disableFastRender")
-
-		if fastRenderMode {
-			// For now, fast render mode only. It should, however, be fast enough
-			// for the full variant, too.
-			changeDetector := &fileChangeDetector{
-				// We use this detector to decide to do a Hot reload of a single path or not.
-				// We need to filter out source maps and possibly some other to be able
-				// to make that decision.
-				irrelevantRe: regexp.MustCompile(`\.map$`),
-			}
-			changeDetector.PrepareNew()
-			fs.Destination = hugofs.NewHashingFs(fs.Destination, changeDetector)
-			c.changeDetector = changeDetector
-		}
-
-		err = c.initFs(fs)
-		if err != nil {
-			return
-		}
-
-		var h *hugolib.HugoSites
-
-		h, err = hugolib.NewHugoSites(*c.DepsCfg)
-		c.hugo = h
-
-	})
-
-	if err != nil {
-		return err
-	}
-
-	cacheDir := config.GetString("cacheDir")
-	if cacheDir != "" {
-		if helpers.FilePathSeparator != cacheDir[len(cacheDir)-1:] {
-			cacheDir = cacheDir + helpers.FilePathSeparator
-		}
-		isDir, err := helpers.DirExists(cacheDir, sourceFs)
-		checkErr(cfg.Logger, err)
-		if !isDir {
-			mkdir(cacheDir)
-		}
-		config.Set("cacheDir", cacheDir)
-	} else {
-		config.Set("cacheDir", helpers.GetTempDir("hugo_cache", sourceFs))
-	}
-
-	cfg.Logger.INFO.Println("Using config file:", config.ConfigFileUsed())
-
-	themeDir := c.hugo.PathSpec.GetFirstThemeDir()
-	if themeDir != "" {
-		if _, err := sourceFs.Stat(themeDir); os.IsNotExist(err) {
-			return newSystemError("Unable to find theme Directory:", themeDir)
-		}
-	}
-
-	dir, themeVersionMismatch, minVersion := c.isThemeVsHugoVersionMismatch(sourceFs)
-
-	if themeVersionMismatch {
-		name := filepath.Base(dir)
-		cfg.Logger.ERROR.Printf("%s theme does not support Hugo version %s. Minimum version required is %s\n",
-			strings.ToUpper(name), helpers.CurrentHugoVersion.ReleaseVersion(), minVersion)
-	}
-
-	return nil
-
+	return &commandeer{DepsCfg: cfg, pathSpec: ps}, nil
 }

commands/commands.go

@@ -1,283 +0,0 @@
-// Copyright 2017 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 (
-	"os"
-
-	"github.com/gohugoio/hugo/config"
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/spf13/cobra"
-	jww "github.com/spf13/jwalterweatherman"
-
-	"github.com/spf13/nitro"
-)
-
-type commandsBuilder struct {
-	hugoBuilderCommon
-
-	commands []cmder
-}
-
-func newCommandsBuilder() *commandsBuilder {
-	return &commandsBuilder{}
-}
-
-func (b *commandsBuilder) addCommands(commands ...cmder) *commandsBuilder {
-	b.commands = append(b.commands, commands...)
-	return b
-}
-
-func (b *commandsBuilder) addAll() *commandsBuilder {
-	b.addCommands(
-		b.newServerCmd(),
-		newVersionCmd(),
-		newEnvCmd(),
-		newConfigCmd(),
-		newCheckCmd(),
-		b.newBenchmarkCmd(),
-		newConvertCmd(),
-		newNewCmd(),
-		newListCmd(),
-		newImportCmd(),
-		newGenCmd(),
-		createReleaser(),
-	)
-
-	return b
-}
-
-func (b *commandsBuilder) build() *hugoCmd {
-	h := b.newHugoCmd()
-	addCommands(h.getCommand(), b.commands...)
-	return h
-}
-
-func addCommands(root *cobra.Command, commands ...cmder) {
-	for _, command := range commands {
-		cmd := command.getCommand()
-		if cmd == nil {
-			continue
-		}
-		root.AddCommand(cmd)
-	}
-}
-
-type baseCmd struct {
-	cmd *cobra.Command
-}
-
-var _ commandsBuilderGetter = (*baseBuilderCmd)(nil)
-
-// Used in tests.
-type commandsBuilderGetter interface {
-	getCmmandsBuilder() *commandsBuilder
-}
-type baseBuilderCmd struct {
-	*baseCmd
-	*commandsBuilder
-}
-
-func (b *baseBuilderCmd) getCmmandsBuilder() *commandsBuilder {
-	return b.commandsBuilder
-}
-
-func (c *baseCmd) getCommand() *cobra.Command {
-	return c.cmd
-}
-
-func newBaseCmd(cmd *cobra.Command) *baseCmd {
-	return &baseCmd{cmd: cmd}
-}
-
-func (b *commandsBuilder) newBuilderCmd(cmd *cobra.Command) *baseBuilderCmd {
-	bcmd := &baseBuilderCmd{commandsBuilder: b, baseCmd: &baseCmd{cmd: cmd}}
-	bcmd.hugoBuilderCommon.handleFlags(cmd)
-	return bcmd
-}
-
-func (c *baseCmd) flagsToConfig(cfg config.Provider) {
-	initializeFlags(c.cmd, cfg)
-}
-
-type hugoCmd struct {
-	*baseBuilderCmd
-
-	// Need to get the sites once built.
-	c *commandeer
-}
-
-var _ cmder = (*nilCommand)(nil)
-
-type nilCommand struct {
-}
-
-func (c *nilCommand) getCommand() *cobra.Command {
-	return nil
-}
-
-func (c *nilCommand) flagsToConfig(cfg config.Provider) {
-
-}
-
-func (b *commandsBuilder) newHugoCmd() *hugoCmd {
-	cc := &hugoCmd{}
-
-	cc.baseBuilderCmd = b.newBuilderCmd(&cobra.Command{
-		Use:   "hugo",
-		Short: "hugo builds your site",
-		Long: `hugo is the main command, used to build your Hugo site.
-
-Hugo is a Fast and Flexible Static Site Generator
-built with love by spf13 and friends in Go.
-
-Complete documentation is available at http://gohugo.io/.`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			cfgInit := func(c *commandeer) error {
-				if cc.buildWatch {
-					c.Set("disableLiveReload", true)
-				}
-				return nil
-			}
-
-			c, err := initializeConfig(true, cc.buildWatch, &cc.hugoBuilderCommon, cc, cfgInit)
-			if err != nil {
-				return err
-			}
-			cc.c = c
-
-			return c.build()
-		},
-	})
-
-	cc.cmd.PersistentFlags().StringVar(&cc.cfgFile, "config", "", "config file (default is path/config.yaml|json|toml)")
-	cc.cmd.PersistentFlags().BoolVar(&cc.quiet, "quiet", false, "build in quiet mode")
-
-	// Set bash-completion
-	validConfigFilenames := []string{"json", "js", "yaml", "yml", "toml", "tml"}
-	_ = cc.cmd.PersistentFlags().SetAnnotation("config", cobra.BashCompFilenameExt, validConfigFilenames)
-
-	cc.cmd.PersistentFlags().BoolVarP(&cc.verbose, "verbose", "v", false, "verbose output")
-	cc.cmd.PersistentFlags().BoolVarP(&cc.debug, "debug", "", false, "debug output")
-	cc.cmd.PersistentFlags().BoolVar(&cc.logging, "log", false, "enable Logging")
-	cc.cmd.PersistentFlags().StringVar(&cc.logFile, "logFile", "", "log File path (if set, logging enabled automatically)")
-	cc.cmd.PersistentFlags().BoolVar(&cc.verboseLog, "verboseLog", false, "verbose logging")
-
-	cc.cmd.Flags().BoolVarP(&cc.buildWatch, "watch", "w", false, "watch filesystem for changes and recreate as needed")
-
-	cc.cmd.Flags().Bool("renderToMemory", false, "render to memory (only useful for benchmark testing)")
-	cc.cmd.Flags().Bool("minify", false, "minify any supported output format (HTML, XML etc.)")
-
-	// Set bash-completion
-	_ = cc.cmd.PersistentFlags().SetAnnotation("logFile", cobra.BashCompFilenameExt, []string{})
-
-	cc.cmd.SetGlobalNormalizationFunc(helpers.NormalizeHugoFlags)
-	cc.cmd.SilenceUsage = true
-
-	return cc
-}
-
-type hugoBuilderCommon struct {
-	source  string
-	baseURL string
-
-	buildWatch bool
-
-	gc bool
-
-	// TODO(bep) var vs string
-	logging    bool
-	verbose    bool
-	verboseLog bool
-	debug      bool
-	quiet      bool
-
-	cfgFile string
-	logFile string
-}
-
-func (cc *hugoBuilderCommon) handleFlags(cmd *cobra.Command) {
-	cmd.Flags().Bool("cleanDestinationDir", false, "remove files from destination not found in static directories")
-	cmd.Flags().BoolP("buildDrafts", "D", false, "include content marked as draft")
-	cmd.Flags().BoolP("buildFuture", "F", false, "include content with publishdate in the future")
-	cmd.Flags().BoolP("buildExpired", "E", false, "include expired content")
-	cmd.Flags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
-	cmd.Flags().StringP("contentDir", "c", "", "filesystem path to content directory")
-	cmd.Flags().StringP("layoutDir", "l", "", "filesystem path to layout directory")
-	cmd.Flags().StringP("cacheDir", "", "", "filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/")
-	cmd.Flags().BoolP("ignoreCache", "", false, "ignores the cache directory")
-	cmd.Flags().StringP("destination", "d", "", "filesystem path to write files to")
-	cmd.Flags().StringP("theme", "t", "", "theme to use (located in /themes/THEMENAME/)")
-	cmd.Flags().StringP("themesDir", "", "", "filesystem path to themes directory")
-	cmd.Flags().Bool("uglyURLs", false, "(deprecated) if true, use /filename.html instead of /filename/")
-	cmd.Flags().Bool("canonifyURLs", false, "(deprecated) if true, all relative URLs will be canonicalized using baseURL")
-	cmd.Flags().StringVarP(&cc.baseURL, "baseURL", "b", "", "hostname (and path) to the root, e.g. http://spf13.com/")
-	cmd.Flags().Bool("enableGitInfo", false, "add Git revision, date and author info to the pages")
-	cmd.Flags().BoolVar(&cc.gc, "gc", false, "enable to run some cleanup tasks (remove unused cache files) after the build")
-
-	cmd.Flags().BoolVar(&nitro.AnalysisOn, "stepAnalysis", false, "display memory and timing of different steps of the program")
-	cmd.Flags().Bool("templateMetrics", false, "display metrics about template executions")
-	cmd.Flags().Bool("templateMetricsHints", false, "calculate some improvement hints when combined with --templateMetrics")
-	cmd.Flags().Bool("pluralizeListTitles", true, "(deprecated) pluralize titles in lists using inflect")
-	cmd.Flags().Bool("preserveTaxonomyNames", false, `(deprecated) preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")`)
-	cmd.Flags().BoolP("forceSyncStatic", "", false, "copy all files when static is changed.")
-	cmd.Flags().BoolP("noTimes", "", false, "don't sync modification time of files")
-	cmd.Flags().BoolP("noChmod", "", false, "don't sync permission mode of files")
-	cmd.Flags().BoolP("i18n-warnings", "", false, "print missing translations")
-
-	cmd.Flags().StringSlice("disableKinds", []string{}, "disable different kind of pages (home, RSS etc.)")
-
-	// Set bash-completion.
-	// Each flag must first be defined before using the SetAnnotation() call.
-	_ = cmd.Flags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
-	_ = cmd.Flags().SetAnnotation("cacheDir", cobra.BashCompSubdirsInDir, []string{})
-	_ = cmd.Flags().SetAnnotation("destination", cobra.BashCompSubdirsInDir, []string{})
-	_ = cmd.Flags().SetAnnotation("theme", cobra.BashCompSubdirsInDir, []string{"themes"})
-}
-
-func checkErr(logger *jww.Notepad, err error, s ...string) {
-	if err == nil {
-		return
-	}
-	if len(s) == 0 {
-		logger.CRITICAL.Println(err)
-		return
-	}
-	for _, message := range s {
-		logger.ERROR.Println(message)
-	}
-	logger.ERROR.Println(err)
-}
-
-func stopOnErr(logger *jww.Notepad, err error, s ...string) {
-	if err == nil {
-		return
-	}
-
-	defer os.Exit(-1)
-
-	if len(s) == 0 {
-		newMessage := err.Error()
-		// Printing an empty string results in a error with
-		// no message, no bueno.
-		if newMessage != "" {
-			logger.CRITICAL.Println(newMessage)
-		}
-	}
-	for _, message := range s {
-		if message != "" {
-			logger.CRITICAL.Println(message)
-		}
-	}
-}

commands/commands_test.go

@@ -1,253 +0,0 @@
-// 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 (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestExecute(t *testing.T) {
-
-	assert := require.New(t)
-
-	dir, err := createSimpleTestSite(t)
-	assert.NoError(err)
-
-	defer func() {
-		os.RemoveAll(dir)
-	}()
-
-	resp := Execute([]string{"-s=" + dir})
-	assert.NoError(resp.Err)
-	result := resp.Result
-	assert.True(len(result.Sites) == 1)
-	assert.True(len(result.Sites[0].RegularPages) == 1)
-}
-
-func TestCommandsPersistentFlags(t *testing.T) {
-	assert := require.New(t)
-
-	noOpRunE := func(cmd *cobra.Command, args []string) error {
-		return nil
-	}
-
-	tests := []struct {
-		args  []string
-		check func(command []cmder)
-	}{{[]string{"server",
-		"--config=myconfig.toml",
-		"--contentDir=mycontent",
-		"--disableKinds=page,home",
-		"--layoutDir=mylayouts",
-		"--theme=mytheme",
-		"--gc",
-		"--themesDir=mythemes",
-		"--cleanDestinationDir",
-		"--navigateToChanged",
-		"--disableLiveReload",
-		"--noHTTPCache",
-		"--i18n-warnings",
-		"--destination=/tmp/mydestination",
-		"-b=https://example.com/b/",
-		"--port=1366",
-		"--renderToDisk",
-		"--source=mysource",
-		"--uglyURLs"}, func(commands []cmder) {
-		var sc *serverCmd
-		for _, command := range commands {
-			if b, ok := command.(commandsBuilderGetter); ok {
-				v := b.getCmmandsBuilder().hugoBuilderCommon
-				assert.Equal("myconfig.toml", v.cfgFile)
-				assert.Equal("mysource", v.source)
-				assert.Equal("https://example.com/b/", v.baseURL)
-			}
-
-			if srvCmd, ok := command.(*serverCmd); ok {
-				sc = srvCmd
-			}
-		}
-
-		assert.NotNil(sc)
-		assert.True(sc.navigateToChanged)
-		assert.True(sc.disableLiveReload)
-		assert.True(sc.noHTTPCache)
-		assert.True(sc.renderToDisk)
-		assert.Equal(1366, sc.serverPort)
-
-		cfg := viper.New()
-		sc.flagsToConfig(cfg)
-		assert.Equal("/tmp/mydestination", cfg.GetString("publishDir"))
-		assert.Equal("mycontent", cfg.GetString("contentDir"))
-		assert.Equal("mylayouts", cfg.GetString("layoutDir"))
-		assert.Equal("mytheme", cfg.GetString("theme"))
-		assert.Equal("mythemes", cfg.GetString("themesDir"))
-		assert.Equal("https://example.com/b/", cfg.GetString("baseURL"))
-
-		assert.Equal([]string{"page", "home"}, cfg.Get("disableKinds"))
-
-		assert.True(cfg.GetBool("uglyURLs"))
-		assert.True(cfg.GetBool("gc"))
-
-		// The flag is named i18n-warnings
-		assert.True(cfg.GetBool("logI18nWarnings"))
-
-	}}}
-
-	for _, test := range tests {
-		b := newCommandsBuilder()
-		root := b.addAll().build()
-
-		for _, c := range b.commands {
-			if c.getCommand() == nil {
-				continue
-			}
-			// We are only intereseted in the flag handling here.
-			c.getCommand().RunE = noOpRunE
-		}
-		rootCmd := root.getCommand()
-		rootCmd.SetArgs(test.args)
-		assert.NoError(rootCmd.Execute())
-		test.check(b.commands)
-	}
-
-}
-
-func TestCommandsExecute(t *testing.T) {
-
-	assert := require.New(t)
-
-	dir, err := createSimpleTestSite(t)
-	assert.NoError(err)
-
-	dirOut, err := ioutil.TempDir("", "hugo-cli-out")
-	assert.NoError(err)
-
-	defer func() {
-		os.RemoveAll(dir)
-		os.RemoveAll(dirOut)
-	}()
-
-	sourceFlag := fmt.Sprintf("-s=%s", dir)
-
-	tests := []struct {
-		commands           []string
-		flags              []string
-		expectErrToContain string
-	}{
-		// TODO(bep) permission issue on my OSX? "operation not permitted" {[]string{"check", "ulimit"}, nil, false},
-		{[]string{"env"}, nil, ""},
-		{[]string{"version"}, nil, ""},
-		// no args = hugo build
-		{nil, []string{sourceFlag}, ""},
-		{nil, []string{sourceFlag, "--renderToMemory"}, ""},
-		{[]string{"config"}, []string{sourceFlag}, ""},
-		{[]string{"benchmark"}, []string{sourceFlag, "-n=1"}, ""},
-		{[]string{"convert", "toTOML"}, []string{sourceFlag, "-o=" + filepath.Join(dirOut, "toml")}, ""},
-		{[]string{"convert", "toYAML"}, []string{sourceFlag, "-o=" + filepath.Join(dirOut, "yaml")}, ""},
-		{[]string{"convert", "toJSON"}, []string{sourceFlag, "-o=" + filepath.Join(dirOut, "json")}, ""},
-		{[]string{"gen", "autocomplete"}, []string{"--completionfile=" + filepath.Join(dirOut, "autocomplete.txt")}, ""},
-		{[]string{"gen", "chromastyles"}, []string{"--style=manni"}, ""},
-		{[]string{"gen", "doc"}, []string{"--dir=" + filepath.Join(dirOut, "doc")}, ""},
-		{[]string{"gen", "man"}, []string{"--dir=" + filepath.Join(dirOut, "man")}, ""},
-		{[]string{"list", "drafts"}, []string{sourceFlag}, ""},
-		{[]string{"list", "expired"}, []string{sourceFlag}, ""},
-		{[]string{"list", "future"}, []string{sourceFlag}, ""},
-		{[]string{"new", "new-page.md"}, []string{sourceFlag}, ""},
-		{[]string{"new", "site", filepath.Join(dirOut, "new-site")}, nil, ""},
-		{[]string{"unknowncommand"}, nil, "unknown command"},
-		// TODO(bep) cli refactor fix https://github.com/gohugoio/hugo/issues/4450
-		//{[]string{"new", "theme", filepath.Join(dirOut, "new-theme")}, nil,false},
-	}
-
-	for _, test := range tests {
-
-		hugoCmd := newCommandsBuilder().addAll().build().getCommand()
-		test.flags = append(test.flags, "--quiet")
-		hugoCmd.SetArgs(append(test.commands, test.flags...))
-
-		// TODO(bep) capture output and add some simple asserts
-		// TODO(bep) misspelled subcommands does not return an error. We should investigate this
-		// but before that, check for "Error: unknown command".
-
-		_, err := hugoCmd.ExecuteC()
-		if test.expectErrToContain != "" {
-			assert.Error(err, fmt.Sprintf("%v", test.commands))
-			assert.Contains(err.Error(), test.expectErrToContain)
-		} else {
-			assert.NoError(err, fmt.Sprintf("%v", test.commands))
-		}
-
-	}
-
-}
-
-func createSimpleTestSite(t *testing.T) (string, error) {
-	d, e := ioutil.TempDir("", "hugo-cli")
-	if e != nil {
-		return "", e
-	}
-
-	// Just the basic. These are for CLI tests, not site testing.
-	writeFile(t, filepath.Join(d, "config.toml"), `
-
-baseURL = "https://example.org"
-title = "Hugo Commands"
-
-`)
-
-	writeFile(t, filepath.Join(d, "content", "p1.md"), `
----
-title: "P1"
-weight: 1
----
-
-Content
-
-`)
-
-	writeFile(t, filepath.Join(d, "layouts", "_default", "single.html"), `
-
-Single: {{ .Title }}
-
-`)
-
-	writeFile(t, filepath.Join(d, "layouts", "_default", "list.html"), `
-
-List: {{ .Title }}
-
-`)
-
-	return d, nil
-
-}
-
-func writeFile(t *testing.T, filename, content string) {
-	must(t, os.MkdirAll(filepath.Dir(filename), os.FileMode(0755)))
-	must(t, ioutil.WriteFile(filename, []byte(content), os.FileMode(0755)))
-}
-
-func must(t *testing.T, err error) {
-	if err != nil {
-		t.Fatal(err)
-	}
-}

commands/convert.go

@@ -14,181 +14,145 @@
 package commands
 
 import (
+	"errors"
 	"fmt"
+	"path/filepath"
 	"time"
 
-	src "github.com/gohugoio/hugo/source"
-
-	"github.com/gohugoio/hugo/hugolib"
-
-	"path/filepath"
-
-	"github.com/gohugoio/hugo/parser"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
+	"github.com/spf13/hugo/hugolib"
+	"github.com/spf13/hugo/parser"
 )
 
-var (
-	_ cmder = (*convertCmd)(nil)
-)
+var outputDir string
+var unsafe bool
 
-type convertCmd struct {
-	hugoBuilderCommon
-
-	outputDir string
-	unsafe    bool
-
-	*baseCmd
-}
-
-func newConvertCmd() *convertCmd {
-	cc := &convertCmd{}
-
-	cc.baseCmd = newBaseCmd(&cobra.Command{
-		Use:   "convert",
-		Short: "Convert your content to different formats",
-		Long: `Convert your content (e.g. front matter) to different formats.
+var convertCmd = &cobra.Command{
+	Use:   "convert",
+	Short: "Convert your content to different formats",
+	Long: `Convert your content (e.g. front matter) to different formats.
 
 See convert's subcommands toJSON, toTOML and toYAML for more information.`,
-		RunE: nil,
-	})
-
-	cc.cmd.AddCommand(
-		&cobra.Command{
-			Use:   "toJSON",
-			Short: "Convert front matter to JSON",
-			Long: `toJSON converts all front matter in the content directory
-to use JSON for the front matter.`,
-			RunE: func(cmd *cobra.Command, args []string) error {
-				return cc.convertContents(rune([]byte(parser.JSONLead)[0]))
-			},
-		},
-		&cobra.Command{
-			Use:   "toTOML",
-			Short: "Convert front matter to TOML",
-			Long: `toTOML converts all front matter in the content directory
-to use TOML for the front matter.`,
-			RunE: func(cmd *cobra.Command, args []string) error {
-				return cc.convertContents(rune([]byte(parser.TOMLLead)[0]))
-			},
-		},
-		&cobra.Command{
-			Use:   "toYAML",
-			Short: "Convert front matter to YAML",
-			Long: `toYAML converts all front matter in the content directory
-to use YAML for the front matter.`,
-			RunE: func(cmd *cobra.Command, args []string) error {
-				return cc.convertContents(rune([]byte(parser.YAMLLead)[0]))
-			},
-		},
-	)
-
-	cc.cmd.PersistentFlags().StringVarP(&cc.outputDir, "output", "o", "", "filesystem path to write files to")
-	cc.cmd.PersistentFlags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
-	cc.cmd.PersistentFlags().BoolVar(&cc.unsafe, "unsafe", false, "enable less safe operations, please backup first")
-	cc.cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
-
-	return cc
+	RunE: nil,
 }
 
-func (cc *convertCmd) convertContents(mark rune) error {
-	if cc.outputDir == "" && !cc.unsafe {
-		return newUserError("Unsafe operation not allowed, use --unsafe or set a different output path")
-	}
+var toJSONCmd = &cobra.Command{
+	Use:   "toJSON",
+	Short: "Convert front matter to JSON",
+	Long: `toJSON converts all front matter in the content directory
+to use JSON for the front matter.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return convertContents(rune([]byte(parser.JSONLead)[0]))
+	},
+}
 
-	c, err := initializeConfig(true, false, &cc.hugoBuilderCommon, cc, nil)
+var toTOMLCmd = &cobra.Command{
+	Use:   "toTOML",
+	Short: "Convert front matter to TOML",
+	Long: `toTOML converts all front matter in the content directory
+to use TOML for the front matter.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return convertContents(rune([]byte(parser.TOMLLead)[0]))
+	},
+}
+
+var toYAMLCmd = &cobra.Command{
+	Use:   "toYAML",
+	Short: "Convert front matter to YAML",
+	Long: `toYAML converts all front matter in the content directory
+to use YAML for the front matter.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return convertContents(rune([]byte(parser.YAMLLead)[0]))
+	},
+}
+
+func init() {
+	convertCmd.AddCommand(toJSONCmd)
+	convertCmd.AddCommand(toTOMLCmd)
+	convertCmd.AddCommand(toYAMLCmd)
+	convertCmd.PersistentFlags().StringVarP(&outputDir, "output", "o", "", "filesystem path to write files to")
+	convertCmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
+	convertCmd.PersistentFlags().BoolVar(&unsafe, "unsafe", false, "enable less safe operations, please backup first")
+	convertCmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+}
+
+func convertContents(mark rune) error {
+	cfg, err := InitializeConfig()
 	if err != nil {
 		return err
 	}
 
-	h, err := hugolib.NewHugoSites(*c.DepsCfg)
+	h, err := hugolib.NewHugoSites(*cfg)
 	if err != nil {
 		return err
 	}
 
-	if err := h.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-		return err
-	}
-
 	site := h.Sites[0]
 
-	site.Log.FEEDBACK.Println("processing", len(site.AllPages), "content files")
-	for _, p := range site.AllPages {
-		if err := cc.convertAndSavePage(p, site, mark); err != nil {
+	if err = site.Initialise(); err != nil {
+		return err
+	}
+
+	if site.Source == nil {
+		panic("site.Source not set")
+	}
+	if len(site.Source.Files()) < 1 {
+		return errors.New("No source files found")
+	}
+
+	contentDir := site.PathSpec.AbsPathify(site.Cfg.GetString("contentDir"))
+	site.Log.FEEDBACK.Println("processing", len(site.Source.Files()), "content files")
+	for _, file := range site.Source.Files() {
+		site.Log.INFO.Println("Attempting to convert", file.LogicalName())
+		page, err := site.NewPage(file.LogicalName())
+		if err != nil {
 			return err
 		}
-	}
-	return nil
-}
 
-func (cc *convertCmd) convertAndSavePage(p *hugolib.Page, site *hugolib.Site, mark rune) error {
-	// The resources are not in .Site.AllPages.
-	for _, r := range p.Resources.ByType("page") {
-		if err := cc.convertAndSavePage(r.(*hugolib.Page), site, mark); err != nil {
+		psr, err := parser.ReadFrom(file.Contents)
+		if err != nil {
+			site.Log.ERROR.Println("Error processing file:", file.Path())
+			return err
+		}
+		metadata, err := psr.Metadata()
+		if err != nil {
+			site.Log.ERROR.Println("Error processing file:", file.Path())
 			return err
 		}
-	}
 
-	if p.Filename() == "" {
-		// No content file.
-		return nil
-	}
+		// better handling of dates in formats that don't have support for them
+		if mark == parser.FormatToLeadRune("json") || mark == parser.FormatToLeadRune("yaml") || mark == parser.FormatToLeadRune("toml") {
+			newMetadata := cast.ToStringMap(metadata)
+			for k, v := range newMetadata {
+				switch vv := v.(type) {
+				case time.Time:
+					newMetadata[k] = vv.Format(time.RFC3339)
+				}
+			}
+			metadata = newMetadata
+		}
 
-	site.Log.INFO.Println("Attempting to convert", p.LogicalName())
-	newPage, err := site.NewPage(p.LogicalName())
-	if err != nil {
-		return err
-	}
+		page.SetDir(filepath.Join(contentDir, file.Dir()))
+		page.SetSourceContent(psr.Content())
+		if err = page.SetSourceMetaData(metadata, mark); err != nil {
+			site.Log.ERROR.Printf("Failed to set source metadata for file %q: %s. For more info see For more info see https://github.com/spf13/hugo/issues/2458", page.FullFilePath(), err)
+			continue
+		}
 
-	f, _ := p.File.(src.ReadableFile)
-	file, err := f.Open()
-	if err != nil {
-		site.Log.ERROR.Println("Error reading file:", p.Path())
-		file.Close()
-		return nil
-	}
-
-	psr, err := parser.ReadFrom(file)
-	if err != nil {
-		site.Log.ERROR.Println("Error processing file:", p.Path())
-		file.Close()
-		return err
-	}
-
-	file.Close()
-
-	metadata, err := psr.Metadata()
-	if err != nil {
-		site.Log.ERROR.Println("Error processing file:", p.Path())
-		return err
-	}
-
-	// better handling of dates in formats that don't have support for them
-	if mark == parser.FormatToLeadRune("json") || mark == parser.FormatToLeadRune("yaml") || mark == parser.FormatToLeadRune("toml") {
-		newMetadata := cast.ToStringMap(metadata)
-		for k, v := range newMetadata {
-			switch vv := v.(type) {
-			case time.Time:
-				newMetadata[k] = vv.Format(time.RFC3339)
+		if outputDir != "" {
+			if err = page.SaveSourceAs(filepath.Join(outputDir, page.FullFilePath())); err != nil {
+				return fmt.Errorf("Failed to save file %q: %s", page.FullFilePath(), err)
+			}
+		} else {
+			if unsafe {
+				if err = page.SaveSource(); err != nil {
+					return fmt.Errorf("Failed to save file %q: %s", page.FullFilePath(), err)
+				}
+			} else {
+				site.Log.FEEDBACK.Println("Unsafe operation not allowed, use --unsafe or set a different output path")
 			}
 		}
-		metadata = newMetadata
 	}
-
-	newPage.SetSourceContent(psr.Content())
-	if err = newPage.SetSourceMetaData(metadata, mark); err != nil {
-		site.Log.ERROR.Printf("Failed to set source metadata for file %q: %s. For more info see For more info see https://github.com/gohugoio/hugo/issues/2458", newPage.FullFilePath(), err)
-		return nil
-	}
-
-	newFilename := p.Filename()
-	if cc.outputDir != "" {
-		newFilename = filepath.Join(cc.outputDir, p.Dir(), newPage.LogicalName())
-	}
-
-	if err = newPage.SaveSourceAs(newFilename); err != nil {
-		return fmt.Errorf("Failed to save file %q: %s", newFilename, err)
-	}
-
 	return nil
 }

commands/env.go

@@ -20,25 +20,16 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-var _ cmder = (*envCmd)(nil)
+var envCmd = &cobra.Command{
+	Use:   "env",
+	Short: "Print Hugo version and environment info",
+	Long:  `Print Hugo version and environment info. This is useful in Hugo bug reports.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		printHugoVersion()
+		jww.FEEDBACK.Printf("GOOS=%q\n", runtime.GOOS)
+		jww.FEEDBACK.Printf("GOARCH=%q\n", runtime.GOARCH)
+		jww.FEEDBACK.Printf("GOVERSION=%q\n", runtime.Version())
 
-type envCmd struct {
-	*baseCmd
-}
-
-func newEnvCmd() *envCmd {
-	return &envCmd{baseCmd: newBaseCmd(&cobra.Command{
-		Use:   "env",
-		Short: "Print Hugo version and environment info",
-		Long:  `Print Hugo version and environment info. This is useful in Hugo bug reports.`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			printHugoVersion()
-			jww.FEEDBACK.Printf("GOOS=%q\n", runtime.GOOS)
-			jww.FEEDBACK.Printf("GOARCH=%q\n", runtime.GOARCH)
-			jww.FEEDBACK.Printf("GOVERSION=%q\n", runtime.Version())
-
-			return nil
-		},
-	}),
-	}
+		return nil
+	},
 }

commands/gen.go

@@ -17,25 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var _ cmder = (*genCmd)(nil)
-
-type genCmd struct {
-	*baseCmd
-}
-
-func newGenCmd() *genCmd {
-	cc := &genCmd{}
-	cc.baseCmd = newBaseCmd(&cobra.Command{
-		Use:   "gen",
-		Short: "A collection of several useful generators.",
-	})
-
-	cc.cmd.AddCommand(
-		newGenautocompleteCmd().getCommand(),
-		newGenDocCmd().getCommand(),
-		newGenManCmd().getCommand(),
-		createGenDocsHelper().getCommand(),
-		createGenChromaStyles().getCommand())
-
-	return cc
+var genCmd = &cobra.Command{
+	Use:   "gen",
+	Short: "A collection of several useful generators.",
 }

commands/genautocomplete.go

@@ -18,24 +18,15 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-var _ cmder = (*genautocompleteCmd)(nil)
+var autocompleteTarget string
 
-type genautocompleteCmd struct {
-	autocompleteTarget string
+// bash for now (zsh and others will come)
+var autocompleteType string
 
-	// bash for now (zsh and others will come)
-	autocompleteType string
-
-	*baseCmd
-}
-
-func newGenautocompleteCmd() *genautocompleteCmd {
-	cc := &genautocompleteCmd{}
-
-	cc.baseCmd = newBaseCmd(&cobra.Command{
-		Use:   "autocomplete",
-		Short: "Generate shell autocompletion script for Hugo",
-		Long: `Generates a shell autocompletion script for Hugo.
+var genautocompleteCmd = &cobra.Command{
+	Use:   "autocomplete",
+	Short: "Generate shell autocompletion script for Hugo",
+	Long: `Generates a shell autocompletion script for Hugo.
 
 NOTE: The current version supports Bash only.
       This should work for *nix systems with Bash installed.
@@ -53,28 +44,27 @@ or just source them in directly:
 
 	$ . /etc/bash_completion`,
 
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if cc.autocompleteType != "bash" {
-				return newUserError("Only Bash is supported for now")
-			}
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if autocompleteType != "bash" {
+			return newUserError("Only Bash is supported for now")
+		}
 
-			err := cmd.Root().GenBashCompletionFile(cc.autocompleteTarget)
+		err := cmd.Root().GenBashCompletionFile(autocompleteTarget)
 
-			if err != nil {
-				return err
-			}
+		if err != nil {
+			return err
+		}
 
-			jww.FEEDBACK.Println("Bash completion file for Hugo saved to", cc.autocompleteTarget)
+		jww.FEEDBACK.Println("Bash completion file for Hugo saved to", autocompleteTarget)
 
-			return nil
-		},
-	})
+		return nil
+	},
+}
 
-	cc.cmd.PersistentFlags().StringVarP(&cc.autocompleteTarget, "completionfile", "", "/etc/bash_completion.d/hugo.sh", "autocompletion file")
-	cc.cmd.PersistentFlags().StringVarP(&cc.autocompleteType, "type", "", "bash", "autocompletion type (currently only bash supported)")
+func init() {
+	genautocompleteCmd.PersistentFlags().StringVarP(&autocompleteTarget, "completionfile", "", "/etc/bash_completion.d/hugo.sh", "Autocompletion file")
+	genautocompleteCmd.PersistentFlags().StringVarP(&autocompleteType, "type", "", "bash", "Autocompletion type (currently only bash supported)")
 
 	// For bash-completion
-	cc.cmd.PersistentFlags().SetAnnotation("completionfile", cobra.BashCompFilenameExt, []string{})
-
-	return cc
+	genautocompleteCmd.PersistentFlags().SetAnnotation("completionfile", cobra.BashCompFilenameExt, []string{})
 }

commands/genchromastyles.go

@@ -1,74 +0,0 @@
-// Copyright 2017-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 commands
-
-import (
-	"os"
-
-	"github.com/alecthomas/chroma"
-	"github.com/alecthomas/chroma/formatters/html"
-	"github.com/alecthomas/chroma/styles"
-	"github.com/spf13/cobra"
-)
-
-var (
-	_ cmder = (*genChromaStyles)(nil)
-)
-
-type genChromaStyles struct {
-	style          string
-	highlightStyle string
-	linesStyle     string
-	*baseCmd
-}
-
-// TODO(bep) highlight
-func createGenChromaStyles() *genChromaStyles {
-	g := &genChromaStyles{
-		baseCmd: newBaseCmd(&cobra.Command{
-			Use:   "chromastyles",
-			Short: "Generate CSS stylesheet for the Chroma code highlighter",
-			Long: `Generate CSS stylesheet for the Chroma code highlighter for a given style. This stylesheet is needed if pygmentsUseClasses is enabled in config.
-
-See https://help.farbox.com/pygments.html for preview of available styles`,
-		}),
-	}
-
-	g.cmd.RunE = func(cmd *cobra.Command, args []string) error {
-		return g.generate()
-	}
-
-	g.cmd.PersistentFlags().StringVar(&g.style, "style", "friendly", "highlighter style (see https://help.farbox.com/pygments.html)")
-	g.cmd.PersistentFlags().StringVar(&g.highlightStyle, "highlightStyle", "bg:#ffffcc", "style used for highlighting lines (see https://github.com/alecthomas/chroma)")
-	g.cmd.PersistentFlags().StringVar(&g.linesStyle, "linesStyle", "", "style used for line numbers (see https://github.com/alecthomas/chroma)")
-
-	return g
-}
-
-func (g *genChromaStyles) generate() error {
-	builder := styles.Get(g.style).Builder()
-	if g.highlightStyle != "" {
-		builder.Add(chroma.LineHighlight, g.highlightStyle)
-	}
-	if g.linesStyle != "" {
-		builder.Add(chroma.LineNumbers, g.linesStyle)
-	}
-	style, err := builder.Build()
-	if err != nil {
-		return err
-	}
-	formatter := html.New(html.WithClasses())
-	formatter.WriteCSS(os.Stdout, style)
-	return nil
-}

commands/gendoc.go

@@ -20,22 +20,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
+	"github.com/spf13/hugo/helpers"
+	"github.com/spf13/hugo/hugofs"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-var _ cmder = (*genDocCmd)(nil)
-
-type genDocCmd struct {
-	gendocdir string
-	*baseCmd
-}
-
-func newGenDocCmd() *genDocCmd {
-	const gendocFrontmatterTemplate = `---
+const gendocFrontmatterTemplate = `---
 date: %s
 title: "%s"
 slug: %s
@@ -43,12 +35,11 @@ url: %s
 ---
 `
 
-	cc := &genDocCmd{}
-
-	cc.baseCmd = newBaseCmd(&cobra.Command{
-		Use:   "doc",
-		Short: "Generate Markdown documentation for the Hugo CLI.",
-		Long: `Generate Markdown documentation for the Hugo CLI.
+var gendocdir string
+var gendocCmd = &cobra.Command{
+	Use:   "doc",
+	Short: "Generate Markdown documentation for the Hugo CLI.",
+	Long: `Generate Markdown documentation for the Hugo CLI.
 
 This command is, mostly, used to create up-to-date documentation
 of Hugo's command-line interface for http://gohugo.io/.
@@ -56,41 +47,40 @@ of Hugo's command-line interface for http://gohugo.io/.
 It creates one Markdown file per command with front matter suitable
 for rendering in Hugo.`,
 
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if !strings.HasSuffix(cc.gendocdir, helpers.FilePathSeparator) {
-				cc.gendocdir += helpers.FilePathSeparator
-			}
-			if found, _ := helpers.Exists(cc.gendocdir, hugofs.Os); !found {
-				jww.FEEDBACK.Println("Directory", cc.gendocdir, "does not exist, creating...")
-				if err := hugofs.Os.MkdirAll(cc.gendocdir, 0777); err != nil {
-					return err
-				}
-			}
-			now := time.Now().Format("2006-01-02")
-			prepender := func(filename string) string {
-				name := filepath.Base(filename)
-				base := strings.TrimSuffix(name, path.Ext(name))
-				url := "/commands/" + strings.ToLower(base) + "/"
-				return fmt.Sprintf(gendocFrontmatterTemplate, now, strings.Replace(base, "_", " ", -1), base, url)
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if !strings.HasSuffix(gendocdir, helpers.FilePathSeparator) {
+			gendocdir += helpers.FilePathSeparator
+		}
+		if found, _ := helpers.Exists(gendocdir, hugofs.Os); !found {
+			jww.FEEDBACK.Println("Directory", gendocdir, "does not exist, creating...")
+			if err := hugofs.Os.MkdirAll(gendocdir, 0777); err != nil {
+				return err
 			}
+		}
+		now := time.Now().Format(time.RFC3339)
+		prepender := func(filename string) string {
+			name := filepath.Base(filename)
+			base := strings.TrimSuffix(name, path.Ext(name))
+			url := "/commands/" + strings.ToLower(base) + "/"
+			return fmt.Sprintf(gendocFrontmatterTemplate, now, strings.Replace(base, "_", " ", -1), base, url)
+		}
 
-			linkHandler := func(name string) string {
-				base := strings.TrimSuffix(name, path.Ext(name))
-				return "/commands/" + strings.ToLower(base) + "/"
-			}
+		linkHandler := func(name string) string {
+			base := strings.TrimSuffix(name, path.Ext(name))
+			return "/commands/" + strings.ToLower(base) + "/"
+		}
 
-			jww.FEEDBACK.Println("Generating Hugo command-line documentation in", cc.gendocdir, "...")
-			doc.GenMarkdownTreeCustom(cmd.Root(), cc.gendocdir, prepender, linkHandler)
-			jww.FEEDBACK.Println("Done.")
+		jww.FEEDBACK.Println("Generating Hugo command-line documentation in", gendocdir, "...")
+		doc.GenMarkdownTreeCustom(cmd.Root(), gendocdir, prepender, linkHandler)
+		jww.FEEDBACK.Println("Done.")
 
-			return nil
-		},
-	})
+		return nil
+	},
+}
 
-	cc.cmd.PersistentFlags().StringVar(&cc.gendocdir, "dir", "/tmp/hugodoc/", "the directory to write the doc.")
+func init() {
+	gendocCmd.PersistentFlags().StringVar(&gendocdir, "dir", "/tmp/hugodoc/", "the directory to write the doc.")
 
 	// For bash-completion
-	cc.cmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
-
-	return cc
+	gendocCmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
 }

commands/gendocshelper.go

@@ -19,33 +19,29 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/gohugoio/hugo/docshelper"
 	"github.com/spf13/cobra"
-)
-
-var (
-	_ cmder = (*genDocsHelper)(nil)
+	"github.com/spf13/hugo/docshelper"
 )
 
 type genDocsHelper struct {
 	target string
-	*baseCmd
+	cmd    *cobra.Command
 }
 
 func createGenDocsHelper() *genDocsHelper {
 	g := &genDocsHelper{
-		baseCmd: newBaseCmd(&cobra.Command{
+		cmd: &cobra.Command{
 			Use:    "docshelper",
 			Short:  "Generate some data files for the Hugo docs.",
 			Hidden: true,
-		}),
+		},
 	}
 
 	g.cmd.RunE = func(cmd *cobra.Command, args []string) error {
 		return g.generate()
 	}
 
-	g.cmd.PersistentFlags().StringVarP(&g.target, "dir", "", "docs/data", "data dir")
+	g.cmd.PersistentFlags().StringVarP(&g.target, "dir", "", "docs/data", "Data dir")
 
 	return g
 }

commands/genman.go

@@ -17,60 +17,50 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
+	"github.com/spf13/hugo/helpers"
+	"github.com/spf13/hugo/hugofs"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-var _ cmder = (*genManCmd)(nil)
-
-type genManCmd struct {
-	genmandir string
-	*baseCmd
-}
-
-func newGenManCmd() *genManCmd {
-	cc := &genManCmd{}
-
-	cc.baseCmd = newBaseCmd(&cobra.Command{
-		Use:   "man",
-		Short: "Generate man pages for the Hugo CLI",
-		Long: `This command automatically generates up-to-date man pages of Hugo's
+var genmandir string
+var genmanCmd = &cobra.Command{
+	Use:   "man",
+	Short: "Generate man pages for the Hugo CLI",
+	Long: `This command automatically generates up-to-date man pages of Hugo's
 command-line interface.  By default, it creates the man page files
 in the "man" directory under the current directory.`,
 
-		RunE: func(cmd *cobra.Command, args []string) error {
-			header := &doc.GenManHeader{
-				Section: "1",
-				Manual:  "Hugo Manual",
-				Source:  fmt.Sprintf("Hugo %s", helpers.CurrentHugoVersion),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		header := &doc.GenManHeader{
+			Section: "1",
+			Manual:  "Hugo Manual",
+			Source:  fmt.Sprintf("Hugo %s", helpers.HugoVersion()),
+		}
+		if !strings.HasSuffix(genmandir, helpers.FilePathSeparator) {
+			genmandir += helpers.FilePathSeparator
+		}
+		if found, _ := helpers.Exists(genmandir, hugofs.Os); !found {
+			jww.FEEDBACK.Println("Directory", genmandir, "does not exist, creating...")
+			if err := hugofs.Os.MkdirAll(genmandir, 0777); err != nil {
+				return err
 			}
-			if !strings.HasSuffix(cc.genmandir, helpers.FilePathSeparator) {
-				cc.genmandir += helpers.FilePathSeparator
-			}
-			if found, _ := helpers.Exists(cc.genmandir, hugofs.Os); !found {
-				jww.FEEDBACK.Println("Directory", cc.genmandir, "does not exist, creating...")
-				if err := hugofs.Os.MkdirAll(cc.genmandir, 0777); err != nil {
-					return err
-				}
-			}
-			cmd.Root().DisableAutoGenTag = true
+		}
+		cmd.Root().DisableAutoGenTag = true
 
-			jww.FEEDBACK.Println("Generating Hugo man pages in", cc.genmandir, "...")
-			doc.GenManTree(cmd.Root(), header, cc.genmandir)
+		jww.FEEDBACK.Println("Generating Hugo man pages in", genmandir, "...")
+		doc.GenManTree(cmd.Root(), header, genmandir)
 
-			jww.FEEDBACK.Println("Done.")
+		jww.FEEDBACK.Println("Done.")
 
-			return nil
-		},
-	})
+		return nil
+	},
+}
 
-	cc.cmd.PersistentFlags().StringVar(&cc.genmandir, "dir", "man/", "the directory to write the man pages.")
+func init() {
+	genmanCmd.PersistentFlags().StringVar(&genmandir, "dir", "man/", "the directory to write the man pages.")
 
 	// For bash-completion
-	cc.cmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
-
-	return cc
+	genmanCmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
 }

commands/helpers.go

@@ -1,72 +0,0 @@
-// 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 defines and implements command-line commands and flags
-// used by Hugo. Commands and flags are implemented using Cobra.
-package commands
-
-import (
-	"fmt"
-	"regexp"
-
-	"github.com/gohugoio/hugo/config"
-	"github.com/spf13/cobra"
-)
-
-type flagsToConfigHandler interface {
-	flagsToConfig(cfg config.Provider)
-}
-
-type cmder interface {
-	flagsToConfigHandler
-	getCommand() *cobra.Command
-}
-
-// commandError is an error used to signal different error situations in command handling.
-type commandError struct {
-	s         string
-	userError bool
-}
-
-func (c commandError) Error() string {
-	return c.s
-}
-
-func (c commandError) isUserError() bool {
-	return c.userError
-}
-
-func newUserError(a ...interface{}) commandError {
-	return commandError{s: fmt.Sprintln(a...), userError: true}
-}
-
-func newSystemError(a ...interface{}) commandError {
-	return commandError{s: fmt.Sprintln(a...), userError: false}
-}
-
-func newSystemErrorF(format string, a ...interface{}) commandError {
-	return commandError{s: fmt.Sprintf(format, a...), userError: false}
-}
-
-// Catch some of the obvious user errors from Cobra.
-// We don't want to show the usage message for every error.
-// The below may be to generic. Time will show.
-var userErrorRegexp = regexp.MustCompile("argument|flag|shorthand")
-
-func isUserError(err error) bool {
-	if cErr, ok := err.(commandError); ok && cErr.isUserError() {
-		return true
-	}
-
-	return userErrorRegexp.MatchString(err.Error())
-}

commands/helpers_others.go

@@ -1,23 +0,0 @@
-// 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.
-
-// +build !windows
-
-package commands
-
-const (
-	ansiEsc    = "\u001B"
-	clearLine  = "\r\033[K"
-	hideCursor = ansiEsc + "[?25l"
-	showCursor = ansiEsc + "[?25h"
-)

commands/helpers_windows.go

@@ -1,23 +0,0 @@
-// 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.
-
-// +build windows
-
-package commands
-
-const (
-	ansiEsc    = ""
-	clearLine  = ""
-	hideCursor = ""
-	showCursor = ""
-)

commands/hugo_windows.go

@@ -23,5 +23,5 @@ func init() {
 
   You need to open cmd.exe and run Hugo from there.
   
-  Visit https://gohugo.io/ for more information.`
+  Visit http://gohugo.io/ for more information.`
 }

commands/import_jekyll.go

@@ -25,52 +25,43 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugofs"
-	"github.com/gohugoio/hugo/hugolib"
-	"github.com/gohugoio/hugo/parser"
 	"github.com/spf13/afero"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
+	"github.com/spf13/hugo/helpers"
+	"github.com/spf13/hugo/hugofs"
+	"github.com/spf13/hugo/hugolib"
+	"github.com/spf13/hugo/parser"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-var _ cmder = (*importCmd)(nil)
-
-type importCmd struct {
-	*baseCmd
+func init() {
+	importCmd.AddCommand(importJekyllCmd)
 }
 
-func newImportCmd() *importCmd {
-	cc := &importCmd{}
-
-	cc.baseCmd = newBaseCmd(&cobra.Command{
-		Use:   "import",
-		Short: "Import your site from others.",
-		Long: `Import your site from other web site generators like Jekyll.
+var importCmd = &cobra.Command{
+	Use:   "import",
+	Short: "Import your site from others.",
+	Long: `Import your site from other web site generators like Jekyll.
 
 Import requires a subcommand, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.",
-		RunE: nil,
-	})
-
-	importJekyllCmd := &cobra.Command{
-		Use:   "jekyll",
-		Short: "hugo import from Jekyll",
-		Long: `hugo import from Jekyll.
-
-Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.",
-		RunE: cc.importFromJekyll,
-	}
-
-	importJekyllCmd.Flags().Bool("force", false, "allow import into non-empty target directory")
-
-	cc.cmd.AddCommand(importJekyllCmd)
-
-	return cc
-
+	RunE: nil,
 }
 
-func (i *importCmd) importFromJekyll(cmd *cobra.Command, args []string) error {
+var importJekyllCmd = &cobra.Command{
+	Use:   "jekyll",
+	Short: "hugo import from Jekyll",
+	Long: `hugo import from Jekyll.
+
+Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.",
+	RunE: importFromJekyll,
+}
+
+func init() {
+	importJekyllCmd.Flags().Bool("force", false, "Allow import into non-empty target directory")
+}
+
+func importFromJekyll(cmd *cobra.Command, args []string) error {
 
 	if len(args) < 2 {
 		return newUserError(`Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.")
@@ -93,17 +84,9 @@ func (i *importCmd) importFromJekyll(cmd *cobra.Command, args []string) error {
 	}
 
 	forceImport, _ := cmd.Flags().GetBool("force")
-
-	fs := afero.NewOsFs()
-	jekyllPostDirs, hasAnyPost := i.getJekyllDirInfo(fs, jekyllRoot)
-	if !hasAnyPost {
-		return errors.New("Your Jekyll root contains neither posts nor drafts, aborting.")
-	}
-
-	site, err := i.createSiteFromJekyll(jekyllRoot, targetDir, jekyllPostDirs, forceImport)
-
+	site, err := createSiteFromJekyll(jekyllRoot, targetDir, forceImport)
 	if err != nil {
-		return newUserError(err)
+		return err
 	}
 
 	jww.FEEDBACK.Println("Importing...")
@@ -127,10 +110,10 @@ func (i *importCmd) importFromJekyll(cmd *cobra.Command, args []string) error {
 		draft := false
 
 		switch {
-		case strings.Contains(relPath, "_posts/"):
-			relPath = filepath.Join("content/post", strings.Replace(relPath, "_posts/", "", -1))
-		case strings.Contains(relPath, "_drafts/"):
-			relPath = filepath.Join("content/draft", strings.Replace(relPath, "_drafts/", "", -1))
+		case strings.HasPrefix(relPath, "_posts/"):
+			relPath = "content/post" + relPath[len("_posts"):]
+		case strings.HasPrefix(relPath, "_drafts/"):
+			relPath = "content/draft" + relPath[len("_drafts"):]
 			draft = true
 		default:
 			return nil
@@ -140,14 +123,11 @@ func (i *importCmd) importFromJekyll(cmd *cobra.Command, args []string) error {
 		return convertJekyllPost(site, path, relPath, targetDir, draft)
 	}
 
-	for jekyllPostDir, hasAnyPostInDir := range jekyllPostDirs {
-		if hasAnyPostInDir {
-			if err = helpers.SymbolicWalk(hugofs.Os, filepath.Join(jekyllRoot, jekyllPostDir), callback); err != nil {
-				return err
-			}
-		}
-	}
+	err = helpers.SymbolicWalk(hugofs.Os, jekyllRoot, callback)
 
+	if err != nil {
+		return err
+	}
 	jww.FEEDBACK.Println("Congratulations!", fileCount, "post(s) imported!")
 	jww.FEEDBACK.Println("Now, start Hugo by yourself:\n" +
 		"$ git clone https://github.com/spf13/herring-cove.git " + args[1] + "/themes/herring-cove")
@@ -156,52 +136,15 @@ func (i *importCmd) importFromJekyll(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (i *importCmd) getJekyllDirInfo(fs afero.Fs, jekyllRoot string) (map[string]bool, bool) {
-	postDirs := make(map[string]bool)
-	hasAnyPost := false
-	if entries, err := ioutil.ReadDir(jekyllRoot); err == nil {
-		for _, entry := range entries {
-			if entry.IsDir() {
-				subDir := filepath.Join(jekyllRoot, entry.Name())
-				if isPostDir, hasAnyPostInDir := i.retrieveJekyllPostDir(fs, subDir); isPostDir {
-					postDirs[entry.Name()] = hasAnyPostInDir
-					if hasAnyPostInDir {
-						hasAnyPost = true
-					}
-				}
-			}
-		}
-	}
-	return postDirs, hasAnyPost
-}
-
-func (i *importCmd) retrieveJekyllPostDir(fs afero.Fs, dir string) (bool, bool) {
-	if strings.HasSuffix(dir, "_posts") || strings.HasSuffix(dir, "_drafts") {
-		isEmpty, _ := helpers.IsEmpty(dir, fs)
-		return true, !isEmpty
-	}
-
-	if entries, err := ioutil.ReadDir(dir); err == nil {
-		for _, entry := range entries {
-			if entry.IsDir() {
-				subDir := filepath.Join(dir, entry.Name())
-				if isPostDir, hasAnyPost := i.retrieveJekyllPostDir(fs, subDir); isPostDir {
-					return isPostDir, hasAnyPost
-				}
-			}
-		}
-	}
-
-	return false, true
-}
-
-func (i *importCmd) createSiteFromJekyll(jekyllRoot, targetDir string, jekyllPostDirs map[string]bool, force bool) (*hugolib.Site, error) {
+// TODO: Consider calling doNewSite() instead?
+func createSiteFromJekyll(jekyllRoot, targetDir string, force bool) (*hugolib.Site, error) {
 	s, err := hugolib.NewSiteDefaultLang()
 	if err != nil {
 		return nil, err
 	}
 
 	fs := s.Fs.Source
+
 	if exists, _ := helpers.Exists(targetDir, fs); exists {
 		if isDir, _ := helpers.IsDir(targetDir, fs); !isDir {
 			return nil, errors.New("Target path \"" + targetDir + "\" already exists but not a directory")
@@ -214,7 +157,25 @@ func (i *importCmd) createSiteFromJekyll(jekyllRoot, targetDir string, jekyllPos
 		}
 	}
 
-	jekyllConfig := i.loadJekyllConfig(fs, jekyllRoot)
+	jekyllConfig := loadJekyllConfig(fs, jekyllRoot)
+
+	// Crude test to make sure at least one of _drafts/ and _posts/ exists
+	// and is not empty.
+	hasPostsOrDrafts := false
+	postsDir := filepath.Join(jekyllRoot, "_posts")
+	draftsDir := filepath.Join(jekyllRoot, "_drafts")
+	for _, d := range []string{postsDir, draftsDir} {
+		if exists, _ := helpers.Exists(d, fs); exists {
+			if isDir, _ := helpers.IsDir(d, fs); isDir {
+				if isEmpty, _ := helpers.IsEmpty(d, fs); !isEmpty {
+					hasPostsOrDrafts = true
+				}
+			}
+		}
+	}
+	if !hasPostsOrDrafts {
+		return nil, errors.New("Your Jekyll root contains neither posts nor drafts, aborting.")
+	}
 
 	mkdir(targetDir, "layouts")
 	mkdir(targetDir, "content")
@@ -223,14 +184,14 @@ func (i *importCmd) createSiteFromJekyll(jekyllRoot, targetDir string, jekyllPos
 	mkdir(targetDir, "data")
 	mkdir(targetDir, "themes")
 
-	i.createConfigFromJekyll(fs, targetDir, "yaml", jekyllConfig)
+	createConfigFromJekyll(fs, targetDir, "yaml", jekyllConfig)
 
-	i.copyJekyllFilesAndFolders(jekyllRoot, filepath.Join(targetDir, "static"), jekyllPostDirs)
+	copyJekyllFilesAndFolders(jekyllRoot, filepath.Join(targetDir, "static"))
 
 	return s, nil
 }
 
-func (i *importCmd) loadJekyllConfig(fs afero.Fs, jekyllRoot string) map[string]interface{} {
+func loadJekyllConfig(fs afero.Fs, jekyllRoot string) map[string]interface{} {
 	path := filepath.Join(jekyllRoot, "_config.yml")
 
 	exists, err := helpers.Exists(path, fs)
@@ -259,10 +220,10 @@ func (i *importCmd) loadJekyllConfig(fs afero.Fs, jekyllRoot string) map[string]
 		return nil
 	}
 
-	return c
+	return c.(map[string]interface{})
 }
 
-func (i *importCmd) createConfigFromJekyll(fs afero.Fs, inpath string, kind string, jekyllConfig map[string]interface{}) (err error) {
+func createConfigFromJekyll(fs afero.Fs, inpath string, kind string, jekyllConfig map[string]interface{}) (err error) {
 	title := "My New Hugo Site"
 	baseURL := "http://example.org/"
 
@@ -357,7 +318,7 @@ func copyDir(source string, dest string) error {
 	return nil
 }
 
-func (i *importCmd) copyJekyllFilesAndFolders(jekyllRoot, dest string, jekyllPostDirs map[string]bool) (err error) {
+func copyJekyllFilesAndFolders(jekyllRoot string, dest string) error {
 	fi, err := os.Stat(jekyllRoot)
 	if err != nil {
 		return err
@@ -375,11 +336,9 @@ func (i *importCmd) copyJekyllFilesAndFolders(jekyllRoot, dest string, jekyllPos
 		dfp := filepath.Join(dest, entry.Name())
 		if entry.IsDir() {
 			if entry.Name()[0] != '_' && entry.Name()[0] != '.' {
-				if _, ok := jekyllPostDirs[entry.Name()]; !ok {
-					err = copyDir(sfp, dfp)
-					if err != nil {
-						jww.ERROR.Println(err)
-					}
+				err = copyDir(sfp, dfp)
+				if err != nil {
+					jww.ERROR.Println(err)
 				}
 			}
 		} else {
@@ -472,6 +431,7 @@ func convertJekyllPost(s *hugolib.Site, path, relPath, targetDir string, draft b
 		return err
 	}
 
+	page.SetDir(targetParentDir)
 	page.SetSourceContent([]byte(content))
 	page.SetSourceMetaData(newmetadata, parser.FormatToLeadRune("yaml"))
 	page.SaveSourceAs(targetFile)
@@ -482,6 +442,8 @@ func convertJekyllPost(s *hugolib.Site, path, relPath, targetDir string, draft b
 }
 
 func convertJekyllMetaData(m interface{}, postName string, postDate time.Time, draft bool) (interface{}, error) {
+	url := postDate.Format("/2006/01/02/") + postName + "/"
+
 	metadata, err := cast.ToStringMapE(m)
 	if err != nil {
 		return nil, err
@@ -499,7 +461,7 @@ func convertJekyllMetaData(m interface{}, postName string, postDate time.Time, d
 			delete(metadata, key)
 		case "permalink":
 			if str, ok := value.(string); ok {
-				metadata["url"] = str
+				url = str
 			}
 			delete(metadata, key)
 		case "category":
@@ -528,6 +490,7 @@ func convertJekyllMetaData(m interface{}, postName string, postDate time.Time, d
 
 	}
 
+	metadata["url"] = url
 	metadata["date"] = postDate.Format(time.RFC3339)
 
 	return metadata, nil
@@ -565,50 +528,5 @@ func convertJekyllContent(m interface{}, content string) string {
 		content = replace.re.ReplaceAllString(content, replace.replace)
 	}
 
-	replaceListFunc := []struct {
-		re      *regexp.Regexp
-		replace func(string) string
-	}{
-		// Octopress image tag: http://octopress.org/docs/plugins/image-tag/
-		{regexp.MustCompile(`{%\s+img\s*(.*?)\s*%}`), replaceImageTag},
-	}
-
-	for _, replace := range replaceListFunc {
-		content = replace.re.ReplaceAllStringFunc(content, replace.replace)
-	}
-
 	return content
 }
-
-func replaceImageTag(match string) string {
-	r := regexp.MustCompile(`{%\s+img\s*(\p{L}*)\s+([\S]*/[\S]+)\s+(\d*)\s*(\d*)\s*(.*?)\s*%}`)
-	result := bytes.NewBufferString("{{< figure ")
-	parts := r.FindStringSubmatch(match)
-	// Index 0 is the entire string, ignore
-	replaceOptionalPart(result, "class", parts[1])
-	replaceOptionalPart(result, "src", parts[2])
-	replaceOptionalPart(result, "width", parts[3])
-	replaceOptionalPart(result, "height", parts[4])
-	// title + alt
-	part := parts[5]
-	if len(part) > 0 {
-		splits := strings.Split(part, "'")
-		lenSplits := len(splits)
-		if lenSplits == 1 {
-			replaceOptionalPart(result, "title", splits[0])
-		} else if lenSplits == 3 {
-			replaceOptionalPart(result, "title", splits[1])
-		} else if lenSplits == 5 {
-			replaceOptionalPart(result, "title", splits[1])
-			replaceOptionalPart(result, "alt", splits[3])
-		}
-	}
-	result.WriteString(">}}")
-	return result.String()
-
-}
-func replaceOptionalPart(buffer *bytes.Buffer, partName string, part string) {
-	if len(part) > 0 {
-		buffer.WriteString(partName + "=\"" + part + "\" ")
-	}
-}

commands/import_jekyll_test.go

@@ -51,9 +51,9 @@ func TestConvertJekyllMetadata(t *testing.T) {
 		expect   string
 	}{
 		{map[interface{}]interface{}{}, "testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
-			`{"date":"2015-10-01T00:00:00Z"}`},
+			`{"date":"2015-10-01T00:00:00Z","url":"/2015/10/01/testPost/"}`},
 		{map[interface{}]interface{}{}, "testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), true,
-			`{"date":"2015-10-01T00:00:00Z","draft":true}`},
+			`{"date":"2015-10-01T00:00:00Z","draft":true,"url":"/2015/10/01/testPost/"}`},
 		{map[interface{}]interface{}{"Permalink": "/permalink.html", "layout": "post"},
 			"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
 			`{"date":"2015-10-01T00:00:00Z","url":"/permalink.html"}`},
@@ -62,13 +62,13 @@ func TestConvertJekyllMetadata(t *testing.T) {
 			`{"date":"2015-10-01T00:00:00Z","url":"/permalink.html"}`},
 		{map[interface{}]interface{}{"category": nil, "permalink": 123},
 			"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
-			`{"date":"2015-10-01T00:00:00Z"}`},
+			`{"date":"2015-10-01T00:00:00Z","url":"/2015/10/01/testPost/"}`},
 		{map[interface{}]interface{}{"Excerpt_Separator": "sep"},
 			"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
-			`{"date":"2015-10-01T00:00:00Z","excerpt_separator":"sep"}`},
+			`{"date":"2015-10-01T00:00:00Z","excerpt_separator":"sep","url":"/2015/10/01/testPost/"}`},
 		{map[interface{}]interface{}{"category": "book", "layout": "post", "Others": "Goods", "Date": "2015-10-01 12:13:11"},
 			"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
-			`{"Others":"Goods","categories":["book"],"date":"2015-10-01T12:13:11Z"}`},
+			`{"Others":"Goods","categories":["book"],"date":"2015-10-01T12:13:11Z","url":"/2015/10/01/testPost/"}`},
 	}
 
 	for _, data := range testDataList {
@@ -97,26 +97,6 @@ func TestConvertJekyllContent(t *testing.T) {
 		{map[interface{}]interface{}{},
 			"{% highlight go %}\nvar s int\n{% endhighlight %}",
 			"{{< highlight go >}}\nvar s int\n{{< / highlight >}}"},
-
-		// Octopress image tag
-		{map[interface{}]interface{}{},
-			"{% img http://placekitten.com/890/280 %}",
-			"{{< figure src=\"http://placekitten.com/890/280\" >}}"},
-		{map[interface{}]interface{}{},
-			"{% img left http://placekitten.com/320/250 Place Kitten #2 %}",
-			"{{< figure class=\"left\" src=\"http://placekitten.com/320/250\" title=\"Place Kitten #2\" >}}"},
-		{map[interface{}]interface{}{},
-			"{% img right http://placekitten.com/300/500 150 250 'Place Kitten #3' %}",
-			"{{< figure class=\"right\" src=\"http://placekitten.com/300/500\" width=\"150\" height=\"250\" title=\"Place Kitten #3\" >}}"},
-		{map[interface{}]interface{}{},
-			"{% img right http://placekitten.com/300/500 150 250 'Place Kitten #4' 'An image of a very cute kitten' %}",
-			"{{< figure class=\"right\" src=\"http://placekitten.com/300/500\" width=\"150\" height=\"250\" title=\"Place Kitten #4\" alt=\"An image of a very cute kitten\" >}}"},
-		{map[interface{}]interface{}{},
-			"{% img http://placekitten.com/300/500 150 250 'Place Kitten #4' 'An image of a very cute kitten' %}",
-			"{{< figure src=\"http://placekitten.com/300/500\" width=\"150\" height=\"250\" title=\"Place Kitten #4\" alt=\"An image of a very cute kitten\" >}}"},
-		{map[interface{}]interface{}{},
-			"{% img right /placekitten/300/500 'Place Kitten #4' 'An image of a very cute kitten' %}",
-			"{{< figure class=\"right\" src=\"/placekitten/300/500\" title=\"Place Kitten #4\" alt=\"An image of a very cute kitten\" >}}"},
 	}
 
 	for _, data := range testDataList {

commands/limit_darwin.go

@@ -1,4 +1,17 @@
-// Copyright 2018 The Hugo Authors. All rights reserved.
+// 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.
+
+// 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.
@@ -20,45 +33,39 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-var _ cmder = (*limitCmd)(nil)
-
-type limitCmd struct {
-	*baseCmd
+func init() {
+	checkCmd.AddCommand(limit)
 }
 
-func newLimitCmd() *limitCmd {
-	ccmd := &cobra.Command{
-		Use:   "ulimit",
-		Short: "Check system ulimit settings",
-		Long: `Hugo will inspect the current ulimit settings on the system.
+var limit = &cobra.Command{
+	Use:   "ulimit",
+	Short: "Check system ulimit settings",
+	Long: `Hugo will inspect the current ulimit settings on the system.
 This is primarily to ensure that Hugo can watch enough files on some OSs`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			var rLimit syscall.Rlimit
-			err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
-			if err != nil {
-				return newSystemError("Error Getting Rlimit ", err)
-			}
+	RunE: func(cmd *cobra.Command, args []string) error {
+		var rLimit syscall.Rlimit
+		err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+		if err != nil {
+			return newSystemError("Error Getting Rlimit ", err)
+		}
 
-			jww.FEEDBACK.Println("Current rLimit:", rLimit)
+		jww.FEEDBACK.Println("Current rLimit:", rLimit)
 
-			jww.FEEDBACK.Println("Attempting to increase limit")
-			rLimit.Max = 999999
-			rLimit.Cur = 999999
-			err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
-			if err != nil {
-				return newSystemError("Error Setting rLimit ", err)
-			}
-			err = syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
-			if err != nil {
-				return newSystemError("Error Getting rLimit ", err)
-			}
-			jww.FEEDBACK.Println("rLimit after change:", rLimit)
+		jww.FEEDBACK.Println("Attempting to increase limit")
+		rLimit.Max = 999999
+		rLimit.Cur = 999999
+		err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+		if err != nil {
+			return newSystemError("Error Setting rLimit ", err)
+		}
+		err = syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+		if err != nil {
+			return newSystemError("Error Getting rLimit ", err)
+		}
+		jww.FEEDBACK.Println("rLimit after change:", rLimit)
 
-			return nil
-		},
-	}
-
-	return &limitCmd{baseCmd: newBaseCmd(ccmd)}
+		return nil
+	},
 }
 
 func tweakLimit() {
@@ -68,11 +75,11 @@ func tweakLimit() {
 		jww.ERROR.Println("Unable to obtain rLimit", err)
 	}
 	if rLimit.Cur < rLimit.Max {
-		rLimit.Max = 64000
-		rLimit.Cur = 64000
+		rLimit.Max = 999999
+		rLimit.Cur = 999999
 		err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
 		if err != nil {
-			jww.WARN.Println("Unable to increase number of open files limit", err)
+			jww.ERROR.Println("Unable to increase number of open files limit", err)
 		}
 	}
 }

commands/limit_others.go

@@ -1,4 +1,4 @@
-// Copyright 2018 The Hugo Authors. All rights reserved.
+// 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.
@@ -12,6 +12,18 @@
 // limitations under the License.
 
 // +build !darwin
+// 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 commands
 

commands/list.go

@@ -16,142 +16,146 @@ package commands
 import (
 	"path/filepath"
 
-	"github.com/gohugoio/hugo/hugolib"
 	"github.com/spf13/cobra"
+	"github.com/spf13/hugo/hugolib"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-var _ cmder = (*listCmd)(nil)
-
-type listCmd struct {
-	hugoBuilderCommon
-	*baseCmd
+func init() {
+	listCmd.AddCommand(listDraftsCmd)
+	listCmd.AddCommand(listFutureCmd)
+	listCmd.AddCommand(listExpiredCmd)
+	listCmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
+	listCmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
 }
 
-func newListCmd() *listCmd {
-	cc := &listCmd{}
-
-	cc.baseCmd = newBaseCmd(&cobra.Command{
-		Use:   "list",
-		Short: "Listing out various types of content",
-		Long: `Listing out various types of content.
+var listCmd = &cobra.Command{
+	Use:   "list",
+	Short: "Listing out various types of content",
+	Long: `Listing out various types of content.
 
 List requires a subcommand, e.g. ` + "`hugo list drafts`.",
-		RunE: nil,
-	})
-
-	cc.cmd.AddCommand(
-		&cobra.Command{
-			Use:   "drafts",
-			Short: "List all drafts",
-			Long:  `List all of the drafts in your content directory.`,
-			RunE: func(cmd *cobra.Command, args []string) error {
-				cfgInit := func(c *commandeer) error {
-					c.Set("buildDrafts", true)
-					return nil
-				}
-				c, err := initializeConfig(true, false, &cc.hugoBuilderCommon, cc, cfgInit)
-				if err != nil {
-					return err
-				}
-
-				sites, err := hugolib.NewHugoSites(*c.DepsCfg)
-
-				if err != nil {
-					return newSystemError("Error creating sites", err)
-				}
-
-				if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-					return newSystemError("Error Processing Source Content", err)
-				}
-
-				for _, p := range sites.Pages() {
-					if p.IsDraft() {
-						jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
-					}
-
-				}
-
-				return nil
-
-			},
-		},
-		&cobra.Command{
-			Use:   "future",
-			Short: "List all posts dated in the future",
-			Long: `List all of the posts in your content directory which will be
-posted in the future.`,
-			RunE: func(cmd *cobra.Command, args []string) error {
-				cfgInit := func(c *commandeer) error {
-					c.Set("buildFuture", true)
-					return nil
-				}
-				c, err := initializeConfig(true, false, &cc.hugoBuilderCommon, cc, cfgInit)
-				if err != nil {
-					return err
-				}
-
-				sites, err := hugolib.NewHugoSites(*c.DepsCfg)
-
-				if err != nil {
-					return newSystemError("Error creating sites", err)
-				}
-
-				if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-					return newSystemError("Error Processing Source Content", err)
-				}
-
-				for _, p := range sites.Pages() {
-					if p.IsFuture() {
-						jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
-					}
-
-				}
-
-				return nil
-
-			},
-		},
-		&cobra.Command{
-			Use:   "expired",
-			Short: "List all posts already expired",
-			Long: `List all of the posts in your content directory which has already
-expired.`,
-			RunE: func(cmd *cobra.Command, args []string) error {
-				cfgInit := func(c *commandeer) error {
-					c.Set("buildExpired", true)
-					return nil
-				}
-				c, err := initializeConfig(true, false, &cc.hugoBuilderCommon, cc, cfgInit)
-				if err != nil {
-					return err
-				}
-
-				sites, err := hugolib.NewHugoSites(*c.DepsCfg)
-
-				if err != nil {
-					return newSystemError("Error creating sites", err)
-				}
-
-				if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-					return newSystemError("Error Processing Source Content", err)
-				}
-
-				for _, p := range sites.Pages() {
-					if p.IsExpired() {
-						jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
-					}
-
-				}
-
-				return nil
-
-			},
-		},
-	)
-
-	cc.cmd.PersistentFlags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
-	cc.cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
-
-	return cc
+	RunE: nil,
+}
+
+var listDraftsCmd = &cobra.Command{
+	Use:   "drafts",
+	Short: "List all drafts",
+	Long:  `List all of the drafts in your content directory.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+
+		cfg, err := InitializeConfig()
+		if err != nil {
+			return err
+		}
+
+		c, err := newCommandeer(cfg)
+		if err != nil {
+			return err
+		}
+
+		c.Set("buildDrafts", true)
+
+		sites, err := hugolib.NewHugoSites(*cfg)
+
+		if err != nil {
+			return newSystemError("Error creating sites", err)
+		}
+
+		if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+			return newSystemError("Error Processing Source Content", err)
+		}
+
+		for _, p := range sites.Pages() {
+			if p.IsDraft() {
+				jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+			}
+
+		}
+
+		return nil
+
+	},
+}
+
+var listFutureCmd = &cobra.Command{
+	Use:   "future",
+	Short: "List all posts dated in the future",
+	Long: `List all of the posts in your content directory which will be
+posted in the future.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+
+		cfg, err := InitializeConfig()
+		if err != nil {
+			return err
+		}
+
+		c, err := newCommandeer(cfg)
+		if err != nil {
+			return err
+		}
+
+		c.Set("buildFuture", true)
+
+		sites, err := hugolib.NewHugoSites(*cfg)
+
+		if err != nil {
+			return newSystemError("Error creating sites", err)
+		}
+
+		if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+			return newSystemError("Error Processing Source Content", err)
+		}
+
+		for _, p := range sites.Pages() {
+			if p.IsFuture() {
+				jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+			}
+
+		}
+
+		return nil
+
+	},
+}
+
+var listExpiredCmd = &cobra.Command{
+	Use:   "expired",
+	Short: "List all posts already expired",
+	Long: `List all of the posts in your content directory which has already
+expired.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+
+		cfg, err := InitializeConfig()
+		if err != nil {
+			return err
+		}
+
+		c, err := newCommandeer(cfg)
+		if err != nil {
+			return err
+		}
+
+		c.Set("buildExpired", true)
+
+		sites, err := hugolib.NewHugoSites(*cfg)
+
+		if err != nil {
+			return newSystemError("Error creating sites", err)
+		}
+
+		if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+			return newSystemError("Error Processing Source Content", err)
+		}
+
+		for _, p := range sites.Pages() {
+			if p.IsExpired() {
+				jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+			}
+
+		}
+
+		return nil
+
+	},
 }

commands/list_config.go

@@ -22,29 +22,18 @@ import (
 	"github.com/spf13/viper"
 )
 
-var _ cmder = (*configCmd)(nil)
-
-type configCmd struct {
-	hugoBuilderCommon
-	*baseCmd
+var configCmd = &cobra.Command{
+	Use:   "config",
+	Short: "Print the site configuration",
+	Long:  `Print the site configuration, both default and custom settings.`,
 }
 
-func newConfigCmd() *configCmd {
-	cc := &configCmd{}
-	cc.baseCmd = newBaseCmd(&cobra.Command{
-		Use:   "config",
-		Short: "Print the site configuration",
-		Long:  `Print the site configuration, both default and custom settings.`,
-		RunE:  cc.printConfig,
-	})
-
-	cc.cmd.Flags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
-
-	return cc
+func init() {
+	configCmd.RunE = printConfig
 }
 
-func (c *configCmd) printConfig(cmd *cobra.Command, args []string) error {
-	cfg, err := initializeConfig(true, false, &c.hugoBuilderCommon, c, nil)
+func printConfig(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig(configCmd)
 
 	if err != nil {
 		return err

commands/new.go

@@ -1,4 +1,4 @@
-// Copyright 2018 The Hugo Authors. All rights reserved.
+// Copyright 2016 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.
@@ -15,68 +15,97 @@ package commands
 
 import (
 	"bytes"
+	"errors"
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
-	"github.com/gohugoio/hugo/create"
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugolib"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
+	"github.com/spf13/hugo/create"
+	"github.com/spf13/hugo/helpers"
+	"github.com/spf13/hugo/hugofs"
+	"github.com/spf13/hugo/hugolib"
+	"github.com/spf13/hugo/parser"
 	jww "github.com/spf13/jwalterweatherman"
+	"github.com/spf13/viper"
 )
 
-var _ cmder = (*newCmd)(nil)
-
-type newCmd struct {
-	hugoBuilderCommon
+var (
+	configFormat  string
 	contentEditor string
 	contentType   string
+)
+
+func init() {
+	newSiteCmd.Flags().StringVarP(&configFormat, "format", "f", "toml", "config & frontmatter format")
+	newSiteCmd.Flags().Bool("force", false, "Init inside non-empty directory")
+	newCmd.Flags().StringVarP(&configFormat, "format", "f", "toml", "frontmatter format")
+	newCmd.Flags().StringVarP(&contentType, "kind", "k", "", "Content type to create")
+	newCmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
+	newCmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+	newCmd.Flags().StringVar(&contentEditor, "editor", "", "edit new content with this editor, if provided")
+
+	newCmd.AddCommand(newSiteCmd)
+	newCmd.AddCommand(newThemeCmd)
 
-	*baseCmd
 }
 
-func newNewCmd() *newCmd {
-	cc := &newCmd{}
-	cc.baseCmd = newBaseCmd(&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.
+var newCmd = &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.`,
 
-		RunE: cc.newContent,
-	})
-
-	cc.cmd.Flags().StringVarP(&cc.contentType, "kind", "k", "", "content type to create")
-	cc.cmd.PersistentFlags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
-	cc.cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
-	cc.cmd.Flags().StringVar(&cc.contentEditor, "editor", "", "edit new content with this editor, if provided")
-
-	cc.cmd.AddCommand(newNewSiteCmd().getCommand())
-	cc.cmd.AddCommand(newNewThemeCmd().getCommand())
-
-	return cc
+	RunE: NewContent,
 }
 
-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
-	}
+var newSiteCmd = &cobra.Command{
+	Use:   "site [path]",
+	Short: "Create a new site (skeleton)",
+	Long: `Create a new site in the provided directory.
+The new site will have the correct structure, but no content or theme yet.
+Use ` + "`hugo new [contentPath]`" + ` to create new content.`,
+	RunE: NewSite,
+}
 
-	c, err := initializeConfig(true, false, &n.hugoBuilderCommon, n, cfgInit)
+var newThemeCmd = &cobra.Command{
+	Use:   "theme [name]",
+	Short: "Create a new theme",
+	Long: `Create a new theme (skeleton) called [name] in the current directory.
+New theme is a skeleton. Please add content to the touched files. Add your
+name to the copyright line in the license and adjust the theme.toml file
+as you see fit.`,
+	RunE: NewTheme,
+}
+
+// NewContent adds new content to a Hugo site.
+func NewContent(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig()
 
 	if err != nil {
 		return err
 	}
 
+	c, err := newCommandeer(cfg)
+	if err != nil {
+		return err
+	}
+
+	if flagChanged(cmd.Flags(), "format") {
+		c.Set("metaDataFormat", configFormat)
+	}
+
+	if flagChanged(cmd.Flags(), "editor") {
+		c.Set("newContentEditor", contentEditor)
+	}
+
 	if len(args) < 1 {
 		return newUserError("path needs to be provided")
 	}
@@ -87,43 +116,178 @@ func (n *newCmd) newContent(cmd *cobra.Command, args []string) error {
 
 	createPath, kind = newContentPathSection(createPath)
 
-	if n.contentType != "" {
-		kind = n.contentType
+	if contentType != "" {
+		kind = contentType
 	}
 
-	cfg := c.DepsCfg
+	s, err := hugolib.NewSite(*cfg)
+
+	if err != nil {
+		return newSystemError(err)
+	}
+
+	return create.NewContent(s, kind, createPath)
+}
+
+func doNewSite(fs *hugofs.Fs, basepath string, force bool) error {
+	dirs := []string{
+		filepath.Join(basepath, "layouts"),
+		filepath.Join(basepath, "content"),
+		filepath.Join(basepath, "archetypes"),
+		filepath.Join(basepath, "static"),
+		filepath.Join(basepath, "data"),
+		filepath.Join(basepath, "themes"),
+	}
+
+	if exists, _ := helpers.Exists(basepath, fs.Source); exists {
+		if isDir, _ := helpers.IsDir(basepath, fs.Source); !isDir {
+			return errors.New(basepath + " already exists but not a directory")
+		}
+
+		isEmpty, _ := helpers.IsEmpty(basepath, fs.Source)
+
+		switch {
+		case !isEmpty && !force:
+			return errors.New(basepath + " already exists and is not empty")
+
+		case !isEmpty && force:
+			all := append(dirs, filepath.Join(basepath, "config."+configFormat))
+			for _, path := range all {
+				if exists, _ := helpers.Exists(path, fs.Source); exists {
+					return errors.New(path + " already exists")
+				}
+			}
+		}
+	}
+
+	for _, dir := range dirs {
+		if err := fs.Source.MkdirAll(dir, 0777); err != nil {
+			return fmt.Errorf("Failed to create dir: %s", err)
+		}
+	}
+
+	createConfig(fs, basepath, configFormat)
+
+	jww.FEEDBACK.Printf("Congratulations! Your new Hugo site is created in %s.\n\n", basepath)
+	jww.FEEDBACK.Println(nextStepsText())
+
+	return nil
+}
+
+func nextStepsText() string {
+	var nextStepsText bytes.Buffer
+
+	nextStepsText.WriteString(`Just a few more steps and you're ready to go:
+
+1. Download a theme into the same-named folder.
+   Choose a theme from https://themes.gohugo.io/, or
+   create your own with the "hugo new theme <THEMENAME>" command.
+2. Perhaps you want to add some content. You can add single files
+   with "hugo new `)
+
+	nextStepsText.WriteString(filepath.Join("<SECTIONNAME>", "<FILENAME>.<FORMAT>"))
+
+	nextStepsText.WriteString(`".
+3. Start the built-in live server via "hugo server".
+
+Visit https://gohugo.io/ for quickstart guide and full documentation.`)
+
+	return nextStepsText.String()
+}
+
+// NewSite creates a new Hugo site and initializes a structured Hugo directory.
+func NewSite(cmd *cobra.Command, args []string) error {
+	if len(args) < 1 {
+		return newUserError("path needs to be provided")
+	}
+
+	createpath, err := filepath.Abs(filepath.Clean(args[0]))
+	if err != nil {
+		return newUserError(err)
+	}
+
+	forceNew, _ := cmd.Flags().GetBool("force")
+
+	return doNewSite(hugofs.NewDefault(viper.New()), createpath, forceNew)
+}
+
+// NewTheme creates a new Hugo theme.
+func NewTheme(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig()
 
-	ps, err := helpers.NewPathSpec(cfg.Fs, cfg.Cfg)
 	if err != nil {
 		return err
 	}
 
-	// If a site isn't in use in the archetype template, we can skip the build.
-	siteFactory := func(filename string, siteUsed bool) (*hugolib.Site, error) {
-		if !siteUsed {
-			return hugolib.NewSite(*cfg)
-		}
-		var s *hugolib.Site
-
-		if err := c.hugo.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-			return nil, err
-		}
-
-		s = c.hugo.Sites[0]
-
-		if len(c.hugo.Sites) > 1 {
-			// Find the best match.
-			for _, ss := range c.hugo.Sites {
-				if strings.Contains(createPath, "."+ss.Language.Lang) {
-					s = ss
-					break
-				}
-			}
-		}
-		return s, nil
+	if len(args) < 1 {
+		return newUserError("theme name needs to be provided")
 	}
 
-	return create.NewContent(ps, siteFactory, kind, createPath)
+	c, err := newCommandeer(cfg)
+	if err != nil {
+		return err
+	}
+
+	createpath := c.PathSpec().AbsPathify(filepath.Join(c.Cfg.GetString("themesDir"), args[0]))
+	jww.INFO.Println("creating theme at", createpath)
+
+	if x, _ := helpers.Exists(createpath, cfg.Fs.Source); x {
+		return newUserError(createpath, "already exists")
+	}
+
+	mkdir(createpath, "layouts", "_default")
+	mkdir(createpath, "layouts", "partials")
+
+	touchFile(cfg.Fs.Source, createpath, "layouts", "index.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "404.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "list.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "single.html")
+
+	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "header.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "footer.html")
+
+	mkdir(createpath, "archetypes")
+
+	archDefault := []byte("+++\n+++\n")
+
+	err = helpers.WriteToDisk(filepath.Join(createpath, "archetypes", "default.md"), bytes.NewReader(archDefault), cfg.Fs.Source)
+	if err != nil {
+		return err
+	}
+
+	mkdir(createpath, "static", "js")
+	mkdir(createpath, "static", "css")
+
+	by := []byte(`The MIT License (MIT)
+
+Copyright (c) ` + time.Now().Format("2006") + ` YOUR_NAME_HERE
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+`)
+
+	err = helpers.WriteToDisk(filepath.Join(createpath, "LICENSE.md"), bytes.NewReader(by), cfg.Fs.Source)
+	if err != nil {
+		return err
+	}
+
+	createThemeMD(cfg.Fs, createpath)
+
+	return nil
 }
 
 func mkdir(x ...string) {
@@ -144,6 +308,39 @@ func touchFile(fs afero.Fs, x ...string) {
 	}
 }
 
+func createThemeMD(fs *hugofs.Fs, inpath string) (err error) {
+
+	by := []byte(`# theme.toml template for a Hugo theme
+# See https://github.com/spf13/hugoThemes#themetoml for an example
+
+name = "` + strings.Title(helpers.MakeTitle(filepath.Base(inpath))) + `"
+license = "MIT"
+licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE.md"
+description = ""
+homepage = "http://siteforthistheme.com/"
+tags = []
+features = []
+min_version = "0.20"
+
+[author]
+  name = ""
+  homepage = ""
+
+# If porting an existing theme
+[original]
+  name = ""
+  homepage = ""
+  repo = ""
+`)
+
+	err = helpers.WriteToDisk(filepath.Join(inpath, "theme.toml"), bytes.NewReader(by), fs.Source)
+	if err != nil {
+		return
+	}
+
+	return nil
+}
+
 func newContentPathSection(path string) (string, string) {
 	// Forward slashes is used in all examples. Convert if needed.
 	// Issue #1133
@@ -151,12 +348,25 @@ func newContentPathSection(path string) (string, string) {
 	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]
-		}
-
+		section = helpers.GuessSection(createpath)
 	}
 
 	return createpath, section
 }
+
+func createConfig(fs *hugofs.Fs, inpath string, kind string) (err error) {
+	in := map[string]interface{}{
+		"baseURL":      "http://example.org/",
+		"title":        "My New Hugo Site",
+		"languageCode": "en-us",
+	}
+	kind = parser.FormatSanitize(kind)
+
+	var buf bytes.Buffer
+	err = parser.InterfaceToConfig(in, parser.FormatToLeadRune(kind), &buf)
+	if err != nil {
+		return err
+	}
+
+	return helpers.WriteToDisk(filepath.Join(inpath, "config."+kind), &buf, fs.Source)
+}

commands/new_site.go

@@ -1,163 +0,0 @@
-// 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"
-	"errors"
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"github.com/gohugoio/hugo/create"
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugofs"
-	"github.com/gohugoio/hugo/parser"
-	"github.com/spf13/cobra"
-	jww "github.com/spf13/jwalterweatherman"
-	"github.com/spf13/viper"
-)
-
-var _ cmder = (*newSiteCmd)(nil)
-
-type newSiteCmd struct {
-	configFormat string
-
-	*baseCmd
-}
-
-func newNewSiteCmd() *newSiteCmd {
-	ccmd := &newSiteCmd{}
-
-	cmd := &cobra.Command{
-		Use:   "site [path]",
-		Short: "Create a new site (skeleton)",
-		Long: `Create a new site in the provided directory.
-The new site will have the correct structure, but no content or theme yet.
-Use ` + "`hugo new [contentPath]`" + ` to create new content.`,
-		RunE: ccmd.newSite,
-	}
-
-	cmd.Flags().StringVarP(&ccmd.configFormat, "format", "f", "toml", "config & frontmatter format")
-	cmd.Flags().Bool("force", false, "init inside non-empty directory")
-
-	ccmd.baseCmd = newBaseCmd(cmd)
-
-	return ccmd
-
-}
-
-func (n *newSiteCmd) doNewSite(fs *hugofs.Fs, basepath string, force bool) error {
-	archeTypePath := filepath.Join(basepath, "archetypes")
-	dirs := []string{
-		filepath.Join(basepath, "layouts"),
-		filepath.Join(basepath, "content"),
-		archeTypePath,
-		filepath.Join(basepath, "static"),
-		filepath.Join(basepath, "data"),
-		filepath.Join(basepath, "themes"),
-	}
-
-	if exists, _ := helpers.Exists(basepath, fs.Source); exists {
-		if isDir, _ := helpers.IsDir(basepath, fs.Source); !isDir {
-			return errors.New(basepath + " already exists but not a directory")
-		}
-
-		isEmpty, _ := helpers.IsEmpty(basepath, fs.Source)
-
-		switch {
-		case !isEmpty && !force:
-			return errors.New(basepath + " already exists and is not empty")
-
-		case !isEmpty && force:
-			all := append(dirs, filepath.Join(basepath, "config."+n.configFormat))
-			for _, path := range all {
-				if exists, _ := helpers.Exists(path, fs.Source); exists {
-					return errors.New(path + " already exists")
-				}
-			}
-		}
-	}
-
-	for _, dir := range dirs {
-		if err := fs.Source.MkdirAll(dir, 0777); err != nil {
-			return fmt.Errorf("Failed to create dir: %s", err)
-		}
-	}
-
-	createConfig(fs, basepath, n.configFormat)
-
-	// Create a default archetype file.
-	helpers.SafeWriteToDisk(filepath.Join(archeTypePath, "default.md"),
-		strings.NewReader(create.ArchetypeTemplateTemplate), fs.Source)
-
-	jww.FEEDBACK.Printf("Congratulations! Your new Hugo site is created in %s.\n\n", basepath)
-	jww.FEEDBACK.Println(nextStepsText())
-
-	return nil
-}
-
-// newSite creates a new Hugo site and initializes a structured Hugo directory.
-func (n *newSiteCmd) newSite(cmd *cobra.Command, args []string) error {
-	if len(args) < 1 {
-		return newUserError("path needs to be provided")
-	}
-
-	createpath, err := filepath.Abs(filepath.Clean(args[0]))
-	if err != nil {
-		return newUserError(err)
-	}
-
-	forceNew, _ := cmd.Flags().GetBool("force")
-
-	return n.doNewSite(hugofs.NewDefault(viper.New()), createpath, forceNew)
-}
-
-func createConfig(fs *hugofs.Fs, inpath string, kind string) (err error) {
-	in := map[string]string{
-		"baseURL":      "http://example.org/",
-		"title":        "My New Hugo Site",
-		"languageCode": "en-us",
-	}
-	kind = parser.FormatSanitize(kind)
-
-	var buf bytes.Buffer
-	err = parser.InterfaceToConfig(in, parser.FormatToLeadRune(kind), &buf)
-	if err != nil {
-		return err
-	}
-
-	return helpers.WriteToDisk(filepath.Join(inpath, "config."+kind), &buf, fs.Source)
-}
-
-func nextStepsText() string {
-	var nextStepsText bytes.Buffer
-
-	nextStepsText.WriteString(`Just a few more steps and you're ready to go:
-
-1. Download a theme into the same-named folder.
-   Choose a theme from https://themes.gohugo.io/, or
-   create your own with the "hugo new theme <THEMENAME>" command.
-2. Perhaps you want to add some content. You can add single files
-   with "hugo new `)
-
-	nextStepsText.WriteString(filepath.Join("<SECTIONNAME>", "<FILENAME>.<FORMAT>"))
-
-	nextStepsText.WriteString(`".
-3. Start the built-in live server via "hugo server".
-
-Visit https://gohugo.io/ for quickstart guide and full documentation.`)
-
-	return nextStepsText.String()
-}

commands/new_test.go

@@ -1,4 +1,4 @@
-// Copyright 2018 The Hugo Authors. All rights reserved.
+// Copyright 2016 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.
@@ -17,7 +17,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gohugoio/hugo/hugofs"
+	"github.com/spf13/hugo/hugofs"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -48,11 +48,10 @@ func checkNewSiteInited(fs *hugofs.Fs, basepath string, t *testing.T) {
 }
 
 func TestDoNewSite(t *testing.T) {
-	n := newNewSiteCmd()
 	basepath := filepath.Join("base", "blog")
 	_, fs := newTestCfg()
 
-	require.NoError(t, n.doNewSite(fs, basepath, false))
+	require.NoError(t, doNewSite(fs, basepath, false))
 
 	checkNewSiteInited(fs, basepath, t)
 }
@@ -60,34 +59,31 @@ func TestDoNewSite(t *testing.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))
+	require.NoError(t, 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))
+	require.Error(t, 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))
+	require.NoError(t, doNewSite(fs, basepath, true))
 
 	checkNewSiteInited(fs, basepath, t)
 }
@@ -95,25 +91,23 @@ func TestDoNewSite_force_empty_dir(t *testing.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))
+	require.Error(t, 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))
+	require.Error(t, doNewSite(fs, basepath, true))
 }
 
 func newTestCfg() (*viper.Viper, *hugofs.Fs) {

commands/new_theme.go

@@ -1,179 +0,0 @@
-// 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"
-	"errors"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugofs"
-	"github.com/spf13/cobra"
-	jww "github.com/spf13/jwalterweatherman"
-)
-
-var _ cmder = (*newThemeCmd)(nil)
-
-type newThemeCmd struct {
-	*baseCmd
-	hugoBuilderCommon
-}
-
-func newNewThemeCmd() *newThemeCmd {
-	ccmd := &newThemeCmd{baseCmd: newBaseCmd(nil)}
-
-	cmd := &cobra.Command{
-		Use:   "theme [name]",
-		Short: "Create a new theme",
-		Long: `Create a new theme (skeleton) called [name] in the current directory.
-New theme is a skeleton. Please add content to the touched files. Add your
-name to the copyright line in the license and adjust the theme.toml file
-as you see fit.`,
-		RunE: ccmd.newTheme,
-	}
-
-	ccmd.cmd = cmd
-
-	return ccmd
-}
-
-// newTheme creates a new Hugo theme template
-func (n *newThemeCmd) newTheme(cmd *cobra.Command, args []string) error {
-	c, err := initializeConfig(false, false, &n.hugoBuilderCommon, n, nil)
-
-	if err != nil {
-		return err
-	}
-
-	if len(args) < 1 {
-		return newUserError("theme name needs to be provided")
-	}
-
-	createpath := c.hugo.PathSpec.AbsPathify(filepath.Join(c.Cfg.GetString("themesDir"), args[0]))
-	jww.FEEDBACK.Println("Creating theme at", createpath)
-
-	cfg := c.DepsCfg
-
-	if x, _ := helpers.Exists(createpath, cfg.Fs.Source); x {
-		return errors.New(createpath + " already exists")
-	}
-
-	mkdir(createpath, "layouts", "_default")
-	mkdir(createpath, "layouts", "partials")
-
-	touchFile(cfg.Fs.Source, createpath, "layouts", "index.html")
-	touchFile(cfg.Fs.Source, createpath, "layouts", "404.html")
-	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "list.html")
-	touchFile(cfg.Fs.Source, createpath, "layouts", "_default", "single.html")
-
-	baseofDefault := []byte(`<!DOCTYPE html>
-<html>
-    {{- partial "head.html" . -}}
-    <body>
-        {{- partial "header.html" . -}}
-        <div id="content">
-        {{- block "main" . }}{{- end }}
-        </div>
-        {{- partial "footer.html" . -}}
-    </body>
-</html>
-`)
-	err = helpers.WriteToDisk(filepath.Join(createpath, "layouts", "_default", "baseof.html"), bytes.NewReader(baseofDefault), cfg.Fs.Source)
-	if err != nil {
-		return err
-	}
-
-	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "head.html")
-	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "header.html")
-	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "footer.html")
-
-	mkdir(createpath, "archetypes")
-
-	archDefault := []byte("+++\n+++\n")
-
-	err = helpers.WriteToDisk(filepath.Join(createpath, "archetypes", "default.md"), bytes.NewReader(archDefault), cfg.Fs.Source)
-	if err != nil {
-		return err
-	}
-
-	mkdir(createpath, "static", "js")
-	mkdir(createpath, "static", "css")
-
-	by := []byte(`The MIT License (MIT)
-
-Copyright (c) ` + time.Now().Format("2006") + ` YOUR_NAME_HERE
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-`)
-
-	err = helpers.WriteToDisk(filepath.Join(createpath, "LICENSE"), bytes.NewReader(by), cfg.Fs.Source)
-	if err != nil {
-		return err
-	}
-
-	n.createThemeMD(cfg.Fs, createpath)
-
-	return nil
-}
-
-func (n *newThemeCmd) createThemeMD(fs *hugofs.Fs, inpath string) (err error) {
-
-	by := []byte(`# theme.toml template for a Hugo theme
-# See https://github.com/gohugoio/hugoThemes#themetoml for an example
-
-name = "` + strings.Title(helpers.MakeTitle(filepath.Base(inpath))) + `"
-license = "MIT"
-licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE"
-description = ""
-homepage = "http://example.com/"
-tags = []
-features = []
-min_version = "0.41"
-
-[author]
-  name = ""
-  homepage = ""
-
-# If porting an existing theme
-[original]
-  name = ""
-  homepage = ""
-  repo = ""
-`)
-
-	err = helpers.WriteToDisk(filepath.Join(inpath, "theme.toml"), bytes.NewReader(by), fs.Source)
-	if err != nil {
-		return
-	}
-
-	return nil
-}

commands/release.go

@@ -1,72 +0,0 @@
-// +build release
-
-// Copyright 2017-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 commands
-
-import (
-	"errors"
-
-	"github.com/gohugoio/hugo/config"
-	"github.com/gohugoio/hugo/releaser"
-	"github.com/spf13/cobra"
-)
-
-var _ cmder = (*releaseCommandeer)(nil)
-
-type releaseCommandeer struct {
-	cmd *cobra.Command
-
-	version string
-
-	skipPublish bool
-	try         bool
-}
-
-func createReleaser() cmder {
-	// Note: This is a command only meant for internal use and must be run
-	// via "go run -tags release main.go release" on the actual code base that is in the release.
-	r := &releaseCommandeer{
-		cmd: &cobra.Command{
-			Use:    "release",
-			Short:  "Release a new version of Hugo.",
-			Hidden: true,
-		},
-	}
-
-	r.cmd.RunE = func(cmd *cobra.Command, args []string) error {
-		return r.release()
-	}
-
-	r.cmd.PersistentFlags().StringVarP(&r.version, "rel", "r", "", "new release version, i.e. 0.25.1")
-	r.cmd.PersistentFlags().BoolVarP(&r.skipPublish, "skip-publish", "", false, "skip all publishing pipes of the release")
-	r.cmd.PersistentFlags().BoolVarP(&r.try, "try", "", false, "simulate a release, i.e. no changes")
-
-	return r
-}
-
-func (c *releaseCommandeer) getCommand() *cobra.Command {
-	return c.cmd
-}
-
-func (c *releaseCommandeer) flagsToConfig(cfg config.Provider) {
-
-}
-
-func (r *releaseCommandeer) release() error {
-	if r.version == "" {
-		return errors.New("must set the --rel flag to the relevant version number")
-	}
-	return releaser.New(r.version, r.skipPublish, r.try).Run()
-}

commands/server.go

@@ -1,4 +1,4 @@
-// Copyright 2018 The Hugo Authors. All rights reserved.
+// Copyright 2016 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.
@@ -19,56 +19,32 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"os/signal"
-	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
-	"sync"
-	"syscall"
 	"time"
 
-	"github.com/gohugoio/hugo/livereload"
-
-	"github.com/gohugoio/hugo/config"
-
-	"github.com/gohugoio/hugo/helpers"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
+	"github.com/spf13/hugo/config"
+	"github.com/spf13/hugo/helpers"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-type serverCmd struct {
-	// Can be used to stop the server. Useful in tests
-	stop <-chan bool
-
+var (
 	disableLiveReload bool
-	navigateToChanged bool
 	renderToDisk      bool
 	serverAppend      bool
 	serverInterface   string
 	serverPort        int
-	liveReloadPort    int
 	serverWatch       bool
-	noHTTPCache       bool
+)
 
-	disableFastRender bool
-
-	*baseBuilderCmd
-}
-
-func (b *commandsBuilder) newServerCmd() *serverCmd {
-	return b.newServerCmdSignaled(nil)
-}
-
-func (b *commandsBuilder) newServerCmdSignaled(stop <-chan bool) *serverCmd {
-	cc := &serverCmd{stop: stop}
-
-	cc.baseBuilderCmd = b.newBuilderCmd(&cobra.Command{
-		Use:     "server",
-		Aliases: []string{"serve"},
-		Short:   "A high performance webserver",
-		Long: `Hugo provides its own webserver which builds and serves the site.
+var serverCmd = &cobra.Command{
+	Use:     "server",
+	Aliases: []string{"serve"},
+	Short:   "A high performance webserver",
+	Long: `Hugo provides its own webserver which builds and serves the site.
 While hugo server is high performance, it is a webserver with limited options.
 Many run it in production, but the standard behavior is for people to use it
 in development and use a more full featured server such as Nginx or Caddy.
@@ -80,24 +56,7 @@ By default hugo will also watch your files for any changes you make and
 automatically rebuild the site. It will then live reload any open browser pages
 and push the latest content to them. As most Hugo sites are built in a fraction
 of a second, you will be able to save and see your changes nearly instantly.`,
-		RunE: cc.server,
-	})
-
-	cc.cmd.Flags().IntVarP(&cc.serverPort, "port", "p", 1313, "port on which the server will listen")
-	cc.cmd.Flags().IntVar(&cc.liveReloadPort, "liveReloadPort", -1, "port for live reloading (i.e. 443 in HTTPS proxy situations)")
-	cc.cmd.Flags().StringVarP(&cc.serverInterface, "bind", "", "127.0.0.1", "interface to which the server will bind")
-	cc.cmd.Flags().BoolVarP(&cc.serverWatch, "watch", "w", true, "watch filesystem for changes and recreate as needed")
-	cc.cmd.Flags().BoolVar(&cc.noHTTPCache, "noHTTPCache", false, "prevent HTTP caching")
-	cc.cmd.Flags().BoolVarP(&cc.serverAppend, "appendPort", "", true, "append port to baseURL")
-	cc.cmd.Flags().BoolVar(&cc.disableLiveReload, "disableLiveReload", false, "watch without enabling live browser reload on rebuild")
-	cc.cmd.Flags().BoolVar(&cc.navigateToChanged, "navigateToChanged", false, "navigate to changed content file on live browser reload")
-	cc.cmd.Flags().BoolVar(&cc.renderToDisk, "renderToDisk", false, "render to Destination path (default is render to memory & serve from there)")
-	cc.cmd.Flags().BoolVar(&cc.disableFastRender, "disableFastRender", false, "enables full re-renders on changes")
-
-	cc.cmd.Flags().String("memstats", "", "log memory usage to this file")
-	cc.cmd.Flags().String("meminterval", "100ms", "interval to poll memory usage (requires --memstats), valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".")
-
-	return cc
+	//RunE: server,
 }
 
 type filesOnlyFs struct {
@@ -120,301 +79,153 @@ func (f noDirFile) Readdir(count int) ([]os.FileInfo, error) {
 	return nil, nil
 }
 
-var serverPorts []int
+func init() {
+	initHugoBuilderFlags(serverCmd)
 
-func (s *serverCmd) server(cmd *cobra.Command, args []string) error {
-	// If a Destination is provided via flag write to disk
-	destination, _ := cmd.Flags().GetString("destination")
-	if destination != "" {
-		s.renderToDisk = true
-	}
+	serverCmd.Flags().IntVarP(&serverPort, "port", "p", 1313, "port on which the server will listen")
+	serverCmd.Flags().StringVarP(&serverInterface, "bind", "", "127.0.0.1", "interface to which the server will bind")
+	serverCmd.Flags().BoolVarP(&serverWatch, "watch", "w", true, "watch filesystem for changes and recreate as needed")
+	serverCmd.Flags().BoolVarP(&serverAppend, "appendPort", "", true, "append port to baseURL")
+	serverCmd.Flags().BoolVar(&disableLiveReload, "disableLiveReload", false, "watch without enabling live browser reload on rebuild")
+	serverCmd.Flags().BoolVar(&renderToDisk, "renderToDisk", false, "render to Destination path (default is render to memory & serve from there)")
+	serverCmd.Flags().String("memstats", "", "log memory usage to this file")
+	serverCmd.Flags().String("meminterval", "100ms", "interval to poll memory usage (requires --memstats), valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".")
 
-	var serverCfgInit sync.Once
+	serverCmd.RunE = server
 
-	cfgInit := func(c *commandeer) error {
-		c.Set("renderToMemory", !s.renderToDisk)
-		if cmd.Flags().Changed("navigateToChanged") {
-			c.Set("navigateToChanged", s.navigateToChanged)
-		}
-		if cmd.Flags().Changed("disableLiveReload") {
-			c.Set("disableLiveReload", s.disableLiveReload)
-		}
-		if cmd.Flags().Changed("disableFastRender") {
-			c.Set("disableFastRender", s.disableFastRender)
-		}
-		if s.serverWatch {
-			c.Set("watch", true)
-		}
-
-		// TODO(bep) yes, we should fix.
-		if !c.languagesConfigured {
-			return nil
-		}
-
-		var err error
-
-		// We can only do this once.
-		serverCfgInit.Do(func() {
-			serverPorts = make([]int, 1)
-
-			if c.languages.IsMultihost() {
-				if !s.serverAppend {
-					err = newSystemError("--appendPort=false not supported when in multihost mode")
-				}
-				serverPorts = make([]int, len(c.languages))
-			}
-
-			currentServerPort := s.serverPort
-
-			for i := 0; i < len(serverPorts); i++ {
-				l, err := net.Listen("tcp", net.JoinHostPort(s.serverInterface, strconv.Itoa(currentServerPort)))
-				if err == nil {
-					l.Close()
-					serverPorts[i] = currentServerPort
-				} else {
-					if i == 0 && s.cmd.Flags().Changed("port") {
-						// port set explicitly by user -- he/she probably meant it!
-						err = newSystemErrorF("Server startup failed: %s", err)
-					}
-					jww.ERROR.Println("port", s.serverPort, "already in use, attempting to use an available port")
-					sp, err := helpers.FindAvailablePort()
-					if err != nil {
-						err = newSystemError("Unable to find alternative port to use:", err)
-					}
-					serverPorts[i] = sp.Port
-				}
-
-				currentServerPort = serverPorts[i] + 1
-			}
-		})
-
-		c.serverPorts = serverPorts
-
-		c.Set("port", s.serverPort)
-		if s.liveReloadPort != -1 {
-			c.Set("liveReloadPort", s.liveReloadPort)
-		} else {
-			c.Set("liveReloadPort", serverPorts[0])
-		}
-
-		isMultiHost := c.languages.IsMultihost()
-		for i, language := range c.languages {
-			var serverPort int
-			if isMultiHost {
-				serverPort = serverPorts[i]
-			} else {
-				serverPort = serverPorts[0]
-			}
-
-			baseURL, err := s.fixURL(language, s.baseURL, serverPort)
-			if err != nil {
-				return nil
-			}
-			if isMultiHost {
-				language.Set("baseURL", baseURL)
-			}
-			if i == 0 {
-				c.Set("baseURL", baseURL)
-			}
-		}
+}
 
+func server(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig(serverCmd)
+	if err != nil {
 		return err
-
 	}
 
+	c, err := newCommandeer(cfg)
+	if err != nil {
+		return err
+	}
+
+	if flagChanged(cmd.Flags(), "disableLiveReload") {
+		c.Set("disableLiveReload", disableLiveReload)
+	}
+
+	if serverWatch {
+		c.Set("watch", true)
+	}
+
+	if c.Cfg.GetBool("watch") {
+		serverWatch = true
+		c.watchConfig()
+	}
+
+	l, err := net.Listen("tcp", net.JoinHostPort(serverInterface, strconv.Itoa(serverPort)))
+	if err == nil {
+		l.Close()
+	} else {
+		if flagChanged(serverCmd.Flags(), "port") {
+			// port set explicitly by user -- he/she probably meant it!
+			return newSystemErrorF("Server startup failed: %s", err)
+		}
+		jww.ERROR.Println("port", serverPort, "already in use, attempting to use an available port")
+		sp, err := helpers.FindAvailablePort()
+		if err != nil {
+			return newSystemError("Unable to find alternative port to use:", err)
+		}
+		serverPort = sp.Port
+	}
+
+	c.Set("port", serverPort)
+
+	baseURL, err = fixURL(c.Cfg, baseURL)
+	if err != nil {
+		return err
+	}
+	c.Set("baseURL", baseURL)
+
 	if err := memStats(); err != nil {
 		jww.ERROR.Println("memstats error:", err)
 	}
 
-	c, err := initializeConfig(true, true, &s.hugoBuilderCommon, s, cfgInit)
-	if err != nil {
+	// If a Destination is provided via flag write to disk
+	if destination != "" {
+		renderToDisk = true
+	}
+
+	// Hugo writes the output to memory instead of the disk
+	if !renderToDisk {
+		cfg.Fs.Destination = new(afero.MemMapFs)
+		// Rendering to memoryFS, publish to Root regardless of publishDir.
+		c.Set("publishDir", "/")
+	}
+
+	if err := c.build(serverWatch); err != nil {
 		return err
 	}
 
-	if err := c.serverBuild(); err != nil {
-		return err
-	}
-
-	for _, s := range c.hugo.Sites {
+	for _, s := range Hugo.Sites {
 		s.RegisterMediaTypes()
 	}
 
 	// Watch runs its own server as part of the routine
-	if s.serverWatch {
-
-		watchDirs, err := c.getDirList()
-		if err != nil {
-			return err
-		}
-
+	if serverWatch {
+		watchDirs := c.getDirList()
 		baseWatchDir := c.Cfg.GetString("workingDir")
-		relWatchDirs := make([]string, len(watchDirs))
 		for i, dir := range watchDirs {
-			relWatchDirs[i], _ = helpers.GetRelativePath(dir, baseWatchDir)
+			watchDirs[i], _ = helpers.GetRelativePath(dir, baseWatchDir)
 		}
 
-		rootWatchDirs := strings.Join(helpers.UniqueStrings(helpers.ExtractRootPaths(relWatchDirs)), ",")
+		rootWatchDirs := strings.Join(helpers.UniqueStrings(helpers.ExtractRootPaths(watchDirs)), ",")
 
 		jww.FEEDBACK.Printf("Watching for changes in %s%s{%s}\n", baseWatchDir, helpers.FilePathSeparator, rootWatchDirs)
-		watcher, err := c.newWatcher(watchDirs...)
+		err := c.newWatcher(serverPort)
 
 		if err != nil {
 			return err
 		}
-
-		defer watcher.Close()
-
 	}
 
-	return c.serve(s)
-
-}
-
-type fileServer struct {
-	baseURLs []string
-	roots    []string
-	c        *commandeer
-	s        *serverCmd
-}
-
-func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, error) {
-	baseURL := f.baseURLs[i]
-	root := f.roots[i]
-	port := f.c.serverPorts[i]
-
-	publishDir := f.c.Cfg.GetString("publishDir")
-
-	if root != "" {
-		publishDir = filepath.Join(publishDir, root)
-	}
-
-	absPublishDir := f.c.hugo.PathSpec.AbsPathify(publishDir)
-
-	if i == 0 {
-		if f.s.renderToDisk {
-			jww.FEEDBACK.Println("Serving pages from " + absPublishDir)
-		} else {
-			jww.FEEDBACK.Println("Serving pages from memory")
-		}
-	}
-
-	httpFs := afero.NewHttpFs(f.c.destinationFs)
-	fs := filesOnlyFs{httpFs.Dir(absPublishDir)}
-
-	doLiveReload := !f.s.buildWatch && !f.c.Cfg.GetBool("disableLiveReload")
-	fastRenderMode := doLiveReload && !f.c.Cfg.GetBool("disableFastRender")
-
-	if i == 0 && fastRenderMode {
-		jww.FEEDBACK.Println("Running in Fast Render Mode. For full rebuilds on change: hugo server --disableFastRender")
-	}
-
-	// We're only interested in the path
-	u, err := url.Parse(baseURL)
-	if err != nil {
-		return nil, "", "", fmt.Errorf("Invalid baseURL: %s", err)
-	}
-
-	decorate := func(h http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if f.s.noHTTPCache {
-				w.Header().Set("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0")
-				w.Header().Set("Pragma", "no-cache")
-			}
-
-			if fastRenderMode {
-				p := r.RequestURI
-				if strings.HasSuffix(p, "/") || strings.HasSuffix(p, "html") || strings.HasSuffix(p, "htm") {
-					f.c.visitedURLs.Add(p)
-				}
-			}
-			h.ServeHTTP(w, r)
-		})
-	}
-
-	fileserver := decorate(http.FileServer(fs))
-	mu := http.NewServeMux()
-
-	if u.Path == "" || u.Path == "/" {
-		mu.Handle("/", fileserver)
-	} else {
-		mu.Handle(u.Path, http.StripPrefix(u.Path, fileserver))
-	}
-
-	endpoint := net.JoinHostPort(f.s.serverInterface, strconv.Itoa(port))
-
-	return mu, u.String(), endpoint, nil
-}
-
-func (c *commandeer) serve(s *serverCmd) error {
-
-	isMultiHost := c.hugo.IsMultihost()
-
-	var (
-		baseURLs []string
-		roots    []string
-	)
-
-	if isMultiHost {
-		for _, s := range c.hugo.Sites {
-			baseURLs = append(baseURLs, s.BaseURL.String())
-			roots = append(roots, s.Language.Lang)
-		}
-	} else {
-		s := c.hugo.Sites[0]
-		baseURLs = []string{s.BaseURL.String()}
-		roots = []string{""}
-	}
-
-	srv := &fileServer{
-		baseURLs: baseURLs,
-		roots:    roots,
-		c:        c,
-		s:        s,
-	}
-
-	doLiveReload := !c.Cfg.GetBool("disableLiveReload")
-
-	if doLiveReload {
-		livereload.Initialize()
-	}
-
-	var sigs = make(chan os.Signal)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
-
-	for i := range baseURLs {
-		mu, serverURL, endpoint, err := srv.createEndpoint(i)
-
-		if doLiveReload {
-			mu.HandleFunc("/livereload.js", livereload.ServeJS)
-			mu.HandleFunc("/livereload", livereload.Handler)
-		}
-		jww.FEEDBACK.Printf("Web Server is available at %s (bind address %s)\n", serverURL, s.serverInterface)
-		go func() {
-			err = http.ListenAndServe(endpoint, mu)
-			if err != nil {
-				jww.ERROR.Printf("Error: %s\n", err.Error())
-				os.Exit(1)
-			}
-		}()
-	}
-
-	jww.FEEDBACK.Println("Press Ctrl+C to stop")
-
-	if s.stop != nil {
-		select {
-		case <-sigs:
-		case <-s.stop:
-		}
-	} else {
-		<-sigs
-	}
+	c.serve(serverPort)
 
 	return nil
 }
 
+func (c *commandeer) serve(port int) {
+	if renderToDisk {
+		jww.FEEDBACK.Println("Serving pages from " + c.PathSpec().AbsPathify(c.Cfg.GetString("publishDir")))
+	} else {
+		jww.FEEDBACK.Println("Serving pages from memory")
+	}
+
+	httpFs := afero.NewHttpFs(c.Fs.Destination)
+	fs := filesOnlyFs{httpFs.Dir(c.PathSpec().AbsPathify(c.Cfg.GetString("publishDir")))}
+	fileserver := http.FileServer(fs)
+
+	// We're only interested in the path
+	u, err := url.Parse(c.Cfg.GetString("baseURL"))
+	if err != nil {
+		jww.ERROR.Fatalf("Invalid baseURL: %s", err)
+	}
+	if u.Path == "" || u.Path == "/" {
+		http.Handle("/", fileserver)
+	} else {
+		http.Handle(u.Path, http.StripPrefix(u.Path, fileserver))
+	}
+
+	jww.FEEDBACK.Printf("Web Server is available at %s (bind address %s)\n", u.String(), serverInterface)
+	jww.FEEDBACK.Println("Press Ctrl+C to stop")
+
+	endpoint := net.JoinHostPort(serverInterface, strconv.Itoa(port))
+	err = http.ListenAndServe(endpoint, nil)
+	if err != nil {
+		jww.ERROR.Printf("Error: %s\n", err.Error())
+		os.Exit(1)
+	}
+}
+
 // fixURL massages the baseURL into a form needed for serving
 // all pages correctly.
-func (sc *serverCmd) fixURL(cfg config.Provider, s string, port int) (string, error) {
+func fixURL(cfg config.Provider, s string) (string, error) {
 	useLocalhost := false
 	if s == "" {
 		s = cfg.GetString("baseURL")
@@ -449,25 +260,23 @@ func (sc *serverCmd) fixURL(cfg config.Provider, s string, port int) (string, er
 		u.Host = "localhost"
 	}
 
-	if sc.serverAppend {
+	if serverAppend {
 		if strings.Contains(u.Host, ":") {
 			u.Host, _, err = net.SplitHostPort(u.Host)
 			if err != nil {
 				return "", fmt.Errorf("Failed to split baseURL hostpost: %s", err)
 			}
 		}
-		u.Host += fmt.Sprintf(":%d", port)
+		u.Host += fmt.Sprintf(":%d", serverPort)
 	}
 
 	return u.String(), nil
 }
 
 func memStats() error {
-	b := newCommandsBuilder()
-	sc := b.newServerCmd().getCommand()
-	memstats := sc.Flags().Lookup("memstats").Value.String()
+	memstats := serverCmd.Flags().Lookup("memstats").Value.String()
 	if memstats != "" {
-		interval, err := time.ParseDuration(sc.Flags().Lookup("meminterval").Value.String())
+		interval, err := time.ParseDuration(serverCmd.Flags().Lookup("meminterval").Value.String())
 		if err != nil {
 			interval, _ = time.ParseDuration("100ms")
 		}

commands/server_test.go

@@ -14,65 +14,11 @@
 package commands
 
 import (
-	"fmt"
-	"net/http"
-	"os"
-	"runtime"
 	"testing"
-	"time"
-
-	"github.com/gohugoio/hugo/helpers"
 
 	"github.com/spf13/viper"
-	"github.com/stretchr/testify/require"
 )
 
-func TestServer(t *testing.T) {
-	if isWindowsCI() {
-		// TODO(bep) not sure why server tests have started to fail on the Windows CI server.
-		t.Skip("Skip server test on appveyor")
-	}
-	assert := require.New(t)
-	dir, err := createSimpleTestSite(t)
-	assert.NoError(err)
-
-	// Let us hope that this port is available on all systems ...
-	port := 1331
-
-	defer func() {
-		os.RemoveAll(dir)
-	}()
-
-	stop := make(chan bool)
-
-	b := newCommandsBuilder()
-	scmd := b.newServerCmdSignaled(stop)
-
-	cmd := scmd.getCommand()
-	cmd.SetArgs([]string{"-s=" + dir, fmt.Sprintf("-p=%d", port)})
-
-	go func() {
-		_, err = cmd.ExecuteC()
-		assert.NoError(err)
-	}()
-
-	// There is no way to know exactly when the server is ready for connections.
-	// We could improve by something like https://golang.org/pkg/net/http/httptest/#Server
-	// But for now, let us sleep and pray!
-	time.Sleep(2 * time.Second)
-
-	resp, err := http.Get("http://localhost:1331/")
-	assert.NoError(err)
-	defer resp.Body.Close()
-	homeContent := helpers.ReaderToString(resp.Body)
-
-	assert.Contains(homeContent, "List: Hugo Commands")
-
-	// Stop the server.
-	stop <- true
-
-}
-
 func TestFixURL(t *testing.T) {
 	type data struct {
 		TestName   string
@@ -96,14 +42,12 @@ func TestFixURL(t *testing.T) {
 	}
 
 	for i, test := range tests {
-		b := newCommandsBuilder()
-		s := b.newServerCmd()
 		v := viper.New()
-		baseURL := test.CLIBaseURL
+		baseURL = test.CLIBaseURL
 		v.Set("baseURL", test.CfgBaseURL)
-		s.serverAppend = test.AppendPort
-		s.serverPort = test.Port
-		result, err := s.fixURL(v, baseURL, s.serverPort)
+		serverAppend = test.AppendPort
+		serverPort = test.Port
+		result, err := fixURL(v, baseURL)
 		if err != nil {
 			t.Errorf("Test #%d %s: unexpected error %s", i, test.TestName, err)
 		}
@@ -112,7 +56,3 @@ func TestFixURL(t *testing.T) {
 		}
 	}
 }
-
-func isWindowsCI() bool {
-	return runtime.GOOS == "windows" && os.Getenv("CI") != ""
-}

commands/static_syncer.go

@@ -1,130 +0,0 @@
-// Copyright 2017 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 (
-	"os"
-	"path/filepath"
-
-	"github.com/gohugoio/hugo/hugolib/filesystems"
-
-	"github.com/fsnotify/fsnotify"
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/spf13/fsync"
-)
-
-type staticSyncer struct {
-	c *commandeer
-}
-
-func newStaticSyncer(c *commandeer) (*staticSyncer, error) {
-	return &staticSyncer{c: c}, nil
-}
-
-func (s *staticSyncer) isStatic(filename string) bool {
-	return s.c.hugo.BaseFs.SourceFilesystems.IsStatic(filename)
-}
-
-func (s *staticSyncer) syncsStaticEvents(staticEvents []fsnotify.Event) error {
-	c := s.c
-
-	syncFn := func(sourceFs *filesystems.SourceFilesystem) (uint64, error) {
-		publishDir := c.hugo.PathSpec.PublishDir
-		// If root, remove the second '/'
-		if publishDir == "//" {
-			publishDir = helpers.FilePathSeparator
-		}
-
-		if sourceFs.PublishFolder != "" {
-			publishDir = filepath.Join(publishDir, sourceFs.PublishFolder)
-		}
-
-		syncer := fsync.NewSyncer()
-		syncer.NoTimes = c.Cfg.GetBool("noTimes")
-		syncer.NoChmod = c.Cfg.GetBool("noChmod")
-		syncer.SrcFs = sourceFs.Fs
-		syncer.DestFs = c.Fs.Destination
-
-		// prevent spamming the log on changes
-		logger := helpers.NewDistinctFeedbackLogger()
-
-		for _, ev := range staticEvents {
-			// Due to our approach of layering both directories and the content's rendered output
-			// into one we can't accurately remove a file not in one of the source directories.
-			// If a file is in the local static dir and also in the theme static dir and we remove
-			// it from one of those locations we expect it to still exist in the destination
-			//
-			// If Hugo generates a file (from the content dir) over a static file
-			// the content generated file should take precedence.
-			//
-			// Because we are now watching and handling individual events it is possible that a static
-			// event that occupies the same path as a content generated file will take precedence
-			// until a regeneration of the content takes places.
-			//
-			// Hugo assumes that these cases are very rare and will permit this bad behavior
-			// The alternative is to track every single file and which pipeline rendered it
-			// and then to handle conflict resolution on every event.
-
-			fromPath := ev.Name
-
-			relPath := sourceFs.MakePathRelative(fromPath)
-			if relPath == "" {
-				// Not member of this virtual host.
-				continue
-			}
-
-			// Remove || rename is harder and will require an assumption.
-			// Hugo takes the following approach:
-			// If the static file exists in any of the static source directories after this event
-			// Hugo will re-sync it.
-			// If it does not exist in all of the static directories Hugo will remove it.
-			//
-			// This assumes that Hugo has not generated content on top of a static file and then removed
-			// the source of that static file. In this case Hugo will incorrectly remove that file
-			// from the published directory.
-			if ev.Op&fsnotify.Rename == fsnotify.Rename || ev.Op&fsnotify.Remove == fsnotify.Remove {
-				if _, err := sourceFs.Fs.Stat(relPath); os.IsNotExist(err) {
-					// If file doesn't exist in any static dir, remove it
-					toRemove := filepath.Join(publishDir, relPath)
-
-					logger.Println("File no longer exists in static dir, removing", toRemove)
-					_ = c.Fs.Destination.RemoveAll(toRemove)
-				} else if err == nil {
-					// If file still exists, sync it
-					logger.Println("Syncing", relPath, "to", publishDir)
-
-					if err := syncer.Sync(filepath.Join(publishDir, relPath), relPath); err != nil {
-						c.Logger.ERROR.Println(err)
-					}
-				} else {
-					c.Logger.ERROR.Println(err)
-				}
-
-				continue
-			}
-
-			// For all other event operations Hugo will sync static.
-			logger.Println("Syncing", relPath, "to", publishDir)
-			if err := syncer.Sync(filepath.Join(publishDir, relPath), relPath); err != nil {
-				c.Logger.ERROR.Println(err)
-			}
-		}
-
-		return 0, nil
-	}
-
-	_, err := c.doWithPublishDirs(syncFn)
-	return err
-
-}

commands/undraft.go

@@ -0,0 +1,157 @@
+// 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 commands
+
+import (
+	"bytes"
+	"errors"
+	"os"
+	"time"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/hugo/parser"
+)
+
+var undraftCmd = &cobra.Command{
+	Use:   "undraft path/to/content",
+	Short: "Undraft changes the content's draft status from 'True' to 'False'",
+	Long: `Undraft changes the content's draft status from 'True' to 'False'
+and updates the date to the current date and time.
+If the content's draft status is 'False', nothing is done.`,
+	RunE: Undraft,
+}
+
+// Undraft publishes the specified content by setting its draft status
+// to false and setting its publish date to now. If the specified content is
+// not a draft, it will log an error.
+func Undraft(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig()
+
+	if err != nil {
+		return err
+	}
+
+	if len(args) < 1 {
+		return newUserError("a piece of content needs to be specified")
+	}
+
+	location := args[0]
+	// open the file
+	f, err := cfg.Fs.Source.Open(location)
+	if err != nil {
+		return err
+	}
+
+	// get the page from file
+	p, err := parser.ReadFrom(f)
+	f.Close()
+	if err != nil {
+		return err
+	}
+
+	w, err := undraftContent(p)
+	if err != nil {
+		return newSystemErrorF("an error occurred while undrafting %q: %s", location, err)
+	}
+
+	f, err = cfg.Fs.Source.OpenFile(location, os.O_WRONLY|os.O_TRUNC, 0644)
+	if err != nil {
+		return newSystemErrorF("%q not be undrafted due to error opening file to save changes: %q\n", location, err)
+	}
+	defer f.Close()
+	_, err = w.WriteTo(f)
+	if err != nil {
+		return newSystemErrorF("%q not be undrafted due to save error: %q\n", location, err)
+	}
+	return nil
+}
+
+// undraftContent: if the content is a draft, change its draft status to
+// 'false' and set the date to time.Now(). If the draft status is already
+// 'false', don't do anything.
+func undraftContent(p parser.Page) (bytes.Buffer, error) {
+	var buff bytes.Buffer
+	// get the metadata; easiest way to see if it's a draft
+	meta, err := p.Metadata()
+	if err != nil {
+		return buff, err
+	}
+	// since the metadata was obtainable, we can also get the key/value separator for
+	// Front Matter
+	fm := p.FrontMatter()
+	if fm == nil {
+		return buff, errors.New("Front Matter was found, nothing was finalized")
+	}
+
+	var isDraft, gotDate bool
+	var date string
+L:
+	for k, v := range meta.(map[string]interface{}) {
+		switch k {
+		case "draft":
+			if !v.(bool) {
+				return buff, errors.New("not a Draft: nothing was done")
+			}
+			isDraft = true
+			if gotDate {
+				break L
+			}
+		case "date":
+			date = v.(string) // capture the value to make replacement easier
+			gotDate = true
+			if isDraft {
+				break L
+			}
+		}
+	}
+
+	// if draft wasn't found in FrontMatter, it isn't a draft.
+	if !isDraft {
+		return buff, errors.New("not a Draft: nothing was done")
+	}
+
+	// get the front matter as bytes and split it into lines
+	var lineEnding []byte
+	fmLines := bytes.Split(fm, []byte("\n"))
+	if len(fmLines) == 1 { // if the result is only 1 element, try to split on dos line endings
+		fmLines = bytes.Split(fm, []byte("\r\n"))
+		if len(fmLines) == 1 {
+			return buff, errors.New("unable to split FrontMatter into lines")
+		}
+		lineEnding = append(lineEnding, []byte("\r\n")...)
+	} else {
+		lineEnding = append(lineEnding, []byte("\n")...)
+	}
+
+	// Write the front matter lines to the buffer, replacing as necessary
+	for _, v := range fmLines {
+		pos := bytes.Index(v, []byte("draft"))
+		if pos != -1 {
+			v = bytes.Replace(v, []byte("true"), []byte("false"), 1)
+			goto write
+		}
+		pos = bytes.Index(v, []byte("date"))
+		if pos != -1 { // if date field wasn't found, add it
+			v = bytes.Replace(v, []byte(date), []byte(time.Now().Format(time.RFC3339)), 1)
+		}
+	write:
+		buff.Write(v)
+		buff.Write(lineEnding)
+	}
+
+	// append the actual content
+	buff.Write(p.Content())
+
+	return buff, nil
+}

commands/undraft_test.go

@@ -0,0 +1,85 @@
+// 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 commands
+
+// TODO Support Mac Encoding (\r)
+
+import (
+	"bytes"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/spf13/hugo/parser"
+)
+
+var (
+	jsonFM      = "{\n \"date\": \"12-04-06\",\n \"title\": \"test json\"\n}"
+	jsonDraftFM = "{\n \"draft\": true,\n \"date\": \"12-04-06\",\n \"title\":\"test json\"\n}"
+	tomlFM      = "+++\n date= \"12-04-06\"\n title= \"test toml\"\n+++"
+	tomlDraftFM = "+++\n draft= true\n date= \"12-04-06\"\n title=\"test toml\"\n+++"
+	yamlFM      = "---\n date: \"12-04-06\"\n title: \"test yaml\"\n---"
+	yamlDraftFM = "---\n draft: true\n date: \"12-04-06\"\n title: \"test yaml\"\n---"
+)
+
+func TestUndraftContent(t *testing.T) {
+	tests := []struct {
+		fm          string
+		expectedErr string
+	}{
+		{jsonFM, "not a Draft: nothing was done"},
+		{jsonDraftFM, ""},
+		{tomlFM, "not a Draft: nothing was done"},
+		{tomlDraftFM, ""},
+		{yamlFM, "not a Draft: nothing was done"},
+		{yamlDraftFM, ""},
+	}
+
+	for i, test := range tests {
+		r := bytes.NewReader([]byte(test.fm))
+		p, _ := parser.ReadFrom(r)
+		res, err := undraftContent(p)
+		if test.expectedErr != "" {
+			if err == nil {
+				t.Errorf("[%d] Expected error, got none", i)
+				continue
+			}
+			if err.Error() != test.expectedErr {
+				t.Errorf("[%d] Expected %q, got %q", i, test.expectedErr, err)
+				continue
+			}
+		} else {
+			r = bytes.NewReader(res.Bytes())
+			p, _ = parser.ReadFrom(r)
+			meta, err := p.Metadata()
+			if err != nil {
+				t.Errorf("[%d] unexpected error %q", i, err)
+				continue
+			}
+			for k, v := range meta.(map[string]interface{}) {
+				if k == "draft" {
+					if v.(bool) {
+						t.Errorf("[%d] Expected %q to be \"false\", got \"true\"", i, k)
+						continue
+					}
+				}
+				if k == "date" {
+					if !strings.HasPrefix(v.(string), time.Now().Format("2006-01-02")) {
+						t.Errorf("[%d] Expected %v to start with %v", i, v.(string), time.Now().Format("2006-01-02"))
+					}
+				}
+			}
+		}
+	}
+}

commands/version.go

@@ -14,55 +14,67 @@
 package commands
 
 import (
+	"os"
+	"path/filepath"
 	"runtime"
 	"strings"
+	"time"
 
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugolib"
-	"github.com/gohugoio/hugo/resource/tocss/scss"
+	"github.com/kardianos/osext"
 	"github.com/spf13/cobra"
+	"github.com/spf13/hugo/helpers"
+	"github.com/spf13/hugo/hugolib"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-var _ cmder = (*versionCmd)(nil)
-
-type versionCmd struct {
-	*baseCmd
-}
-
-func newVersionCmd() *versionCmd {
-	return &versionCmd{
-		newBaseCmd(&cobra.Command{
-			Use:   "version",
-			Short: "Print the version number of Hugo",
-			Long:  `All software has versions. This is Hugo's.`,
-			RunE: func(cmd *cobra.Command, args []string) error {
-				printHugoVersion()
-				return nil
-			},
-		}),
-	}
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Print the version number of Hugo",
+	Long:  `All software has versions. This is Hugo's.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		printHugoVersion()
+		return nil
+	},
 }
 
 func printHugoVersion() {
-	program := "Hugo Static Site Generator"
-
-	version := "v" + helpers.CurrentHugoVersion.String()
-	if hugolib.CommitHash != "" {
-		version += "-" + strings.ToUpper(hugolib.CommitHash)
-	}
-	if scss.Supports() {
-		version += "/extended"
-	}
-
-	osArch := runtime.GOOS + "/" + runtime.GOARCH
-
-	var buildDate string
-	if hugolib.BuildDate != "" {
-		buildDate = hugolib.BuildDate
+	if hugolib.BuildDate == "" {
+		setBuildDate() // set the build date from executable's mdate
 	} else {
-		buildDate = "unknown"
+		formatBuildDate() // format the compile time
+	}
+	if hugolib.CommitHash == "" {
+		jww.FEEDBACK.Printf("Hugo Static Site Generator v%s %s/%s BuildDate: %s\n", helpers.HugoVersion(), runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)
+	} else {
+		jww.FEEDBACK.Printf("Hugo Static Site Generator v%s-%s %s/%s BuildDate: %s\n", helpers.HugoVersion(), strings.ToUpper(hugolib.CommitHash), runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)
 	}
-
-	jww.FEEDBACK.Println(program, version, osArch, "BuildDate:", buildDate)
+}
+
+// setBuildDate checks the ModTime of the Hugo executable and returns it as a
+// formatted string.  This assumes that the executable name is Hugo, if it does
+// not exist, an empty string will be returned.  This is only called if the
+// hugolib.BuildDate wasn't set during compile time.
+//
+// osext is used for cross-platform.
+func setBuildDate() {
+	fname, _ := osext.Executable()
+	dir, err := filepath.Abs(filepath.Dir(fname))
+	if err != nil {
+		jww.ERROR.Println(err)
+		return
+	}
+	fi, err := os.Lstat(filepath.Join(dir, filepath.Base(fname)))
+	if err != nil {
+		jww.ERROR.Println(err)
+		return
+	}
+	t := fi.ModTime()
+	hugolib.BuildDate = t.Format(time.RFC3339)
+}
+
+// formatBuildDate formats the hugolib.BuildDate according to the value in
+// .Params.DateFormat, if it's set.
+func formatBuildDate() {
+	t, _ := time.Parse("2006-01-02T15:04:05-0700", hugolib.BuildDate)
+	hugolib.BuildDate = t.Format(time.RFC3339)
 }

common/errors/errors.go

@@ -1,23 +0,0 @@
-// 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 errors contains common Hugo errors and error related utilities.
-package errors
-
-import (
-	"errors"
-)
-
-// We will, at least to begin with, make some Hugo features (SCSS with libsass) optional,
-// and this error is used to signal those situations.
-var FeatureNotAvailableErr = errors.New("this feature is not available in your current Hugo version")

common/hugio/readers.go

@@ -1,53 +0,0 @@
-// 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 hugio
-
-import (
-	"io"
-	"strings"
-)
-
-// ReadSeeker wraps io.Reader and io.Seeker.
-type ReadSeeker interface {
-	io.Reader
-	io.Seeker
-}
-
-// ReadSeekCloser is implemented by afero.File. We use this as the common type for
-// content in Resource objects, even for strings.
-type ReadSeekCloser interface {
-	ReadSeeker
-	io.Closer
-}
-
-// ReadSeekerNoOpCloser implements ReadSeekCloser by doing nothing in Close.
-type ReadSeekerNoOpCloser struct {
-	ReadSeeker
-}
-
-// Close does nothing.
-func (r ReadSeekerNoOpCloser) Close() error {
-	return nil
-}
-
-// NewReadSeekerNoOpCloser creates a new ReadSeekerNoOpCloser with the given ReadSeeker.
-func NewReadSeekerNoOpCloser(r ReadSeeker) ReadSeekerNoOpCloser {
-	return ReadSeekerNoOpCloser{r}
-}
-
-// NewReadSeekerNoOpCloserFromString uses strings.NewReader to create a new ReadSeekerNoOpCloser
-// from the given string.
-func NewReadSeekerNoOpCloserFromString(content string) ReadSeekerNoOpCloser {
-	return ReadSeekerNoOpCloser{strings.NewReader(content)}
-}

common/hugio/writers.go

@@ -1,43 +0,0 @@
-// 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 hugio
-
-import (
-	"io"
-)
-
-type multiWriteCloser struct {
-	io.Writer
-	closers []io.WriteCloser
-}
-
-func (m multiWriteCloser) Close() error {
-	var err error
-	for _, c := range m.closers {
-		if closeErr := c.Close(); err != nil {
-			err = closeErr
-		}
-	}
-	return err
-}
-
-// NewMultiWriteCloser creates a new io.WriteCloser that duplicates its writes to all the
-// provided writers.
-func NewMultiWriteCloser(writeClosers ...io.WriteCloser) io.WriteCloser {
-	writers := make([]io.Writer, len(writeClosers))
-	for i, w := range writeClosers {
-		writers[i] = w
-	}
-	return multiWriteCloser{Writer: io.MultiWriter(writers...), closers: writeClosers}
-}

common/loggers/loggers.go

@@ -1,37 +0,0 @@
-// 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 loggers
-
-import (
-	"io/ioutil"
-	"log"
-	"os"
-
-	jww "github.com/spf13/jwalterweatherman"
-)
-
-// NewDebugLogger is a convenience function to create a debug logger.
-func NewDebugLogger() *jww.Notepad {
-	return jww.NewNotepad(jww.LevelDebug, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
-}
-
-// NewWarningLogger is a convenience function to create a warning logger.
-func NewWarningLogger() *jww.Notepad {
-	return jww.NewNotepad(jww.LevelWarn, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
-}
-
-// NewErrorLogger is a convenience function to create an error logger.
-func NewErrorLogger() *jww.Notepad {
-	return jww.NewNotepad(jww.LevelError, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
-}

common/maps/maps.go

@@ -1,44 +0,0 @@
-// 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 maps
-
-import (
-	"strings"
-
-	"github.com/spf13/cast"
-)
-
-// ToLower makes all the keys in the given map lower cased and will do so
-// recursively.
-// Notes:
-// * This will modify the map given.
-// * Any nested map[interface{}]interface{} will be converted to map[string]interface{}.
-func ToLower(m map[string]interface{}) {
-	for k, v := range m {
-		switch v.(type) {
-		case map[interface{}]interface{}:
-			v = cast.ToStringMap(v)
-			ToLower(v.(map[string]interface{}))
-		case map[string]interface{}:
-			ToLower(v.(map[string]interface{}))
-		}
-
-		lKey := strings.ToLower(k)
-		if k != lKey {
-			delete(m, k)
-			m[lKey] = v
-		}
-
-	}
-}

common/maps/maps_test.go

@@ -1,72 +0,0 @@
-// 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 maps
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestToLower(t *testing.T) {
-
-	tests := []struct {
-		input    map[string]interface{}
-		expected map[string]interface{}
-	}{
-		{
-			map[string]interface{}{
-				"abC": 32,
-			},
-			map[string]interface{}{
-				"abc": 32,
-			},
-		},
-		{
-			map[string]interface{}{
-				"abC": 32,
-				"deF": map[interface{}]interface{}{
-					23: "A value",
-					24: map[string]interface{}{
-						"AbCDe": "A value",
-						"eFgHi": "Another value",
-					},
-				},
-				"gHi": map[string]interface{}{
-					"J": 25,
-				},
-			},
-			map[string]interface{}{
-				"abc": 32,
-				"def": map[string]interface{}{
-					"23": "A value",
-					"24": map[string]interface{}{
-						"abcde": "A value",
-						"efghi": "Another value",
-					},
-				},
-				"ghi": map[string]interface{}{
-					"j": 25,
-				},
-			},
-		},
-	}
-
-	for i, test := range tests {
-		// ToLower modifies input.
-		ToLower(test.input)
-		if !reflect.DeepEqual(test.expected, test.input) {
-			t.Errorf("[%d] Expected\n%#v, got\n%#v\n", i, test.expected, test.input)
-		}
-	}
-}

common/math/math.go

@@ -1,135 +0,0 @@
-// 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 math
-
-import (
-	"errors"
-	"reflect"
-)
-
-// DoArithmetic performs arithmetic operations (+,-,*,/) using reflection to
-// determine the type of the two terms.
-func DoArithmetic(a, b interface{}, op rune) (interface{}, error) {
-	av := reflect.ValueOf(a)
-	bv := reflect.ValueOf(b)
-	var ai, bi int64
-	var af, bf float64
-	var au, bu uint64
-	switch av.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		ai = av.Int()
-		switch bv.Kind() {
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			bi = bv.Int()
-		case reflect.Float32, reflect.Float64:
-			af = float64(ai) // may overflow
-			ai = 0
-			bf = bv.Float()
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-			bu = bv.Uint()
-			if ai >= 0 {
-				au = uint64(ai)
-				ai = 0
-			} else {
-				bi = int64(bu) // may overflow
-				bu = 0
-			}
-		default:
-			return nil, errors.New("Can't apply the operator to the values")
-		}
-	case reflect.Float32, reflect.Float64:
-		af = av.Float()
-		switch bv.Kind() {
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			bf = float64(bv.Int()) // may overflow
-		case reflect.Float32, reflect.Float64:
-			bf = bv.Float()
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-			bf = float64(bv.Uint()) // may overflow
-		default:
-			return nil, errors.New("Can't apply the operator to the values")
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		au = av.Uint()
-		switch bv.Kind() {
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			bi = bv.Int()
-			if bi >= 0 {
-				bu = uint64(bi)
-				bi = 0
-			} else {
-				ai = int64(au) // may overflow
-				au = 0
-			}
-		case reflect.Float32, reflect.Float64:
-			af = float64(au) // may overflow
-			au = 0
-			bf = bv.Float()
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-			bu = bv.Uint()
-		default:
-			return nil, errors.New("Can't apply the operator to the values")
-		}
-	case reflect.String:
-		as := av.String()
-		if bv.Kind() == reflect.String && op == '+' {
-			bs := bv.String()
-			return as + bs, nil
-		}
-		return nil, errors.New("Can't apply the operator to the values")
-	default:
-		return nil, errors.New("Can't apply the operator to the values")
-	}
-
-	switch op {
-	case '+':
-		if ai != 0 || bi != 0 {
-			return ai + bi, nil
-		} else if af != 0 || bf != 0 {
-			return af + bf, nil
-		} else if au != 0 || bu != 0 {
-			return au + bu, nil
-		}
-		return 0, nil
-	case '-':
-		if ai != 0 || bi != 0 {
-			return ai - bi, nil
-		} else if af != 0 || bf != 0 {
-			return af - bf, nil
-		} else if au != 0 || bu != 0 {
-			return au - bu, nil
-		}
-		return 0, nil
-	case '*':
-		if ai != 0 || bi != 0 {
-			return ai * bi, nil
-		} else if af != 0 || bf != 0 {
-			return af * bf, nil
-		} else if au != 0 || bu != 0 {
-			return au * bu, nil
-		}
-		return 0, nil
-	case '/':
-		if bi != 0 {
-			return ai / bi, nil
-		} else if bf != 0 {
-			return af / bf, nil
-		} else if bu != 0 {
-			return au / bu, nil
-		}
-		return nil, errors.New("Can't divide the value by 0")
-	default:
-		return nil, errors.New("There is no such an operation")
-	}
-}

common/math/math_test.go

@@ -1,109 +0,0 @@
-// 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 math
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/alecthomas/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDoArithmetic(t *testing.T) {
-	t.Parallel()
-
-	for i, test := range []struct {
-		a      interface{}
-		b      interface{}
-		op     rune
-		expect interface{}
-	}{
-		{3, 2, '+', int64(5)},
-		{3, 2, '-', int64(1)},
-		{3, 2, '*', int64(6)},
-		{3, 2, '/', int64(1)},
-		{3.0, 2, '+', float64(5)},
-		{3.0, 2, '-', float64(1)},
-		{3.0, 2, '*', float64(6)},
-		{3.0, 2, '/', float64(1.5)},
-		{3, 2.0, '+', float64(5)},
-		{3, 2.0, '-', float64(1)},
-		{3, 2.0, '*', float64(6)},
-		{3, 2.0, '/', float64(1.5)},
-		{3.0, 2.0, '+', float64(5)},
-		{3.0, 2.0, '-', float64(1)},
-		{3.0, 2.0, '*', float64(6)},
-		{3.0, 2.0, '/', float64(1.5)},
-		{uint(3), uint(2), '+', uint64(5)},
-		{uint(3), uint(2), '-', uint64(1)},
-		{uint(3), uint(2), '*', uint64(6)},
-		{uint(3), uint(2), '/', uint64(1)},
-		{uint(3), 2, '+', uint64(5)},
-		{uint(3), 2, '-', uint64(1)},
-		{uint(3), 2, '*', uint64(6)},
-		{uint(3), 2, '/', uint64(1)},
-		{3, uint(2), '+', uint64(5)},
-		{3, uint(2), '-', uint64(1)},
-		{3, uint(2), '*', uint64(6)},
-		{3, uint(2), '/', uint64(1)},
-		{uint(3), -2, '+', int64(1)},
-		{uint(3), -2, '-', int64(5)},
-		{uint(3), -2, '*', int64(-6)},
-		{uint(3), -2, '/', int64(-1)},
-		{-3, uint(2), '+', int64(-1)},
-		{-3, uint(2), '-', int64(-5)},
-		{-3, uint(2), '*', int64(-6)},
-		{-3, uint(2), '/', int64(-1)},
-		{uint(3), 2.0, '+', float64(5)},
-		{uint(3), 2.0, '-', float64(1)},
-		{uint(3), 2.0, '*', float64(6)},
-		{uint(3), 2.0, '/', float64(1.5)},
-		{3.0, uint(2), '+', float64(5)},
-		{3.0, uint(2), '-', float64(1)},
-		{3.0, uint(2), '*', float64(6)},
-		{3.0, uint(2), '/', float64(1.5)},
-		{0, 0, '+', 0},
-		{0, 0, '-', 0},
-		{0, 0, '*', 0},
-		{"foo", "bar", '+', "foobar"},
-		{3, 0, '/', false},
-		{3.0, 0, '/', false},
-		{3, 0.0, '/', false},
-		{uint(3), uint(0), '/', false},
-		{3, uint(0), '/', false},
-		{-3, uint(0), '/', false},
-		{uint(3), 0, '/', false},
-		{3.0, uint(0), '/', false},
-		{uint(3), 0.0, '/', false},
-		{3, "foo", '+', false},
-		{3.0, "foo", '+', false},
-		{uint(3), "foo", '+', false},
-		{"foo", 3, '+', false},
-		{"foo", "bar", '-', false},
-		{3, 2, '%', false},
-	} {
-		errMsg := fmt.Sprintf("[%d] %v", i, test)
-
-		result, err := DoArithmetic(test.a, test.b, test.op)
-
-		if b, ok := test.expect.(bool); ok && !b {
-			require.Error(t, err, errMsg)
-			continue
-		}
-
-		require.NoError(t, err, errMsg)
-		assert.Equal(t, test.expect, result, errMsg)
-	}
-}

common/types/evictingqueue.go

@@ -1,89 +0,0 @@
-// Copyright 2017-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 types contains types shared between packages in Hugo.
-package types
-
-import (
-	"sync"
-)
-
-// EvictingStringQueue is a queue which automatically evicts elements from the head of
-// the queue when attempting to add new elements onto the queue and it is full.
-// This queue orders elements LIFO (last-in-first-out). It throws away duplicates.
-// Note: This queue currently does not contain any remove (poll etc.) methods.
-type EvictingStringQueue struct {
-	size int
-	vals []string
-	set  map[string]bool
-	mu   sync.Mutex
-}
-
-// NewEvictingStringQueue creates a new queue with the given size.
-func NewEvictingStringQueue(size int) *EvictingStringQueue {
-	return &EvictingStringQueue{size: size, set: make(map[string]bool)}
-}
-
-// Add adds a new string to the tail of the queue if it's not already there.
-func (q *EvictingStringQueue) Add(v string) {
-	q.mu.Lock()
-	if q.set[v] {
-		q.mu.Unlock()
-		return
-	}
-
-	if len(q.set) == q.size {
-		// Full
-		delete(q.set, q.vals[0])
-		q.vals = append(q.vals[:0], q.vals[1:]...)
-	}
-	q.set[v] = true
-	q.vals = append(q.vals, v)
-	q.mu.Unlock()
-}
-
-// Peek looks at the last element added to the queue.
-func (q *EvictingStringQueue) Peek() string {
-	q.mu.Lock()
-	l := len(q.vals)
-	if l == 0 {
-		q.mu.Unlock()
-		return ""
-	}
-	elem := q.vals[l-1]
-	q.mu.Unlock()
-	return elem
-}
-
-// PeekAll looks at all the elements in the queue, with the newest first.
-func (q *EvictingStringQueue) PeekAll() []string {
-	q.mu.Lock()
-	vals := make([]string, len(q.vals))
-	copy(vals, q.vals)
-	q.mu.Unlock()
-	for i, j := 0, len(vals)-1; i < j; i, j = i+1, j-1 {
-		vals[i], vals[j] = vals[j], vals[i]
-	}
-	return vals
-}
-
-// PeekAllSet returns PeekAll as a set.
-func (q *EvictingStringQueue) PeekAllSet() map[string]bool {
-	all := q.PeekAll()
-	set := make(map[string]bool)
-	for _, v := range all {
-		set[v] = true
-	}
-
-	return set
-}

common/types/evictingqueue_test.go

@@ -1,71 +0,0 @@
-// Copyright 2017-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 types
-
-import (
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestEvictingStringQueue(t *testing.T) {
-	assert := require.New(t)
-
-	queue := NewEvictingStringQueue(3)
-
-	assert.Equal("", queue.Peek())
-	queue.Add("a")
-	queue.Add("b")
-	queue.Add("a")
-	assert.Equal("b", queue.Peek())
-	queue.Add("b")
-	assert.Equal("b", queue.Peek())
-
-	queue.Add("a")
-	queue.Add("b")
-
-	assert.Equal([]string{"b", "a"}, queue.PeekAll())
-	assert.Equal("b", queue.Peek())
-	queue.Add("c")
-	queue.Add("d")
-	// Overflowed, a should now be removed.
-	assert.Equal([]string{"d", "c", "b"}, queue.PeekAll())
-	assert.Len(queue.PeekAllSet(), 3)
-	assert.True(queue.PeekAllSet()["c"])
-}
-
-func TestEvictingStringQueueConcurrent(t *testing.T) {
-	var wg sync.WaitGroup
-	val := "someval"
-
-	queue := NewEvictingStringQueue(3)
-
-	for j := 0; j < 100; j++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			queue.Add(val)
-			v := queue.Peek()
-			if v != val {
-				t.Error("wrong val")
-			}
-			vals := queue.PeekAll()
-			if len(vals) != 1 || vals[0] != val {
-				t.Error("wrong val")
-			}
-		}()
-	}
-	wg.Wait()
-}

common/types/types.go

@@ -1,50 +0,0 @@
-// Copyright 2017-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 types contains types shared between packages in Hugo.
-package types
-
-import (
-	"fmt"
-
-	"github.com/spf13/cast"
-)
-
-// KeyValueStr is a string tuple.
-type KeyValueStr struct {
-	Key   string
-	Value string
-}
-
-// KeyValues holds an key and a slice of values.
-type KeyValues struct {
-	Key    interface{}
-	Values []interface{}
-}
-
-// KeyString returns the key as a string, an empty string if conversion fails.
-func (k KeyValues) KeyString() string {
-	return cast.ToString(k.Key)
-}
-
-func (k KeyValues) String() string {
-	return fmt.Sprintf("%v: %v", k.Key, k.Values)
-}
-
-func NewKeyValuesStrings(key string, values ...string) KeyValues {
-	iv := make([]interface{}, len(values))
-	for i := 0; i < len(values); i++ {
-		iv[i] = values[i]
-	}
-	return KeyValues{Key: key, Values: iv}
-}

common/types/types_test.go

@@ -1,29 +0,0 @@
-// Copyright 2017-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 types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestKeyValues(t *testing.T) {
-	assert := require.New(t)
-
-	kv := NewKeyValuesStrings("key", "a1", "a2")
-
-	assert.Equal("key", kv.KeyString())
-	assert.Equal([]interface{}{"a1", "a2"}, kv.Values)
-}

compare/compare.go

@@ -1,29 +0,0 @@
-// Copyright 2017-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 compare
-
-// Eqer can be used to determine if this value is equal to the other.
-// The semantics of equals is that the two value are interchangeable
-// in the Hugo templates.
-type Eqer interface {
-	Eq(other interface{}) bool
-}
-
-// Comparer can be used to compare two values.
-// This will be used when using the le, ge etc. operators in the templates.
-// Compare returns -1 if the given version is less than, 0 if equal and 1 if greater than
-// the running version.
-type Comparer interface {
-	Compare(other interface{}) int
-}

config/configProvider.go

@@ -13,14 +13,6 @@
 
 package config
 
-import (
-	"strings"
-
-	"github.com/spf13/cast"
-
-	"github.com/spf13/viper"
-)
-
 // Provider provides the configuration settings for Hugo.
 type Provider interface {
 	GetString(key string) string
@@ -28,30 +20,7 @@ type Provider interface {
 	GetBool(key string) bool
 	GetStringMap(key string) map[string]interface{}
 	GetStringMapString(key string) map[string]string
-	GetStringSlice(key string) []string
 	Get(key string) interface{}
 	Set(key string, value interface{})
 	IsSet(key string) bool
 }
-
-// FromConfigString creates a config from the given YAML, JSON or TOML config. This is useful in tests.
-func FromConfigString(config, configType string) (Provider, error) {
-	v := viper.New()
-	v.SetConfigType(configType)
-	if err := v.ReadConfig(strings.NewReader(config)); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// GetStringSlicePreserveString returns a string slice from the given config and key.
-// It differs from the GetStringSlice method in that if the config value is a string,
-// we do not attempt to split it into fields.
-func GetStringSlicePreserveString(cfg Provider, key string) []string {
-	sd := cfg.Get(key)
-	if sds, ok := sd.(string); ok {
-		return []string{sds}
-	} else {
-		return cast.ToStringSlice(sd)
-	}
-}

config/configProvider_test.go

@@ -1,36 +0,0 @@
-// 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 config
-
-import (
-	"testing"
-
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetStringSlicePreserveString(t *testing.T) {
-	assert := require.New(t)
-	cfg := viper.New()
-
-	s := "This is a string"
-	sSlice := []string{"This", "is", "a", "slice"}
-
-	cfg.Set("s1", s)
-	cfg.Set("s2", sSlice)
-
-	assert.Equal([]string{s}, GetStringSlicePreserveString(cfg, "s1"))
-	assert.Equal(sSlice, GetStringSlicePreserveString(cfg, "s2"))
-	assert.Nil(GetStringSlicePreserveString(cfg, "s3"))
-}

config/privacy/privacyConfig.go

@@ -1,109 +0,0 @@
-// 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 privacy
-
-import (
-	"github.com/gohugoio/hugo/config"
-	"github.com/mitchellh/mapstructure"
-)
-
-const privacyConfigKey = "privacy"
-
-// Service is the common values for a service in a policy definition.
-type Service struct {
-	Disable bool
-}
-
-// Config is a privacy configuration for all the relevant services in Hugo.
-type Config struct {
-	Disqus          Disqus
-	GoogleAnalytics GoogleAnalytics
-	Instagram       Instagram
-	Twitter         Twitter
-	Vimeo           Vimeo
-	YouTube         YouTube
-}
-
-// Disqus holds the privacy configuration settings related to the Disqus template.
-type Disqus struct {
-	Service `mapstructure:",squash"`
-}
-
-// GoogleAnalytics holds the privacy configuration settings related to the Google Analytics template.
-type GoogleAnalytics struct {
-	Service `mapstructure:",squash"`
-
-	// Enabling this will disable the use of Cookies and use Session Storage to Store the GA Client ID.
-	UseSessionStorage bool
-
-	// Enabling this will make the GA templates respect the
-	// "Do Not Track" HTTP header. See  https://www.paulfurley.com/google-analytics-dnt/.
-	RespectDoNotTrack bool
-
-	// Enabling this will make it so the users' IP addresses are anonymized within Google Analytics.
-	AnonymizeIP bool
-}
-
-// Instagram holds the privacy configuration settings related to the Instagram shortcode.
-type Instagram struct {
-	Service `mapstructure:",squash"`
-
-	// If simple mode is enabled, a static and no-JS version of the Instagram
-	// image card will be built.
-	Simple bool
-}
-
-// Twitter holds the privacy configuration settingsrelated to the Twitter shortcode.
-type Twitter struct {
-	Service `mapstructure:",squash"`
-
-	// When set to true, the Tweet and its embedded page on your site are not used
-	// for purposes that include personalized suggestions and personalized ads.
-	EnableDNT bool
-
-	// If simple mode is enabled, a static and no-JS version of the Tweet will be built.
-	Simple bool
-}
-
-// Vimeo holds the privacy configuration settingsrelated to the Vimeo shortcode.
-type Vimeo struct {
-	Service `mapstructure:",squash"`
-
-	// If simple mode is enabled, only a thumbnail is fetched from i.vimeocdn.com and
-	// shown with a play button overlaid. If a user clicks the button, he/she will
-	// be taken to the video page on vimeo.com in a new browser tab.
-	Simple bool
-}
-
-// YouTube holds the privacy configuration settingsrelated to the YouTube shortcode.
-type YouTube struct {
-	Service `mapstructure:",squash"`
-
-	// When you turn on privacy-enhanced mode,
-	// YouTube won’t store information about visitors on your website
-	// unless the user plays the embedded video.
-	PrivacyEnhanced bool
-}
-
-func DecodeConfig(cfg config.Provider) (pc Config, err error) {
-	if !cfg.IsSet(privacyConfigKey) {
-		return
-	}
-
-	m := cfg.GetStringMap(privacyConfigKey)
-
-	err = mapstructure.WeakDecode(m, &pc)
-
-	return
-}

config/privacy/privacyConfig_test.go

@@ -1,104 +0,0 @@
-// 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 privacy
-
-import (
-	"testing"
-
-	"github.com/gohugoio/hugo/config"
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDecodeConfigFromTOML(t *testing.T) {
-	assert := require.New(t)
-
-	tomlConfig := `
-
-someOtherValue = "foo"
-
-[privacy]
-[privacy.disqus]
-disable = true
-[privacy.googleAnalytics]
-disable = true
-respectDoNotTrack = true
-anonymizeIP = true
-useSessionStorage = true
-[privacy.instagram]
-disable = true
-simple = true
-[privacy.twitter]
-disable = true
-enableDNT = true
-simple = true
-[privacy.vimeo]
-disable = true
-simple = true
-[privacy.youtube]
-disable = true
-privacyEnhanced = true
-simple = true
-`
-	cfg, err := config.FromConfigString(tomlConfig, "toml")
-	assert.NoError(err)
-
-	pc, err := DecodeConfig(cfg)
-	assert.NoError(err)
-	assert.NotNil(pc)
-
-	assert.True(pc.Disqus.Disable)
-	assert.True(pc.GoogleAnalytics.Disable)
-	assert.True(pc.GoogleAnalytics.RespectDoNotTrack)
-	assert.True(pc.GoogleAnalytics.AnonymizeIP)
-	assert.True(pc.GoogleAnalytics.UseSessionStorage)
-	assert.True(pc.Instagram.Disable)
-	assert.True(pc.Instagram.Simple)
-	assert.True(pc.Twitter.Disable)
-	assert.True(pc.Twitter.EnableDNT)
-	assert.True(pc.Twitter.Simple)
-	assert.True(pc.Vimeo.Disable)
-	assert.True(pc.Vimeo.Simple)
-	assert.True(pc.YouTube.PrivacyEnhanced)
-	assert.True(pc.YouTube.Disable)
-}
-
-func TestDecodeConfigFromTOMLCaseInsensitive(t *testing.T) {
-	assert := require.New(t)
-
-	tomlConfig := `
-
-someOtherValue = "foo"
-
-[Privacy]
-[Privacy.YouTube]
-PrivacyENhanced = true
-`
-	cfg, err := config.FromConfigString(tomlConfig, "toml")
-	assert.NoError(err)
-
-	pc, err := DecodeConfig(cfg)
-	assert.NoError(err)
-	assert.NotNil(pc)
-	assert.True(pc.YouTube.PrivacyEnhanced)
-}
-
-func TestDecodeConfigDefault(t *testing.T) {
-	assert := require.New(t)
-
-	pc, err := DecodeConfig(viper.New())
-	assert.NoError(err)
-	assert.NotNil(pc)
-	assert.False(pc.YouTube.PrivacyEnhanced)
-}

config/services/servicesConfig.go

@@ -1,79 +0,0 @@
-// 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 services
-
-import (
-	"github.com/gohugoio/hugo/config"
-	"github.com/mitchellh/mapstructure"
-)
-
-const (
-	servicesConfigKey = "services"
-
-	disqusShortnameKey = "disqusshortname"
-	googleAnalyticsKey = "googleanalytics"
-)
-
-// Config is a privacy configuration for all the relevant services in Hugo.
-type Config struct {
-	Disqus          Disqus
-	GoogleAnalytics GoogleAnalytics
-	Instagram       Instagram
-	Twitter         Twitter
-}
-
-// Disqus holds the functional configuration settings related to the Disqus template.
-type Disqus struct {
-	// A Shortname is the unique identifier assigned to a Disqus site.
-	Shortname string
-}
-
-// GoogleAnalytics holds the functional configuration settings related to the Google Analytics template.
-type GoogleAnalytics struct {
-	// The GA tracking ID.
-	ID string
-}
-
-// Instagram holds the functional configuration settings related to the Instagram shortcodes.
-type Instagram struct {
-	// The Simple variant of the Instagram is decorated with Bootstrap 4 card classes.
-	// This means that if you use Bootstrap 4 or want to provide your own CSS, you want
-	// to disable the inline CSS provided by Hugo.
-	DisableInlineCSS bool
-}
-
-// Twitter holds the functional configuration settings related to the Twitter shortcodes.
-type Twitter struct {
-	// The Simple variant of Twitter is decorated with a basic set of inline styles.
-	// This means that if you want to provide your own CSS, you want
-	// to disable the inline CSS provided by Hugo.
-	DisableInlineCSS bool
-}
-
-func DecodeConfig(cfg config.Provider) (c Config, err error) {
-	m := cfg.GetStringMap(servicesConfigKey)
-
-	err = mapstructure.WeakDecode(m, &c)
-
-	// Keep backwards compatibility.
-	if c.GoogleAnalytics.ID == "" {
-		// Try the global config
-		c.GoogleAnalytics.ID = cfg.GetString(googleAnalyticsKey)
-	}
-	if c.Disqus.Shortname == "" {
-		c.Disqus.Shortname = cfg.GetString(disqusShortnameKey)
-	}
-
-	return
-}

config/services/servicesConfig_test.go

@@ -1,69 +0,0 @@
-// 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 services
-
-import (
-	"testing"
-
-	"github.com/gohugoio/hugo/config"
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDecodeConfigFromTOML(t *testing.T) {
-	assert := require.New(t)
-
-	tomlConfig := `
-
-someOtherValue = "foo"
-
-[services]
-[services.disqus]
-shortname = "DS"
-[services.googleAnalytics]
-id = "ga_id"
-[services.instagram]
-disableInlineCSS = true
-[services.twitter]
-disableInlineCSS = true
-`
-	cfg, err := config.FromConfigString(tomlConfig, "toml")
-	assert.NoError(err)
-
-	config, err := DecodeConfig(cfg)
-	assert.NoError(err)
-	assert.NotNil(config)
-
-	assert.Equal("DS", config.Disqus.Shortname)
-	assert.Equal("ga_id", config.GoogleAnalytics.ID)
-
-	assert.True(config.Instagram.DisableInlineCSS)
-}
-
-// Support old root-level GA settings etc.
-func TestUseSettingsFromRootIfSet(t *testing.T) {
-	assert := require.New(t)
-
-	cfg := viper.New()
-	cfg.Set("disqusShortname", "root_short")
-	cfg.Set("googleAnalytics", "ga_root")
-
-	config, err := DecodeConfig(cfg)
-	assert.NoError(err)
-	assert.NotNil(config)
-
-	assert.Equal("root_short", config.Disqus.Shortname)
-	assert.Equal("ga_root", config.GoogleAnalytics.ID)
-
-}

create/content.go

@@ -16,81 +16,71 @@ package create
 
 import (
 	"bytes"
-	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
+	"time"
 
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugolib"
+	"github.com/spf13/afero"
+	"github.com/spf13/cast"
+	"github.com/spf13/hugo/helpers"
+	"github.com/spf13/hugo/hugolib"
+	"github.com/spf13/hugo/parser"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
 // NewContent creates a new content file in the content directory based upon the
 // given kind, which is used to lookup an archetype.
-func NewContent(
-	ps *helpers.PathSpec,
-	siteFactory func(filename string, siteUsed bool) (*hugolib.Site, error), kind, targetPath string) error {
-	ext := helpers.Ext(targetPath)
-	fs := ps.BaseFs.SourceFilesystems.Archetypes.Fs
+func NewContent(s *hugolib.Site, kind, name string) (err error) {
+	jww.INFO.Println("attempting to create ", name, "of", kind)
 
-	jww.INFO.Printf("attempting to create %q of %q of ext %q", targetPath, kind, ext)
+	location := FindArchetype(s, kind)
 
-	archetypeFilename := findArchetype(ps, kind, ext)
+	var by []byte
 
-	// Building the sites can be expensive, so only do it if really needed.
-	siteUsed := false
-
-	if archetypeFilename != "" {
-		f, err := fs.Open(archetypeFilename)
+	if location != "" {
+		by, err = afero.ReadFile(s.Fs.Source, location)
 		if err != nil {
-			return fmt.Errorf("failed to open archetype file: %s", err)
-		}
-		defer f.Close()
-
-		if helpers.ReaderContains(f, []byte(".Site")) {
-			siteUsed = true
+			jww.ERROR.Println(err)
 		}
 	}
+	if location == "" || err != nil {
+		by = []byte("+++\ndraft = true \n+++\n")
+	}
 
-	s, err := siteFactory(targetPath, siteUsed)
+	psr, err := parser.ReadFrom(bytes.NewReader(by))
 	if err != nil {
 		return err
 	}
 
-	var content []byte
+	metadata, err := createMetadata(psr, name)
+	if err != nil {
+		jww.ERROR.Printf("Error processing archetype file %s: %s\n", location, err)
+		return err
+	}
 
-	content, err = executeArcheTypeAsTemplate(s, kind, targetPath, archetypeFilename)
+	page, err := s.NewPage(name)
 	if err != nil {
 		return err
 	}
 
-	// The site may have multiple content dirs, and we currently do not know which contentDir the
-	// user wants to create this content in. We should improve on this, but we start by testing if the
-	// provided path points to an existing dir. If so, use it as is.
-	var contentPath string
-	var exists bool
-	targetDir := filepath.Dir(targetPath)
-
-	if targetDir != "" && targetDir != "." {
-		exists, _ = helpers.Exists(targetDir, fs)
+	if err = page.SetSourceMetaData(metadata, parser.FormatToLeadRune(s.Cfg.GetString("metaDataFormat"))); err != nil {
+		return
 	}
 
-	if exists {
-		contentPath = targetPath
-	} else {
-		contentPath = s.PathSpec.AbsPathify(filepath.Join(s.Cfg.GetString("contentDir"), targetPath))
-	}
+	page.SetSourceContent(psr.Content())
 
-	if err := helpers.SafeWriteToDisk(contentPath, bytes.NewReader(content), s.Fs.Source); err != nil {
-		return err
-	}
+	contentPath := s.PathSpec.AbsPathify(filepath.Join(s.Cfg.GetString("contentDir"), name))
 
+	if err = page.SafeSaveSourceAs(contentPath); err != nil {
+		return
+	}
 	jww.FEEDBACK.Println(contentPath, "created")
 
 	editor := s.Cfg.GetString("newContentEditor")
 	if editor != "" {
-		jww.FEEDBACK.Printf("Editing %s with %q ...\n", targetPath, editor)
+		jww.FEEDBACK.Printf("Editing %s with %q ...\n", name, editor)
 
 		cmd := exec.Command(editor, contentPath)
 		cmd.Stdin = os.Stdin
@@ -103,27 +93,88 @@ func NewContent(
 	return nil
 }
 
-// FindArchetype takes a given kind/archetype of content and returns the path
-// to the archetype in the archetype filesystem, blank if none found.
-func findArchetype(ps *helpers.PathSpec, kind, ext string) (outpath string) {
-	fs := ps.BaseFs.Archetypes.Fs
+// createMetadata generates Metadata for a new page based upon the metadata
+// found in an archetype.
+func createMetadata(archetype parser.Page, name string) (map[string]interface{}, error) {
+	archMetadata, err := archetype.Metadata()
+	if err != nil {
+		return nil, err
+	}
 
-	// If the new content isn't in a subdirectory, kind == "".
-	// Therefore it should be excluded otherwise `is a directory`
-	// error will occur. github.com/gohugoio/hugo/issues/411
-	var pathsToCheck = []string{"default"}
+	metadata, err := cast.ToStringMapE(archMetadata)
+	if err != nil {
+		return nil, err
+	}
 
-	if ext != "" {
-		if kind != "" {
-			pathsToCheck = append([]string{kind + ext, "default" + ext}, pathsToCheck...)
-		} else {
-			pathsToCheck = append([]string{"default" + ext}, pathsToCheck...)
+	var date time.Time
+
+	for k, v := range metadata {
+		if v == "" {
+			continue
+		}
+		lk := strings.ToLower(k)
+		switch lk {
+		case "date":
+			date, err = cast.ToTimeE(v)
+			if err != nil {
+				return nil, err
+			}
+		case "title":
+			// Use the archetype title as is
+			metadata[lk] = v
 		}
 	}
 
-	for _, p := range pathsToCheck {
-		if exists, _ := helpers.Exists(p, fs); exists {
-			return p
+	if metadata == nil {
+		metadata = make(map[string]interface{})
+	}
+
+	if date.IsZero() {
+		date = time.Now()
+	}
+
+	if _, ok := metadata["title"]; !ok {
+		metadata["title"] = helpers.MakeTitle(helpers.Filename(name))
+	}
+
+	metadata["date"] = date.Format(time.RFC3339)
+
+	return metadata, nil
+}
+
+// FindArchetype takes a given kind/archetype of content and returns an output
+// path for that archetype.  If no archetype is found, an empty string is
+// returned.
+func FindArchetype(s *hugolib.Site, kind string) (outpath string) {
+	search := []string{s.PathSpec.AbsPathify(s.Cfg.GetString("archetypeDir"))}
+
+	if s.Cfg.GetString("theme") != "" {
+		themeDir := filepath.Join(s.PathSpec.AbsPathify(s.Cfg.GetString("themesDir")+"/"+s.Cfg.GetString("theme")), "/archetypes/")
+		if _, err := s.Fs.Source.Stat(themeDir); os.IsNotExist(err) {
+			jww.ERROR.Printf("Unable to find archetypes directory for theme %q at %q", s.Cfg.GetString("theme"), themeDir)
+		} else {
+			search = append(search, themeDir)
+		}
+	}
+
+	for _, x := range search {
+		// If the new content isn't in a subdirectory, kind == "".
+		// Therefore it should be excluded otherwise `is a directory`
+		// error will occur. github.com/spf13/hugo/issues/411
+		var pathsToCheck []string
+
+		if kind == "" {
+			pathsToCheck = []string{"default.md", "default"}
+		} else {
+			pathsToCheck = []string{kind + ".md", kind, "default.md", "default"}
+		}
+		for _, p := range pathsToCheck {
+			curpath := filepath.Join(x, p)
+			jww.DEBUG.Println("checking", curpath, "for archetypes")
+			if exists, _ := helpers.Exists(curpath, s.Fs.Source); exists {
+				jww.INFO.Println("curpath: " + curpath)
+				return curpath
+			}
 		}
 	}
 

create/content_template_handler.go

@@ -1,148 +0,0 @@
-// Copyright 2017 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 create
-
-import (
-	"bytes"
-	"fmt"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/source"
-
-	"github.com/gohugoio/hugo/hugolib"
-	"github.com/gohugoio/hugo/tpl"
-	"github.com/spf13/afero"
-)
-
-// ArchetypeFileData represents the data available to an archetype template.
-type ArchetypeFileData struct {
-	// The archetype content type, either given as --kind option or extracted
-	// from the target path's section, i.e. "blog/mypost.md" will resolve to
-	// "blog".
-	Type string
-
-	// The current date and time as a RFC3339 formatted string, suitable for use in front matter.
-	Date string
-
-	// The Site, fully equipped with all the pages etc. Note: This will only be set if it is actually
-	// used in the archetype template. Also, if this is a multilingual setup,
-	// this site is the site that best matches the target content file, based
-	// on the presence of language code in the filename.
-	Site *hugolib.SiteInfo
-
-	// Name will in most cases be the same as TranslationBaseName, e.g. "my-post".
-	// But if that value is "index" (bundles), the Name is instead the owning folder.
-	// This is the value you in most cases would want to use to construct the title in your
-	// archetype template.
-	Name string
-
-	// The target content file. Note that the .Content will be empty, as that
-	// has not been created yet.
-	source.File
-}
-
-const (
-	// ArchetypeTemplateTemplate is used as initial template when adding an archetype template.
-	ArchetypeTemplateTemplate = `---
-title: "{{ replace .Name "-" " " | title }}"
-date: {{ .Date }}
-draft: true
----
-
-`
-)
-
-var (
-	archetypeShortcodeReplacementsPre = strings.NewReplacer(
-		"{{<", "{x{<",
-		"{{%", "{x{%",
-		">}}", ">}x}",
-		"%}}", "%}x}")
-
-	archetypeShortcodeReplacementsPost = strings.NewReplacer(
-		"{x{<", "{{<",
-		"{x{%", "{{%",
-		">}x}", ">}}",
-		"%}x}", "%}}")
-)
-
-func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFilename string) ([]byte, error) {
-
-	var (
-		archetypeContent  []byte
-		archetypeTemplate []byte
-		err               error
-	)
-
-	ps, err := helpers.NewPathSpec(s.Deps.Fs, s.Deps.Cfg)
-	if err != nil {
-		return nil, err
-	}
-	sp := source.NewSourceSpec(ps, ps.Fs.Source)
-
-	f := sp.NewFileInfo("", targetPath, false, nil)
-
-	name := f.TranslationBaseName()
-
-	if name == "index" || name == "_index" {
-		// Page bundles; the directory name will hopefully have a better name.
-		dir := strings.TrimSuffix(f.Dir(), helpers.FilePathSeparator)
-		_, name = filepath.Split(dir)
-	}
-
-	data := ArchetypeFileData{
-		Type: kind,
-		Date: time.Now().Format(time.RFC3339),
-		Name: name,
-		File: f,
-		Site: &s.Info,
-	}
-
-	if archetypeFilename == "" {
-		// TODO(bep) archetype revive the issue about wrong tpl funcs arg order
-		archetypeTemplate = []byte(ArchetypeTemplateTemplate)
-	} else {
-		archetypeTemplate, err = afero.ReadFile(s.BaseFs.Archetypes.Fs, archetypeFilename)
-		if err != nil {
-			return nil, fmt.Errorf("failed to read archetype file %s", err)
-		}
-
-	}
-
-	// The archetype template may contain shortcodes, and these does not play well
-	// with the Go templates. Need to set some temporary delimiters.
-	archetypeTemplate = []byte(archetypeShortcodeReplacementsPre.Replace(string(archetypeTemplate)))
-
-	// Reuse the Hugo template setup to get the template funcs properly set up.
-	templateHandler := s.Deps.Tmpl.(tpl.TemplateHandler)
-	templateName := "_text/" + helpers.Filename(archetypeFilename)
-	if err := templateHandler.AddTemplate(templateName, string(archetypeTemplate)); err != nil {
-		return nil, fmt.Errorf("Failed to parse archetype file %q: %s", archetypeFilename, err)
-	}
-
-	templ, _ := templateHandler.Lookup(templateName)
-
-	var buff bytes.Buffer
-	if err := templ.Execute(&buff, data); err != nil {
-		return nil, fmt.Errorf("Failed to process archetype file %q: %s", archetypeFilename, err)
-	}
-
-	archetypeContent = []byte(archetypeShortcodeReplacementsPost.Replace(buff.String()))
-
-	return archetypeContent, nil
-
-}

create/content_test.go

@@ -19,17 +19,17 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gohugoio/hugo/deps"
+	"github.com/spf13/hugo/deps"
 
-	"github.com/gohugoio/hugo/hugolib"
+	"github.com/spf13/hugo/hugolib"
 
 	"fmt"
 
-	"github.com/gohugoio/hugo/hugofs"
+	"github.com/spf13/hugo/hugofs"
 
-	"github.com/gohugoio/hugo/create"
-	"github.com/gohugoio/hugo/helpers"
 	"github.com/spf13/afero"
+	"github.com/spf13/hugo/create"
+	"github.com/spf13/hugo/helpers"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 )
@@ -44,36 +44,28 @@ func TestNewContent(t *testing.T) {
 		expected []string
 	}{
 		{"post", "post/sample-1.md", []string{`title = "Post Arch title"`, `test = "test1"`, "date = \"2015-01-12T19:20:04-07:00\""}},
-		{"post", "post/org-1.org", []string{`#+title: ORG-1`}},
 		{"emptydate", "post/sample-ed.md", []string{`title = "Empty Date Arch title"`, `test = "test1"`}},
-		{"stump", "stump/sample-2.md", []string{`title: "Sample 2"`}},      // no archetype file
-		{"", "sample-3.md", []string{`title: "Sample 3"`}},                 // no archetype
-		{"product", "product/sample-4.md", []string{`title = "SAMPLE-4"`}}, // empty archetype front matter
-		{"shortcodes", "shortcodes/go.md", []string{
-			`title = "GO"`,
-			"{{< myshortcode >}}",
-			"{{% myshortcode %}}",
-			"{{</* comment */>}}\n{{%/* comment */%}}"}}, // shortcodes
+		{"stump", "stump/sample-2.md", []string{`title = "sample 2"`}},     // no archetype file
+		{"", "sample-3.md", []string{`title = "sample 3"`}},                // no archetype
+		{"product", "product/sample-4.md", []string{`title = "sample 4"`}}, // empty archetype front matter
 	}
 
 	for _, c := range cases {
 		cfg, fs := newTestCfg()
-		require.NoError(t, initFs(fs))
 		h, err := hugolib.NewHugoSites(deps.DepsCfg{Cfg: cfg, Fs: fs})
 		require.NoError(t, err)
+		require.NoError(t, initFs(fs))
 
-		siteFactory := func(filename string, siteUsed bool) (*hugolib.Site, error) {
-			return h.Sites[0], nil
-		}
+		s := h.Sites[0]
 
-		require.NoError(t, create.NewContent(h.PathSpec, siteFactory, c.kind, c.path))
+		require.NoError(t, create.NewContent(s, c.kind, c.path))
 
 		fname := filepath.Join("content", filepath.FromSlash(c.path))
 		content := readFileFromFs(t, fs.Source, fname)
 		for i, v := range c.expected {
 			found := strings.Contains(content, v)
 			if !found {
-				t.Fatalf("[%d] %q missing from output:\n%q", i, v, content)
+				t.Errorf("[%d] %q missing from output:\n%q", i, v, content)
 			}
 		}
 	}
@@ -87,9 +79,6 @@ func initViper(v *viper.Viper) {
 	v.Set("layoutDir", "layouts")
 	v.Set("i18nDir", "i18n")
 	v.Set("theme", "sample")
-	v.Set("archetypeDir", "archetypes")
-	v.Set("resourceDir", "resources")
-	v.Set("publishDir", "public")
 }
 
 func initFs(fs *hugofs.Fs) error {
@@ -119,37 +108,13 @@ func initFs(fs *hugofs.Fs) error {
 			content: "+++\ndate = \"2015-01-12T19:20:04-07:00\"\ntitle = \"Post Arch title\"\ntest = \"test1\"\n+++\n",
 		},
 		{
-			path:    filepath.Join("archetypes", "post.org"),
-			content: "#+title: {{ .BaseFileName  | upper }}",
-		},
-		{
-			path: filepath.Join("archetypes", "product.md"),
-			content: `+++
-title = "{{ .BaseFileName  | upper }}"
-+++`,
+			path:    filepath.Join("archetypes", "product.md"),
+			content: "+++\n+++\n",
 		},
 		{
 			path:    filepath.Join("archetypes", "emptydate.md"),
 			content: "+++\ndate =\"\"\ntitle = \"Empty Date Arch title\"\ntest = \"test1\"\n+++\n",
 		},
-		// #3623x
-		{
-			path: filepath.Join("archetypes", "shortcodes.md"),
-			content: `+++
-title = "{{ .BaseFileName  | upper }}"
-+++
-
-{{< myshortcode >}}
-
-Some text.
-
-{{% myshortcode %}}
-{{</* comment */>}}
-{{%/* comment */%}}
-
-
-`,
-		},
 	} {
 		f, err := fs.Source.Create(v.path)
 		if err != nil {
@@ -188,13 +153,6 @@ func readFileFromFs(t *testing.T, fs afero.Fs, filename string) string {
 func newTestCfg() (*viper.Viper, *hugofs.Fs) {
 
 	v := viper.New()
-	v.Set("contentDir", "content")
-	v.Set("dataDir", "data")
-	v.Set("i18nDir", "i18n")
-	v.Set("layoutDir", "layouts")
-	v.Set("archetypeDir", "archetypes")
-	v.Set("assetDir", "assets")
-
 	fs := hugofs.NewMem(v)
 
 	v.SetFs(fs.Source)

deps/deps.go

@@ -1,40 +1,27 @@
 package deps
 
 import (
-	"sync"
-	"time"
+	"io/ioutil"
+	"log"
+	"os"
 
-	"github.com/gohugoio/hugo/common/loggers"
-
-	"github.com/gohugoio/hugo/config"
-	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugofs"
-	"github.com/gohugoio/hugo/langs"
-	"github.com/gohugoio/hugo/media"
-	"github.com/gohugoio/hugo/metrics"
-	"github.com/gohugoio/hugo/output"
-	"github.com/gohugoio/hugo/resource"
-	"github.com/gohugoio/hugo/source"
-	"github.com/gohugoio/hugo/tpl"
+	"github.com/spf13/hugo/config"
+	"github.com/spf13/hugo/helpers"
+	"github.com/spf13/hugo/hugofs"
+	"github.com/spf13/hugo/output"
+	"github.com/spf13/hugo/tpl"
 	jww "github.com/spf13/jwalterweatherman"
 )
 
 // Deps holds dependencies used by many.
-// There will be normally only one instance of deps in play
+// There will be normally be only one instance of deps in play
 // at a given time, i.e. one per Site built.
 type Deps struct {
-
 	// The logger to use.
 	Log *jww.Notepad `json:"-"`
 
-	// Used to log errors that may repeat itself many times.
-	DistinctErrorLog *helpers.DistinctLogger
-
-	// The templates to use. This will usually implement the full tpl.TemplateHandler.
-	Tmpl tpl.TemplateFinder `json:"-"`
-
-	// We use this to parse and execute ad-hoc text templates.
-	TextTmpl tpl.TemplateParseFinder `json:"-"`
+	// The templates to use.
+	Tmpl tpl.TemplateHandler `json:"-"`
 
 	// The file systems to use.
 	Fs *hugofs.Fs `json:"-"`
@@ -45,19 +32,13 @@ type Deps struct {
 	// The ContentSpec to use
 	*helpers.ContentSpec `json:"-"`
 
-	// The SourceSpec to use
-	SourceSpec *source.SourceSpec `json:"-"`
-
-	// The Resource Spec to use
-	ResourceSpec *resource.Spec
-
 	// The configuration to use
 	Cfg config.Provider `json:"-"`
 
 	// The translation func to use
 	Translate func(translationID string, args ...interface{}) string `json:"-"`
 
-	Language *langs.Language
+	Language *helpers.Language
 
 	// All the output formats available for the current site.
 	OutputFormatsConfig output.Formats
@@ -66,35 +47,6 @@ type Deps struct {
 	WithTemplate     func(templ tpl.TemplateHandler) error `json:"-"`
 
 	translationProvider ResourceProvider
-
-	Metrics metrics.Provider
-
-	// Timeout is configurable in site config.
-	Timeout time.Duration
-
-	// BuildStartListeners will be notified before a build starts.
-	BuildStartListeners *Listeners
-}
-
-type Listeners struct {
-	sync.Mutex
-
-	// A list of funcs to be notified about an event.
-	listeners []func()
-}
-
-func (b *Listeners) Add(f func()) {
-	b.Lock()
-	defer b.Unlock()
-	b.listeners = append(b.listeners, f)
-}
-
-func (b *Listeners) Notify() {
-	b.Lock()
-	defer b.Unlock()
-	for _, notify := range b.listeners {
-		notify()
-	}
 }
 
 // ResourceProvider is used to create and refresh, and clone resources needed.
@@ -103,12 +55,6 @@ type ResourceProvider interface {
 	Clone(deps *Deps) error
 }
 
-// TemplateHandler returns the used tpl.TemplateFinder as tpl.TemplateHandler.
-func (d *Deps) TemplateHandler() tpl.TemplateHandler {
-	return d.Tmpl.(tpl.TemplateHandler)
-}
-
-// LoadResources loads translations and templates.
 func (d *Deps) LoadResources() error {
 	// Note that the translations need to be loaded before the templates.
 	if err := d.translationProvider.Update(d); err != nil {
@@ -118,17 +64,11 @@ func (d *Deps) LoadResources() error {
 	if err := d.templateProvider.Update(d); err != nil {
 		return err
 	}
-
-	if th, ok := d.Tmpl.(tpl.TemplateHandler); ok {
-		th.PrintErrors()
-	}
+	d.Tmpl.PrintErrors()
 
 	return nil
 }
 
-// New initializes a Dep struct.
-// Defaults are set for nil values,
-// but TemplateProvider, TranslationProvider and Language are always required.
 func New(cfg DepsCfg) (*Deps, error) {
 	var (
 		logger = cfg.Logger
@@ -148,7 +88,7 @@ func New(cfg DepsCfg) (*Deps, error) {
 	}
 
 	if logger == nil {
-		logger = loggers.NewErrorLogger()
+		logger = jww.NewNotepad(jww.LevelError, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
 	}
 
 	if fs == nil {
@@ -162,44 +102,16 @@ func New(cfg DepsCfg) (*Deps, error) {
 		return nil, err
 	}
 
-	resourceSpec, err := resource.NewSpec(ps, logger, cfg.OutputFormats, cfg.MediaTypes)
-	if err != nil {
-		return nil, err
-	}
-
-	contentSpec, err := helpers.NewContentSpec(cfg.Language)
-	if err != nil {
-		return nil, err
-	}
-
-	sp := source.NewSourceSpec(ps, fs.Source)
-
-	timeoutms := cfg.Language.GetInt("timeout")
-	if timeoutms <= 0 {
-		timeoutms = 3000
-	}
-
-	distinctErrorLogger := helpers.NewDistinctLogger(logger.ERROR)
-
 	d := &Deps{
 		Fs:                  fs,
 		Log:                 logger,
-		DistinctErrorLog:    distinctErrorLogger,
 		templateProvider:    cfg.TemplateProvider,
 		translationProvider: cfg.TranslationProvider,
 		WithTemplate:        cfg.WithTemplate,
 		PathSpec:            ps,
-		ContentSpec:         contentSpec,
-		SourceSpec:          sp,
-		ResourceSpec:        resourceSpec,
+		ContentSpec:         helpers.NewContentSpec(cfg.Language),
 		Cfg:                 cfg.Language,
 		Language:            cfg.Language,
-		BuildStartListeners: &Listeners{},
-		Timeout:             time.Duration(timeoutms) * time.Millisecond,
-	}
-
-	if cfg.Cfg.GetBool("templateMetrics") {
-		d.Metrics = metrics.NewProvider(cfg.Cfg.GetBool("templateMetricsHints"))
 	}
 
 	return d, nil
@@ -207,29 +119,15 @@ func New(cfg DepsCfg) (*Deps, error) {
 
 // ForLanguage creates a copy of the Deps with the language dependent
 // parts switched out.
-func (d Deps) ForLanguage(cfg DepsCfg) (*Deps, error) {
-	l := cfg.Language
+func (d Deps) ForLanguage(l *helpers.Language) (*Deps, error) {
 	var err error
 
-	d.PathSpec, err = helpers.NewPathSpecWithBaseBaseFsProvided(d.Fs, l, d.BaseFs)
+	d.PathSpec, err = helpers.NewPathSpec(d.Fs, l)
 	if err != nil {
 		return nil, err
 	}
 
-	d.ContentSpec, err = helpers.NewContentSpec(l)
-	if err != nil {
-		return nil, err
-	}
-
-	// The resource cache is global so reuse.
-	// TODO(bep) clean up these inits.
-	resourceCache := d.ResourceSpec.ResourceCache
-	d.ResourceSpec, err = resource.NewSpec(d.PathSpec, d.Log, cfg.OutputFormats, cfg.MediaTypes)
-	if err != nil {
-		return nil, err
-	}
-	d.ResourceSpec.ResourceCache = resourceCache
-
+	d.ContentSpec = helpers.NewContentSpec(l)
 	d.Cfg = l
 	d.Language = l
 
@@ -241,8 +139,6 @@ func (d Deps) ForLanguage(cfg DepsCfg) (*Deps, error) {
 		return nil, err
 	}
 
-	d.BuildStartListeners = &Listeners{}
-
 	return &d, nil
 
 }
@@ -259,24 +155,15 @@ type DepsCfg struct {
 	Fs *hugofs.Fs
 
 	// The language to use.
-	Language *langs.Language
+	Language *helpers.Language
 
 	// The configuration to use.
 	Cfg config.Provider
 
-	// The media types configured.
-	MediaTypes media.Types
-
-	// The output formats configured.
-	OutputFormats output.Formats
-
 	// Template handling.
 	TemplateProvider ResourceProvider
 	WithTemplate     func(templ tpl.TemplateHandler) error
 
 	// i18n handling.
 	TranslationProvider ResourceProvider
-
-	// Whether we are in running (server) mode
-	Running bool
 }

docs/.gitignore

@@ -1,4 +1 @@
 /.idea
-/public
-nohup.out
-.DS_Store

docs/README.md

@@ -1,45 +0,0 @@
-# Hugo Docs
-
-Documentation site for [Hugo](https://github.com/gohugoio/hugo), the very fast and flexible static site generator built with love in Go.
-
-## Contributing
-
-We welcome contributions to Hugo of any kind including documentation, suggestions, bug reports, pull requests etc. Also check out our [contribution guide](https://gohugo.io/contribute/documentation/). We would love to hear from you. 
-
-Note that this repository contains solely the documentation for Hugo. For contributions that aren't documentation-related please refer to the [hugo](https://github.com/gohugoio/hugo) repository. 
-
-*Pull requests shall **only** contain changes to the actual documentation. However, changes on the code base of Hugo **and** the documentation shall be a single, atomic pull request in the [hugo](https://github.com/gohugoio/hugo) repository.*
-
-Spelling fixes are most welcomed, and if you want to contribute longer sections to the documentation, it would be great if you had these in mind when writing:
-
-* Short is good. People go to the library to read novels. If there is more than one way to _do a thing_ in Hugo, describe the current _best practice_ (avoid "… but you can also do …" and "… in older versions of Hugo you had to …".
-* For examples, try to find short snippets that teaches people about the concept. If the example is also useful as-is (copy and paste), then great, but don't list long and similar examples just so people can use them on their sites.
-* Hugo has users from all over the world, so an easy to understand and [simple English](https://simple.wikipedia.org/wiki/Basic_English) is good.
-
-## Branches
-
-* The `master` branch is where the site is automatically built from, and is the place to put changes relevant to the current Hugo version.
-* The `next` branch is where we store changes that is related to the next Hugo release. This can be previewed here: https://next--gohugoio.netlify.com/
-
-## Build
-
-To view the documentation site locally, you need to clone this repository:
-
-```bash
-git clone https://github.com/gohugoio/hugoDocs.git
-```
-
-Also note that the documentation version for a given version of Hugo can also be found in the `/docs` sub-folder of the [Hugo source repository](https://github.com/gohugoio/hugo).
-
-Then to view the docs in your browser, run Hugo and open up the link:
-
-```bash
-▶ hugo server
-
-Started building sites ...
-.
-.
-Serving pages from memory
-Web Server is available at http://localhost:1313/ (bind address 127.0.0.1)
-Press Ctrl+C to stop
-```

docs/archetypes/default.md

@@ -1,13 +1,6 @@
----
-linktitle: ""
-description: ""
-godocref: ""
-publishdate: ""
-lastmod: ""
-categories: []
-tags: []
-weight: 00
-slug: ""
-aliases: []
-toc: false
----
++++
+weight = 5
+[menu]
+  [menu.main]
+    parent = "x"
++++

docs/archetypes/functions.md

@@ -1,17 +0,0 @@
----
-linktitle: ""
-description: ""
-godocref: ""
-publishdate: ""
-lastmod: ""
-categories: [functions]
-tags: []
-ns: ""
-signature: []
-workson: []
-hugoversion: ""
-aliases: []
-relatedfuncs: []
-toc: false
-deprecated: false
----

docs/archetypes/showcase.md

@@ -0,0 +1,14 @@
+---
+date: 2013-07-01T07:32:00Z
+description: ""
+license: ""
+licenseLink: ""
+sitelink: http://spf13.com/
+sourceLink: https://github.com/spf13/spf13.com
+tags:
+- personal
+- blog
+thumbnail: /img/spf13-tn.jpg
+title: spf13.com
+---
+

docs/config.toml

@@ -1,412 +1,113 @@
-baseURL = "https://gohugo.io/"
-paginate =  100
-defaultContentLanguage = "en"
-enableEmoji = true
-# Set the unicode character used for the "return" link in page footnotes.
-footnotereturnlinkcontents = "↩"
-languageCode = "en-us"
-metaDataFormat = "yaml"
-title = "Hugo"
-theme = "gohugoioTheme"
-
-googleAnalytics = "UA-7131036-4"
-
+title = "Hugo: A Fast and Flexible Website Generator"
+baseurl = "http://gohugo.io/"
+MetaDataFormat = "yaml"
 pluralizeListTitles = false
 
-# We do redirects via Netlify's _redirects file, generated by Hugo (see "outputs" below).
-disableAliases = true
-
-# Highlighting config (Pygments)
-# It is (currently) not in use, but you can do ```go in a content file if you want to.
-pygmentsCodeFences = true
-
-pygmentsOptions = ""
-# Use the Chroma stylesheet
-pygmentsUseClasses = true
-pygmentsUseClassic = false
-
-# See https://help.farbox.com/pygments.html
-pygmentsStyle = "trac"
-
-[outputs]
-home = [ "HTML", "RSS", "REDIR", "HEADERS" ]
-section = [ "HTML", "RSS"]
-
-[mediaTypes]
-[mediaTypes."text/netlify"]
-delimiter = ""
-
-[outputFormats]
-[outputFormats.REDIR]
-mediatype = "text/netlify"
-baseName = "_redirects"
-isPlainText = true
-notAlternative = true
-[outputFormats.HEADERS]
-mediatype = "text/netlify"
-baseName = "_headers"
-isPlainText = true
-notAlternative = true
-
-[related]
-
-threshold = 80
-includeNewer = true
-toLower = false
-
-[[related.indices]]
-name = "keywords"
-weight = 100
-[[related.indices]]
-name  = "date"
-weight = 10
-pattern = "2006"
-
-[social]
-twitter = "GoHugoIO"
-
-#CUSTOM PARAMS
-[params]
-  description = "The world’s fastest framework for building websites"
-  ## Used for views in rendered HTML (i.e., rather than using the .Hugo variable)
-  release = "0.47"
-  ## Setting this to true will add a "noindex" to *EVERY* page on the site
-  removefromexternalsearch = false
-  ## Gh repo for site footer (include trailing slash)
-  ghrepo = "https://github.com/gohugoio/hugoDocs/"
-  ## GH Repo for filing a new issue
-  github_repo = "https://github.com/gohugoio/hugo/issues/new"
-  ### Edit content repo (set to automatically enter "edit" mode; this is good for "improve this page" links)
-  ghdocsrepo = "https://github.com/gohugoio/hugoDocs/tree/master/docs"
-  ## Gitter URL
-  gitter = "https://gitter.im/spf13/hugo"
-  ## Discuss Forum URL
-  forum = "https://discourse.gohugo.io/"
-  ## Google Tag Manager
-  gtmid = ""
-
-  # First one is picked as the Twitter card image if not set on page.
-  images = ["images/gohugoio-card.png"]
-
-  flex_box_interior_classes = "flex-auto w-100 w-40-l mr3 mb3 bg-white ba b--moon-gray nested-copy-line-height"
-
-  #sidebar_direction = "sidebar_left"
-
-# MARKDOWN
-## Configuration for BlackFriday markdown parser: https://github.com/russross/blackfriday
 [blackfriday]
-	plainIDAnchors = true
-  # See https://github.com/gohugoio/hugo/issues/2424
-	hrefTargetBlank = false
-  angledQuotes = false
-  latexDashes = true
+  plainIDAnchors = true
 
-[imaging]
-# See https://github.com/disintegration/imaging
-# CatmullRom is a sharp bicubic filter which should fit the docs site well with its many screenshots.
-# Note that you can also set this per image processing.
-resampleFilter = "CatmullRom"
+[params]
+  description = "Documentation of Hugo, a fast and flexible static site generator built with love by spf13, bep and friends in Go"
+  author = "Steve Francia (spf13) and friends"
+  release = "0.20.2"
 
-# Defatult JPEG quality setting. Default is 75.
-quality = 75
-
-anchor = "smart"
-
-
-## As of v0.20, all content files include a default "categories" value that's the same as the section. This was a cheap future-proofing method and should/could be changed accordingly.
 [taxonomies]
-  category = "categories"
+  tag = "tags"
+  group = "groups"
 
-# High level items
-
-[[menu.docs]]
-  name = "About Hugo"
-  weight = 1
-  identifier = "about"
-  url = "/about/"
-
-[[menu.docs]]
-  name = "Getting Started"
-  weight = 5
-  identifier = "getting-started"
-  url = "/getting-started/"
-
-
-[[menu.docs]]
-  name = "Themes"
-  weight = 15
-  identifier = "themes"
-  post = "break"
-  url = "/themes/"
-
-# Core Menus
-
-[[menu.docs]]
-  name = "Content Management"
-  weight = 20
-  identifier = "content-management"
-  post = "expanded"
-  url = "/content-management/"
-
-[[menu.docs]]
-  name = "Templates"
-  weight = 25
-  identifier = "templates"
-
-  url = "/templates/"
-
-[[menu.docs]]
-  name = "Functions"
-  weight = 30
-  identifier = "functions"
-  url = "/functions/"
-
-[[menu.docs]]
-  name = "Variables"
-  weight = 35
-  identifier = "variables"
-  url = "/variables/"
-[[menu.docs]]
-  name = "Hugo Pipes"
-  weight = 36
-  identifier = "pipes"
-  url = "/hugo-pipes/"
-[[menu.docs]]
-  name = "CLI"
-  weight = 40
-  post = "break"
-  identifier = "commands"
-  url = "/commands/"
-
-
-
-# LOW LEVEL ITEMS
-
-
-[[menu.docs]]
-  name = "Troubleshooting"
-  weight = 60
-  identifier = "troubleshooting"
-  url = "/troubleshooting/"
-
-[[menu.docs]]
-  name = "Tools"
-  weight = 70
-  identifier = "tools"
-  url = "/tools/"
-
-[[menu.docs]]
-  name = "Hosting & Deployment"
-  weight = 80
-  identifier = "hosting-and-deployment"
-  url = "/hosting-and-deployment/"
-
-[[menu.docs]]
-  name = "Contribute"
-  weight = 100
-  post = "break"
-  identifier = "contribute"
-  url = "/contribute/"
-
-#[[menu.docs]]
-#  name = "Tags"
-#  weight = 120
-#  identifier = "tags"
-#  url = "/tags/"
-
-
-# [[menu.docs]]
-#   name = "Categories"
-#   weight = 140
-#   identifier = "categories"
-#   url = "/categories/"
-
-######## QUICKLINKS
-
-  [[menu.quicklinks]]
-    name = "Fundamentals"
-    weight = 1
-    identifier = "fundamentals"
-    url = "/tags/fundamentals/"
-
-
-
-
-######## GLOBAL ITEMS TO BE SHARED WITH THE HUGO SITES
-
-[[menu.global]]
-    name = "News"
-    weight = 1
-    identifier = "news"
-    url = "/news/"
-
-  [[menu.global]]
-    name = "Docs"
-    weight = 5
-    identifier = "docs"
-    url = "/documentation/"
-
-  [[menu.global]]
+[[menu.main]]
+    name = "Download Hugo"
+    pre = "<i class='fa fa-download'></i>"
+    url = "https://github.com/spf13/hugo/releases"
+    weight = -200
+[[menu.main]]
+    name = "Site Showcase"
+    pre = "<i class='fa fa-cubes'></i>"
+    url = "/showcase/"
+    weight = -180
+[[menu.main]]
+    name = "Theme Showcase"
+    pre = "<i class='fa fa-puzzle-piece'></i>"
+    url = "http://themes.gohugo.io"
+    weight = -170
+[[menu.main]]
+    name = "Press & Articles"
+    pre = "<i class='fa fa-bullhorn'></i>"
+    url = "/community/press/"
+    weight = -160
+[[menu.main]]
+    name = "Discuss Hugo"
+    pre = "<i class='fa fa-comments'></i>"
+    url = "http://discuss.gohugo.io/"
+    weight = -150
+[[menu.main]]
+    name = "About Hugo"
+    identifier = "about"
+    pre = "<i class='fa fa-heart'></i>"
+    weight = -110
+[[menu.main]]
+    name = "Getting Started"
+    identifier = "getting started"
+    pre = "<i class='fa fa-road'></i>"
+    weight = -100
+[[menu.main]]
+    name = "Content"
+    identifier = "content"
+    pre = "<i class='fa fa-file-text'></i>"
+    weight = -90
+[[menu.main]]
     name = "Themes"
-    weight = 10
     identifier = "themes"
-    url = "https://themes.gohugo.io/"
-
-    [[menu.global]]
-      name = "Showcase"
-      weight = 20
-      identifier = "showcase"
-      url = "/showcase/"
-
-  # Anything with a weight > 100 gets an external icon
-  [[menu.global]]
+    pre = "<i class='fa fa-desktop'></i>"
+    weight = -85
+[[menu.main]]
+    parent = "themes"
+    name = "Theme Showcase"
+    url = "http://themes.gohugo.io"
+    weight = -170
+[[menu.main]]
+    name = "Templates"
+    identifier = "layout"
+    pre = "<i class='fa fa-columns'></i>"
+    weight = -80
+[[menu.main]]
+    name = "Taxonomies"
+    identifier = "taxonomy"
+    pre = "<i class='fa fa-tags'></i>"
+    weight = -70
+[[menu.main]]
+    name = "Extras"
+    identifier = "extras"
+    pre = "<i class='fa fa-gift'></i>"
+    weight = -60
+[[menu.main]]
     name = "Community"
-    weight = 150
-    icon = true
     identifier = "community"
-    post = "external"
-    url = "https://discourse.gohugo.io/"
-
-
-  [[menu.global]]
-    name = "GitHub"
-    weight = 200
-    identifier = "github"
-    post = "external"
-    url = "https://github.com/gohugoio/hugo"
-
-### LANGUAGES ###
-
-[languages]
-  [languages.en]
-    contentDir = "content/en"
-    languageName = "English"
-    weight = 1
-  [languages.zh]
-    contentDir = "content/zh"
-    languageName = "中文"
-    weight = 2
-
-
-### LANGUAGE-SPECIFIC MENUS ###
-
-# Chinese menus
-
-[[languages.zh.menu.docs]]
-  name = "关于 Hugo"
-  weight = 1
-  identifier = "about"
-  url = "/zh/about/"
-
-[[languages.zh.menu.docs]]
-  name = "入门"
-  weight = 5
-  identifier = "getting-started"
-  url = "/zh/getting-started/"
-
-[[languages.zh.menu.docs]]
-  name = "主题"
-  weight = 15
-  identifier = "themes"
-  post = "break"
-  url = "/zh/themes/"
-
-# Core languages.zh.menus
-
-[[languages.zh.menu.docs]]
-  name = "内容管理"
-  weight = 20
-  identifier = "content-management"
-  post = "expanded"
-  url = "/zh/content-management/"
-
-[[languages.zh.menu.docs]]
-  name = "模板"
-  weight = 25
-  identifier = "templates"
-  url = "/zh/templates/"
-
-[[languages.zh.menu.docs]]
-  name = "函数"
-  weight = 30
-  identifier = "functions"
-  url = "/zh/functions/"
-
-[[languages.zh.menu.docs]]
-  name = "变量"
-  weight = 35
-  identifier = "variables"
-  url = "/zh/variables/"
-
-[[languages.zh.menu.docs]]
-  name = "CLI"
-  weight = 40
-  post = "break"
-  identifier = "commands"
-  url = "/commands/"
-
-# LOW LEVEL ITEMS
-[[languages.zh.menu.docs]]
-  name = "故障排除"
-  weight = 60
-  identifier = "troubleshooting"
-  url = "/zh/troubleshooting/"
-
-[[languages.zh.menu.docs]]
-  name = "工具"
-  weight = 70
-  identifier = "tools"
-  url = "/zh/tools/"
-
-[[languages.zh.menu.docs]]
-  name = "托管与部署"
-  weight = 80
-  identifier = "hosting-and-deployment"
-  url = "/zh/hosting-and-deployment/"
-
-[[languages.zh.menu.docs]]
-  name = "贡献"
-  weight = 100
-  post = "break"
-  identifier = "contribute"
-  url = "/zh/contribute/"
-
-[[languages.zh.menu.global]]
-  name = "新闻"
-  weight = 1
-  identifier = "news"
-  url = "/zh/news/"
-
-[[languages.zh.menu.global]]
-  name = "文档"
-  weight = 5
-  identifier = "docs"
-  url = "/zh/documentation/"
-
-[[languages.zh.menu.global]]
-  name = "主题"
-  weight = 10
-  identifier = "themes"
-  url = "https://themes.gohugo.io/"
-
-[[languages.zh.menu.global]]
-  name = "作品展示"
-  weight = 20
-  identifier = "showcase"
-  url = "/zh/showcase/"
-
-# Anything with a weight > 100 gets an external icon
-[[languages.zh.menu.global]]
-  name = "社区"
-  weight = 150
-  icon = true
-  identifier = "community"
-  post = "external"
-  url = "https://discourse.gohugo.io/"
-
-[[languages.zh.menu.global]]
-  name = "GitHub"
-  weight = 200
-  identifier = "github"
-  post = "external"
-  url = "https://github.com/gohugoio/hugo"
+    pre = "<i class='fa fa-group'></i>"
+    weight = -50
+[[menu.main]]
+    parent = "community"
+    name = "Discussion Forum"
+    url = "http://discuss.gohugo.io"
+    weight = 150
+[[menu.main]]
+    name = "Tutorials"
+    identifier = "tutorials"
+    pre = "<i class='fa fa-book'></i>"
+    weight = -40
+[[menu.main]]
+    name = "Troubleshooting"
+    identifier = "troubleshooting"
+    pre = "<i class='fa fa-wrench'></i>"
+    weight = -30
+[[menu.main]]
+    name = "Tools"
+    url = "/tools/"
+    pre = "<i class='fa fa-cogs'></i>"
+    weight = -25
+[[menu.main]]
+    name = "Hugo Cmd Reference"
+    identifier = "commands"
+    pre = "<i class='fa fa-space-shuttle'></i>"
+    weight = -20
+    url = "/commands/"

docs/content/commands/hugo.md

@@ -0,0 +1,79 @@
+---
+date: 2017-02-25T10:01:37+01:00
+title: "hugo"
+slug: hugo
+url: /commands/hugo/
+---
+## hugo
+
+hugo builds your site
+
+### Synopsis
+
+
+hugo is the main command, used to build your Hugo site.
+
+Hugo is a Fast and Flexible Static Site Generator
+built with love by spf13 and friends in Go.
+
+Complete documentation is available at http://gohugo.io/.
+
+```
+hugo
+```
+
+### Options
+
+```
+  -b, --baseURL string             hostname (and path) to the root, e.g. http://spf13.com/
+  -D, --buildDrafts                include content marked as draft
+  -E, --buildExpired               include expired content
+  -F, --buildFuture                include content with publishdate in the future
+      --cacheDir string            filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
+      --canonifyURLs               if true, all relative URLs will be canonicalized using baseURL
+      --cleanDestinationDir        Remove files from destination not found in static directories
+      --config string              config file (default is path/config.yaml|json|toml)
+  -c, --contentDir string          filesystem path to content directory
+  -d, --destination string         filesystem path to write files to
+      --disable404                 Do not render 404 page
+      --disableKinds stringSlice   Disable different kind of pages (home, RSS etc.)
+      --disableRSS                 Do not build RSS files
+      --disableSitemap             Do not build Sitemap file
+      --enableGitInfo              Add Git revision, date and author info to the pages
+      --forceSyncStatic            Copy all files when static is changed.
+      --i18n-warnings              Print missing translations
+      --ignoreCache                Ignores the cache directory
+  -l, --layoutDir string           filesystem path to layout directory
+      --log                        Enable Logging
+      --logFile string             Log File path (if set, logging enabled automatically)
+      --noChmod                    Don't sync permission mode of files
+      --noTimes                    Don't sync modification time of files
+      --pluralizeListTitles        Pluralize titles in lists using inflect (default true)
+      --preserveTaxonomyNames      Preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
+      --quiet                      build in quiet mode
+      --renderToMemory             render to memory (only useful for benchmark testing)
+  -s, --source string              filesystem path to read files relative from
+      --stepAnalysis               display memory and timing of different steps of the program
+  -t, --theme string               theme to use (located in /themes/THEMENAME/)
+      --themesDir string           filesystem path to themes directory
+      --uglyURLs                   if true, use /filename.html instead of /filename/
+  -v, --verbose                    verbose output
+      --verboseLog                 verbose logging
+  -w, --watch                      watch filesystem for changes and recreate as needed
+```
+
+### SEE ALSO
+* [hugo benchmark](/commands/hugo_benchmark/)	 - Benchmark Hugo by building a site a number of times.
+* [hugo check](/commands/hugo_check/)	 - Contains some verification checks
+* [hugo config](/commands/hugo_config/)	 - Print the site configuration
+* [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats
+* [hugo env](/commands/hugo_env/)	 - Print Hugo version and environment info
+* [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.
+* [hugo import](/commands/hugo_import/)	 - Import your site from others.
+* [hugo list](/commands/hugo_list/)	 - Listing out various types of content
+* [hugo new](/commands/hugo_new/)	 - Create new content for your site
+* [hugo server](/commands/hugo_server/)	 - A high performance webserver
+* [hugo undraft](/commands/hugo_undraft/)	 - Undraft changes the content's draft status from 'True' to 'False'
+* [hugo version](/commands/hugo_version/)	 - Print the version number of Hugo
+
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_benchmark.md

@@ -0,0 +1,71 @@
+---
+date: 2017-02-25T10:01:37+01:00
+title: "hugo benchmark"
+slug: hugo_benchmark
+url: /commands/hugo_benchmark/
+---
+## hugo benchmark
+
+Benchmark Hugo by building a site a number of times.
+
+### Synopsis
+
+
+Hugo can build a site many times over and analyze the running process
+creating a benchmark.
+
+```
+hugo benchmark
+```
+
+### Options
+
+```
+  -b, --baseURL string             hostname (and path) to the root, e.g. http://spf13.com/
+  -D, --buildDrafts                include content marked as draft
+  -E, --buildExpired               include expired content
+  -F, --buildFuture                include content with publishdate in the future
+      --cacheDir string            filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
+      --canonifyURLs               if true, all relative URLs will be canonicalized using baseURL
+      --cleanDestinationDir        Remove files from destination not found in static directories
+  -c, --contentDir string          filesystem path to content directory
+  -n, --count int                  number of times to build the site (default 13)
+      --cpuprofile string          path/filename for the CPU profile file
+  -d, --destination string         filesystem path to write files to
+      --disable404                 Do not render 404 page
+      --disableKinds stringSlice   Disable different kind of pages (home, RSS etc.)
+      --disableRSS                 Do not build RSS files
+      --disableSitemap             Do not build Sitemap file
+      --enableGitInfo              Add Git revision, date and author info to the pages
+      --forceSyncStatic            Copy all files when static is changed.
+      --i18n-warnings              Print missing translations
+      --ignoreCache                Ignores the cache directory
+  -l, --layoutDir string           filesystem path to layout directory
+      --memprofile string          path/filename for the memory profile file
+      --noChmod                    Don't sync permission mode of files
+      --noTimes                    Don't sync modification time of files
+      --pluralizeListTitles        Pluralize titles in lists using inflect (default true)
+      --preserveTaxonomyNames      Preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
+      --renderToMemory             render to memory (only useful for benchmark testing)
+  -s, --source string              filesystem path to read files relative from
+      --stepAnalysis               display memory and timing of different steps of the program
+  -t, --theme string               theme to use (located in /themes/THEMENAME/)
+      --themesDir string           filesystem path to themes directory
+      --uglyURLs                   if true, use /filename.html instead of /filename/
+```
+
+### Options inherited from parent commands
+
+```
+      --config string    config file (default is path/config.yaml|json|toml)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
+      --quiet            build in quiet mode
+  -v, --verbose          verbose output
+      --verboseLog       verbose logging
+```
+
+### SEE ALSO
+* [hugo](/commands/hugo/)	 - hugo builds your site
+
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_check.md

@@ -1,5 +1,5 @@
 ---
-date: 2018-08-17
+date: 2017-02-25T10:01:37+01:00
 title: "hugo check"
 slug: hugo_check
 url: /commands/hugo_check/
@@ -10,29 +10,22 @@ Contains some verification checks
 
 ### Synopsis
 
+
 Contains some verification checks
 
-### Options
-
-```
-  -h, --help   help for check
-```
-
 ### Options inherited from parent commands
 
 ```
       --config string    config file (default is path/config.yaml|json|toml)
-      --debug            debug output
-      --log              enable Logging
-      --logFile string   log File path (if set, logging enabled automatically)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
       --quiet            build in quiet mode
   -v, --verbose          verbose output
       --verboseLog       verbose logging
 ```
 
 ### SEE ALSO
-
 * [hugo](/commands/hugo/)	 - hugo builds your site
 * [hugo check ulimit](/commands/hugo_check_ulimit/)	 - Check system ulimit settings
 
-###### Auto generated by spf13/cobra on 17-Aug-2018
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_check_ulimit.md

@@ -1,5 +1,5 @@
 ---
-date: 2018-08-17
+date: 2017-02-25T10:01:37+01:00
 title: "hugo check ulimit"
 slug: hugo_check_ulimit
 url: /commands/hugo_check_ulimit/
@@ -10,33 +10,26 @@ Check system ulimit settings
 
 ### Synopsis
 
+
 Hugo will inspect the current ulimit settings on the system.
 This is primarily to ensure that Hugo can watch enough files on some OSs
 
 ```
-hugo check ulimit [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for ulimit
+hugo check ulimit
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string    config file (default is path/config.yaml|json|toml)
-      --debug            debug output
-      --log              enable Logging
-      --logFile string   log File path (if set, logging enabled automatically)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
       --quiet            build in quiet mode
   -v, --verbose          verbose output
       --verboseLog       verbose logging
 ```
 
 ### SEE ALSO
-
 * [hugo check](/commands/hugo_check/)	 - Contains some verification checks
 
-###### Auto generated by spf13/cobra on 17-Aug-2018
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_config.md

@@ -1,5 +1,5 @@
 ---
-date: 2018-08-17
+date: 2017-02-25T10:01:37+01:00
 title: "hugo config"
 slug: hugo_config
 url: /commands/hugo_config/
@@ -10,33 +10,25 @@ Print the site configuration
 
 ### Synopsis
 
+
 Print the site configuration, both default and custom settings.
 
 ```
-hugo config [flags]
-```
-
-### Options
-
-```
-  -h, --help            help for config
-  -s, --source string   filesystem path to read files relative from
+hugo config
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string    config file (default is path/config.yaml|json|toml)
-      --debug            debug output
-      --log              enable Logging
-      --logFile string   log File path (if set, logging enabled automatically)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
       --quiet            build in quiet mode
   -v, --verbose          verbose output
       --verboseLog       verbose logging
 ```
 
 ### SEE ALSO
-
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 17-Aug-2018
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_convert.md

@@ -1,5 +1,5 @@
 ---
-date: 2018-08-17
+date: 2017-02-25T10:01:37+01:00
 title: "hugo convert"
 slug: hugo_convert
 url: /commands/hugo_convert/
@@ -10,6 +10,7 @@ Convert your content to different formats
 
 ### Synopsis
 
+
 Convert your content (e.g. front matter) to different formats.
 
 See convert's subcommands toJSON, toTOML and toYAML for more information.
@@ -17,7 +18,6 @@ See convert's subcommands toJSON, toTOML and toYAML for more information.
 ### Options
 
 ```
-  -h, --help            help for convert
   -o, --output string   filesystem path to write files to
   -s, --source string   filesystem path to read files relative from
       --unsafe          enable less safe operations, please backup first
@@ -27,19 +27,17 @@ See convert's subcommands toJSON, toTOML and toYAML for more information.
 
 ```
       --config string    config file (default is path/config.yaml|json|toml)
-      --debug            debug output
-      --log              enable Logging
-      --logFile string   log File path (if set, logging enabled automatically)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
       --quiet            build in quiet mode
   -v, --verbose          verbose output
       --verboseLog       verbose logging
 ```
 
 ### SEE ALSO
-
 * [hugo](/commands/hugo/)	 - hugo builds your site
 * [hugo convert toJSON](/commands/hugo_convert_tojson/)	 - Convert front matter to JSON
 * [hugo convert toTOML](/commands/hugo_convert_totoml/)	 - Convert front matter to TOML
 * [hugo convert toYAML](/commands/hugo_convert_toyaml/)	 - Convert front matter to YAML
 
-###### Auto generated by spf13/cobra on 17-Aug-2018
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_convert_toJSON.md

@@ -1,5 +1,5 @@
 ---
-date: 2018-08-17
+date: 2017-02-25T10:01:37+01:00
 title: "hugo convert toJSON"
 slug: hugo_convert_toJSON
 url: /commands/hugo_convert_tojson/
@@ -10,26 +10,20 @@ Convert front matter to JSON
 
 ### Synopsis
 
+
 toJSON converts all front matter in the content directory
 to use JSON for the front matter.
 
 ```
-hugo convert toJSON [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for toJSON
+hugo convert toJSON
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string    config file (default is path/config.yaml|json|toml)
-      --debug            debug output
-      --log              enable Logging
-      --logFile string   log File path (if set, logging enabled automatically)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
   -o, --output string    filesystem path to write files to
       --quiet            build in quiet mode
   -s, --source string    filesystem path to read files relative from
@@ -39,7 +33,6 @@ hugo convert toJSON [flags]
 ```
 
 ### SEE ALSO
-
 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats
 
-###### Auto generated by spf13/cobra on 17-Aug-2018
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_convert_toTOML.md

@@ -1,5 +1,5 @@
 ---
-date: 2018-08-17
+date: 2017-02-25T10:01:37+01:00
 title: "hugo convert toTOML"
 slug: hugo_convert_toTOML
 url: /commands/hugo_convert_totoml/
@@ -10,26 +10,20 @@ Convert front matter to TOML
 
 ### Synopsis
 
+
 toTOML converts all front matter in the content directory
 to use TOML for the front matter.
 
 ```
-hugo convert toTOML [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for toTOML
+hugo convert toTOML
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string    config file (default is path/config.yaml|json|toml)
-      --debug            debug output
-      --log              enable Logging
-      --logFile string   log File path (if set, logging enabled automatically)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
   -o, --output string    filesystem path to write files to
       --quiet            build in quiet mode
   -s, --source string    filesystem path to read files relative from
@@ -39,7 +33,6 @@ hugo convert toTOML [flags]
 ```
 
 ### SEE ALSO
-
 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats
 
-###### Auto generated by spf13/cobra on 17-Aug-2018
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_convert_toYAML.md

@@ -1,5 +1,5 @@
 ---
-date: 2018-08-17
+date: 2017-02-25T10:01:37+01:00
 title: "hugo convert toYAML"
 slug: hugo_convert_toYAML
 url: /commands/hugo_convert_toyaml/
@@ -10,26 +10,20 @@ Convert front matter to YAML
 
 ### Synopsis
 
+
 toYAML converts all front matter in the content directory
 to use YAML for the front matter.
 
 ```
-hugo convert toYAML [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for toYAML
+hugo convert toYAML
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string    config file (default is path/config.yaml|json|toml)
-      --debug            debug output
-      --log              enable Logging
-      --logFile string   log File path (if set, logging enabled automatically)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
   -o, --output string    filesystem path to write files to
       --quiet            build in quiet mode
   -s, --source string    filesystem path to read files relative from
@@ -39,7 +33,6 @@ hugo convert toYAML [flags]
 ```
 
 ### SEE ALSO
-
 * [hugo convert](/commands/hugo_convert/)	 - Convert your content to different formats
 
-###### Auto generated by spf13/cobra on 17-Aug-2018
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_env.md

@@ -1,5 +1,5 @@
 ---
-date: 2018-08-17
+date: 2017-02-25T10:01:37+01:00
 title: "hugo env"
 slug: hugo_env
 url: /commands/hugo_env/
@@ -10,32 +10,25 @@ Print Hugo version and environment info
 
 ### Synopsis
 
+
 Print Hugo version and environment info. This is useful in Hugo bug reports.
 
 ```
-hugo env [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for env
+hugo env
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string    config file (default is path/config.yaml|json|toml)
-      --debug            debug output
-      --log              enable Logging
-      --logFile string   log File path (if set, logging enabled automatically)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
       --quiet            build in quiet mode
   -v, --verbose          verbose output
       --verboseLog       verbose logging
 ```
 
 ### SEE ALSO
-
 * [hugo](/commands/hugo/)	 - hugo builds your site
 
-###### Auto generated by spf13/cobra on 17-Aug-2018
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_gen.md

@@ -1,5 +1,5 @@
 ---
-date: 2018-08-17
+date: 2017-02-25T10:01:37+01:00
 title: "hugo gen"
 slug: hugo_gen
 url: /commands/hugo_gen/
@@ -10,32 +10,24 @@ A collection of several useful generators.
 
 ### Synopsis
 
+
 A collection of several useful generators.
 
-### Options
-
-```
-  -h, --help   help for gen
-```
-
 ### Options inherited from parent commands
 
 ```
       --config string    config file (default is path/config.yaml|json|toml)
-      --debug            debug output
-      --log              enable Logging
-      --logFile string   log File path (if set, logging enabled automatically)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
       --quiet            build in quiet mode
   -v, --verbose          verbose output
       --verboseLog       verbose logging
 ```
 
 ### SEE ALSO
-
 * [hugo](/commands/hugo/)	 - hugo builds your site
 * [hugo gen autocomplete](/commands/hugo_gen_autocomplete/)	 - Generate shell autocompletion script for Hugo
-* [hugo gen chromastyles](/commands/hugo_gen_chromastyles/)	 - Generate CSS stylesheet for the Chroma code highlighter
 * [hugo gen doc](/commands/hugo_gen_doc/)	 - Generate Markdown documentation for the Hugo CLI.
 * [hugo gen man](/commands/hugo_gen_man/)	 - Generate man pages for the Hugo CLI
 
-###### Auto generated by spf13/cobra on 17-Aug-2018
+###### Auto generated by spf13/cobra on 25-Feb-2017

docs/content/commands/hugo_gen_autocomplete.md

@@ -1,5 +1,5 @@
 ---
-date: 2018-08-17
+date: 2017-02-25T10:01:37+01:00
 title: "hugo gen autocomplete"
 slug: hugo_gen_autocomplete
 url: /commands/hugo_gen_autocomplete/
@@ -10,6 +10,7 @@ Generate shell autocompletion script for Hugo
 
 ### Synopsis
 
+
 Generates a shell autocompletion script for Hugo.
 
 NOTE: The current version supports Bash only.
@@ -29,31 +30,28 @@ or just source them in directly:
 	$ . /etc/bash_completion
 
 ```
-hugo gen autocomplete [flags]
+hugo gen autocomplete
 ```
 
 ### Options
 
 ```
-      --completionfile string   autocompletion file (default "/etc/bash_completion.d/hugo.sh")
-  -h, --help                    help for autocomplete
-      --type string             autocompletion type (currently only bash supported) (default "bash")
+      --completionfile string   Autocompletion file (default "/etc/bash_completion.d/hugo.sh")
+      --type string             Autocompletion type (currently only bash supported) (default "bash")
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string    config file (default is path/config.yaml|json|toml)
-      --debug            debug output
-      --log              enable Logging
-      --logFile string   log File path (if set, logging enabled automatically)
+      --log              Enable Logging
+      --logFile string   Log File path (if set, logging enabled automatically)
       --quiet            build in quiet mode
   -v, --verbose          verbose output
       --verboseLog       verbose logging
 ```
 
 ### SEE ALSO
-
 * [hugo gen](/commands/hugo_gen/)	 - A collection of several useful generators.
 
-###### Auto generated by spf13/cobra on 17-Aug-2018
+###### Auto generated by spf13/cobra on 25-Feb-2017