releaser: Update /docs to 0.23 [ci skip]

[ci skip]

.gitignore

@@ -1,7 +1,18 @@
 hugo
 docs/public*
+/.idea
 hugo.exe
+*.test
+*.prof
+nohup.out
+cover.out
 *.swp
 *.swo
 .DS_Store
 *~
+vendor/*/
+*.bench
+coverage*.out
+
+GoBuilds
+dist

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "docs"]
+	path = docs
+	url = https://github.com/gohugoio/hugoDocs.git
+	ignore = dirty

.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"
+}

.mailmap

@@ -0,0 +1,3 @@
+spf13 <steve.francia@gmail.com> Steve Francia <steve.francia@gmail.com>
+bep <bjorn.erik.pedersen@gmail.com> Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
+

.travis.yml

@@ -1,11 +1,21 @@
-language: go
-go:
-  - 1.1
-  - tip
-script:
-  - go test ./...
-  - go build
-  - ./hugo -s docs/
-install:
-  - go get github.com/stretchr/testify
-  - go get -v ./...
+language: go
+sudo: required
+go:
+  - 1.7.6
+  - 1.8.3
+  - tip
+os:
+  - linux
+  - osx
+matrix:
+  allow_failures:
+    - go: tip
+  fast_finish: true
+install:
+  - make vendor
+script:
+  - make hugo-race check
+before_install:
+  # gem install must be run with sudo on OSX
+  - sudo gem install asciidoctor | gem install asciidoctor
+  - sudo pip install docutils

CONTRIBUTING.md

@@ -0,0 +1,161 @@
+# Contributing to Hugo
+
+We welcome contributions to Hugo of any kind including documentation, themes,
+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.
+
+## Table of Contents
+
+* [Asking Support Questions](#asking-support-questions)
+* [Reporting Issues](#reporting-issues)
+* [Submitting Patches](#submitting-patches)
+  * [Code Contribution Guidelines](#code-contribution-guidelines)
+  * [Git Commit Message Guidelines](#git-commit-message-guidelines)
+  * [Vendored Dependencies](#vendored-dependencies)
+  * [Fetching the Sources From GitHub](#fetching-the-sources-from-github)
+  * [Using Git Remotes](#using-git-remotes)
+  * [Build Hugo with Your Changes](#build-hugo-with-your-changes)
+  * [Updating the Hugo Sources](#updating-the-hugo-sources)
+
+## Asking Support Questions
+
+We have an active [discussion forum](https://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://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.
+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
+
+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).
+    * 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 `make 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 `make check` fails.
+    * Follow the **Git Commit Message Guidelines** below.
+
+### Git Commit Message Guidelines
+
+This [blog article](http://chris.beams.io/posts/git-commit/) is a good resource for learning how to write good commit messages,
+the most important part being that each commit message should have a title/subject in imperative mood starting with a capital letter and no trailing period:
+*"Return error on wrong use of the Paginator"*, **NOT** *"returning some error."*
+
+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 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 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:
+
+```text
+tpl: Add custom index function
+
+Add a custom index template function that deviates from the stdlib simply by not
+returning an "index out of range" error if an array, slice or string index is
+out of range.  Instead, we just return nil values.  This should help make the
+new default function more useful for Hugo users.
+
+Fixes #1949
+```
+
+### 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/gohugoio/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. Fetch the Hugo sources as described above.
+
+1. Change to the Hugo source directory:
+
+    ```
+    cd $HOME/go/src/github.com/gohugoio/hugo
+    ```
+
+1. Create a new branch for your changes (the branch name is arbitrary):
+
+    ```
+    git checkout -b iss1234
+    ```
+
+1. After making your changes, commit them to your new branch:
+
+    ```
+    git commit -a -v
+    ```
+
+1. Fork Hugo in GitHub.
+
+1. Add your fork as a new remote (the remote name, "fork" in this example, is arbitrary):
+
+    ```
+    git remote add fork git://github.com/USERNAME/hugo.git
+    ```
+
+1. Push the changes to your new remote:
+
+    ```
+    git push --set-upstream fork iss1234
+    ```
+
+1. You're now ready to submit a PR based upon the new branch in your forked repository.
+
+### Build Hugo with Your Changes
+
+```bash
+cd $HOME/go/src/github.com/gohugoio/hugo
+make hugo
+# or to install in $HOME/go/bin:
+make 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.
+
+```
+git pull
+make vendor
+```
+

Dockerfile

@@ -0,0 +1,15 @@
+FROM golang:1.8-alpine
+
+ENV GOPATH /go
+ENV USER root
+
+RUN apk update && apk add git make
+
+# 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/gohugoio/hugo
+
+COPY . $GOPATH/src/github.com/gohugoio/hugo
+
+RUN cd $GOPATH/src/github.com/gohugoio/hugo \
+ 	&& make install test

LICENSE.md

@@ -1,67 +1,194 @@
-Simple Public License (SimPL-2.0)
-=================================
+Apache License
+==============
 
-Preamble
---------
+_Version 2.0, January 2004_
+_&lt;<http://www.apache.org/licenses/>&gt;_
 
-This Simple Public License 2.0 (SimPL-2.0 for short) is a plain language
-implementation of GPL 2.0.  The words are different, but the goal is the
-same - to guarantee for all users the freedom to share and change
-software.  If anyone wonders about the meaning of the SimPL, they should
-interpret it as consistent with GPL 2.0.
+### Terms and Conditions for use, reproduction, and distribution
 
+#### 1. Definitions
 
-Simple Public License (SimPL) 2.0
-=================================
+“License” shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
 
-The SimPL applies to the software's source and object code and comes
-with any rights that I have in it (other than trademarks). You agree to
-the SimPL by copying, distributing, or making a derivative work of the
-software.
+“Licensor” shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
 
- You get the royalty free right to:
+“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.
 
--   Use the software for any purpose;
--   Make derivative works of it (this is called a "Derived Work");
--   Copy and distribute it and any Derived Work.
+“You” (or “Your”) shall mean an individual or Legal Entity exercising
+permissions granted by this License.
 
-If you distribute the software or a Derived Work, you must give back to
-the community by:
+“Source” form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
 
--   Prominently noting the date of any changes you make;
--   Leaving other people's copyright notices, warranty disclaimers, and
-    license terms in place;
--   Providing the source code, build scripts, installation scripts, and
-    interface definitions in a form that is easy to get and best to
-    modify;
--   Licensing it to everyone under SimPL, or substantially similar terms
-    (such as GPL 2.0), without adding further restrictions to the rights
-    provided;
--   Conspicuously announcing that it is available under that license.
+“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.
 
-There are some things that you must shoulder:
+“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).
 
--   You get NO WARRANTIES. None of any kind;
--   If the software damages you in any way, you may only recover direct
-    damages up to the amount you paid for it (that is zero if you did
-    not pay anything). You may not recover any other damages, including
-    those called "consequential damages." (The state or country where
-    you live may not allow you to limit your liability in this way, so
-    this may not apply to you);
+“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.
 
-The SimPL continues perpetually, except that your license rights end
-automatically if:
+“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.”
 
--   You do not abide by the "give back to the community" terms (your
-    licensees get to keep their rights if they abide);
--   Anyone prevents you from distributing the software under the terms
-    of the SimPL.
+“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.
 
-License for the License
------------------------
+#### 2. Grant of Copyright License
 
-You may do anything that you want with the SimPL text; it's a license
-form to use in any way that you find helpful.  To avoid confusion,
-however, if you change the terms in any way then you may not call your
-license the Simple Public License or the SimPL (but feel free to
-acknowledge that your license is "based on the Simple Public 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,83 @@
+# A Self-Documenting Makefile: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
+
+PACKAGE = github.com/gohugoio/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.gohugoio.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.gohugoio.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.gohugoio.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
+
+check-vendor: ## Verify that vendored packages match git HEAD
+	@git diff-index --quiet HEAD vendor/ || (echo "check-vendor target failed: vendored packages out of sync" && echo && git diff vendor/ && exit 1)
+
+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,101 +1,106 @@
-# Hugo
-A Fast and Flexible Static Site Generator built with love by [spf13](http://spf13.com) 
-and [friends](http://github.com/spf13/hugo/graphs/contributors) in Go.
+![Hugo](https://raw.githubusercontent.com/gohugoio/hugoDocs/master/static/img/hugo-logo.png)
 
-[![Build Status](https://travis-ci.org/spf13/hugo.png)](https://travis-ci.org/spf13/hugo)
-[![wercker status](https://app.wercker.com/status/1a0de7d703ce3b80527f00f675e1eb32 "wercker status")](https://app.wercker.com/project/bykey/1a0de7d703ce3b80527f00f675e1eb32)
+A Fast and Flexible Static Site Generator built with love by [spf13](http://spf13.com/) and [friends](https://github.com/gohugoio/hugo/graphs/contributors) in [Go][].
+
+[Website](https://gohugo.io) |
+[Forum](https://discuss.gohugo.io) |
+[Developer Chat (no support)](https://gitter.im/gohugoio/hugo) |
+[Documentation](https://gohugo.io/overview/introduction/) |
+[Installation Guide](https://gohugo.io/overview/installing/) |
+[Contribution Guide](CONTRIBUTING.md) |
+[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)
 
 ## Overview
 
-Hugo is a static site generator written in Go. 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 is a static HTML and CSS website generator written in [Go][].
+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 makes use of markdown files with front matter for meta data.
+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.
 
-A typical website of moderate size can be
-rendered in a fraction of a second. A good rule of thumb is that Hugo
-takes around 1 millisecond for each piece of content.
+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.
 
-It is written to work well with 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.
 
-**Complete documentation is available at [Hugo Documentation](http://hugo.spf13.com).**
+#### Supported Architectures
 
-# Getting Started
+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.
 
-## Installing Hugo
+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 is written in Go with support for Windows, Linux, FreeBSD and OSX.
+**Complete documentation is available at [Hugo Documentation][].**
 
-The latest release can be found at [hugo releases](https://github.com/spf13/hugo/releases).
-We currently build for Windows, Linux, FreeBSD and OS X for x64
-and 386 architectures.
+## Choose How to Install
 
-### Installing Hugo (binary)
+If you want to use Hugo as your site generator, simply install the Hugo binaries.
+The Hugo binaries have no external dependencies.
 
-Installation is very easy. Simply download the appropriate version for your
-platform from [hugo releases](https://github.com/spf13/hugo/releases).
-Once downloaded it can be run from anywhere. You don't need to install
-it into a global location. This works well for shared hosts and other systems
-where you don't have a privileged account.
+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.
 
-Ideally you should install it somewhere in your path for easy use. `/usr/local/bin` 
-is the most probable location.
+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.
 
-*The Hugo executable has no external dependencies.*
+### Install Hugo as Your Site Generator (Binary Install)
 
-### Installing from source
+Use the [installation instructions in the Hugo documentation](https://gohugo.io/overview/installing/).
 
-#### Dependencies
+### Build and Install the Binaries from Source (Advanced Install)
 
-* Git
-* Go 1.1+
-* Mercurial
-* Bazaar
+Add Hugo and its package dependencies to your go `src` directory.
 
-#### Clone locally (for contributors):
+    go get -v github.com/gohugoio/hugo
 
-    git clone https://github.com/spf13/hugo
-    cd hugo
-    go get
+Once the `get` completes, you should find your new `hugo` (or `hugo.exe`) executable sitting inside `$GOPATH/bin/`.
 
-Because go expects all of your libraries to be found in either $GOROOT or $GOPATH,
-it's helpful to symlink the project to one of the following paths:
+To update Hugo’s dependencies, use `go get` with the `-u` option.
 
- * ln -s /path/to/your/hugo $GOPATH/src/github.com/spf13/hugo
- * ln -s /path/to/your/hugo $GOROOT/src/pkg/github.com/spf13/hugo
+    go get -u -v github.com/gohugoio/hugo
 
-#### Get directly from Github:
+## Contributing to Hugo
 
-If you only want to build from source, it's even easier.
+For a complete guide to contributing to Hugo, see the [Contribution Guide](CONTRIBUTING.md).
 
-    go get github.com/spf13/hugo
+We welcome contributions to Hugo of any kind including documentation, themes,
+organization, tutorials, blog posts, bug reports, issues, feature requests,
+feature implementations, pull requests, answering questions on the forum,
+helping to manage issues, etc.
 
-#### Building Hugo
+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.
 
-    cd /path/to/hugo
-    go build -o hugo main.go
-    mv hugo /usr/local/bin/
+### Asking Support Questions
 
-#### Running Hugo
+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.
 
-    cd /path/to/hugo
-    go install github.com/spf13/hugo/hugolib
-    go run main.go
+### Reporting Issues
 
-#### Contribution Guidelines
+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](http://discuss.gohugo.io).
+When reporting the issue, please provide the version of Hugo in use (`hugo version`).
 
-We welcome your contributions.  To make the process as seamless as possible, we ask for the following:
+### Submitting Patches
 
-* Go ahead and fork the project and make your changes.  We encourage pull requests to discuss code changes.
-* When you're ready to create a pull request, be sure to:
-     * Have test cases for the new code.  If you have questions about how to do it, please ask in your pull request.
-     * Run `go fmt`
-     * Squash your commits into a single commit.  `git rebase -i`.  It's okay to force update your pull request.  
-     * Make sure `go test ./...` passes, and go build completes.  Our Travis CI loop will catch most things that are missing.  The exception: Windows.  We run on windows from time to time, but if you have access please check on a Windows machine too.
+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.
 
-**Complete documentation is available at [Hugo Documentation](http://hugo.spf13.com).**
+For a complete guide to contributing code to Hugo, see the [Contribution Guide](CONTRIBUTING.md).
 
 [![Analytics](https://ga-beacon.appspot.com/UA-7131036-6/hugo/readme)](https://github.com/igrigorik/ga-beacon)
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/spf13/hugo/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+
+[Go]: https://golang.org/
+[Hugo Documentation]: https://gohugo.io/overview/introduction/

appveyor.yml

@@ -0,0 +1,15 @@
+init:
+  - copy c:\MinGW\bin\mingw32-make.exe c:\MinGW\bin\make.exe
+  - set PATH=%PATH%;C:\MinGW\bin;%GOPATH%\bin
+  - go version
+  - go env
+
+# clones and cd's to path
+clone_folder: C:\GOPATH\src\github.com\gohugoio\hugo
+
+install:
+  - gem install asciidoctor
+  - pip install docutils
+
+build_script:
+  - make hugo-race check

baseline.txt

@@ -1,3 +0,0 @@
-PASS
-BenchmarkChain	  500000	      7074 ns/op	    3913 B/op	      15 allocs/op
-ok  	github.com/spf13/hugo/transform	3.669s

bench.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+
+# Convenience script to
+# - For a given branch
+# - Run  benchmark tests for a given package
+# - Do the same for master
+# - then compare the two runs with benchcmp
+
+benchFilter=".*"
+
+if (( $# < 2 ));
+  then
+    echo "USAGE: ./bench.sh <git-branch> <package-to-bench> (and <benchmark filter> (regexp, optional))"
+    exit 1
+fi
+
+
+
+if [ $# -eq 3 ]; then
+  benchFilter=$3
+fi
+
+
+BRANCH=$1
+PACKAGE=$2
+
+git checkout $BRANCH
+go test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-$BRANCH.txt
+
+git checkout master
+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

benchSite.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# 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}"
+
+go test -run="NONE" -bench="BenchmarkSiteBuilding/${1}$" -test.benchmem=true ./hugolib -memprofile mem.prof -cpuprofile cpu.prof

bufferpool/bufpool.go

@@ -0,0 +1,38 @@
+// 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 bufferpool provides a pool of bytes buffers.
+package bufferpool
+
+import (
+	"bytes"
+	"sync"
+)
+
+var bufferPool = &sync.Pool{
+	New: func() interface{} {
+		return &bytes.Buffer{}
+	},
+}
+
+// GetBuffer returns a buffer from the pool.
+func GetBuffer() (buf *bytes.Buffer) {
+	return bufferPool.Get().(*bytes.Buffer)
+}
+
+// PutBuffer returns a buffer to the pool.
+// The buffer is reset before it is put back into circulation.
+func PutBuffer(buf *bytes.Buffer) {
+	buf.Reset()
+	bufferPool.Put(buf)
+}

bufferpool/bufpool_test.go

@@ -0,0 +1,27 @@
+// Copyright 2016-present The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bufferpool
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestBufferPool(t *testing.T) {
+	buff := GetBuffer()
+	buff.WriteString("do be do be do")
+	assert.Equal(t, "do be do be do", buff.String())
+	PutBuffer(buff)
+	assert.Equal(t, 0, buff.Len())
+}

cache/partitioned_lazy_cache.go

@@ -0,0 +1,80 @@
+// 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)
+}
+
+type lazyPartition struct {
+	initSync sync.Once
+	cache    map[string]interface{}
+	load     func() (map[string]interface{}, error)
+}
+
+func (l *lazyPartition) init() error {
+	var err error
+	l.initSync.Do(func() {
+		var c map[string]interface{}
+		c, err = l.load()
+		l.cache = c
+	})
+
+	return err
+}
+
+// PartitionedLazyCache is a lazily loaded cache paritioned by a supplied string key.
+type PartitionedLazyCache struct {
+	partitions map[string]*lazyPartition
+}
+
+// NewPartitionedLazyCache creates a new NewPartitionedLazyCache with the supplied
+// partitions.
+func NewPartitionedLazyCache(partitions ...Partition) *PartitionedLazyCache {
+	lazyPartitions := make(map[string]*lazyPartition, len(partitions))
+	for _, partition := range partitions {
+		lazyPartitions[partition.Key] = &lazyPartition{load: 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
+	}
+
+	if err := p.init(); err != nil {
+		return nil, err
+	}
+
+	if v, found := p.cache[key]; found {
+		return v, nil
+	}
+
+	return nil, nil
+
+}

cache/partitioned_lazy_cache_test.go

@@ -0,0 +1,92 @@
+// 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"
+	"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)
+
+}

commands/benchmark.go

@@ -1,9 +1,9 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -14,41 +14,99 @@
 package commands
 
 import (
-	"github.com/spf13/cobra"
 	"os"
+	"runtime"
 	"runtime/pprof"
+	"time"
+
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
 )
 
-var cpuProfilefile string
-var benchmarkTimes int
+var (
+	benchmarkTimes int
+	cpuProfileFile string
+	memProfileFile string
+)
 
-var benchmark = &cobra.Command{
+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 anlyze the
-    running process creating a `,
-	Run: func(cmd *cobra.Command, args []string) {
-		InitializeConfig()
-		bench(cmd, args)
-	},
+	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.`,
 }
 
 func init() {
-	benchmark.Flags().StringVar(&cpuProfilefile, "outputfile", "/tmp/hugo-cpuprofile", "path/filename for the profile file")
-	benchmark.Flags().IntVarP(&benchmarkTimes, "count", "n", 13, "number of times to build the site")
+	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 bench(cmd *cobra.Command, args []string) {
-	f, err := os.Create(cpuProfilefile)
-
+func benchmark(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig(benchmarkCmd)
 	if err != nil {
-		panic(err)
+		return err
 	}
 
-	pprof.StartCPUProfile(f)
-	defer pprof.StopCPUProfile()
+	c, err := newCommandeer(cfg)
+	if err != nil {
+		return err
+	}
 
+	var memProf *os.File
+	if memProfileFile != "" {
+		memProf, err = os.Create(memProfileFile)
+		if err != nil {
+			return err
+		}
+	}
+
+	var cpuProf *os.File
+	if cpuProfileFile != "" {
+		cpuProf, err = os.Create(cpuProfileFile)
+		if err != nil {
+			return err
+		}
+	}
+
+	var memStats runtime.MemStats
+	runtime.ReadMemStats(&memStats)
+	memAllocated := memStats.TotalAlloc
+	mallocs := memStats.Mallocs
+	if cpuProf != nil {
+		pprof.StartCPUProfile(cpuProf)
+	}
+
+	t := time.Now()
 	for i := 0; i < benchmarkTimes; i++ {
-		_ = buildSite()
+		if err = c.resetAndBuildSites(false); err != nil {
+			return err
+		}
 	}
+	totalTime := time.Since(t)
+
+	if memProf != nil {
+		pprof.WriteHeapProfile(memProf)
+		memProf.Close()
+	}
+	if cpuProf != nil {
+		pprof.StopCPUProfile()
+		cpuProf.Close()
+	}
+
+	runtime.ReadMemStats(&memStats)
+	totalMemAllocated := memStats.TotalAlloc - memAllocated
+	totalMallocs := memStats.Mallocs - mallocs
+
+	jww.FEEDBACK.Println()
+	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,9 +1,9 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -15,17 +15,9 @@ package commands
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/hugolib"
 )
 
-var check = &cobra.Command{
+var checkCmd = &cobra.Command{
 	Use:   "check",
-	Short: "Check content in the source directory",
-	Long: `Hugo will perform some basic analysis on the
-    content provided and will give feedback.`,
-	Run: func(cmd *cobra.Command, args []string) {
-		InitializeConfig()
-		site := hugolib.Site{}
-		site.Analyze()
-	},
+	Short: "Contains some verification checks",
 }

commands/commandeer.go

@@ -0,0 +1,62 @@
+// 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 (
+	"github.com/gohugoio/hugo/deps"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+)
+
+type commandeer struct {
+	*deps.DepsCfg
+	pathSpec   *helpers.PathSpec
+	configured bool
+}
+
+func (c *commandeer) Set(key string, value interface{}) {
+	if c.configured {
+		panic("commandeer cannot be changed")
+	}
+	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.DepsCfg.Fs = fs
+	ps, err := helpers.NewPathSpec(fs, c.Cfg)
+	if err != nil {
+		return err
+	}
+	c.pathSpec = ps
+	return nil
+}
+
+func newCommandeer(cfg *deps.DepsCfg) (*commandeer, error) {
+	l := cfg.Language
+	if l == nil {
+		l = helpers.NewDefaultLanguage(cfg.Cfg)
+	}
+	ps, err := helpers.NewPathSpec(cfg.Fs, l)
+	if err != nil {
+		return nil, err
+	}
+	return &commandeer{DepsCfg: cfg, pathSpec: ps}, nil
+}

commands/convert.go

@@ -1,9 +1,9 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -14,63 +14,56 @@
 package commands
 
 import (
+	"errors"
 	"fmt"
-	"path"
+	"path/filepath"
 	"time"
 
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/parser"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/hugolib"
-	"github.com/spf13/hugo/parser"
-	jww "github.com/spf13/jwalterweatherman"
 )
 
-var OutputDir string
-var Unsafe bool
+var outputDir string
+var unsafe bool
 
 var convertCmd = &cobra.Command{
 	Use:   "convert",
-	Short: "Convert will modify your content to different formats",
-	Long:  `Convert will modify your content to different formats`,
-	Run:   nil,
+	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,
 }
 
 var toJSONCmd = &cobra.Command{
 	Use:   "toJSON",
 	Short: "Convert front matter to JSON",
-	Long: `toJSON will convert all front matter in the content
-	directory to use JSON for the front matter`,
-	Run: func(cmd *cobra.Command, args []string) {
-		err := convertContents(rune([]byte(parser.JSON_LEAD)[0]))
-		if err != nil {
-			jww.ERROR.Println(err)
-		}
+	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]))
 	},
 }
 
 var toTOMLCmd = &cobra.Command{
 	Use:   "toTOML",
 	Short: "Convert front matter to TOML",
-	Long: `toTOML will convert all front matter in the content
-	directory to use TOML for the front matter`,
-	Run: func(cmd *cobra.Command, args []string) {
-		err := convertContents(rune([]byte(parser.TOML_LEAD)[0]))
-		if err != nil {
-			jww.ERROR.Println(err)
-		}
+	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 will convert all front matter in the content
-	directory to use YAML for the front matter`,
-	Run: func(cmd *cobra.Command, args []string) {
-		err := convertContents(rune([]byte(parser.YAML_LEAD)[0]))
-		if err != nil {
-			jww.ERROR.Println(err)
-		}
+	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]))
 	},
 }
 
@@ -78,69 +71,88 @@ 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().BoolVar(&Unsafe, "unsafe", false, "enable less safe operations, please backup first")
+	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) (err error) {
-	InitializeConfig()
-	site := &hugolib.Site{}
+func convertContents(mark rune) error {
+	cfg, err := InitializeConfig()
+	if err != nil {
+		return err
+	}
 
-	if err := site.Initialise(); err != nil {
+	h, err := hugolib.NewHugoSites(*cfg)
+	if err != nil {
+		return err
+	}
+
+	site := h.Sites[0]
+
+	if err = site.Initialise(); err != nil {
 		return err
 	}
 
 	if site.Source == nil {
-		panic(fmt.Sprintf("site.Source not set"))
+		panic("site.Source not set")
 	}
 	if len(site.Source.Files()) < 1 {
-		return fmt.Errorf("No source files found")
+		return errors.New("No source files found")
 	}
 
-	jww.FEEDBACK.Println("processing", len(site.Source.Files()), "content files")
+	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() {
-		jww.INFO.Println("Attempting to convert", file.LogicalName)
-		page, err := hugolib.NewPage(file.LogicalName)
+		site.Log.INFO.Println("Attempting to convert", file.LogicalName())
+		page, err := site.NewPage(file.LogicalName())
 		if err != nil {
 			return err
 		}
 
 		psr, err := parser.ReadFrom(file.Contents)
 		if err != nil {
-			jww.ERROR.Println("Error processing file:", path.Join(file.Dir, file.LogicalName))
+			site.Log.ERROR.Println("Error processing file:", file.Path())
 			return err
 		}
 		metadata, err := psr.Metadata()
 		if err != nil {
-			jww.ERROR.Println("Error processing file:", path.Join(file.Dir, file.LogicalName))
+			site.Log.ERROR.Println("Error processing file:", file.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") {
-			newmetadata := cast.ToStringMap(metadata)
-			for k, v := range newmetadata {
+		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)
+					newMetadata[k] = vv.Format(time.RFC3339)
 				}
 			}
-			metadata = newmetadata
+			metadata = newMetadata
 		}
 
-		page.Dir = file.Dir
+		page.SetDir(filepath.Join(contentDir, file.Dir()))
 		page.SetSourceContent(psr.Content())
-		page.SetSourceMetaData(metadata, mark)
+		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/gohugoio/hugo/issues/2458", page.FullFilePath(), err)
+			continue
+		}
 
-		if OutputDir != "" {
-			page.SaveSourceAs(path.Join(OutputDir, page.FullFilePath()))
+		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 {
-				page.SaveSource()
+			if unsafe {
+				if err = page.SaveSource(); err != nil {
+					return fmt.Errorf("Failed to save file %q: %s", page.FullFilePath(), err)
+				}
 			} else {
-				jww.FEEDBACK.Println("Unsafe operation not allowed, use --unsafe or set a different output path")
+				site.Log.FEEDBACK.Println("Unsafe operation not allowed, use --unsafe or set a different output path")
 			}
 		}
 	}
-	return
+	return nil
 }

commands/env.go

@@ -0,0 +1,35 @@
+// 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.
+// 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 (
+	"runtime"
+
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+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())
+
+		return nil
+	},
+}

commands/gen.go

@@ -0,0 +1,23 @@
+// 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 (
+	"github.com/spf13/cobra"
+)
+
+var genCmd = &cobra.Command{
+	Use:   "gen",
+	Short: "A collection of several useful generators.",
+}

commands/genautocomplete.go

@@ -0,0 +1,70 @@
+// 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 (
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+var autocompleteTarget string
+
+// bash for now (zsh and others will come)
+var autocompleteType string
+
+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.
+
+By default, the file is written directly to /etc/bash_completion.d
+for convenience, and the command may need superuser rights, e.g.:
+
+	$ sudo hugo gen autocomplete
+
+Add ` + "`--completionfile=/path/to/file`" + ` flag to set alternative
+file-path and name.
+
+Logout and in again to reload the completion scripts,
+or just source them in directly:
+
+	$ . /etc/bash_completion`,
+
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if autocompleteType != "bash" {
+			return newUserError("Only Bash is supported for now")
+		}
+
+		err := cmd.Root().GenBashCompletionFile(autocompleteTarget)
+
+		if err != nil {
+			return err
+		}
+
+		jww.FEEDBACK.Println("Bash completion file for Hugo saved to", autocompleteTarget)
+
+		return nil
+	},
+}
+
+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
+	genautocompleteCmd.PersistentFlags().SetAnnotation("completionfile", cobra.BashCompFilenameExt, []string{})
+}

commands/gendoc.go

@@ -0,0 +1,86 @@
+// 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.
+// 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"
+	"path"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/spf13/cobra"
+	"github.com/spf13/cobra/doc"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+const gendocFrontmatterTemplate = `---
+date: %s
+title: "%s"
+slug: %s
+url: %s
+---
+`
+
+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/.
+
+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(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) + "/"
+		}
+
+		jww.FEEDBACK.Println("Generating Hugo command-line documentation in", gendocdir, "...")
+		doc.GenMarkdownTreeCustom(cmd.Root(), gendocdir, prepender, linkHandler)
+		jww.FEEDBACK.Println("Done.")
+
+		return nil
+	},
+}
+
+func init() {
+	gendocCmd.PersistentFlags().StringVar(&gendocdir, "dir", "/tmp/hugodoc/", "the directory to write the doc.")
+
+	// For bash-completion
+	gendocCmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
+}

commands/gendocshelper.go

@@ -0,0 +1,72 @@
+// 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 (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/gohugoio/hugo/docshelper"
+	"github.com/spf13/cobra"
+)
+
+type genDocsHelper struct {
+	target string
+	cmd    *cobra.Command
+}
+
+func createGenDocsHelper() *genDocsHelper {
+	g := &genDocsHelper{
+		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()
+	}
+
+	// Note that ./docs is a submodule, and writing to that would be suboptimal.
+	// Let us assume that the default is a sibling project.
+	g.cmd.PersistentFlags().StringVarP(&g.target, "dir", "", "../hugoDocs/data", "data dir")
+
+	return g
+}
+
+func (g *genDocsHelper) generate() error {
+	fmt.Println("Generate docs data to", g.target)
+
+	targetFile := filepath.Join(g.target, "docs.json")
+
+	f, err := os.Create(targetFile)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	enc := json.NewEncoder(f)
+	enc.SetIndent("", "  ")
+
+	if err := enc.Encode(docshelper.DocProviders); err != nil {
+		return err
+	}
+
+	fmt.Println("Done!")
+	return nil
+
+}

commands/genman.go

@@ -0,0 +1,66 @@
+// 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.
+// 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"
+	"strings"
+
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/spf13/cobra"
+	"github.com/spf13/cobra/doc"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+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),
+		}
+		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
+			}
+		}
+		cmd.Root().DisableAutoGenTag = true
+
+		jww.FEEDBACK.Println("Generating Hugo man pages in", genmandir, "...")
+		doc.GenManTree(cmd.Root(), header, genmandir)
+
+		jww.FEEDBACK.Println("Done.")
+
+		return nil
+	},
+}
+
+func init() {
+	genmanCmd.PersistentFlags().StringVar(&genmandir, "dir", "man/", "the directory to write the man pages.")
+
+	// For bash-completion
+	genmanCmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
+}

commands/hugo_windows.go

@@ -0,0 +1,27 @@
+// 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 "github.com/spf13/cobra"
+
+func init() {
+	// This message to show to Windows users if Hugo is opened from explorer.exe
+	cobra.MousetrapHelpText = `
+
+  Hugo is a command-line tool for generating static website.
+
+  You need to open cmd.exe and run Hugo from there.
+  
+  Visit http://gohugo.io/ for more information.`
+}

commands/import_jekyll.go

@@ -0,0 +1,577 @@
+// 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.
+// 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"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"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"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+func init() {
+	importCmd.AddCommand(importJekyllCmd)
+}
+
+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,
+}
+
+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`.")
+	}
+
+	jekyllRoot, err := filepath.Abs(filepath.Clean(args[0]))
+	if err != nil {
+		return newUserError("Path error:", args[0])
+	}
+
+	targetDir, err := filepath.Abs(filepath.Clean(args[1]))
+	if err != nil {
+		return newUserError("Path error:", args[1])
+	}
+
+	jww.INFO.Println("Import Jekyll from:", jekyllRoot, "to:", targetDir)
+
+	if strings.HasPrefix(filepath.Dir(targetDir), jekyllRoot) {
+		return newUserError("Target path should not be inside the Jekyll root, aborting.")
+	}
+
+	forceImport, _ := cmd.Flags().GetBool("force")
+	site, err := createSiteFromJekyll(jekyllRoot, targetDir, forceImport)
+	if err != nil {
+		return err
+	}
+
+	jww.FEEDBACK.Println("Importing...")
+
+	fileCount := 0
+	callback := func(path string, fi os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if fi.IsDir() {
+			return nil
+		}
+
+		relPath, err := filepath.Rel(jekyllRoot, path)
+		if err != nil {
+			return newUserError("Get rel path error:", path)
+		}
+
+		relPath = filepath.ToSlash(relPath)
+		draft := false
+
+		switch {
+		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
+		}
+
+		fileCount++
+		return convertJekyllPost(site, path, relPath, targetDir, draft)
+	}
+
+	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")
+	jww.FEEDBACK.Println("$ cd " + args[1] + "\n$ hugo server --theme=herring-cove")
+
+	return nil
+}
+
+// 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")
+		}
+
+		isEmpty, _ := helpers.IsEmpty(targetDir, fs)
+
+		if !isEmpty && !force {
+			return nil, errors.New("Target path \"" + targetDir + "\" already exists and is not empty")
+		}
+	}
+
+	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")
+	mkdir(targetDir, "archetypes")
+	mkdir(targetDir, "static")
+	mkdir(targetDir, "data")
+	mkdir(targetDir, "themes")
+
+	createConfigFromJekyll(fs, targetDir, "yaml", jekyllConfig)
+
+	copyJekyllFilesAndFolders(jekyllRoot, filepath.Join(targetDir, "static"))
+
+	return s, nil
+}
+
+func loadJekyllConfig(fs afero.Fs, jekyllRoot string) map[string]interface{} {
+	path := filepath.Join(jekyllRoot, "_config.yml")
+
+	exists, err := helpers.Exists(path, fs)
+
+	if err != nil || !exists {
+		jww.WARN.Println("_config.yaml not found: Is the specified Jekyll root correct?")
+		return nil
+	}
+
+	f, err := fs.Open(path)
+	if err != nil {
+		return nil
+	}
+
+	defer f.Close()
+
+	b, err := ioutil.ReadAll(f)
+
+	if err != nil {
+		return nil
+	}
+
+	c, err := parser.HandleYAMLMetaData(b)
+
+	if err != nil {
+		return nil
+	}
+
+	return c.(map[string]interface{})
+}
+
+func createConfigFromJekyll(fs afero.Fs, inpath string, kind string, jekyllConfig map[string]interface{}) (err error) {
+	title := "My New Hugo Site"
+	baseURL := "http://example.org/"
+
+	for key, value := range jekyllConfig {
+		lowerKey := strings.ToLower(key)
+
+		switch lowerKey {
+		case "title":
+			if str, ok := value.(string); ok {
+				title = str
+			}
+
+		case "url":
+			if str, ok := value.(string); ok {
+				baseURL = str
+			}
+		}
+	}
+
+	in := map[string]interface{}{
+		"baseURL":            baseURL,
+		"title":              title,
+		"languageCode":       "en-us",
+		"disablePathToLower": true,
+	}
+	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)
+}
+
+func copyFile(source string, dest string) error {
+	sf, err := os.Open(source)
+	if err != nil {
+		return err
+	}
+	defer sf.Close()
+	df, err := os.Create(dest)
+	if err != nil {
+		return err
+	}
+	defer df.Close()
+	_, err = io.Copy(df, sf)
+	if err == nil {
+		si, err := os.Stat(source)
+		if err != nil {
+			err = os.Chmod(dest, si.Mode())
+
+			if err != nil {
+				return err
+			}
+		}
+
+	}
+	return nil
+}
+
+func copyDir(source string, dest string) error {
+	fi, err := os.Stat(source)
+	if err != nil {
+		return err
+	}
+	if !fi.IsDir() {
+		return errors.New(source + " is not a directory")
+	}
+	err = os.MkdirAll(dest, fi.Mode())
+	if err != nil {
+		return err
+	}
+	entries, err := ioutil.ReadDir(source)
+	for _, entry := range entries {
+		sfp := filepath.Join(source, entry.Name())
+		dfp := filepath.Join(dest, entry.Name())
+		if entry.IsDir() {
+			err = copyDir(sfp, dfp)
+			if err != nil {
+				jww.ERROR.Println(err)
+			}
+		} else {
+			err = copyFile(sfp, dfp)
+			if err != nil {
+				jww.ERROR.Println(err)
+			}
+		}
+
+	}
+	return nil
+}
+
+func copyJekyllFilesAndFolders(jekyllRoot string, dest string) error {
+	fi, err := os.Stat(jekyllRoot)
+	if err != nil {
+		return err
+	}
+	if !fi.IsDir() {
+		return errors.New(jekyllRoot + " is not a directory")
+	}
+	err = os.MkdirAll(dest, fi.Mode())
+	if err != nil {
+		return err
+	}
+	entries, err := ioutil.ReadDir(jekyllRoot)
+	for _, entry := range entries {
+		sfp := filepath.Join(jekyllRoot, entry.Name())
+		dfp := filepath.Join(dest, entry.Name())
+		if entry.IsDir() {
+			if entry.Name()[0] != '_' && entry.Name()[0] != '.' {
+				err = copyDir(sfp, dfp)
+				if err != nil {
+					jww.ERROR.Println(err)
+				}
+			}
+		} else {
+			lowerEntryName := strings.ToLower(entry.Name())
+			exceptSuffix := []string{".md", ".markdown", ".html", ".htm",
+				".xml", ".textile", "rakefile", "gemfile", ".lock"}
+			isExcept := false
+			for _, suffix := range exceptSuffix {
+				if strings.HasSuffix(lowerEntryName, suffix) {
+					isExcept = true
+					break
+				}
+			}
+
+			if !isExcept && entry.Name()[0] != '.' && entry.Name()[0] != '_' {
+				err = copyFile(sfp, dfp)
+				if err != nil {
+					jww.ERROR.Println(err)
+				}
+			}
+		}
+
+	}
+	return nil
+}
+
+func parseJekyllFilename(filename string) (time.Time, string, error) {
+	re := regexp.MustCompile(`(\d+-\d+-\d+)-(.+)\..*`)
+	r := re.FindAllStringSubmatch(filename, -1)
+	if len(r) == 0 {
+		return time.Now(), "", errors.New("filename not match")
+	}
+
+	postDate, err := time.Parse("2006-1-2", r[0][1])
+	if err != nil {
+		return time.Now(), "", err
+	}
+
+	postName := r[0][2]
+
+	return postDate, postName, nil
+}
+
+func convertJekyllPost(s *hugolib.Site, path, relPath, targetDir string, draft bool) error {
+	jww.TRACE.Println("Converting", path)
+
+	filename := filepath.Base(path)
+	postDate, postName, err := parseJekyllFilename(filename)
+	if err != nil {
+		jww.WARN.Printf("Failed to parse filename '%s': %s. Skipping.", filename, err)
+		return nil
+	}
+
+	jww.TRACE.Println(filename, postDate, postName)
+
+	targetFile := filepath.Join(targetDir, relPath)
+	targetParentDir := filepath.Dir(targetFile)
+	os.MkdirAll(targetParentDir, 0777)
+
+	contentBytes, err := ioutil.ReadFile(path)
+	if err != nil {
+		jww.ERROR.Println("Read file error:", path)
+		return err
+	}
+
+	psr, err := parser.ReadFrom(bytes.NewReader(contentBytes))
+	if err != nil {
+		jww.ERROR.Println("Parse file error:", path)
+		return err
+	}
+
+	metadata, err := psr.Metadata()
+	if err != nil {
+		jww.ERROR.Println("Processing file error:", path)
+		return err
+	}
+
+	newmetadata, err := convertJekyllMetaData(metadata, postName, postDate, draft)
+	if err != nil {
+		jww.ERROR.Println("Convert metadata error:", path)
+		return err
+	}
+
+	jww.TRACE.Println(newmetadata)
+	content := convertJekyllContent(newmetadata, string(psr.Content()))
+
+	page, err := s.NewPage(filename)
+	if err != nil {
+		jww.ERROR.Println("New page error", filename)
+		return err
+	}
+
+	page.SetDir(targetParentDir)
+	page.SetSourceContent([]byte(content))
+	page.SetSourceMetaData(newmetadata, parser.FormatToLeadRune("yaml"))
+	page.SaveSourceAs(targetFile)
+
+	jww.TRACE.Println("Target file:", targetFile)
+
+	return nil
+}
+
+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
+	}
+
+	if draft {
+		metadata["draft"] = true
+	}
+
+	for key, value := range metadata {
+		lowerKey := strings.ToLower(key)
+
+		switch lowerKey {
+		case "layout":
+			delete(metadata, key)
+		case "permalink":
+			if str, ok := value.(string); ok {
+				url = str
+			}
+			delete(metadata, key)
+		case "category":
+			if str, ok := value.(string); ok {
+				metadata["categories"] = []string{str}
+			}
+			delete(metadata, key)
+		case "excerpt_separator":
+			if key != lowerKey {
+				delete(metadata, key)
+				metadata[lowerKey] = value
+			}
+		case "date":
+			if str, ok := value.(string); ok {
+				re := regexp.MustCompile(`(\d+):(\d+):(\d+)`)
+				r := re.FindAllStringSubmatch(str, -1)
+				if len(r) > 0 {
+					hour, _ := strconv.Atoi(r[0][1])
+					minute, _ := strconv.Atoi(r[0][2])
+					second, _ := strconv.Atoi(r[0][3])
+					postDate = time.Date(postDate.Year(), postDate.Month(), postDate.Day(), hour, minute, second, 0, time.UTC)
+				}
+			}
+			delete(metadata, key)
+		}
+
+	}
+
+	metadata["url"] = url
+	metadata["date"] = postDate.Format(time.RFC3339)
+
+	return metadata, nil
+}
+
+func convertJekyllContent(m interface{}, content string) string {
+	metadata, _ := cast.ToStringMapE(m)
+
+	lines := strings.Split(content, "\n")
+	var resultLines []string
+	for _, line := range lines {
+		resultLines = append(resultLines, strings.Trim(line, "\r\n"))
+	}
+
+	content = strings.Join(resultLines, "\n")
+
+	excerptSep := "<!--more-->"
+	if value, ok := metadata["excerpt_separator"]; ok {
+		if str, strOk := value.(string); strOk {
+			content = strings.Replace(content, strings.TrimSpace(str), excerptSep, -1)
+		}
+	}
+
+	replaceList := []struct {
+		re      *regexp.Regexp
+		replace string
+	}{
+		{regexp.MustCompile("(?i)<!-- more -->"), "<!--more-->"},
+		{regexp.MustCompile(`\{%\s*raw\s*%\}\s*(.*?)\s*\{%\s*endraw\s*%\}`), "$1"},
+		{regexp.MustCompile(`{%\s*highlight\s*(.*?)\s*%}`), "{{< highlight $1 >}}"},
+		{regexp.MustCompile(`{%\s*endhighlight\s*%}`), "{{< / highlight >}}"},
+	}
+
+	for _, replace := range replaceList {
+		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

@@ -0,0 +1,126 @@
+// 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 (
+	"encoding/json"
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
+)
+
+func TestParseJekyllFilename(t *testing.T) {
+	filenameArray := []string{
+		"2015-01-02-test.md",
+		"2012-03-15-中文.markup",
+	}
+
+	expectResult := []struct {
+		postDate time.Time
+		postName string
+	}{
+		{time.Date(2015, time.January, 2, 0, 0, 0, 0, time.UTC), "test"},
+		{time.Date(2012, time.March, 15, 0, 0, 0, 0, time.UTC), "中文"},
+	}
+
+	for i, filename := range filenameArray {
+		postDate, postName, err := parseJekyllFilename(filename)
+		assert.Equal(t, err, nil)
+		assert.Equal(t, expectResult[i].postDate.Format("2006-01-02"), postDate.Format("2006-01-02"))
+		assert.Equal(t, expectResult[i].postName, postName)
+	}
+}
+
+func TestConvertJekyllMetadata(t *testing.T) {
+	testDataList := []struct {
+		metadata interface{}
+		postName string
+		postDate time.Time
+		draft    bool
+		expect   string
+	}{
+		{map[interface{}]interface{}{}, "testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
+			`{"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,"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"}`},
+		{map[interface{}]interface{}{"permalink": "/permalink.html"},
+			"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
+			`{"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","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","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","url":"/2015/10/01/testPost/"}`},
+	}
+
+	for _, data := range testDataList {
+		result, err := convertJekyllMetaData(data.metadata, data.postName, data.postDate, data.draft)
+		assert.Equal(t, nil, err)
+		jsonResult, err := json.Marshal(result)
+		assert.Equal(t, nil, err)
+		assert.Equal(t, data.expect, string(jsonResult))
+	}
+}
+
+func TestConvertJekyllContent(t *testing.T) {
+	testDataList := []struct {
+		metadata interface{}
+		content  string
+		expect   string
+	}{
+		{map[interface{}]interface{}{},
+			`Test content\n<!-- more -->\npart2 content`, `Test content\n<!--more-->\npart2 content`},
+		{map[interface{}]interface{}{},
+			`Test content\n<!-- More -->\npart2 content`, `Test content\n<!--more-->\npart2 content`},
+		{map[interface{}]interface{}{"excerpt_separator": "<!--sep-->"},
+			`Test content\n<!--sep-->\npart2 content`, `Test content\n<!--more-->\npart2 content`},
+		{map[interface{}]interface{}{}, "{% raw %}text{% endraw %}", "text"},
+		{map[interface{}]interface{}{}, "{%raw%} text2 {%endraw %}", "text2"},
+		{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 {
+		result := convertJekyllContent(data.metadata, data.content)
+		assert.Equal(t, data.expect, result)
+	}
+}

commands/limit_darwin.go

@@ -1,10 +1,22 @@
-// +build darwin
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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.
+// 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,
@@ -22,20 +34,21 @@ import (
 )
 
 func init() {
-	check.AddCommand(limit)
+	checkCmd.AddCommand(limit)
 }
 
 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`,
-	Run: func(cmd *cobra.Command, args []string) {
+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 {
-			jww.ERROR.Println("Error Getting Rlimit ", err)
+			return newSystemError("Error Getting Rlimit ", err)
 		}
+
 		jww.FEEDBACK.Println("Current rLimit:", rLimit)
 
 		jww.FEEDBACK.Println("Attempting to increase limit")
@@ -43,13 +56,15 @@ var limit = &cobra.Command{
 		rLimit.Cur = 999999
 		err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
 		if err != nil {
-			jww.ERROR.Println("Error Setting rLimit ", err)
+			return newSystemError("Error Setting rLimit ", err)
 		}
 		err = syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
 		if err != nil {
-			jww.ERROR.Println("Error Getting rLimit ", err)
+			return newSystemError("Error Getting rLimit ", err)
 		}
 		jww.FEEDBACK.Println("rLimit after change:", rLimit)
+
+		return nil
 	},
 }
 
@@ -60,11 +75,11 @@ func tweakLimit() {
 		jww.ERROR.Println("Unable to obtain rLimit", err)
 	}
 	if rLimit.Cur < rLimit.Max {
-		rLimit.Max = 999999
-		rLimit.Cur = 999999
+		rLimit.Max = 64000
+		rLimit.Cur = 64000
 		err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
 		if err != nil {
-			jww.ERROR.Println("Unable to increase number of open files limit", err)
+			jww.WARN.Println("Unable to increase number of open files limit", err)
 		}
 	}
 }

commands/limit_others.go

@@ -1,10 +1,23 @@
-// +build !darwin
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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 !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,

commands/list.go

@@ -0,0 +1,161 @@
+// 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 (
+	"path/filepath"
+
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+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{})
+}
+
+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,
+}
+
+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

@@ -0,0 +1,66 @@
+// 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.Print the version number of Hug
+
+package commands
+
+import (
+	"reflect"
+	"sort"
+
+	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
+	"github.com/spf13/viper"
+)
+
+var configCmd = &cobra.Command{
+	Use:   "config",
+	Short: "Print the site configuration",
+	Long:  `Print the site configuration, both default and custom settings.`,
+}
+
+func init() {
+	configCmd.RunE = printConfig
+}
+
+func printConfig(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig(configCmd)
+
+	if err != nil {
+		return err
+	}
+
+	allSettings := cfg.Cfg.(*viper.Viper).AllSettings()
+
+	var separator string
+	if allSettings["metadataformat"] == "toml" {
+		separator = " = "
+	} else {
+		separator = ": "
+	}
+
+	var keys []string
+	for k := range allSettings {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		kv := reflect.ValueOf(allSettings[k])
+		if kv.Kind() == reflect.String {
+			jww.FEEDBACK.Printf("%s%s\"%+v\"\n", k, separator, allSettings[k])
+		} else {
+			jww.FEEDBACK.Printf("%s%s%+v\n", k, separator, allSettings[k])
+		}
+	}
+
+	return nil
+}

commands/new.go

@@ -1,7 +1,9 @@
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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.
 // You may obtain a copy of the License at
-// http://opensource.org/licenses/Simple-2.0
+// 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,
@@ -13,42 +15,55 @@ package commands
 
 import (
 	"bytes"
+	"errors"
+	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
+	"time"
 
+	"github.com/gohugoio/hugo/create"
+	"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/cobra"
-	"github.com/spf13/hugo/create"
-	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/parser"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
 )
 
-var siteType string
-var configFormat string
-var contentType string
-var contentFormat string
-var contentFrontMatter string
+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.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)
+
 }
 
 var newCmd = &cobra.Command{
 	Use:   "new [path]",
 	Short: "Create new content for your site",
-	Long: `Create will create a new content file and automatically set the date and title.
+	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.
-`,
-	Run: NewContent,
+
+You can also specify the kind with ` + "`-k KIND`" + `.
+
+If archetypes are provided in your theme or site, they will be used.`,
+
+	RunE: NewContent,
 }
 
 var newSiteCmd = &cobra.Command{
@@ -56,9 +71,8 @@ var newSiteCmd = &cobra.Command{
 	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.
-	`,
-	Run: NewSite,
+Use ` + "`hugo new [contentPath]`" + ` to create new content.`,
+	RunE: NewSite,
 }
 
 var newThemeCmd = &cobra.Command{
@@ -67,105 +81,186 @@ var newThemeCmd = &cobra.Command{
 	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.
-	`,
-	Run: NewTheme,
+as you see fit.`,
+	RunE: NewTheme,
 }
 
-func NewContent(cmd *cobra.Command, args []string) {
-	InitializeConfig()
+// NewContent adds new content to a Hugo site.
+func NewContent(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig()
 
-	if cmd.Flags().Lookup("format").Changed {
-		viper.Set("MetaDataFormat", configFormat)
+	if err != nil {
+		return err
+	}
+
+	c, err := newCommandeer(cfg)
+	if err != nil {
+		return err
+	}
+
+	if cmd.Flags().Changed("format") {
+		c.Set("metaDataFormat", configFormat)
+	}
+
+	if cmd.Flags().Changed("editor") {
+		c.Set("newContentEditor", contentEditor)
 	}
 
 	if len(args) < 1 {
-		cmd.Usage()
-		jww.FATAL.Fatalln("path needs to be provided")
+		return newUserError("path needs to be provided")
 	}
 
-	createpath := args[0]
+	createPath := args[0]
 
 	var kind string
 
-	// assume the first directory is the section (kind)
-	if strings.Contains(createpath[1:], "/") {
-		kind = helpers.GuessSection(createpath)
-	}
+	createPath, kind = newContentPathSection(createPath)
 
 	if contentType != "" {
 		kind = contentType
 	}
 
-	err := create.NewContent(kind, createpath)
+	s, err := hugolib.NewSite(*cfg)
+
 	if err != nil {
-		jww.ERROR.Println(err)
+		return newSystemError(err)
 	}
+
+	return create.NewContent(s, kind, createPath)
 }
 
-func NewSite(cmd *cobra.Command, args []string) {
+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 {
-		cmd.Usage()
-		jww.FATAL.Fatalln("path needs to be provided")
+		return newUserError("path needs to be provided")
 	}
 
 	createpath, err := filepath.Abs(filepath.Clean(args[0]))
 	if err != nil {
-		cmd.Usage()
-		jww.FATAL.Fatalln(err)
+		return newUserError(err)
 	}
 
-	if x, _ := helpers.Exists(createpath); x {
-		y, _ := helpers.IsDir(createpath)
-		if z, _ := helpers.IsEmpty(createpath); y && z {
-			jww.INFO.Println(createpath, "already exists and is empty")
-		} else {
-			jww.FATAL.Fatalln(createpath, "already exists and is not empty")
-		}
-	}
+	forceNew, _ := cmd.Flags().GetBool("force")
 
-	mkdir(createpath, "layouts")
-	mkdir(createpath, "content")
-	mkdir(createpath, "archetypes")
-	mkdir(createpath, "static")
-
-	createConfig(createpath, configFormat)
+	return doNewSite(hugofs.NewDefault(viper.New()), createpath, forceNew)
 }
 
-func NewTheme(cmd *cobra.Command, args []string) {
-	InitializeConfig()
+// NewTheme creates a new Hugo theme.
+func NewTheme(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig()
 
-	if len(args) < 1 {
-		cmd.Usage()
-		jww.FATAL.Fatalln("theme name needs to be provided")
+	if err != nil {
+		return err
 	}
 
-	createpath := helpers.AbsPathify(path.Join("themes", args[0]))
+	if len(args) < 1 {
+		return newUserError("theme name needs to be provided")
+	}
+
+	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); x {
-		jww.FATAL.Fatalln(createpath, "already exists")
+	if x, _ := helpers.Exists(createpath, cfg.Fs.Source); x {
+		return newUserError(createpath, "already exists")
 	}
 
 	mkdir(createpath, "layouts", "_default")
 	mkdir(createpath, "layouts", "partials")
 
-	touchFile(createpath, "layouts", "index.html")
-	touchFile(createpath, "layouts", "_default", "list.html")
-	touchFile(createpath, "layouts", "_default", "single.html")
+	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(createpath, "layouts", "partials", "header.html")
-	touchFile(createpath, "layouts", "partials", "footer.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "header.html")
+	touchFile(cfg.Fs.Source, createpath, "layouts", "partials", "footer.html")
 
 	mkdir(createpath, "archetypes")
-	touchFile(createpath, "archetypes", "default.md")
+
+	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) 2014 YOUR_NAME_HERE
+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
@@ -185,49 +280,60 @@ 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(path.Join(createpath, "LICENSE.md"), bytes.NewReader(by))
+	err = helpers.WriteToDisk(filepath.Join(createpath, "LICENSE.md"), bytes.NewReader(by), cfg.Fs.Source)
 	if err != nil {
-		jww.FATAL.Fatalln(err)
+		return err
 	}
 
-	createThemeMD(createpath)
+	createThemeMD(cfg.Fs, createpath)
+
+	return nil
 }
 
 func mkdir(x ...string) {
-	p := path.Join(x...)
+	p := filepath.Join(x...)
 
-	err := os.MkdirAll(p, 0777) // rwx, rw, r
+	err := os.MkdirAll(p, 0777) // before umask
 	if err != nil {
 		jww.FATAL.Fatalln(err)
 	}
 }
 
-func touchFile(x ...string) {
-	inpath := path.Join(x...)
+func touchFile(fs afero.Fs, x ...string) {
+	inpath := filepath.Join(x...)
 	mkdir(filepath.Dir(inpath))
-	err := helpers.WriteToDisk(inpath, bytes.NewReader([]byte{}))
+	err := helpers.WriteToDisk(inpath, bytes.NewReader([]byte{}), fs)
 	if err != nil {
 		jww.FATAL.Fatalln(err)
 	}
 }
 
-func createThemeMD(inpath string) (err error) {
+func createThemeMD(fs *hugofs.Fs, inpath string) (err error) {
 
-	in := map[string]interface{}{
-		"name":        helpers.MakeTitle(filepath.Base(inpath)),
-		"license":     "MIT",
-		"source_repo": "",
-		"author":      "",
-		"description": "",
-		"tags":        []string{"", ""},
-	}
+	by := []byte(`# theme.toml template for a Hugo theme
+# See https://github.com/gohugoio/hugoThemes#themetoml for an example
 
-	by, err := parser.InterfaceToConfig(in, parser.FormatToLeadRune("toml"))
-	if err != nil {
-		return err
-	}
+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.23"
 
-	err = helpers.WriteToDisk(path.Join(inpath, "theme.toml"), bytes.NewReader(by))
+[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
 	}
@@ -235,19 +341,32 @@ func createThemeMD(inpath string) (err error) {
 	return nil
 }
 
-func createConfig(inpath string, kind string) (err error) {
-	in := map[string]string{"baseurl": "http://yourSiteHere", "title": "my new hugo site", "languageCode": "en-us"}
+func newContentPathSection(path string) (string, string) {
+	// Forward slashes is used in all examples. Convert if needed.
+	// Issue #1133
+	createpath := filepath.FromSlash(path)
+	var section string
+	// assume the first directory is the section (kind)
+	if strings.Contains(createpath[1:], helpers.FilePathSeparator) {
+		section = helpers.GuessSection(createpath)
+	}
+
+	return createpath, section
+}
+
+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)
 
-	by, err := parser.InterfaceToConfig(in, parser.FormatToLeadRune(kind))
+	var buf bytes.Buffer
+	err = parser.InterfaceToConfig(in, parser.FormatToLeadRune(kind), &buf)
 	if err != nil {
 		return err
 	}
 
-	err = helpers.WriteToDisk(path.Join(inpath, "config."+kind), bytes.NewReader(by))
-	if err != nil {
-		return
-	}
-
-	return nil
+	return helpers.WriteToDisk(filepath.Join(inpath, "config."+kind), &buf, fs.Source)
 }

commands/new_test.go

@@ -0,0 +1,122 @@
+// 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.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// Issue #1133
+func TestNewContentPathSectionWithForwardSlashes(t *testing.T) {
+	p, s := newContentPathSection("/post/new.md")
+	assert.Equal(t, filepath.FromSlash("/post/new.md"), p)
+	assert.Equal(t, "post", s)
+}
+
+func checkNewSiteInited(fs *hugofs.Fs, basepath string, t *testing.T) {
+
+	paths := []string{
+		filepath.Join(basepath, "layouts"),
+		filepath.Join(basepath, "content"),
+		filepath.Join(basepath, "archetypes"),
+		filepath.Join(basepath, "static"),
+		filepath.Join(basepath, "data"),
+		filepath.Join(basepath, "config.toml"),
+	}
+
+	for _, path := range paths {
+		_, err := fs.Source.Stat(path)
+		require.NoError(t, err)
+	}
+}
+
+func TestDoNewSite(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	require.NoError(t, doNewSite(fs, basepath, false))
+
+	checkNewSiteInited(fs, basepath, t)
+}
+
+func TestDoNewSite_noerror_base_exists_but_empty(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
+
+	require.NoError(t, doNewSite(fs, basepath, false))
+}
+
+func TestDoNewSite_error_base_exists(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	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, doNewSite(fs, basepath, false))
+
+}
+
+func TestDoNewSite_force_empty_dir(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	require.NoError(t, fs.Source.MkdirAll(basepath, 777))
+
+	require.NoError(t, doNewSite(fs, basepath, true))
+
+	checkNewSiteInited(fs, basepath, t)
+}
+
+func TestDoNewSite_error_force_dir_inside_exists(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	contentPath := filepath.Join(basepath, "content")
+
+	require.NoError(t, fs.Source.MkdirAll(contentPath, 777))
+	require.Error(t, doNewSite(fs, basepath, true))
+}
+
+func TestDoNewSite_error_force_config_inside_exists(t *testing.T) {
+	basepath := filepath.Join("base", "blog")
+	_, fs := newTestCfg()
+
+	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, doNewSite(fs, basepath, true))
+}
+
+func newTestCfg() (*viper.Viper, *hugofs.Fs) {
+
+	v := viper.New()
+	fs := hugofs.NewMem(v)
+
+	v.SetFs(fs.Source)
+
+	return v, fs
+
+}

commands/release.go

@@ -0,0 +1,62 @@
+// +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 (
+	"github.com/gohugoio/hugo/releaser"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	HugoCmd.AddCommand(createReleaser().cmd)
+}
+
+type releaseCommandeer struct {
+	cmd *cobra.Command
+
+	// Will be zero for main releases.
+	patchLevel int
+
+	skipPublish bool
+
+	step int
+}
+
+func createReleaser() *releaseCommandeer {
+	// 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().IntVarP(&r.patchLevel, "patch", "p", 0, "patch level, defaults to 0 for main releases")
+	r.cmd.PersistentFlags().IntVarP(&r.step, "step", "s", -1, "release step, defaults to -1 for all steps.")
+	r.cmd.PersistentFlags().BoolVarP(&r.skipPublish, "skip-publish", "", false, "skip all publishing pipes of the release")
+
+	return r
+}
+
+func (r *releaseCommandeer) release() error {
+	return releaser.New(r.patchLevel, r.step, r.skipPublish).Run()
+}

commands/server.go

@@ -1,9 +1,9 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2016 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -17,103 +17,293 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"net/url"
 	"os"
+	"runtime"
 	"strconv"
 	"strings"
+	"time"
 
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/spf13/hugo/helpers"
 	jww "github.com/spf13/jwalterweatherman"
-	"github.com/spf13/viper"
 )
 
-var serverPort int
-var serverWatch bool
-var serverAppend bool
-var disableLiveReload bool
-
-//var serverCmdV *cobra.Command
+var (
+	disableLiveReload bool
+	renderToDisk      bool
+	serverAppend      bool
+	serverInterface   string
+	serverPort        int
+	serverWatch       bool
+)
 
 var serverCmd = &cobra.Command{
-	Use:   "server",
-	Short: "Hugo runs it's own a webserver to render the files",
-	Long: `Hugo is able to run it's own high performance web server.
-Hugo will render all the files defined in the source directory and
-Serve them up.`,
-	//Run: server,
+	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.
+
+'hugo server' will avoid writing the rendered and served content to disk,
+preferring to store it in memory.
+
+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: server,
+}
+
+type filesOnlyFs struct {
+	fs http.FileSystem
+}
+
+type noDirFile struct {
+	http.File
+}
+
+func (fs filesOnlyFs) Open(name string) (http.File, error) {
+	f, err := fs.fs.Open(name)
+	if err != nil {
+		return nil, err
+	}
+	return noDirFile{f}, nil
+}
+
+func (f noDirFile) Readdir(count int) ([]os.FileInfo, error) {
+	return nil, nil
 }
 
 func init() {
-	serverCmd.Flags().IntVarP(&serverPort, "port", "p", 1313, "port to run the server on")
-	serverCmd.Flags().BoolVarP(&serverWatch, "watch", "w", false, "watch filesystem for changes and recreate as needed")
-	serverCmd.Flags().BoolVarP(&serverAppend, "appendPort", "", true, "append port to baseurl")
+	initHugoBuilderFlags(serverCmd)
+
+	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.Run = server
+	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\".")
+
+	serverCmd.RunE = server
+
 }
 
-func server(cmd *cobra.Command, args []string) {
-	InitializeConfig()
-
-	if BaseUrl == "" {
-		BaseUrl = "http://localhost"
+func server(cmd *cobra.Command, args []string) error {
+	cfg, err := InitializeConfig(serverCmd)
+	if err != nil {
+		return err
 	}
 
-	if cmd.Flags().Lookup("disableLiveReload").Changed {
-		viper.Set("DisableLiveReload", disableLiveReload)
+	c, err := newCommandeer(cfg)
+	if err != nil {
+		return err
+	}
+
+	if cmd.Flags().Changed("disableLiveReload") {
+		c.Set("disableLiveReload", disableLiveReload)
 	}
 
 	if serverWatch {
-		viper.Set("Watch", true)
+		c.Set("watch", true)
 	}
 
-	if !strings.HasPrefix(BaseUrl, "http://") {
-		BaseUrl = "http://" + BaseUrl
+	if c.Cfg.GetBool("watch") {
+		serverWatch = true
+		c.watchConfig()
 	}
 
-	l, err := net.Listen("tcp", ":"+strconv.Itoa(serverPort))
+	l, err := net.Listen("tcp", net.JoinHostPort(serverInterface, strconv.Itoa(serverPort)))
 	if err == nil {
 		l.Close()
 	} else {
+		if serverCmd.Flags().Changed("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 {
-			jww.ERROR.Println("Unable to find alternative port to use")
-			jww.ERROR.Fatalln(err)
+			return newSystemError("Unable to find alternative port to use:", err)
 		}
 		serverPort = sp.Port
 	}
 
-	viper.Set("port", serverPort)
+	c.Set("port", serverPort)
 
-	if serverAppend {
-		viper.Set("BaseUrl", strings.TrimSuffix(BaseUrl, "/")+":"+strconv.Itoa(serverPort))
-	} else {
-		viper.Set("BaseUrl", strings.TrimSuffix(BaseUrl, "/"))
+	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)
 	}
 
-	build(serverWatch)
+	// 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
+	}
+
+	for _, s := range Hugo.Sites {
+		s.RegisterMediaTypes()
+	}
 
 	// Watch runs its own server as part of the routine
 	if serverWatch {
-		jww.FEEDBACK.Println("Watching for changes in", helpers.AbsPathify(viper.GetString("ContentDir")))
-		err := NewWatcher(serverPort)
+		watchDirs := c.getDirList()
+		baseWatchDir := c.Cfg.GetString("workingDir")
+		for i, dir := range watchDirs {
+			watchDirs[i], _ = helpers.GetRelativePath(dir, baseWatchDir)
+		}
+
+		rootWatchDirs := strings.Join(helpers.UniqueStrings(helpers.ExtractRootPaths(watchDirs)), ",")
+
+		jww.FEEDBACK.Printf("Watching for changes in %s%s{%s}\n", baseWatchDir, helpers.FilePathSeparator, rootWatchDirs)
+		err := c.newWatcher(serverPort)
+
 		if err != nil {
-			fmt.Println(err)
+			return err
 		}
 	}
 
-	serve(serverPort)
+	c.serve(serverPort)
+
+	return nil
 }
 
-func serve(port int) {
-	jww.FEEDBACK.Println("Serving pages from " + helpers.AbsPathify(viper.GetString("PublishDir")))
-	jww.FEEDBACK.Printf("Web Server is available at %s\n", viper.GetString("BaseUrl"))
-	fmt.Println("Press ctrl+c to stop")
+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")
+	}
 
-	http.Handle("/", http.FileServer(http.Dir(helpers.AbsPathify(viper.GetString("PublishDir")))))
-	err := http.ListenAndServe(":"+strconv.Itoa(port), nil)
+	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 fixURL(cfg config.Provider, s string) (string, error) {
+	useLocalhost := false
+	if s == "" {
+		s = cfg.GetString("baseURL")
+		useLocalhost = true
+	}
+
+	if !strings.HasSuffix(s, "/") {
+		s = s + "/"
+	}
+
+	// do an initial parse of the input string
+	u, err := url.Parse(s)
+	if err != nil {
+		return "", err
+	}
+
+	// if no Host is defined, then assume that no schema or double-slash were
+	// present in the url.  Add a double-slash and make a best effort attempt.
+	if u.Host == "" && s != "/" {
+		s = "//" + s
+
+		u, err = url.Parse(s)
+		if err != nil {
+			return "", err
+		}
+	}
+
+	if useLocalhost {
+		if u.Scheme == "https" {
+			u.Scheme = "http"
+		}
+		u.Host = "localhost"
+	}
+
+	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", serverPort)
+	}
+
+	return u.String(), nil
+}
+
+func memStats() error {
+	memstats := serverCmd.Flags().Lookup("memstats").Value.String()
+	if memstats != "" {
+		interval, err := time.ParseDuration(serverCmd.Flags().Lookup("meminterval").Value.String())
+		if err != nil {
+			interval, _ = time.ParseDuration("100ms")
+		}
+
+		fileMemStats, err := os.Create(memstats)
+		if err != nil {
+			return err
+		}
+
+		fileMemStats.WriteString("# Time\tHeapSys\tHeapAlloc\tHeapIdle\tHeapReleased\n")
+
+		go func() {
+			var stats runtime.MemStats
+
+			start := time.Now().UnixNano()
+
+			for {
+				runtime.ReadMemStats(&stats)
+				if fileMemStats != nil {
+					fileMemStats.WriteString(fmt.Sprintf("%d\t%d\t%d\t%d\t%d\n",
+						(time.Now().UnixNano()-start)/1000000, stats.HeapSys, stats.HeapAlloc, stats.HeapIdle, stats.HeapReleased))
+					time.Sleep(interval)
+				} else {
+					break
+				}
+			}
+		}()
+	}
+	return nil
+}

commands/server_test.go

@@ -0,0 +1,58 @@
+// 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 (
+	"testing"
+
+	"github.com/spf13/viper"
+)
+
+func TestFixURL(t *testing.T) {
+	type data struct {
+		TestName   string
+		CLIBaseURL string
+		CfgBaseURL string
+		AppendPort bool
+		Port       int
+		Result     string
+	}
+	tests := []data{
+		{"Basic http localhost", "", "http://foo.com", true, 1313, "http://localhost:1313/"},
+		{"Basic https production, http localhost", "", "https://foo.com", true, 1313, "http://localhost:1313/"},
+		{"Basic subdir", "", "http://foo.com/bar", true, 1313, "http://localhost:1313/bar/"},
+		{"Basic production", "http://foo.com", "http://foo.com", false, 80, "http://foo.com/"},
+		{"Production subdir", "http://foo.com/bar", "http://foo.com/bar", false, 80, "http://foo.com/bar/"},
+		{"No http", "", "foo.com", true, 1313, "//localhost:1313/"},
+		{"Override configured port", "", "foo.com:2020", true, 1313, "//localhost:1313/"},
+		{"No http production", "foo.com", "foo.com", false, 80, "//foo.com/"},
+		{"No http production with port", "foo.com", "foo.com", true, 2020, "//foo.com:2020/"},
+		{"No config", "", "", true, 1313, "//localhost:1313/"},
+	}
+
+	for i, test := range tests {
+		v := viper.New()
+		baseURL = test.CLIBaseURL
+		v.Set("baseURL", test.CfgBaseURL)
+		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)
+		}
+		if result != test.Result {
+			t.Errorf("Test #%d %s: expected %q, got %q", i, test.TestName, test.Result, result)
+		}
+	}
+}

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/gohugoio/hugo/parser"
+	"github.com/spf13/cobra"
+)
+
+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/gohugoio/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

@@ -1,9 +1,9 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
+// Copyright 2015 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -14,16 +14,67 @@
 package commands
 
 import (
-	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"time"
 
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/kardianos/osext"
 	"github.com/spf13/cobra"
+	jww "github.com/spf13/jwalterweatherman"
 )
 
-var version = &cobra.Command{
+var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print the version number of Hugo",
-	Long:  `All software has versions. This is Hugo's`,
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("Hugo Static Site Generator v0.11")
+	Long:  `All software has versions. This is Hugo's.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		printHugoVersion()
+		return nil
 	},
 }
+
+func printHugoVersion() {
+	if hugolib.BuildDate == "" {
+		setBuildDate() // set the build date from executable's mdate
+	} else {
+		formatBuildDate() // format the compile time
+	}
+	if hugolib.CommitHash == "" {
+		jww.FEEDBACK.Printf("Hugo Static Site Generator v%s %s/%s BuildDate: %s\n", helpers.CurrentHugoVersion, runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)
+	} else {
+		jww.FEEDBACK.Printf("Hugo Static Site Generator v%s-%s %s/%s BuildDate: %s\n", helpers.CurrentHugoVersion, strings.ToUpper(hugolib.CommitHash), runtime.GOOS, runtime.GOARCH, hugolib.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)
+}

config/configProvider.go

@@ -0,0 +1,26 @@
+// 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 config
+
+// Provider provides the configuration settings for Hugo.
+type Provider interface {
+	GetString(key string) string
+	GetInt(key string) int
+	GetBool(key string) bool
+	GetStringMap(key string) map[string]interface{}
+	GetStringMapString(key string) map[string]string
+	Get(key string) interface{}
+	Set(key string, value interface{})
+	IsSet(key string) bool
+}

create/content.go

@@ -1,9 +1,9 @@
-// Copyright © 2014 Steve Francia <spf@spf13.com>.
+// Copyright 2016 The Hugo Authors. All rights reserved.
 //
-// Licensed under the Simple Public License, Version 2.0 (the "License");
+// 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://opensource.org/licenses/Simple-2.0
+// 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,
@@ -11,118 +11,168 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package create provides functions to create new content.
 package create
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
-	"path"
+	"os/exec"
+	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugolib"
+	"github.com/gohugoio/hugo/parser"
+	"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"
-	"github.com/spf13/viper"
 )
 
-func NewContent(kind, name string) (err error) {
-	jww.INFO.Println("attempting to create", name, "of", kind)
+// NewContent creates a new content file in the content directory based upon the
+// given kind, which is used to lookup an archetype.
+func NewContent(s *hugolib.Site, kind, name string) (err error) {
+	jww.INFO.Println("attempting to create ", name, "of", kind)
 
-	location := FindArchetype(kind)
+	location := FindArchetype(s, kind)
 
 	var by []byte
 
 	if location != "" {
-		by, err = ioutil.ReadFile(location)
+		by, err = afero.ReadFile(s.Fs.Source, location)
 		if err != nil {
 			jww.ERROR.Println(err)
 		}
 	}
 	if location == "" || err != nil {
-		by = []byte("+++\n title = \"title\"\n draft = true \n+++\n")
+		by = []byte("+++\ndraft = true \n+++\n")
 	}
 
 	psr, err := parser.ReadFrom(bytes.NewReader(by))
 	if err != nil {
 		return err
 	}
-	metadata, err := psr.Metadata()
+
+	metadata, err := createMetadata(psr, name)
 	if err != nil {
+		jww.ERROR.Printf("Error processing archetype file %s: %s\n", location, err)
 		return err
 	}
-	newmetadata, err := cast.ToStringMapE(metadata)
+
+	page, err := s.NewPage(name)
 	if err != nil {
 		return err
 	}
 
-	for k, _ := range newmetadata {
-		switch strings.ToLower(k) {
-		case "date":
-			newmetadata[k] = time.Now()
-		case "title":
-			newmetadata[k] = helpers.MakeTitle(helpers.Filename(name))
-		}
-	}
-
-	caseimatch := func(m map[string]interface{}, key string) bool {
-		for k, _ := range m {
-			if strings.ToLower(k) == strings.ToLower(key) {
-				return true
-			}
-		}
-		return false
-	}
-
-	if !caseimatch(newmetadata, "date") {
-		newmetadata["date"] = time.Now()
-	}
-
-	if !caseimatch(newmetadata, "title") {
-		newmetadata["title"] = helpers.MakeTitle(helpers.Filename(name))
-	}
-
-	page, err := hugolib.NewPage(name)
-	if err != nil {
-		return err
-	}
-
-	if x := viper.GetString("MetaDataFormat"); x == "json" || x == "yaml" {
-		newmetadata["date"] = time.Now().Format(time.RFC3339)
-	}
-
-	page.Dir = viper.GetString("sourceDir")
-	page.SetSourceMetaData(newmetadata, parser.FormatToLeadRune(viper.GetString("MetaDataFormat")))
-
-	if err = page.SafeSaveSourceAs(path.Join(viper.GetString("contentDir"), name)); err != nil {
+	if err = page.SetSourceMetaData(metadata, parser.FormatToLeadRune(s.Cfg.GetString("metaDataFormat"))); err != nil {
 		return
 	}
-	jww.FEEDBACK.Println(helpers.AbsPathify(path.Join(viper.GetString("contentDir"), name)), "created")
+
+	page.SetSourceContent(psr.Content())
+
+	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", name, editor)
+
+		cmd := exec.Command(editor, contentPath)
+		cmd.Stdin = os.Stdin
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+
+		return cmd.Run()
+	}
 
 	return nil
 }
 
-func FindArchetype(kind string) (outpath string) {
-	search := []string{helpers.AbsPathify(viper.GetString("archetypeDir"))}
+// 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 viper.GetString("theme") != "" {
-		themeDir := path.Join(helpers.AbsPathify("themes/"+viper.GetString("theme")), "/archetypes/")
-		if _, err := os.Stat(themeDir); os.IsNotExist(err) {
-			jww.ERROR.Println("Unable to find archetypes directory for theme :", viper.GetString("theme"), "in", themeDir)
+	metadata, err := cast.ToStringMapE(archMetadata)
+	if err != nil {
+		return nil, err
+	}
+
+	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
+		}
+	}
+
+	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 {
-		pathsToCheck := []string{kind + ".md", kind, "default.md", "default"}
+		// 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
+
+		if kind == "" {
+			pathsToCheck = []string{"default.md", "default"}
+		} else {
+			pathsToCheck = []string{kind + ".md", kind, "default.md", "default"}
+		}
 		for _, p := range pathsToCheck {
-			curpath := path.Join(x, p)
+			curpath := filepath.Join(x, p)
 			jww.DEBUG.Println("checking", curpath, "for archetypes")
-			if exists, _ := helpers.Exists(curpath); exists {
+			if exists, _ := helpers.Exists(curpath, s.Fs.Source); exists {
+				jww.INFO.Println("curpath: " + curpath)
 				return curpath
 			}
 		}

create/content_test.go

@@ -0,0 +1,164 @@
+// 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.
+// 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_test
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/gohugoio/hugo/deps"
+
+	"github.com/gohugoio/hugo/hugolib"
+
+	"fmt"
+
+	"github.com/gohugoio/hugo/hugofs"
+
+	"github.com/gohugoio/hugo/create"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/spf13/afero"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewContent(t *testing.T) {
+	v := viper.New()
+	initViper(v)
+
+	cases := []struct {
+		kind     string
+		path     string
+		expected []string
+	}{
+		{"post", "post/sample-1.md", []string{`title = "Post Arch title"`, `test = "test1"`, "date = \"2015-01-12T19:20:04-07:00\""}},
+		{"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
+	}
+
+	for _, c := range cases {
+		cfg, fs := newTestCfg()
+		h, err := hugolib.NewHugoSites(deps.DepsCfg{Cfg: cfg, Fs: fs})
+		require.NoError(t, err)
+		require.NoError(t, initFs(fs))
+
+		s := h.Sites[0]
+
+		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.Errorf("[%d] %q missing from output:\n%q", i, v, content)
+			}
+		}
+	}
+}
+
+func initViper(v *viper.Viper) {
+	v.Set("metaDataFormat", "toml")
+	v.Set("archetypeDir", "archetypes")
+	v.Set("contentDir", "content")
+	v.Set("themesDir", "themes")
+	v.Set("layoutDir", "layouts")
+	v.Set("i18nDir", "i18n")
+	v.Set("theme", "sample")
+}
+
+func initFs(fs *hugofs.Fs) error {
+	perm := os.FileMode(0755)
+	var err error
+
+	// create directories
+	dirs := []string{
+		"archetypes",
+		"content",
+		filepath.Join("themes", "sample", "archetypes"),
+	}
+	for _, dir := range dirs {
+		err = fs.Source.Mkdir(dir, perm)
+		if err != nil {
+			return err
+		}
+	}
+
+	// create files
+	for _, v := range []struct {
+		path    string
+		content string
+	}{
+		{
+			path:    filepath.Join("archetypes", "post.md"),
+			content: "+++\ndate = \"2015-01-12T19:20:04-07:00\"\ntitle = \"Post Arch title\"\ntest = \"test1\"\n+++\n",
+		},
+		{
+			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",
+		},
+	} {
+		f, err := fs.Source.Create(v.path)
+		if err != nil {
+			return err
+		}
+		defer f.Close()
+
+		_, err = f.Write([]byte(v.content))
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// TODO(bep) extract common testing package with this and some others
+func readFileFromFs(t *testing.T, fs afero.Fs, filename string) string {
+	filename = filepath.FromSlash(filename)
+	b, err := afero.ReadFile(fs, filename)
+	if err != nil {
+		// Print some debug info
+		root := strings.Split(filename, helpers.FilePathSeparator)[0]
+		afero.Walk(fs, root, func(path string, info os.FileInfo, err error) error {
+			if info != nil && !info.IsDir() {
+				fmt.Println("    ", path)
+			}
+
+			return nil
+		})
+		t.Fatalf("Failed to read file: %s", err)
+	}
+	return string(b)
+}
+
+func newTestCfg() (*viper.Viper, *hugofs.Fs) {
+
+	v := viper.New()
+	fs := hugofs.NewMem(v)
+
+	v.SetFs(fs.Source)
+
+	initViper(v)
+
+	return v, fs
+
+}

deps/deps.go

@@ -0,0 +1,176 @@
+package deps
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+
+	"github.com/gohugoio/hugo/config"
+	"github.com/gohugoio/hugo/helpers"
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/output"
+	"github.com/gohugoio/hugo/tpl"
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+// Deps holds dependencies used by many.
+// 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:"-"`
+
+	// The templates to use. This will usually implement the full tpl.TemplateHandler.
+	Tmpl tpl.TemplateFinder `json:"-"`
+
+	// The file systems to use.
+	Fs *hugofs.Fs `json:"-"`
+
+	// The PathSpec to use
+	*helpers.PathSpec `json:"-"`
+
+	// The ContentSpec to use
+	*helpers.ContentSpec `json:"-"`
+
+	// The configuration to use
+	Cfg config.Provider `json:"-"`
+
+	// The translation func to use
+	Translate func(translationID string, args ...interface{}) string `json:"-"`
+
+	Language *helpers.Language
+
+	// All the output formats available for the current site.
+	OutputFormatsConfig output.Formats
+
+	templateProvider ResourceProvider
+	WithTemplate     func(templ tpl.TemplateHandler) error `json:"-"`
+
+	translationProvider ResourceProvider
+}
+
+// ResourceProvider is used to create and refresh, and clone resources needed.
+type ResourceProvider interface {
+	Update(deps *Deps) error
+	Clone(deps *Deps) error
+}
+
+func (d *Deps) TemplateHandler() tpl.TemplateHandler {
+	return d.Tmpl.(tpl.TemplateHandler)
+}
+
+func (d *Deps) LoadResources() error {
+	// Note that the translations need to be loaded before the templates.
+	if err := d.translationProvider.Update(d); err != nil {
+		return err
+	}
+
+	if err := d.templateProvider.Update(d); err != nil {
+		return err
+	}
+
+	if th, ok := d.Tmpl.(tpl.TemplateHandler); ok {
+		th.PrintErrors()
+	}
+
+	return nil
+}
+
+func New(cfg DepsCfg) (*Deps, error) {
+	var (
+		logger = cfg.Logger
+		fs     = cfg.Fs
+	)
+
+	if cfg.TemplateProvider == nil {
+		panic("Must have a TemplateProvider")
+	}
+
+	if cfg.TranslationProvider == nil {
+		panic("Must have a TranslationProvider")
+	}
+
+	if cfg.Language == nil {
+		panic("Must have a Language")
+	}
+
+	if logger == nil {
+		logger = jww.NewNotepad(jww.LevelError, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
+	}
+
+	if fs == nil {
+		// Default to the production file system.
+		fs = hugofs.NewDefault(cfg.Language)
+	}
+
+	ps, err := helpers.NewPathSpec(fs, cfg.Language)
+
+	if err != nil {
+		return nil, err
+	}
+
+	d := &Deps{
+		Fs:                  fs,
+		Log:                 logger,
+		templateProvider:    cfg.TemplateProvider,
+		translationProvider: cfg.TranslationProvider,
+		WithTemplate:        cfg.WithTemplate,
+		PathSpec:            ps,
+		ContentSpec:         helpers.NewContentSpec(cfg.Language),
+		Cfg:                 cfg.Language,
+		Language:            cfg.Language,
+	}
+
+	return d, nil
+}
+
+// ForLanguage creates a copy of the Deps with the language dependent
+// parts switched out.
+func (d Deps) ForLanguage(l *helpers.Language) (*Deps, error) {
+	var err error
+
+	d.PathSpec, err = helpers.NewPathSpec(d.Fs, l)
+	if err != nil {
+		return nil, err
+	}
+
+	d.ContentSpec = helpers.NewContentSpec(l)
+	d.Cfg = l
+	d.Language = l
+
+	if err := d.translationProvider.Clone(&d); err != nil {
+		return nil, err
+	}
+
+	if err := d.templateProvider.Clone(&d); err != nil {
+		return nil, err
+	}
+
+	return &d, nil
+
+}
+
+// DepsCfg contains configuration options that can be used to configure Hugo
+// on a global level, i.e. logging etc.
+// Nil values will be given default values.
+type DepsCfg struct {
+
+	// The Logger to use.
+	Logger *jww.Notepad
+
+	// The file systems to use
+	Fs *hugofs.Fs
+
+	// The language to use.
+	Language *helpers.Language
+
+	// The configuration to use.
+	Cfg config.Provider
+
+	// Template handling.
+	TemplateProvider ResourceProvider
+	WithTemplate     func(templ tpl.TemplateHandler) error
+
+	// i18n handling.
+	TranslationProvider ResourceProvider
+}

docs/archetypes/default.md

@@ -1,6 +0,0 @@
-+++
-weight = 5
-[menu]
-  [menu.main]
-    parent = "x"
-+++

docs/config.toml

@@ -1,51 +0,0 @@
-baseurl = "http://hugo.spf13.com"
-MetaDataFormat = "yaml"
-
-[indexes]
-  tag = "tags"
-  group = "groups"
-
-[[menu.main]]
-    name = "Download Hugo"
-    pre = "<i class='fa fa-download'></i>"
-    url = "https://github.com/spf13/hugo/releases"
-    weight = -200
-[[menu.main]]
-    name = "about hugo"
-    pre = "<i class='fa fa-heart'></i>"
-    weight = -110
-    identifier = "about"
-[[menu.main]]
-    name = "getting started"
-    pre = "<i class='fa fa-road'></i>"
-    weight = -100
-[[menu.main]]
-    name = "content"
-    pre = "<i class='fa fa-file-text'></i>"
-    weight = -90
-[[menu.main]]
-    name = "themes"
-    pre = "<i class='fa fa-desktop'></i>"
-    weight = -85
-[[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"
-    pre = "<i class='fa fa-gift'></i>"
-    weight = -60
-[[menu.main]]
-    name = "tutorials"
-    pre = "<i class='fa fa-book'></i>"
-    weight = -40
-[[menu.main]]
-    name = "community"
-    pre = "<i class='fa fa-group'></i>"
-    weight = -50

docs/content/community/contributing.md

@@ -1,67 +0,0 @@
----
-aliases:
-- /doc/contributing/
-- /meta/contributing/
-date: 2013-07-01
-menu:
-  main:
-    parent: community
-next: /tutorials/github_pages_blog
-prev: /community/press
-title: Contributing to Hugo
-weight: 30
----
-
-All contributions to Hugo are welcome. Whether you want to scratch an itch, or simply contribute to the project. Feel free to pick something from the roadmap
-or contact [spf13](http://spf13.com) about what may make sense
-to do next.
-
-You should fork the project and make your changes.  *We encourage pull requests to discuss code changes.*
-
-
-When you're ready to create a pull request, be sure to:
-
-  * Have test cases for the new code.  If you have questions about how to do it, please ask in your pull request.
-  * Run `go fmt`
-  * Squash your commits into a single commit.  `git rebase -i`.  It's okay to force update your pull request.
-  * Make sure `go test ./...` passes, and go build completes.  Our Travis CI loop will catch most things that are missing.  The exception: Windows.  We run on windows from time to time, but if you have access please check on a Windows machine too.
-
-## Contribution Overview
-
-1. Fork Hugo from https://github.com/spf13/hugo
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Commit passing tests to validate changes.
-5. Run `go fmt`
-6. Squash commits into a single (or logically grouped) commits (`git rebase -i`)
-7. Push to the branch (`git push origin my-new-feature`)
-8. Create new Pull Request
-
-
-# Building from source
-
-## Clone locally (for contributors):
-
-    git clone https://github.com/spf13/hugo
-    cd hugo
-    go get
-
-Because go expects all of your libraries to be found in either
-$GOROOT or $GOPATH, it's helpful to symlink the project to one
-of the following paths:
-
- * ln -s /path/to/your/hugo $GOPATH/src/github.com/spf13/hugo
- * ln -s /path/to/your/hugo $GOROOT/src/pkg/github.com/spf13/hugo
-
-## Running Hugo
-
-    cd /path/to/hugo
-    go install github.com/spf13/hugo/hugo
-    go run main.go
-
-## Building Hugo
-
-    cd /path/to/hugo
-    go build -o hugo main.go
-    mv hugo /usr/local/bin/
-

docs/content/community/mailing-list.md

@@ -1,38 +0,0 @@
----
-date: 2013-07-01
-menu:
-  main:
-    parent: community
-next: /community/press
-prev: /extras/urls
-title: Mailing List
-weight: 10
----
-
-Hugo has two mailing lists:
-
-## Announcements
-Very low traffic. Only releases will be emailed here.
-
-https://groups.google.com/forum/#!forum/hugo-announce
-
-## Discussion
-For all questions and discussions:
-
-https://groups.google.com/forum/#!forum/hugo-discuss
-
-# Other Resources
-
-## GoNuts
-
-For general go questions or discussion please refer to the go mailing list.
-
-https://groups.google.com/forum/#!forum/golang-nuts
-
-## Github Issues
-
-https://github.com/spf13/hugo/issues
-
-## Twitter
-
-Hugo doesn't have it's own twitter handle, but feel free to tweet [@spf13](http://twitter.com/spf13).

docs/content/community/press.md

@@ -1,37 +0,0 @@
----
-date: 2014-03-24T20:00:00Z
-linktitle: Press
-menu:
-  main:
-    parent: community
-next: /community/contributing
-notoc: true
-prev: /community/mailing-list
-title: Press, Blogs and Media Coverage
-weight: 20
----
-
-Hugo has been featured in the following Blog Posts, Press and Media.
-
-
-| Title | Author | Date  |
-| ------ | ------ | -----: |
-| [Hugo - A Static Site Builder in Go](http://deepfriedcode.com/post/hugo/) | Deep Fried Code |  30 Mar 2014   |
-| [Hugo](http://bra.am/post/hugo/) | bra.am |  23 Mar 2014   |
-| [Converting Blogger To Markdown](http://trishagee.github.io/project/atom-to-hugo/) | Trisha Gee |  20 Mar 2014   |
-| [Moving to Hugo Static Web Pages](http://tepid.org/tech/hugo-web/) |  Tobias Weingartner  |  16 Mar 2014   |
-| [Hugo and Github Pages](http://sglyon.com/blog/2014/creating-the-site/) | Spencer Lyon |  15 Mar 2014   |
-| [Hugo + gulp.js = Huggle](http://ktmud.github.io/huggle/intro/) | Jesse Yang  | 8 Mar 2014   |
-| [Powered by Hugo](http://kieranhealy.org/blog/archives/2014/02/24/powered-by-hugo/) | Kieran Healy  | 24 Feb 2014   |
-| [Latest Roundup of Useful Tools For Developers](http://codegeekz.com/latest-roundup-of-useful-tools-for-developers/) | CodeGeekz  |  13 Feb 2014   |
-| [Hugo: Static Site Generator written in Go](http://www.braveterry.com/2014/02/06/hugo-static-site-generator-written-in-go/) | Brave Terry  | 6 Feb 2014   |
-| [10 Useful HTML5 Tools for Web Designers and Developers](http://designdizzy.com/10-useful-html5-tools-for-web-designers-and-developers/) | Design Dizzy  | 4 Feb 2014   |
-| [Hugo – Fast, Flexible Static Site Generator](http://cube3x.com/hugo-fast-flexible-static-site-generator/) |  Joby Joseph |  18 Jan 2014   |
-| [Xaprb now uses Hugo](http://xaprb.com/blog/2014/01/15/using-hugo/) | Baron Schwartz  | 15 Jan  2014   |
-| [New jQuery Plugins And Resources That Web Designers Need](http://www.designyourway.net/blog/resources/new-jquery-plugins-and-resources-that-web-designers-need/) | Design Your Way  |   2014   |
-| [Hugo](http://onethingwell.org/post/69070926608/hugo) | One Thing Well  |  5 Dec 2013   |
-| [Hosting a blog on S3 and Cloudfront](http://www.danesparza.net/2013/07/hosting-a-blog-on-s3-and-cloudfront/) | Dan Esparza  | 24 July 2013   |
-
-### Wrote a post, article or tutorial?
-
-Have you written a post, article or tutorial on hugo? Send us a pull request or issue with the addition.

docs/content/content/archetypes.md

@@ -1,75 +0,0 @@
----
-date: 2014-05-14T02:13:50Z
-menu:
-  main:
-    parent: content
-next: /content/ordering
-prev: /content/types
-title: Archetypes
-weight: 50
----
-
-Hugo v0.11 introduced the concept of a content builder. Using the
-command: `hugo new [relative new content path]` you can start a content file
-with the date and title automatically set. This is a welcome feature, but 
-active writers need more. 
-
-Hugo presents the concept of archetypes which are archetypal content files.
-
-## Example archetype
-
-In this example scenario I have a blog with a single content type (blog post).
-I use ‘tags’ and ‘categories’ for my taxonomies.
-
-### archetypes/default.md
-
-    +++
-    tags = ["x", "y"]
-    categories = ["x", "y"]
-    +++
-
-
-## using archetypes
-
-If I wanted to create a new post in the `posts` section I would run the following command...
-
-`hugo new posts/my-new-post.md`
-
-Hugo would create the file with the following contents:
-
-### contents/posts/my-new-post.md
-
-    +++
-    title = "my new post"
-    date = 2014-05-14T02:13:50Z
-    tags = ["x", "y"]
-    categories = ["x", "y"]
-    +++
-
-
-## Using a different front matter format
-
-By default the front matter will be created in the TOML format
-regardless of what format the archetype is using.
-
-You can specify a different default format in your config file using
-the `MetaDataFormat` directive. Possible values are `toml`, `yaml` and `json`.
-
-
-## Which archtype is being used
-
-The following rules apply:
-
-* If an archetype with a filename that matches the content type being created it will be used.
-* If no match is found `archetypes/default.md` will be used.
-* If neither are present and a theme is in use then within the theme...
-    * If an archetype with a filename that matches the content type being created it will be used.
-    * If no match is found `archetypes/default.md` will be used.
-* If no archetype files are present then the one that ships with hugo will be used.
-
-Hugo provides a simple archetype which sets the title (based on the
-file name) and the date based on now().
-
-Content type is automatically detected based on the path. You are welcome to declare which 
-type to create using the `--kind` flag during creation.
-

docs/content/content/example.md

@@ -1,49 +0,0 @@
----
-aliases:
-- /doc/example/
-date: 2013-07-01
-linktitle: Example
-menu:
-  main:
-    parent: content
-next: /themes/overview
-notoc: true
-prev: /content/ordering
-title: Example Content File
-weight: 70
----
-
-Somethings are better shown than explained. The following is a very basic example of a content file:
-
-**mysite/project/nitro.md  <- http://mysite.com/project/nitro.html**
-
-    ---
-    Title:       "Nitro : A quick and simple profiler for Go"
-    Description: "Nitro is a simple profiler for you go lang applications"
-    Tags:        [ "Development", "Go", "profiling" ]
-    date:        "2013-06-19"
-    Topics:      [ "Development", "Go" ]
-    Slug:        "nitro"
-    project_url: "http://github.com/spf13/nitro"
-    ---
-
-    # Nitro
-
-    Quick and easy performance analyzer library for Go.
-
-    ## Overview
-
-    Nitro is a quick and easy performance analyzer library for Go.
-    It is useful for comparing A/B against different drafts of functions
-    or different functions.
-
-    ## Implementing Nitro
-
-    Using Nitro is simple. First use go get to install the latest version
-    of the library.
-
-        $ go get github.com/spf13/nitro
-
-    Next include nitro in your application.
-
-

docs/content/content/front-matter.md

@@ -1,94 +0,0 @@
----
-aliases:
-- /doc/front-matter/
-date: 2013-07-01
-menu:
-  main:
-    parent: content
-next: /content/sections
-prev: /content/organization
-title: Front Matter
-weight: 20
----
-
-The front matter is one of the features that gives Hugo its strength. It enables
-you to include the meta data of the content right with it. Hugo supports a few
-different formats each with their own identifying tokens.
-
-Supported formats: <br>
-  **YAML**, identified by '\-\-\-'. <br>
-  **TOML**, indentified with '+++'.<br>
-  **JSON**, a single JSON object which is surrounded by '{' and '}' each on their own line.
-
-### YAML Example
-
-    ---
-    title: "spf13-vim 3.0 release and new website"
-    description: "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
-    tags: [ ".vimrc", "plugins", "spf13-vim", "vim" ]
-    date: "2012-04-06"
-    categories:
-      - "Development"
-      - "VIM"
-    slug: "spf13-vim-3-0-release-and-new-website"
-    ---
-    Content of the file goes Here
-
-### TOML Example
-
-    +++
-    title = "spf13-vim 3.0 release and new website"
-    description = "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
-    tags = [ ".vimrc", "plugins", "spf13-vim", "vim" ]
-    date = "2012-04-06"
-    categories = [
-      "Development",
-      "VIM"
-    ]
-    slug = "spf13-vim-3-0-release-and-new-website"
-    +++
-    Content of the file goes Here
-
-### JSON Example
-
-    {
-        "title": "spf13-vim 3.0 release and new website",
-        "description": "spf13-vim is a cross platform distribution of vim plugins and resources for Vim.",
-        "tags": [ ".vimrc", "plugins", "spf13-vim", "vim" ],
-        "date": "2012-04-06",
-        "categories": [
-            "Development",
-            "VIM"
-        ],
-        "slug": "spf13-vim-3-0-release-and-new-website",
-    }
-    Content of the file goes Here
-
-## Variables
-
-There are a few predefined variables that Hugo is aware of and utilizes. The user can also create
-any variable they want to. These will be placed into the `.Params` variable available to the templates.
-**Field names are case insensitive.**
-
-### Required
-
-* **title** The title for the content
-* **description** The description for the content
-* **date** The date the content will be sorted by
-* **taxonomies** These will use the field name of the plural form of the index (see tags and categories above)
-
-### Optional
-
-* **redirect** Mark the post as a redirect post
-* **draft** If true the content will not be rendered unless hugo is called with --buildDrafts
-* **publishdate** If in the future, content will not be rendered unless hugo is called with --buildFuture
-* **type** The type of the content (will be derived from the directory automatically if unset)
-* **weight** Used for sorting
-* **markup** (Experimental) Specify "rst" for reStructuredText (requires
-            `rst2html`,) or "md" (default) for the Markdown
-* **slug** The token to appear in the tail of the url
-   *or*<br>
-* **url** The full path to the content from the web root.<br>
-
-*If neither slug or url is present the filename will be used.*
-

docs/content/content/ordering.md

@@ -1,39 +0,0 @@
----
-date: 2014-03-06
-linktitle: Ordering
-menu:
-  main:
-    parent: content
-next: /content/example
-prev: /content/archetypes
-title: Ordering Content
-weight: 60
----
-
-Hugo provides you with all the flexibility you need to organize how your content is ordered.
-
-By default, content is ordered by weight, then by date with the most
-recent date first, but alternative sorting (by title and linktitle) is
-also available. The order the content will appear will be specified in
-the [list template](/templates/list).
-
-_Both the date and weight fields are optional._
-
-Unweighted pages appear at the end of the list. If no weights are provided (or
-if weights are the same) date will be used to sort. If neither are provided
-content will be ordered based on how it's read off the disk and no order is
-guaranteed.
-
-## Assigning Weight to content
-
-    +++
-    weight = "4"
-    title = "Three"
-    date = "2012-04-06"
-    +++
-    Front Matter with Ordered Pages 3
-
-
-## Ordering Content Within Taxonomies
-
-Please see the [Taxonomy Ordering Documentation](/taxonomies/ordering/)

docs/content/content/organization.md

@@ -1,164 +0,0 @@
----
-aliases:
-- /doc/organization/
-date: 2013-07-01
-linktitle: Organization
-menu:
-  main:
-    parent: content
-next: /content/front-matter
-prev: /overview/source-directory
-title: Content Organization
-weight: 10
----
-
-Hugo uses markdown files with headers commonly called the front matter. Hugo
-respects the organization that you provide for your content to minimize any
-extra configuration, though this can be overridden by additional configuration
-in the front matter.
-
-## Organization
-
-In Hugo the content should be arranged in the same way they are intended for
-the rendered website. Without any additional configuration the following will
-just work. Hugo supports content nested at any level. The top level is special
-in Hugo and is used as the [section](/content/sections).
-
-    .
-    └── content
-        ├── post
-        |   ├── firstpost.md   // <- http://1.com/post/firstpost/
-        |   ├── happy
-        |   |   └── ness.md    // <- http://1.com/post/happy/ness/
-        |   └── secondpost.md  // <- http://1.com/post/secondpost/
-        └── quote
-            ├── first.md       // <- http://1.com/quote/first/
-            └── second.md      // <- http://1.com/quote/second/
-
-**Here's the same organization run with hugo -\-uglyurls**
-
-    .
-    └── content
-        ├── post
-        |   ├── firstpost.md   // <- http://1.com/post/firstpost.html
-        |   ├── happy
-        |   |   └── ness.md    // <- http://1.com/post/happy/ness.html
-        |   └── secondpost.md  // <- http://1.com/post/secondpost.html
-        └── quote
-            ├── first.md       // <- http://1.com/quote/first.html
-            └── second.md      // <- http://1.com/quote/second.html
-
-## Destinations
-
-Hugo thinks that you organize your content with a purpose. The same structure
-that works to organize your source content is used to organize the rendered
-site. As displayed above, the organization of the source content will be
-mirrored in the destination.
-
-There are times when one would need more control over their content. In these
-cases there are a variety of things that can be specified in the front matter to
-determine the destination of a specific piece of content.
-
-The following items are defined in order, latter items in the list will override
-earlier settings.
-
-### filename
-This isn't in the front matter, but is the actual name of the file minus the
-extension. This will be the name of the file in the destination.
-
-### slug
-Defined in the front matter, the slug can take the place of the filename for the
-destination.
-
-### filepath
-The actual path to the file on disk. Destination will create the destination
-with the same path. Includes [section](/content/sections).
-
-### section
-section can be provided in the front matter overriding the section derived from
-the source content location on disk. See [section](/content/sections).
-
-### path
-path can be provided in the front matter. This will replace the actual
-path to the file on disk. Destination will create the destination with the same
-path. Includes [section](/content/sections).
-
-### url
-A complete url can be provided. This will override all the above as it pertains
-to the end destination. This must be the path from the baseurl (starting with a "/").
-When a url is provided it will be used exactly. Using url will ignore the
--\-uglyurls setting.
-
-
-## Path breakdown in hugo
-
-### Content
-
-    .             path           slug
-    .       ⊢-------^----⊣ ⊢------^-------⊣
-    content/extras/indexes/category-example/index.html
-
-
-    .       section              slug
-    .       ⊢--^--⊣        ⊢------^-------⊣
-    content/extras/indexes/category-example/index.html
-
-
-    .       section  slug
-    .       ⊢--^--⊣⊢--^--⊣
-    content/extras/indexes/index.html
-
-### Destination
-
-
-               permalink
-    ⊢--------------^-------------⊣
-    http://spf13.com/projects/hugo
-
-
-       baseUrl       section  slug
-    ⊢-----^--------⊣ ⊢--^---⊣ ⊢-^⊣
-    http://spf13.com/projects/hugo
-
-
-       baseUrl       section          slug
-    ⊢-----^--------⊣ ⊢--^--⊣        ⊢--^--⊣
-    http://spf13.com/extras/indexes/example
-
-
-       baseUrl            path       slug
-    ⊢-----^--------⊣ ⊢------^-----⊣ ⊢--^--⊣
-    http://spf13.com/extras/indexes/example
-
-
-       baseUrl            url
-    ⊢-----^--------⊣ ⊢-----^-----⊣
-    http://spf13.com/projects/hugo
-
-
-       baseUrl               url
-    ⊢-----^--------⊣ ⊢--------^-----------⊣
-    http://spf13.com/extras/indexes/example
-
-
-
-**section** = which type the content is by default
-
-* based on content location 
-* front matter overrides
-
-**slug** = name.ext or name/
-
-* based on content-name.md 
-* front matter overrides
-
-**path** = section + path to file exluding slug
-
-* based on path to content location
-
-
-**url** = relative url
-
-* defined in front matter
-* overrides all the above
-

docs/content/content/sections.md

@@ -1,51 +0,0 @@
----
-date: 2013-07-01
-menu:
-  main:
-    parent: content
-next: /content/types
-notoc: true
-prev: /content/front-matter
-title: Sections
-weight: 30
----
-
-Hugo thinks that you organize your content with a purpose. The same structure
-that works to organize your source content is used to organize the rendered
-site ( [see organization](/content/organization) ). Following this pattern Hugo
-uses the top level of your content organization as **the Section**.
-
-The following example site uses two sections, "post" and "quote".
-
-    .
-    └── content
-        ├── post
-        |   ├── firstpost.md       // <- http://1.com/post/firstpost/
-        |   ├── happy
-        |   |   └── ness.md   // <- http://1.com/post/happy/ness/
-        |   └── secondpost.md      // <- http://1.com/post/secondpost/
-        └── quote
-            ├── first.md           // <- http://1.com/quote/first/
-            └── second.md          // <- http://1.com/quote/second/
-
-
-## Section Lists
-
-Hugo will automatically create pages for each section root that list all
-of the content in that section. See [List Templates](/templates/list)
-for details on customizing the way they appear.
-
-## Sections and Types
-
-By default everything created within a section will use the content type
-that matches the section name.
-
-Section defined in the front matter have the same impact.
-
-To change the type of a given piece of content simply define the type
-in the front matter.
-
-If a layout for a given type hasn't been provided a default type template will
-be used instead provided is exists.
-
-

docs/content/content/types.md

@@ -1,76 +0,0 @@
----
-date: 2013-07-01
-linktitle: Types
-menu:
-  main:
-    parent: content
-next: /content/archetypes
-prev: /content/sections
-title: Content Types
-weight: 40
----
-
-Hugo has full support for different types of content. A content type can have a
-unique set of meta data, template and can be automatically created by the new
-command through using content [archetypes](/content/archetypes).
-
-A good example of when multiple types are needed is to look at Tumblr. A piece
-of content could be a photo, quote or post, each with different meta data and
-rendered differently.
-
-## Assigning a content type
-
-Hugo assumes that your site will be organized into [sections](/content/sections)
-and each section will use the corresponding type. If you are taking advantage of
-this then each new piece of content you place into a section will automatically
-inherit the type.
-
-Alternatively you can set the type in the meta data under the key "type".
-
-
-## Creating new content of a specific type
-
-Hugo has the ability to create a new content file and populate the front matter
-with the data set corresponding to that type. Hugo does this by utilizing
-[archetypes](/content/archetypes).
-
-To create a new piece of content use:
-
-    hugo new relative/path/to/content.md
-
-For example if I wanted to create a new post inside the post section I would type:
-
-    hugo new post/my-newest-post.md
-
-
-## Defining a content type
-
-Creating a new content type is easy in Hugo. You simply provide the templates and archetype
-that the new type will use. You only need to define the templates, archetypes and/or views
-unique to that content type. Hugo will fall back to using the general templates and default archetype
-whenever a specific file is not present.
-
-*Remember, all of the following are optional:*
-
-### Create Type Directory
-Create a directory with the name of the type in layouts.Type is always singular.  *Eg /layouts/post*.
-
-### Create single template
-Create a file called single.html inside your directory. *Eg /layouts/post/single.html*.
-
-### Create list template
-Create a file called list.html inside your directory  *Eg /layouts/post/list.html*.
-
-### Create views
-Many sites support rendering content in a few different ways, for
-instance a single page view and a summary view to be used when displaying a list
-of contents on a single page. Hugo makes no assumptions here about how you want
-to display your content, and will support as many different views of a content
-type as your site requires. All that is required for these additional views is
-that a template exists in each layout/type directory with the same name.
-
-### Create a corresponding archetype
-
-Create a file called `type`.md in the /archetypes directory *Eg /archetypes/post.md*.
-
-More details about archetypes can be found at the [archetypes docs](/content/archetypes)

docs/content/extras/aliases.md

@@ -1,40 +0,0 @@
----
-aliases:
-- /doc/redirects/
-- /doc/alias/
-- /doc/aliases/
-date: 2013-07-09
-menu:
-  main:
-    parent: extras
-next: /extras/builders
-prev: /taxonomies/ordering
-title: Aliases
-weight: 10
----
-
-For people migrating existing published content to Hugo theres a good chance
-you need a mechanism to handle redirecting old urls.
-
-Luckily, this can be handled easily with aliases in Hugo.
-
-## Example
-**content/posts/my-awesome-blog-post.md**
-
-    ---
-    aliases:
-        - /posts/my-original-url/
-        - /2010/even-earlier-url.html
-    ---
-
-Now when you go to any of the aliases locations they
-will redirect to the page.
-
-## Important Behaviors
-
-1. *Hugo makes no assumptions about aliases. They also don't change based
-on your UglyUrls setting. You need to provide absolute path to your webroot and the
-complete filename or directory.*
-
-2. *Aliases are rendered prior to any content and will be overwritten by
-any content with the same location.*

docs/content/extras/builders.md

@@ -1,60 +0,0 @@
----
-date: 2014-05-26
-linktitle: Builders
-menu:
-  main:
-    parent: extras
-next: /extras/comments
-prev: /extras/aliases
-title: Hugo Builders
-weight: 12
----
-
-Hugo provides the functionality to quickly get a site, theme or page
-started.
-
-
-## New Site
-
-Want to get a site built quickly?.
-
-    hugo new site /path/to/site
-
-Hugo will create all the needed directories and files to get started
-quickly.
-
-Hugo will only touch the files and create the directories (in the right
-places), [configuration](/overview/configuration) and content are up to
-you... but luckily we have builders for content (see below).
-
-## New Theme
-
-Want to design a new theme?
-
-    hugo new theme `THEME_NAME`
-
-Run from your working directory, this will create a new theme with all
-the needed files in your themes directory. Hugo will provide you with a
-license and theme.toml file with most of the work done for you.
-
-Follow the [Theme Creation Guide](/themes/creation) once the builder is
-done.
-
-## New Content
-
-You will use this builder the most of all. Every time you want to create
-a new piece of content, the content builder will get you started right.
-
-Leveraging [content archetypes](/content/archetypes) the content builder
-will not only insert the current date and appropriate metadata, but it
-will pre-populate values based on the content type.
-
-    hugo new relative/path/to/content
-
-This assumes it is being run from your working directory and the content
-path starts from your content directory.
-
-I typically keep two different terminals open, one to run `hugo server
---watch`, and another to use the builders to create new content.
-
-

docs/content/extras/comments.md

@@ -1,67 +0,0 @@
----
-date: 2014-05-26
-linktitle: Comments
-menu:
-  main:
-    parent: extras
-next: /extras/livereload
-prev: /extras/builders
-title: Comments in Hugo
-weight: 14
----
-
-As Hugo is a static site generator, the content produced is static and
-doesn’t interact with the users. The most common interaction people ask
-for is comment capability.
-
-Hugo ships with support for [disqus](http://disqus.com), a third party
-service that provides comment and community capabilities to website via
-javascript.
-
-Your theme may already support disqus, but even it if doesn’t it is easy
-to add.
-
-# Disqus Support
-
-## Adding Disqus to a template
-
-Hugo comes with all the code you would need to include load disqus.
-Simply include the following line where you want your comments to appear
-
-    {{ template "_internal/disqus.html" . }}
-
-
-## Configuring Disqus
-
-That template requires you to set a single value in your site config file, eg. config.yaml.
-
-    disqusShortname = "XYW"
-
-Additionally you can optionally set the following in the front matter
-for a given piece of content
-
- * **disqus_identifier**
- * **disqus_title**
- * **disqus_url**
-
-# Alternatives
-
-A few alternatives exist to Disqus.
-
-* [Intense Debate](http://intensedebate.com/)
-* [LiveFyre](http://livefyre.com/)
-* [Moot](http://muut.com)
-* [Kaiju](http://github.com/spf13/kaiju)
-
-
-[Kaiju](http://github.com/spf13/kaiju) is a open source project started
-by [spf13](http://spf13.com) (Hugo’s author) to bring easy and fast real
-time discussions to the web.
-
-Written using Go, Socket.io and MongoDB it is very fast and easy to
-deploy.
-
-It is in early development but shows promise.. If you have interest
-please help by contributing whether via a pull request, an issue or even
-just a tweet. Everything helps.
-

docs/content/extras/highlighting.md

@@ -1,99 +0,0 @@
----
-date: 2013-07-01
-menu:
-  main:
-    parent: extras
-next: /extras/toc
-prev: /extras/shortcodes
-title: Syntax Highlighting
-weight: 50
----
-
-Hugo provides the ability for you to highlight source code in two different
-ways — either pre-processed server side from your content, or to defer
-the processing to the client side, using a JavaScript library. The advantage of
-server side is that it doesn’t depend on a JavaScript library and consequently
-works very well when read from an rss feed. The advantage of client side is that
-it doesn’t cost anything when building your site and some of the highlighting 
-scripts available cover more languages than pygments does.
-
-For the pre-processed approach, Highlighting is performed by an external
-python based program called [pygments](http://pygments.org) and is triggered
-via an embedded shortcode. If pygments is absent from the path, it will
-silently simply pass the content along unhighlighted.
-
-## Server Side
-
-### Disclaimers
-
- * **Warning** pygments is relatively slow. Expect much longer build times when using server side highlighting.
- * Languages available depends on your pygments installation.
- * Styles are inline in order to be supported in syndicated content when references
-to style sheets are not carried over.
- * We have sought to have the simplest interface possible, which consequently
-limits configuration. An ambitious user is encouraged to extend the current
-functionality to offer more customization.
-* You can change appearance with config options `pygmentsstyle`(default
-`"monokai"`) and `pygmentsuseclasses`(defaut `false`).
-
-### Usage
-Highlight takes exactly one required parameter of language and requires a
-closing shortcode.
-
-### Example
-The example has an extra space between the “{{” and “%” characters to prevent rendering here.
-
-    {{ % highlight html %}}
-    <section id="main">
-      <div>
-       <h1 id="title">{{ .Title }}</h1>
-        {{ range .Data.Pages }}
-            {{ .Render "summary"}}
-        {{ end }}
-      </div>
-    </section>
-    {{ % /highlight %}}
-
-
-### Example Output
-
-    <span style="color: #f92672">&lt;section</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">&quot;main&quot;</span><span style="color: #f92672">&gt;</span>
-      <span style="color: #f92672">&lt;div&gt;</span>
-       <span style="color: #f92672">&lt;h1</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">&quot;title&quot;</span><span style="color: #f92672">&gt;</span>{{ .Title }}<span style="color: #f92672">&lt;/h1&gt;</span>
-        {{ range .Data.Pages }}
-            {{ .Render &quot;summary&quot;}}
-        {{ end }}
-      <span style="color: #f92672">&lt;/div&gt;</span>
-    <span style="color: #f92672">&lt;/section&gt;</span>
-
-## Client-side
-
-Alternatively, code highlighting can be done in client-side JavaScript.
-
-Client-side syntax highlighting is very simple to add. You'll need to pick
-a library and a corresponding theme. Some popular libraries are:
-
-- [Highlight.js]
-- [Rainbow]
-- [Syntax Highlighter]
-- [Google Prettify]
-
-This example uses the popular [Highlight.js] library, hosted by [Yandex], a
-popular Russian search engine.
-
-In your `./layouts/chrome/` folder, depending on your specific theme, there
-will be a snippet that will be included in every generated HTML page, such
-as `header.html` or `header.includes.html`. Simply add:
-
-    <link rel="stylesheet" href="https://yandex.st/highlightjs/8.0/styles/default.min.css">
-    <script src="https://yandex.st/highlightjs/8.0/highlight.min.js"></script>
-
-You can of course use your own copy of these files, typically in `./static/`.
-
-[Highlight.js]: http://highlightjs.org/
-[Rainbow]: http://craig.is/making/rainbows
-[Syntax Highlighter]: http://alexgorbatchev.com/SyntaxHighlighter/
-[Google Prettify]: https://code.google.com/p/google-code-prettify/
-[Yandex]: http://yandex.ru/
-
-Please see individual libraries documentation for how to implement the JavaScript based libraries.

docs/content/extras/livereload.md

@@ -1,61 +0,0 @@
----
-date: 2014-05-26
-menu:
-  main:
-    parent: extras
-next: /extras/menus
-prev: /extras/comments
-title: Live Reload
-weight: 15
----
-
-Hugo may not be the first static site generator to utilize live reload
-technology, but it’s the first to do it right.
-
-The combination of Hugo’s insane build speed and live reload make
-crafting your content pure joy. Virtually instantly after you hit save
-your rebuilt content will appear in your browser.
-
-## Using livereload
-
-Hugo comes with livereload built in. There are no additional packages to
-install. A common way to use hugo while developing a site is to have
-hugo run a server and watch for changes.
-
-    hugo server --watch
-
-This will run a full functioning web server while simultaneously
-watching your file system for additions, deletions or changes within
-your:
-
- * static files
- * content
- * layouts
- * current theme
-
-Whenever anything changes Hugo will rebuild the site, continue to serve
-the content and as soon as the build is finished it will tell the
-browser and silently reload the page. Because most hugo builds are so
-fast they are barely noticeable, you merely need to glance at your open
-browser and you will see the change already there.
-
-This means that keeping the site open on a second monitor (or another
-half of your current monitor), allows you to see exactly what your
-content looks like without even leaving your text editor.
-
-## Disabling livereload
-
-Live reload accomplishes this by injecting javascript into the pages it
-creates that creates a web socket client to the hugo web socket server.
-
-Awesome for development, but not something you would want to do in
-production. Since many people use `hugo server --watch` in production to
-instantly display any updated content, we’ve made it easy to disable the
-live reload functionality.
-
-    hugo server --watch --disableLiveReload
-
-
-
-
-

docs/content/extras/menus.md

@@ -1,164 +0,0 @@
----
-date: 2014-05-14T02:36:37Z
-menu:
-  main:
-    parent: extras
-next: /extras/permalinks
-prev: /extras/livereload
-title: Menus
-weight: 20
----
-
-Hugo has a simple yet powerful menu system that permits content to be
-placed in menus with a good degree of control without a lot of work. 
-
-Some of the features of Hugo Menus:
-
-* Place content in one or many menus
-* Handle nested menus with unlimited depth
-* Create menu entries without being attached to any content
-* Distinguish active element (and active branch)
-
-## What is a menu?
-
-A menus is a named array of menu entries accessible on the site under
-.Site.Menus by name. For example if I have a menu called `main` I would
-access it via .Site.Menus.main.
-
-A menu entry has the following properties:
-
-* **Url**        string
-* **Name**       string
-* **Menu**       string
-* **Identifier** string
-* **Pre**        template.HTML
-* **Post**       template.HTML
-* **Weight**     int
-* **Parent**     string
-* **Children**   Menu
-
-And the following functions:
-
-* **HasChildren** bool
-
-Additionally there are some relevant functions available on the page:
-
-* **IsMenuCurrent** (menu string, menuEntry *MenuEntry ) bool
-* **HasMenuCurrent** (menu string, menuEntry *MenuEntry) bool
-
-
-## Adding content to menus
-
-Hugo supports a couple of different methods of adding a piece of content
-to the front matter.
-
-### Simple
-
-If all you need to do is add an entry to a menu, the simple form works
-well.
-
-**A single menu:**
-
-    ---
-    menu: "main"
-    ---
-
-**Multiple menus:**
-
-    ---
-    menu: ["main", "footer"]
-    ---
-
-
-### Advanced
-
-If more control is required, then the advanced approach gives you the
-control you want. All of the menu entry properties listed above are
-available.
-
-    ---
-    menu:
-      main:
-        parent: 'extras'
-        weight: 20
-    ---
-
-
-## Adding (non-content) entries to a menu
-
-You can also add entries to menus that aren’t attached to a piece of
-content. This takes place in the site wide config file.
-
-Here’s an example (in toml):
-
-    [[menu.main]]
-        name = "about hugo"
-        pre = "<i class='fa fa-heart'></i>"
-        weight = -110
-        identifier = "about"
-    [[menu.main]]
-        name = "getting started"
-        pre = "<i class='fa fa-road'></i>"
-        weight = -100
-
-## Nesting
-
-All nesting of content is done via the `parent` field.
-
-The parent of an entry should be the identifier of another entry.
-Identifier should be unique (within a menu).
-
-The following order is used to determine identity Identifier > Name >
-LinkTitle > Title. This means that the title will be used unless
-linktitle is present, etc. In practice Name and Identifier are never
-displayed and only used to structure relationships.
-
-In this example, the top level of the menu is defined in the config file
-and all content entries are attached to one of these entries via the
-`parent` field.
-
-## Rendering menus
-
-Hugo makes no assumptions about how your rendered HTML will be
-structured, instead it provides all of the functions you will need to be
-able to build your menu however you want. 
-
-
-The following is an example:
-
-    <!--sidebar start-->
-    <aside>
-        <div id="sidebar"  class="nav-collapse ">
-            <!-- sidebar menu start-->
-            <ul class="sidebar-menu">
-              {{ $currentNode := . }}
-              {{ range .Site.Menus.main }}
-                  {{ if .HasChildren }}
-
-                <li class="sub-menu{{if $currentNode.HasMenuCurrent "main" . }} active{{end}}">
-                <a href="javascript:;" class="">
-                    {{ .Pre }}
-                    <span>{{ .Name }}</span>
-                    <span class="menu-arrow arrow_carrot-right"></span>
-                </a>
-                <ul class="sub">
-                    {{ range .Children }}
-                    <li{{if $currentNode.IsMenuCurrent "main" . }} class="active"{{end}}><a href="{{.Url}}"> {{ .Name }} </a> </li>
-                    {{ end }}
-                </ul>
-              {{else}}
-                <li>
-                <a class="" href="{{.Url}}">
-                    {{ .Pre }}
-                    <span>{{ .Name }}</span>
-                </a>
-              {{end}}
-              </li>
-              {{end}}
-                <li> <a href="https://github.com/spf13/hugo/issues" target="blank">Questions and Issues</a> </li>
-                <li> <a href="#" target="blank">Edit this Page</a> </li>
-            </ul>
-            <!-- sidebar menu end-->
-        </div>
-    </aside>
-    <!--sidebar end-->

docs/content/extras/permalinks.md

@@ -1,38 +0,0 @@
----
-aliases:
-- /doc/permalinks/
-date: 2013-11-18
-menu:
-  main:
-    parent: extras
-next: /extras/shortcodes
-notoc: true
-prev: /extras/menus
-title: Permalinks
-weight: 30
----
-
-By default, content is laid out into the target `publishdir` (public)
-namespace matching its layout within the `contentdir` hierarchy.
-The `permalinks` site configuration option allows you to adjust this on a
-per-section basis.
-This will change where the files are written to and will change the page's
-internal "canonical" location, such that template references to
-`.RelPermalink` will honour the adjustments made as a result of the mappings
-in this option.
-
-For instance, if one of your sections is called `post` and you want to adjust
-the canonical path to be hierarchical based on the year and month, then you
-might use:
-
-```yaml
-permalinks:
-  post: /:year/:month/:title/
-```
-
-Only the content under `post/` will be so rewritten.
-A file named `content/post/sample-entry` which contains a line
-`date: 2013-11-18T19:20:00-05:00` might end up with the rendered page
-appearing at `public/2013/11/sample-entry/index.html` and be reachable via
-the URL <http://yoursite.example.com/2013/11/sample-entry/>.
-

docs/content/extras/shortcodes.md

@@ -1,231 +0,0 @@
----
-aliases:
-- /doc/shortcodes/
-date: 2013-07-01
-menu:
-  main:
-    parent: extras
-next: /extras/highlighting
-prev: /extras/permalinks
-title: Shortcodes
-weight: 40
----
-
-Because Hugo uses markdown for its simple content format, however there's a lot
-of things that markdown doesn't support well.
-
-We are unwilling to accept being constrained by our simple format. Also
-unacceptable is writing raw html in our markdown every time we want to include
-unsupported content such as a video. To do so is in complete opposition to the
-intent of using a bare bones format for our content and utilizing templates to
-apply styling for display.
-
-To avoid both of these limitations Hugo created shortcodes.
-
-A shortcode is a simple snippet inside a markdown file that Hugo will render
-using a predefined template.
-
-## Using a shortcode
-
-In your content files a shortcode can be called by using '{{% name parameters
-%}}' respectively. Shortcodes are space delimited (parameters with spaces
-can be quoted).
-
-The first word is always the name of the shortcode. Parameters follow the name.
-The format for named parameters models that of html with the format
-name="value". The current implementation only supports this exact format. Extra
-spaces or different quote marks will not parse properly.
-
-Some shortcodes use or require closing shortcodes. Like HTML, the opening and closing
-shortcodes match (name only), the closing being prepended with a slash.
-
-Example of a paired shortcode:
-
-    {{ % highlight go %}} A bunch of code here {{ % /highlight %}} 
-
-
-## Hugo Shortcodes
-
-Hugo ships with a set of predefined shortcodes.
-
-### highlight
-
-This shortcode will convert the source code provided into syntax highlighted
-html. Read more on [highlighting](/extras/highlighting).
-
-#### Usage
-Highlight takes exactly one required parameter of language and requires a
-closing shortcode.
-
-#### Example
-The example has an extra space between the “{{” and “%” characters to prevent rendering here.
-
-    {{ % highlight html %}}
-    <section id="main">
-      <div>
-       <h1 id="title">{{ .Title }}</h1>
-        {{ range .Data.Pages }}
-            {{ .Render "summary"}}
-        {{ end }}
-      </div>
-    </section>
-    {{ % /highlight %}}
-
-
-#### Example Output
-
-    <span style="color: #f92672">&lt;section</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">&quot;main&quot;</span><span style="color: #f92672">&gt;</span>
-      <span style="color: #f92672">&lt;div&gt;</span>
-       <span style="color: #f92672">&lt;h1</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">&quot;title&quot;</span><span style="color: #f92672">&gt;</span>{{ .Title }}<span style="color: #f92672">&lt;/h1&gt;</span>
-        {{ range .Data.Pages }}
-            {{ .Render &quot;summary&quot;}}
-        {{ end }}
-      <span style="color: #f92672">&lt;/div&gt;</span>
-    <span style="color: #f92672">&lt;/section&gt;</span>
-
-### figure
-Figure is simply an extension of the image capabilities present with Markdown.
-figure provides the ability to add captions, css classes, alt text, links etc.
-
-#### Usage
-
-figure can use the following parameters
-
- * src
- * link
- * title
- * caption
- * attr (attribution)
- * attrlink
- * alt
-
-#### Example
-*Example has an extra space so Hugo doesn't actually render it*.
-
-    {{ % figure src="/media/spf13.jpg" title="Steve Francia" %}}
-
-#### Example output
-
-    <figure>
-        <img src="/media/spf13.jpg"  />
-        <figcaption>
-            <h4>Steve Francia</h4>
-        </figcaption>
-    </figure>
-
-## Creating your own shortcodes
-
-To create a shortcode, place a template in the layouts/shortcodes directory. The
-template name will be the name of the shortcode.
-
-In creating a shortcode you can choose if the short code will use positional
-parameters or named parameters (but not both). A good rule of thumb is that if a
-short code has a single required value in the case of the youtube example below
-then positional works very well. For more complex layouts with optional
-parameters named parameters work best.
-
-**Inside the template**
-
-To access a parameter by position the .Get method can be used.
-
-    {{ .Get 0 }}
-
-To access a parameter by name the .Get method should be utilized
-
-    {{ .Get "class" }}
-
-
-With is great when the output depends on a parameter being set
-
-    {{ with .Get "class"}} class="{{.}}"{{ end }}
-
-Get can also be used to check if a parameter has been provided. This is
-most helpful when the condition depends on either one value or another...
-or both. 
-
-    {{ or .Get "title" | .Get "alt" | if }} alt="{{ with .Get "alt"}}{{.}}{{else}}{{.Get "title"}}{{end}}"{{ end }}
-
-If a closing shortcode is used, the variable .Inner will be populated with all
-of the content between the opening and closing shortcodes. If a closing
-shortcode is required, you can check the length of .Inner and provide a warning
-to the user.
-
-## Single Positional Example: youtube
-
-    {{% youtube 09jf3ow9jfw %}}
-
-Would load the template /layouts/shortcodes/youtube.html
-
-    <div class="embed video-player">
-    <iframe class="youtube-player" type="text/html" width="640" height="385" src="http://www.youtube.com/embed/{{ index .Params 0 }}" allowfullscreen frameborder="0">
-    </iframe>
-    </div>
-
-This would be rendered as 
-
-    <div class="embed video-player">
-    <iframe class="youtube-player" type="text/html"
-        width="640" height="385" 
-        src="http://www.youtube.com/embed/09jf3ow9jfw"
-        allowfullscreen frameborder="0">
-    </iframe>
-    </div>
-
-## Single Named Example: image with caption
-*Example has an extra space so Hugo doesn't actually render it*
-
-    {{ % img src="/media/spf13.jpg" title="Steve Francia" %}}
-
-Would load the template /layouts/shortcodes/img.html
-
-    <!-- image -->
-    <figure {{ with .Get "class" }}class="{{.}}"{{ end }}>
-        {{ with .Get "link"}}<a href="{{.}}">{{ end }}
-            <img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}"{{ end }} />
-        {{ if .Get "link"}}</a>{{ end }}
-        {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}
-        <figcaption>{{ if isset .Params "title" }}
-            <h4>{{ .Get "title" }}</h4>{{ end }}
-            {{ if or (.Get "caption") (.Get "attr")}}<p>
-            {{ .Get "caption" }}
-            {{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }}
-                {{ .Get "attr" }}
-            {{ if .Get "attrlink"}}</a> {{ end }}
-            </p> {{ end }}
-        </figcaption>
-        {{ end }}
-    </figure>
-    <!-- image -->
-
-Would be rendered as:
-
-    <figure >
-        <img src="/media/spf13.jpg"  />
-        <figcaption>
-            <h4>Steve Francia</h4>
-        </figcaption>
-    </figure>
-
-## Paired Example: Highlight
-*Hugo already ships with the highlight shortcode*
-
-*Example has an extra space so Hugo doesn't actually render it*.
-
-    <html>
-        <body> This HTML </body>
-    </html>
-
-The template for this utilizes the following code (already include in hugo)
-    {{ .Get 0 | highlight .Inner  }}
-
-And will be rendered as:
-
-    <div class="highlight" style="background: #272822"><pre style="line-height: 125%"><span style="color: #f92672">&lt;html&gt;</span>
-        <span style="color: #f92672">&lt;body&gt;</span> This HTML <span style="color: #f92672">&lt;/body&gt;</span>
-    <span style="color: #f92672">&lt;/html&gt;</span>
-    </pre></div>
-
-Please notice that this template makes use of a hugo specific template function
-called highlight which uses pygments to add the highlighting code.
-
-More shortcode examples can be found at [spf13.com](https://github.com/spf13/spf13.com/tree/master/layouts/shortcodes)

docs/content/extras/toc.md

@@ -1,37 +0,0 @@
----
-date: 2013-07-09
-menu:
-  main:
-    parent: extras
-next: /extras/urls
-prev: /extras/highlighting
-title: Table of Contents
-weight: 60
----
-
-Hugo will automatically parse the markdown for your content and create
-a Table of Contents you can use to guide readers to the sections within
-your content.
-
-## Usage
-
-Simply create content like you normally would with the appropriate
-headers.
-
-Hugo will take this markdown and create a table of contents stored in the
-[content variable](/layout/variables) .TableOfContents
-
-
-## Template Example
-
-This is example code of a [single.html template](/layout/content).
-
-    {{ template "partials/header.html" . }}
-        <div id="toc" class="well col-md-4 col-sm-6">
-        {{ .TableOfContents }}
-        </div>
-        <h1>{{ .Title }}</h1>
-        {{ .Content }}
-    {{ template "partials/footer.html" . }}
-
-

docs/content/extras/urls.md

@@ -1,45 +0,0 @@
----
-aliases:
-- /doc/urls/
-date: 2014-01-03
-menu:
-  main:
-    parent: extras
-next: /community/mailing-list
-notoc: true
-prev: /extras/toc
-title: URLs
-weight: 70
----
-
-## Pretty Urls
-
-By default Hugo will create content with 'pretty' urls. For example
-content created at /content/extras/urls.md will be rendered at
-/content/extras/urls/index.html and accessible at /content/extras/urls. No
-no standard server side configuration is required for these pretty urls to
-work.
-
-If you would like to have uglyurls you are in luck. Hugo supports the
-ability to create your entire site with ugly urls. Simply use the
-`--uglyurls=true` flag on the command line.
-
-If you want a specific piece of content to have an exact url you can
-specify this in the front matter under the url key. See [Content
-Organization](/content/organization/) for more details. 
-
-## Canonicalization
-
-By default, all relative URLs encountered in the input will be canonicalized
-using `baseurl`, so that a link `/css/foo.css` becomes
-`http://yoursite.example.com/css/foo.css`.
-
-Setting `canonifyurls` to `false` will prevent this canonicalization.
-
-Benefits of canonicalization include fixing all URLs to be absolute, which may
-aid with some parsing tasks.  Note though that all real browsers handle this
-client-side without issues.
-
-Benefits of non-canonicalization include being able to have resource inclusion
-be scheme-relative, so that http vs https can be decided based on how this
-page was retrieved.

docs/content/meta/license.md

@@ -1,78 +0,0 @@
----
-aliases:
-- /doc/license/
-- /license/
-- /meta/license/
-date: 2013-07-01
-menu:
-  main:
-    parent: about
-title: License
-weight: 50
----
-
-Hugo is released under the Simple Public License.
-
-## Simple Public License (SimPL-2.0)
-
-### Preamble
-
-This Simple Public License 2.0 (SimPL-2.0 for short) is a plain language
-implementation of GPL 2.0.  The words are different, but the goal is the
-same - to guarantee for all users the freedom to share and change
-software.  If anyone wonders about the meaning of the SimPL, they should
-interpret it as consistent with GPL 2.0.
-
-
-## Simple Public License (SimPL) 2.0
-
-The SimPL applies to the software's source and object code and comes
-with any rights that I have in it (other than trademarks). You agree to
-the SimPL by copying, distributing, or making a derivative work of the
-software.
-
- You get the royalty free right to:
-
--   Use the software for any purpose;
--   Make derivative works of it (this is called a "Derived Work");
--   Copy and distribute it and any Derived Work.
-
-If you distribute the software or a Derived Work, you must give back to
-the community by:
-
--   Prominently noting the date of any changes you make;
--   Leaving other people's copyright notices, warranty disclaimers, and
-    license terms in place;
--   Providing the source code, build scripts, installation scripts, and
-    interface definitions in a form that is easy to get and best to
-    modify;
--   Licensing it to everyone under SimPL, or substantially similar terms
-    (such as GPL 2.0), without adding further restrictions to the rights
-    provided;
--   Conspicuously announcing that it is available under that license.
-
-There are some things that you must shoulder:
-
--   You get NO WARRANTIES. None of any kind;
--   If the software damages you in any way, you may only recover direct
-    damages up to the amount you paid for it (that is zero if you did
-    not pay anything). You may not recover any other damages, including
-    those called "consequential damages." (The state or country where
-    you live may not allow you to limit your liability in this way, so
-    this may not apply to you);
-
-The SimPL continues perpetually, except that your license rights end
-automatically if:
-
--   You do not abide by the "give back to the community" terms (your
-    licensees get to keep their rights if they abide);
--   Anyone prevents you from distributing the software under the terms
-    of the SimPL.
-
-## License for the License
-
-You may do anything that you want with the SimPL text; it's a license
-form to use in any way that you find helpful.  To avoid confusion,
-however, if you change the terms in any way then you may not call your
-license the Simple Public License or the SimPL (but feel free to
-acknowledge that your license is "based on the Simple Public License").

docs/content/meta/release-notes.md

@@ -1,102 +0,0 @@
----
-aliases:
-- /doc/release-notes/
-- /meta/release-notes/
-date: 2013-07-01
-menu:
-  main:
-    parent: about
-title: Release Notes
-weight: 10
----
-
-## **0.11.0** May 28, 2014
-  * Considerably faster... about 3 - 4x faster on average
-  * [Live Reload](/extras/livereload). Hugo will automatically reload the browser when the build is complete
-  * Theme engine w/[Theme Repository](http://github.com/spf13/hugoThemes)
-  * [Menu system](/extras/menus) with support for active page
-  * [Builders](/extras/builders) to quickly create a new site, content or theme
-  * [XML sitemap](/templates/sitemap) generation
-  * [Integrated Disqus](/extras/comments) support
-  * Streamlined [template organization](/templates/overview)
-  * [Brand new docs site](http://hugo.spf13.com)
-  * Support for publishDate which allows for posts to be dated in the future
-  * More [sort](/content/ordering) options
-  * Logging support
-  * Much better error handling
-  * More informative verbose output
-  * Renamed Indexes > [Taxonomies](/taxonomies/overview)
-  * Renamed Chrome > [Partials](/templates/partials)
-
-## **0.10.0** March 1, 2014
-  * [Syntax highlighting](/extras/highlighting) powered by pygments (**slow**)
-  * Ability to [sort content](/content/ordering) many more ways
-  * Automatic [table of contents](/extras/toc) generation
-  * Support for unicode urls, aliases and indexes
-  * Configurable per-section [permalink](/extras/permalinks) pattern support
-  * Support for [paired shortcodes](/extras/shortcodes)
-  * Shipping with some [shortcodes](/extras/shortcodes) (highlight & figure)
-  * Adding [canonify](/extras/urls) option to keep urls relative
-  * A bunch of [additional template functions](/layout/functions)
-  * Watching very large sites now works on mac
-  * RSS generation improved. Limited to 50 items by default, can limit further in [template](/layout/rss)
-  * Boolean params now supported in [frontmatter](/content/front-matter)
-  * Launched website [showcase](/showcase). Show off your own hugo site!
-  * A bunch of [bug fixes](https://github.com/spf13/hugo/commits/master)
-
-## **0.9.0** November 15, 2013
-  * New [command based interface](/overview/usage) similar to git (hugo server -s ./ )
-  * Amber template support
-  * [Aliases](/extras/aliases) (redirects)
-  * Support for top level pages (in addition to homepage)
-  * Complete overhaul of the documentation site
-  * Full Windows support
-  * Better index support including [ordering by content weight](/content/ordering)
-  * Add params to site config, available in .Site.Params from templates
-  * Friendlier json support
-  * Support for html & xml content (with frontmatter support)
-  * Support for [summary](/content/summaries) content divider (<!–more–>)
-  * HTML in [summary](/content/summaries) (when using divider)
-  * Added ["Minutes to Read"](/layout/variables) functionality
-  * Support for a custom 404 page
-  * Cleanup of how content organization is handled
-  * Loads of unit and performance tests
-  * Integration with travis ci
-  * Static directory now watched and copied on any addition or modification
-  * Support for relative permalinks
-  * Fixed watching being triggered multiple times for the same event
-  * Watch now ignores temp files (as created by Vim)
-  * Configurable number of posts on [homepage](/layout/homepage/)
-  * [Front matter](/content/front-matter) supports multiple types (int, string, date, float)
-  * Indexes can now use a default template
-  * Addition of truncated bool to content to determine if should show 'more' link
-  * Support for [linkTitles](/layout/variables)
-  * Better handling of most errors with directions on how to resolve
-  * Support for more date / time formats
-  * Support for go 1.2
-  * Support for `first` in templates
-
-## **0.8.0** August 2, 2013
-  * Added support for pretty urls (filename/index.html vs filename.html)
-  * Hugo supports a destination directory
-  * Will efficiently sync content in static to destination directory
-  * Cleaned up options.. now with support for short and long options
-  * Added support for TOML
-  * Added support for YAML
-  * Added support for Previous & Next
-  * Added support for indexes for the indexes
-  * Better Windows compatibility
-  * Support for series
-  * Adding verbose output
-  * Loads of bugfixes
-
-## **0.7.0** July 4, 2013
-  * Hugo now includes a simple server
-  * First public release
-
-## **0.6.0** July 2, 2013
-  * Hugo includes an example documentation site which it builds
-
-## **0.5.0** June 25, 2013
-  * Hugo is quite usable and able to build spf13.com
-

docs/content/meta/roadmap.md

@@ -1,25 +0,0 @@
----
-aliases:
-- /doc/roadmap/
-- /meta/roadmap/
-date: 2013-07-01
-menu:
-  main:
-    parent: about
-notoc: true
-title: Hugo Roadmap
-weight: 20
----
-
-In no particular order, here is what we are working on:
-
- * Intelligently Related Posts
- * Even easier deployment to S3, SSH, Github, rsync
- * Import from other website systems (wordpress, jekyll)
- * An interactive web based editor
- * Additional Themes
- * Dynamic image resizing via shortcodes
- * Support for additional formats
- * Pagination
- * Your best ideas
-

docs/content/overview/configuration.md

@@ -1,63 +0,0 @@
----
-aliases:
-- /doc/configuration/
-date: 2013-07-01
-linktitle: Configuration
-menu:
-  main:
-    parent: getting started
-next: /overview/source-directory
-notoc: true
-prev: /overview/usage
-title: Configuring Hugo
-weight: 40
----
-
-The directory structure and templates provide the majority of the
-configuration for a site. In fact a config file isn't even needed for many
-websites since the defaults follow commonly used patterns.
-
-Hugo expects to find the config file in the root of the source directory and
-will look there first for a `config.toml` file. If none is present it will
-then look for a `config.yaml` file, followed by a `config.json` file.
-
-The config file is a site-wide config. The config file provides directions to
-hugo on how to build the site as well as site-wide parameters and menus.
-
-## Examples
-
-The following is an example of a typical yaml config file:
-
-    ---
-    baseurl: "http://yoursite.example.com/"
-    ...
-
-The following is an example of a toml config file with some of the default values:
-
-    contentdir = "content"
-    layoutdir = "layouts"
-    publishdir = "public"
-    builddrafts = false
-    baseurl = "http://yoursite.example.com/"
-    canonifyurls = true
-    [indexes]
-       category = "categories"
-       tag = "tags"
-
-Here is a yaml configuration file which sets a few more options
-
-    ---
-    baseurl: "http://yoursite.example.com/"
-    title: "Yoyodyne Widget Blogging"
-    permalinks:
-      post: /:year/:month/:title/
-    params:
-      Subtitle: "Spinning the cogs in the widgets"
-      AuthorName: "John Doe"
-      GitHubUser: "spf13"
-      ListOfFoo:
-        - "foo1"
-        - "foo2"
-      SidebarRecentLimit: 5
-    ...
-

docs/content/overview/installing.md

@@ -1,65 +0,0 @@
----
-aliases:
-- /doc/installing/
-date: 2013-07-01
-menu:
-  main:
-    parent: getting started
-next: /overview/usage
-prev: /overview/quickstart
-title: Installing Hugo
-weight: 20
----
-
-Hugo is written in Go with support for Windows, Linux, FreeBSD and OSX.
-
-The latest release can be found at [hugo releases](https://github.com/spf13/hugo/releases).
-We currently build for Windows, Linux, FreeBSD and OS X for x64
-and 386 architectures. 
-
-## Installing Hugo (binary)
-
-Installation is very easy. Simply download the appropriate version for your
-platform from [hugo releases](https://github.com/spf13/hugo/releases).
-Once downloaded it can be run from anywhere. You don't need to install
-it into a global location. This works well for shared hosts and other systems
-where you don't have a privileged account.
-
-Ideally you should install it somewhere in your path for easy use. `/usr/local/bin` 
-is the most probable location.
-
-### Installing pygments (optional)
-
-The Hugo executable has one *optional* external dependency for source code highlighting (pygments).
-
-If you want to have source code highlighting using the [highlight shortcode](/extras/highlighting)
-you need to install the python-based pygments program. The procedure is outlined on the [pygments home page](http://pygments.org).
-
-## Upgrading Hugo
-
-Upgrading hugo is as easy as downloading and replacing the executable you’ve
-placed in your path.
-
-
-## Installing from source
-
-### Dependencies
-
-* Git
-* Go 1.1+
-* Mercurial
-* Bazaar
-
-### Get directly from Github:
-
-    go get github.com/spf13/hugo
-
-### Building Hugo
-
-    cd /path/to/hugo
-    go build -o hugo main.go
-    mv hugo /usr/local/bin/
-
-## Contributing
-
-Please see the [contributing guide](/doc/contributing)

docs/content/overview/introduction.md

@@ -1,125 +0,0 @@
----
-date: 2013-07-01
-linktitle: Introduction
-menu:
-  main:
-    parent: getting started
-next: /overview/quickstart
-title: Introduction to Hugo
-weight: 5
----
-
-## What is Hugo?
-
-Hugo is a general purpose website framework. Technically speaking, Hugo is
-a static site generator. This means that unlike systems like Wordpress,
-Ghost & Drupal which run on your web server expensively building a page
-every time a visitor requests one, Hugo does the building when you create
-your content. Since websites are viewed far more often then they are
-edited, Hugo is optimized for website viewing while providing a great
-writing experience. 
-
-Sites built with hugo are extremely fast and very secure. Hugo sites can
-be hosted anywhere including Heroku, GoDaddy, GitHub pages, S3
-& Cloudfront and work well with CDNs. Hugo sites run without dependencies
-on expensive run times like Ruby, Python or PHP and without dependencies
-on any databases.
-
-We think of Hugo as the ideal website creation tool. With nearly instant
-built times and the ability to rebuild whenever a change is made Hugo
-provides a very fast feedback loop. This is essential when you are
-designing websites, but also very useful when creating content.  
-
-## What does Hugo do?
-
-In technical terms Hugo takes a source directory of markdown files and
-templates and uses these as input to create a complete website. 
-
-Hugo boasts the following features:
-
-### General
-
-  * Extremely fast built times (~1ms per page)
-  * Completely cross platform: Runs on Mac OSX, Linux and Windows 
-  * Easy [installation](/overview/installing)
-  * Render changes [on the fly](/overview/usage) with [live reload](#) as you develop
-  * Complete theme support
-  * Host your site anywhere
-
-### Organization
-
-  * Straightforward [organization](/content/organization)
-  * Support for [website sections](/content/sections)
-  * Completely customizable [urls](/extras/urls)
-  * Support for [categories](/indexes/category) and tags
-  * Support for configurable [taxonomies](/indexes/overview) to create your own organization
-  * Ability to [sort content](/content/ordering) as you desire
-  * Automatic [table of contents](/extras/toc) generation
-  * Dynamic menu creation
-  * [pretty urls](/extras/urls) support
-  * [permalink](/extras/permalinks) pattern support
-  * [Aliases](/extras/aliases) (redirects)
-
-### Content
-
-  * Content written in [Markdown](/content/example)
-  * Support for TOML, YAML and JSON metadata in [frontmatter](/content/front-matter)
-  * Completely [customizable homepage](/layout/homepage)
-  * Support for multiple [content types](/content/types)
-  * Automatic and user defined [summaries](/content/summaries)
-  * [shortcodes](/extras/shortcodes) to enable rich content inside of markdown
-  * ["Minutes to Read"](/layout/variables) functionality
-  * ["Wordcount"](/layout/variables) functionality
-
-### Additional Features
-
-  * Integrated Disqus comment support
-  * Automatic [RSS](/layout/rss) creation
-  * Support for go and amber templates
-  * Syntax [highlighting](/extras/highlighting) powered by pygments
-
-See what's coming next in the [roadmap](/meta/roadmap)
-
-## Who should use Hugo?
-
-Hugo is for people that prefer writing in a text editor over
-a browser.
-
-Hugo is for people who want to hand code their own website without
-worrying about setting up complicated runtimes, dependencies and
-databases. 
-
-Hugo is for people building a blog, company site, portfolio, tumblog,
-documentation, single page site or a site with thousands of
-pages. 
-
-## Why did you write Hugo?
-
-I wrote Hugo ultimately for a few reasons. First I was disappointed with
-wordpress, my then website solution. It rendered slowly. I couldn't create
-content as efficiently as I wanted to and needed to be online to write
-posts. The constant security updates and the horror stories of people's
-hacked blogs. I hated how content was written in HTML instead of the much
-simpler markdown. Overall I felt like it got in my way more than it helped
-my from writing great content.
-
-I looked at existing static site generators like Jekyll, Middle and Nanoc.
-All had complicated dependencies to install and took far longer to render
-my blog with hundreds of posts than I felt was acceptable. I wanted
-a framework to be able to get rapid feedback while making changes to the
-templates and the 5+ minute render times was just too slow. In general
-they were also very blog minded and didn't have the ability to have
-different content types and flexible urls.
-
-I wanted to develop a fast and full featured website framework without
-dependencies. The Go language seemed to have all of the features I needed
-in a language. I began developing Hugo in Go and fell in love with the
-language. I hope you will enjoy using (and contributing to) Hugo as much
-as I have writing it.
-
-## Next Steps
-
- * [Install Hugo](/overview/installing)
- * [Quick start](/overview/quickstart)
- * [Join the Mailing List](/community/mailing-list)
- * [Star us on Github](http://github.com/spf13/hugo)

docs/content/overview/quickstart.md

@@ -1,159 +0,0 @@
----
-date: 2013-07-01
-linktitle: Quickstart
-menu:
-  main:
-    parent: getting started
-next: /overview/installing
-prev: /overview/introduction
-title: Hugo Quickstart Guide
-weight: 10
----
-
-_This quickstart depends on features introduced in hugo v0.11. If you
-have an earlier version of hugo you will need to [upgrade](/overview/installing/) before
-proceeding._
-
-## Step 1. Install Hugo
-
-Goto [hugo releases](https://github.com/spf13/hugo/releases) and download the
-appropriate version for your os and architecture.
-
-Save it somewhere specific as we will be using it in the next step.
-
-More complete instructions are available at [installing hugo](/overview/installing/)
-
-## Step 2. Have Hugo Create a site for you
-
-Hugo has the ability to create a skeleton site.
-
-    hugo new site /path/to/site
-
-For the rest of the operations we will be executing all commands from within the site directory
-
-    cd /path/to/site
-
-The new site will have the following structure
-
-      ▸ archetypes/
-      ▸ content/
-      ▸ layouts/
-      ▸ static/
-        config.toml
-
-Currently the site doesn’t have any content, nor is it configured.
-
-## Step 3. Create Some Content
-
-Hugo also has the ability to create content for you.
-
-    hugo new about.md
-
-A new file is now created in `content/` with the following contents
-
-    +++
-    draft = true
-    title = "about"
-    date = 2014-05-20T10:04:31Z
-    +++
-
-Notice the date is automatically set to the moment you created the content.
-
-Place some content in this file below the `+++` in the markdown format.
-
-For example you could put this
-
-    ## A headline
-
-    Some Content
-
-For fun, let’s create another piece of content and place some markdown in it as well.
-
-    hugo new post/first.md
-
-The new file is located at `content/post/first.md`
-
-We still lack any templates to tell us how to display the content.
-
-## Step 4. Install some themes
-
-    Hugo has rich theme support and a growing set of themes to choose from.
-
-    git clone --recursive https://github.com/spf13/hugoThemes themes
-
-
-## Step 5. Run Hugo
-
-Hugo contains it’s own high performance web server. Simply run `hugo
-server` and Hugo will find an available port and run a server with
-your content 
-
-    hugo server --theme=hyde --buildDrafts
-    2 pages created
-    0 tags created
-    0 categories created
-    in 5 ms
-    Serving pages from exampleHugoSite/public
-    Web Server is available at http://localhost:1313
-    Press ctrl+c to stop
-
-We specified two options here.
- * --theme to pick which theme.
- * --buildDrafts because we want to display our content, both set to draft status
-
-To learn about what other options hugo has run 
-
-    hugo help
-
-To learn about the server options
-
-    hugo help server
-
-## Step 6. Edit Content
-
-Not only can Hugo run a server, but it can also watch your files for
-changes and automatically rebuild your site. Hugo will then
-communicate with your browser and automatically reload any open page.
-This even works in mobile browsers.
-
-Stop the Hugo process by hitting ctrl+c. Then run the following:
-
-    hugo server --theme=hyde --buildDrafts --watch
-    2 pages created
-    0 tags created
-    0 categories created
-    in 5 ms
-    Watching for changes in exampleHugoSite/content
-    Serving pages from exampleHugoSite/public
-    Web Server is available at http://localhost:1313
-    Press ctrl+c to stop
-Open your [favorite editor](http://vim.spf13.com), edit and save your content and watch as Hugo rebuilds and reloads automatically.
-
-It’s especially productive to leave a browser open on a second monitor
-and just glance at it whenever you save. You don’t even need to tab to
-your browser. Hugo is so fast, that the new site will be there before
-you can look at the browser in most cases.
-
-
-Change and save this file.. Notice what happened in your terminal.
-
-    Change detected, rebuilding site
-
-    2 pages created
-    0 tags created
-    0 categories created
-    in 5 ms
-
-## Step 7. Have fun
-
-The best way to learn something is to play with it.
-
-Things to try:
-
- * Add a [new content file](/content/organization/)
- * Create a [new section](/content/sections/)
- * Modify [a template](/layout/templates/)
- * Create content with [toml front matter](/content/front-matter/)
- * Define your own field in [front matter](/content/front-matter/)
- * Display that [field in the template](/layout/variables/)
- * Create a [new content type](/content/types/)

docs/content/overview/source-directory.md

@@ -1,90 +0,0 @@
----
-aliases:
-- /doc/source-directory/
-date: 2013-07-01
-menu:
-  main:
-    parent: getting started
-next: /content/organization
-notoc: true
-prev: /overview/configuration
-title: Source Organization
-weight: 50
----
-
-Hugo takes a single directory and uses it as the input for creating a complete
-website.
-
-
-The top level of a source directory will typically have the following elements:
-
-    ▸ archetypes/
-    ▸ content/
-    ▸ layouts/
-    ▸ static/
-    ▸ themes/
-      config.toml
-
-Learn more about the different directories and what their purpose is 
-
-* [config](/overview/configuration)
-* [archetypes](/content/archetypes)
-* [content](/content/organization)
-* [layouts](/layout/overview)
-* [static]()
-* [themes](/themes/overview)
-
-
-## Example
-
-An example directory may look like:
-
-    .
-    ├── config.toml
-    ├── archetypes
-    |   └── default.md
-    ├── content
-    |   ├── post
-    |   |   ├── firstpost.md
-    |   |   └── secondpost.md
-    |   └── quote
-    |   |   ├── first.md
-    |   |   └── second.md
-    ├── layouts
-    |   ├── _default
-    |   |   ├── single.html
-    |   |   └── list.html
-    |   ├── partials
-    |   |   ├── header.html
-    |   |   └── footer.html
-    |   ├── taxonomies
-    |   |   ├── category.html
-    |   |   ├── post.html
-    |   |   ├── quote.html
-    |   |   └── tag.html
-    |   ├── post
-    |   |   ├── li.html
-    |   |   ├── single.html
-    |   |   └── summary.html
-    |   ├── quote
-    |   |   ├── li.html
-    |   |   ├── single.html
-    |   |   └── summary.html
-    |   ├── shortcodes
-    |   |   ├── img.html
-    |   |   ├── vimeo.html
-    |   |   └── youtube.html
-    |   ├── index.html
-    |   └── sitemap.xml
-    ├── themes
-    |   ├── hyde
-    |   └── doc
-    └── static
-        ├── css
-        └── js
-
-This directory structure tells us a lot about this site:
-
-1. the website intends to have two different types of content, posts and quotes.
-2. It will also apply two different indexes to that content, categories and tags.
-3. It will be displaying content in 3 different views, a list, a summary and a full page view.

docs/content/overview/usage.md

@@ -1,89 +0,0 @@
----
-aliases:
-- /doc/usage/
-date: 2013-07-01
-menu:
-  main:
-    parent: getting started
-next: /overview/configuration
-notoc: true
-prev: /overview/installing
-title: Using Hugo
-weight: 30
----
-
-Make sure either hugo is in your path or provide a path to it.
-
-
-
-    $ hugo help
-    A Fast and Flexible Static Site Generator
-    built with love by spf13 and friends in Go.
-
-    Complete documentation is available at http://hugo.spf13.com
-
-    Usage:
-      hugo [flags]
-      hugo [command]
-
-    Available Commands:
-      server                    :: Hugo runs it's own a webserver to render the files
-      version                   :: Print the version number of Hugo
-      check                     :: Check content in the source directory
-      benchmark                 :: Benchmark hugo by building a site a number of times
-      new [path]                :: Create new content for your site
-      help [command]            :: Help about any command
-
-     Available Flags:
-      -b, --baseUrl="": hostname (and path) to the root eg. http://spf13.com/
-      -D, --buildDrafts=false: build content marked as draft
-      -F, --buildFuture=false: build content with PublishDate in the future
-          --config="": config file (default is path/config.yaml|json|toml)
-      -d, --destination="": filesystem path to write files to
-          --disableRSS=false: Do not build RSS files
-          --disableSitemap=false: Do not build Sitemap file
-          --log=false: Enable Logging
-          --logFile="": Log File path (if set, logging enabled automatically)
-      -s, --source="": filesystem path to read files relative from
-          --stepAnalysis=false: display memory and timing of different steps of the program
-      -t, --theme="": theme to use (located in /themes/THEMENAME/)
-          --uglyUrls=false: if true, use /filename.html instead of /filename/
-      -v, --verbose=false: verbose output
-          --verboseLog=false: verbose logging
-      -w, --watch=false: watch filesystem for changes and recreate as needed
-
-    Use "hugo help [command]" for more information about that command.
-
-## Common Usage Example:
-
-The most common use is probably to run hugo with your current
-directory being the input directory.
-
-    $ hugo
-    > X pages created
-      in 8 ms
-
-If you are working on things and want to see the changes
-immediately, tell Hugo to watch for changes.
-
-Hugo will watch the filesystem for changes, rebuild your site as soon as a file
-is saved.
-
-    $ hugo -s ~/mysite --watch
-       28 pages created
-       in 18 ms
-       Watching for changes in /Users/spf13/Code/hugo/docs/content
-       Press ctrl+c to stop
-
-Hugo can even run a server and create your site at the same time! Hugo
-implements [live reload](/extras/livereload) technology to automatically reload any open pages in
-all browsers (including mobile).
-
-    $ hugo server -ws ~/mysite
-       Watching for changes in /Users/spf13/Code/hugo/docs/content
-       Web Server is available at http://localhost:1313
-       Press ctrl+c to stop
-       28 pages created
-       0 tags created
-       in 18 ms
-

docs/content/showcase/antzucaro.md

@@ -1,15 +0,0 @@
----
-date: 2014-02-03T20:00:00Z
-description: Ant Zucaro's Blog
-license: GPL
-licenseLink: ""
-sitelink: http://antzucaro.com
-sourceLink: http://github.com/antzucaro/az.com
-tags:
-- personal
-- blog
-- foundation
-thumbnail: /static/img/antzucaro-tn.jpg
-title: Ant Zucaro
----
-

docs/content/showcase/asc.md

@@ -1,14 +0,0 @@
----
-date: 2014-01-22T07:32:00Z
-description: ""
-license: CC-BY-SA
-licenseLink: ""
-sitelink: http://andrewcodispoti.com
-sourceLink: https://gitlab.com/acodispo/andrewcodispoti-com
-tags:
-- personal
-- bootstrap
-thumbnail: /static/img/asc-tn.jpg
-title: Andrew S Codispoti
----
-

docs/content/showcase/chimera-art-space.md

@@ -1,14 +0,0 @@
----
-date: 2013-10-02T07:32:00Z
-description: ""
-license: CC-SA
-licenseLink: ""
-sitelink: http://chimeraarts.org
-sourceLink: https://github.com/chimera/chimeraarts.org
-tags:
-- company
-- bootstrap
-thumbnail: /static/img/chimera-tn.jpg
-title: Chimera Art Space
----
-

docs/content/showcase/cloudshark.md

@@ -1,14 +0,0 @@
----
-date: 2014-03-27T09:45:00Z
-description: CloudShark Appliance homepage and documentation
-license: ""
-licenseLink: ""
-sitelink: https://appliance.cloudshark.org
-tags:
-- company
-- documentation
-- foundation
-thumbnail: /static/img/cloudshark-tn.jpg
-title: CloudShark
----
-

docs/content/showcase/heyitsalex.md

@@ -1,14 +0,0 @@
----
-date: 2014-03-09T06:00:00Z
-description: ""
-license: MIT
-licenseLink: ""
-sitelink: http://heyitsalex.net
-sourceLink: https://github.com/alexandre-normand/alexandre-normand
-tags:
-- personal
-- blog
-thumbnail: /static/img/heyitsalex-tn.jpg
-title: Hey, it's Alex
----
-

docs/content/showcase/hugo.md

@@ -1,14 +0,0 @@
----
-date: 2013-07-01T07:32:00Z
-description: This site
-license: Simpl
-licenseLink: ""
-sitelink: http://hugo.spf13.com
-sourceLink: http://github.com/spf13/hugo/docs
-tags:
-- documentation
-- bootstrap
-thumbnail: /static/img/hugo-tn.jpg
-title: Hugo
----
-

docs/content/showcase/ifup.md

@@ -1,14 +0,0 @@
----
-date: 2013-11-02T07:32:00Z
-description: ""
-license: MIT
-licenseLink: ""
-sitelink: http://ifup.org
-sourceLink: http://www.ifup.org
-tags:
-- personal
-- blog
-thumbnail: /static/img/ifup-tn.jpg
-title: ifup
----
-

docs/content/showcase/kieranhealy.md

@@ -1,15 +0,0 @@
----
-date: 2014-02-27T20:35:00Z
-description: Kieran Healy's Website
-license: ""
-licenseLink: ""
-sitelink: http://kieranhealy.org
-sourceLink: http://github.com/kjhealy/kieranhealy.hugo
-tags:
-- personal
-- blog
-- academic
-thumbnail: /static/img/kjhealy-tn.jpg
-title: Kieran Healy
----
-

docs/content/showcase/spf13.md

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

docs/content/showcase/techmadeplain.md

@@ -1,13 +0,0 @@
----
-date: 2014-05-22T19:54:00Z
-description: Tech Coaching site
-license: ""
-licenseLink: ""
-sitelink: http://techmadeplain.com
-tags:
-- personal
-- blog
-thumbnail: /static/img/techmadeplain-tn.jpg
-title: Tech Made Plain
----
-

docs/content/showcase/yslow-rules.md

@@ -1,15 +0,0 @@
----
-date: 2014-04-07T10:45:00Z
-description: Community project of YSlow rules translations
-license: MIT License
-licenseLink: https://raw.github.com/checkmyws/yslow-rules/master/LICENSE
-sitelink: http://checkmyws.github.io/yslow-rules/
-sourceLink: https://github.com/checkmyws/yslow-rules
-tags:
-- community
-- documentation
-- translation
-thumbnail: /static/img/yslow-rules.jpg
-title: YSlow Rules
----
-

docs/content/taxonomies/displaying.md

@@ -1,119 +0,0 @@
----
-aliases:
-- /indexes/displaying/
-date: 2013-07-01
-linktitle: Displaying
-menu:
-  main:
-    parent: taxonomy
-next: /taxonomies/templates
-prev: /taxonomies/usage
-title: Displaying Taxonomies
-weight: 20
----
-
-There are four common ways you can display the data in your
-taxonomies in addition to the automatic taxonomy pages created by hugo
-using the [list templates](/templates/list).
-
-1. For a given piece of content you can list the terms attached 
-2. For a given piece of content you can list other content with the same
-   term
-3. You can list all terms for a taxonomy
-4. You can list all taxonomies (with their terms)
-
-## 1. Displaying taxonomy terms assigned to this content
-
-Within your content templates you may wish to display 
-the taxonomies that that piece of content is assigned to.
-
-Because we are leveraging the front matter system to 
-define taxonomies for content, the taxonomies assigned to 
-each content piece are located in the usual place 
-(.Params.`plural`)
-
-### Example
-
-    <ul id="tags">
-      {{ range .Params.tags }}
-        <li><a href="tags/{{ . | urlize }}">{{ . }}</a> </li>
-      {{ end }}
-    </ul>
-
-## 2. Listing content with the same taxonomy term
-
-First you may be asking why you would use this. If you are using a
-taxonomy for something like a series of posts, this is exactly how you
-would do it. It’s also an quick and dirty way to show some related
-content.
-
-
-### Example
-
-    <ul>
-      {{ range .Site.Taxonomies.series.golang }}
-        <li><a href="{{ .Url }}">{{ .Name }}</a></li>
-      {{ end }}
-    </ul>
-
-## 3. Listing all content in a given taxonomy
-
-This would be very useful in a sidebar as “featured content”. You could
-even have different sections of “featured content” by assigning
-different terms to the content.
-
-### Example
-
-    <section id="menu">
-        <ul>
-            {{ range $key, $taxonomy := .Site.Taxonomies.featured }}
-            <li> {{ $key }} </li>
-            <ul>
-                {{ range $taxonomy.Pages }}
-                <li hugo-nav="{{ .RelPermalink}}"><a href="{{ .Permalink}}"> {{ .LinkTitle }} </a> </li>
-                {{ end }}
-            </ul>
-            {{ end }}
-        </ul>
-    </section>
-
-
-## 4. Rendering a Site's Taxonomies
-
-If you wish to display the list of all keys for an taxonomy you can find retrieve
-them from the `.Site` variable which is available on every page.
-
-This may take the form of a tag cloud, a menu or simply a list.
-
-The following example displays all tag keys:
-
-### Example
-
-    <ul id="all-tags">
-      {{ range .Site.Taxonomies.tags }}
-        <li><a href="/tags/{{ .Name | urlize }}">{{ .Name }}</a></li>  
-      {{ end }}
-    </ul>
-
-### Complete Example
-This example will list all taxonomies, each of their keys and all the content assigned to each key.
-
-    <section>
-      <ul>
-        {{ range $taxonomyname, $taxonomy := .Site.Taxonomies }}
-          <li><a href="/{{ $taxonomyname | urlize }}">{{ $taxonomyname }}</a> 
-            <ul>
-              {{ range $key, $value := $taxonomy }}
-              <li> {{ $key }} </li>
-                    <ul>
-                    {{ range $value.Pages }}
-                        <li hugo-nav="{{ .RelPermalink}}"><a href="{{ .Permalink}}"> {{ .LinkTitle }} </a> </li>
-                    {{ end }}
-                    </ul>
-              {{ end }}
-            </ul>
-          </li> 
-        {{ end }}
-      </ul>
-    </section>
-

docs/content/taxonomies/ordering.md

@@ -1,77 +0,0 @@
----
-aliases:
-- /indexes/ordering/
-date: 2013-07-01
-linktitle: Ordering
-menu:
-  main:
-    identifier: Ordering Taxonomies
-    parent: taxonomy
-next: /extras/aliases
-prev: /taxonomies/templates
-title: Ordering Taxonomies
-weight: 60
----
-
-Hugo provides the ability to both:
-
- 1. Order the way the keys for an taxonomy are displayed
- 2. Order the way taxonomyed content appears
-
-
-## Ordering Taxonomies
-Taxonomies can be ordered by either alphabetical key or by the number of content pieces assigned to that key.
-
-### Order Alphabetically Example:
-
-    <ul>
-    {{ $data := .Data }}
-    {{ range $key, $value := .Data.Taxonomy.Alphabetical }}
-    <li><a href="{{ $data.Plural }}/{{ $value.Name | urlize }}"> {{ $value.Name }} </a> {{ $value.Count }} </li>
-    {{ end }}
-    </ul>
-
-### Order by Popularity Example:
-
-    <ul>
-    {{ $data := .Data }}
-    {{ range $key, $value := .Data.Taxonomy.ByCount }}
-    <li><a href="{{ $data.Plural }}/{{ $value.Name | urlize }}"> {{ $value.Name }} </a> {{ $value.Count }} </li>
-    {{ end }}
-    </ul>
-
-
-[See Also Taxonomy Lists](/taxonomies/lists/)
-
-## Ordering Content within Taxonomies
-
-Hugo uses both **Date** and **Weight** to order content within taxonomies.
-
-Each piece of content in Hugo can optionally be assigned a date.
-It can also be assigned a weight for each taxonomy it is assigned to.
-
-When iterating over content within taxonomies the default sort is first by weight then by date. This means that if the weights for two pieces of content are the same, than the more recent content will be displayed first. The default weight for any piece of content is 0.
-
-### Assigning Weight
-
-Content can be assigned weight for each taxonomy that it's assigned to.
-
-    +++
-    tags = [ "a", "b", "c" ]
-    tags_weight = 22
-    categories = ["d"]
-    title = "foo"
-    categories_weight = 44
-    +++
-    Front Matter with weighted tags and categories
-
-
-The convention is `taxonomyname_weight`.
-
-In the above example, this piece of content has a weight of 22 which applies to the sorting when rendering the pages assigned to the "a", "b" and "c" values of the 'tag' taxonomy.
-
-It has also been assigned the weight of 44 when rendering the 'd' category.
-
-With this the same piece of content can appear in different positions in different taxonomies.
-
-Currently taxonomies only support the default ordering of content which is weight -> date.

docs/content/taxonomies/overview.md

@@ -1,92 +0,0 @@
----
-aliases:
-- /indexes/overview/
-- /doc/indexes/
-- /extras/indexes
-date: 2013-07-01
-linktitle: Overview
-menu:
-  main:
-    identifier: taxonomy overview
-    parent: taxonomy
-next: /taxonomies/usage
-prev: /templates/404
-title: Taxonomy Overview
-weight: 10
----
-
-Hugo includes support for user defined groupings of content called
-taxonomies. Taxonomies give us a way to classify our content so we can
-demonstrate relationships in a variety of logical ways.
-
-The default taxonomies for Hugo are tags and categories. These
-taxonomies are  common to many websites systems (Wordpress, Drupal,
-Jekyll). Unlike all of those Systems, Hugo makes it trivial to customize
-the taxonomies you will be using for your site however you wish. Another
-good use for taxonomies is to group a set of posts into a series. Other
-common uses would include categories, tags, groups, series and many
-more.
-
-When taxonomies are used (and templates are provided) Hugo will
-automatically create pages listing all of the taxonomies, their terms
-and all of the content attached to those terms.
-
-## Definitions
-
-**Taxonomy:** A categorization that can be used to classify content
-
-**Term:** A key within that taxonomy 
-
-**Value:** A piece of content assigned to that Term
-
-## Example
-
-For example if I was writing about movies I may want the following
-taxonomies:
-
-* Actors
-* Directors
-* Studios
-* Genre
-* Year
-* Awards
-
-I would then specify in each movies front-matter the specific terms for
-each of those taxonomies. Hugo would then automatically create pages for
-each Actor, Director, Studio, Genre, Year and Award listing all of the
-Movies that matched that specific Actor, Director, etc.
-
-
-### Taxonomy Organization
-
-Let’s use an example to demonstrate the different labels in action.
-From the perspective of the taxonomy it could be visualized as:
-
-    Actor                    <- Taxonomy
-        Bruce Willis         <- Term
-            The Six Sense    <- Content
-            Unbreakable      <- Content
-            Moonrise Kingdom <- Content
-        Samuel L. Jackson    <- Term
-            Unbreakable      <- Content
-            The Avengers     <- Content
-            xXx              <- Content
-
-From the perspective of the content if would appear differently, though
-the data and labels used are the same:
-
-    Unbreakable                 <- Content
-        Actors                  <- Taxonomy
-            Bruce Willis        <- Term
-            Samuel L. Jackson   <- Term
-        Director                <- Taxonomy
-            M. Night Shyamalan  <- Term
-        ...
-    Moonrise Kingdom            <- Content
-        Actors                  <- Taxonomy
-            Bruce Willis        <- Term
-            Bill Murray         <- Term
-        Director                <- Taxonomy
-            Wes Anderson        <- Term
-        ...
-

docs/content/taxonomies/templates.md

@@ -1,25 +0,0 @@
----
-aliases:
-- /indexes/templates/
-date: 2013-07-01
-linktitle: Templates
-menu:
-  main:
-    parent: taxonomy
-next: /taxonomies/ordering
-prev: /templates/displaying
-title: Taxonomy Templates
-weight: 30
----
-
-There are two different templates that the use of taxonomies will require you to provide.
-
-Both templates are covered in detail in the templates section.
-
-A [list template](/templates/list/) is any template that will be used to render multiple pieces of
-content in a single html page. This template will be used to generate
-all the automatically created taxonomy pages.
-
-A [taxonomy terms template](/templates/terms/) is a template used to
-generate the list of terms for a given template.
-

docs/content/taxonomies/usage.md

@@ -1,60 +0,0 @@
----
-date: 2014-05-26
-linktitle: Usage
-menu:
-  main:
-    parent: taxonomy
-next: /taxonomies/displaying
-prev: /taxonomies/overview
-title: Using Taxonomies
-weight: 15
----
-
-## Defining taxonomies for a site
-
-Taxonomies must be defined in the site configuration, before they can be
-used throughout the site. You need to provide both the plural and
-singular labels for each taxonomy.
-
-Here is an example configuration in YAML that specifies two taxonomies.
-
-Notice the format is **singular key** : *plural value*. 
-### config.yaml
-
-    ---
-    taxonomies:
-        tag: "tags"
-        category: "categories"
-        series: "series"
-    ---
-
-## Assigning taxonomy values to content
-
-Once an taxonomy is defined at the site level, any piece of content
-can be assigned to it regardless of content type or section.
-
-Assigning content to an taxonomy is done in the front matter.
-Simply create a variable with the *plural* name of the taxonomy
-and assign all terms you want to apply to this content.
-
-**taxonomy values are case insensitive**
-
-### Front Matter Example (in JSON)
-
-    {
-        "title": "Hugo: A fast and flexible static site generator",
-        "tags": [
-            "Development",
-            "Go",
-            "fast",
-            "Blogging"
-        ],
-        "categories" : [
-            "Development"
-        ],
-        "series" : [
-            "Go Web Dev"
-        ],
-        "slug": "hugo",
-        "project_url": "http://github.com/spf13/hugo"
-    }

docs/content/templates/404.md

@@ -1,41 +0,0 @@
----
-aliases:
-- /layout/404/
-date: 2013-08-21
-linktitle: "404"
-menu:
-  main:
-    parent: layout
-next: /taxonomies/overview
-notoc: true
-prev: /templates/sitemap
-title: 404.html Templates
-weight: 100
----
-
-When using Hugo with [github pages](http://pages.github.com/) you can provide
-your own 404 template by creating a 404.html file in the root.
-
-404 pages are of the type "node" and have all the [node
-variables](/layout/variables/) available to use in the templates.
-
-In addition to the standard node variables, the homepage has access to
-all site content accessible from .Data.Pages
-
-    ▾ layouts/
-        404.html
-
-## 404.html
-This is a basic example of a 404.html template:
-
-    {{ template "chrome/header.html" . }}
-    {{ template "chrome/subheader.html" . }}
-
-    <section id="main">
-      <div>
-       <h1 id="title">{{ .Title }}</h1>
-      </div>
-    </section>
-
-    {{ template "chrome/footer.html" }}
-

docs/content/templates/content.md

@@ -1,161 +0,0 @@
----
-aliases:
-- /layout/functions/
-date: 2013-07-01
-linktitle: Single
-menu:
-  main:
-    parent: layout
-next: /templates/list
-prev: /templates/variables
-title: Single Content Template
-weight: 30
----
-
-The primary view of content in hugo is the single view. Hugo for every
-markdown file provided hugo will render it with a single template.
-
-
-## Which Template will be rendered?
-Hugo uses a set of rules to figure out which template to use when
-rendering a specific page.
-
-Hugo will use the following prioritized list. If a file isn’t present
-than the next one in the list will be used. This enables you to craft
-specific layouts when you want to without creating more templates
-then necessary. For most sites only the \_default file at the end of
-the list will be needed.
-
-Users can specify the `type` and `layout` in the [front-matter](/content/front-matter). `Section`
-is determined based on the content file’s location. If `type` is provide
-it will be used instead of `section`.
-
-### Single
-
-* /layouts/`TYPE` or `SECTION`/`LAYOUT`.html
-* /layouts/`TYPE` or `SECTION`/single.html
-* /layouts/\_default/single.html
-* /themes/`THEME`/layouts/`TYPE` or `SECTION`/`LAYOUT`.html
-* /themes/`THEME`/layouts/`TYPE` or `SECTION`/single.html
-* /themes/`THEME`/layouts/\_default/single.html
-
-## Example Single Template File
-
-Content pages are of the type "page" and have all the [page
-variables](/layout/variables/) and [site
-variables](/templates/variables/) available to use in the templates.
-
-In the following examples we have created two different content types as well as
-a default content type.
-
-The default content template to be used in the event that a specific
-template has not been provided for that type. The default type works the
-same as the other types but the directory must be called "\_default".
-
-    ▾ layouts/
-      ▾ _default/
-          single.html
-      ▾ post/
-          single.html
-      ▾ project/
-          single.html
-
-
-## post/single.html
-This content template is used for [spf13.com](http://spf13.com).
-It makes use of [partial templates](/layout/partials)
-
-    {{ template "partials/header.html" . }}
-    {{ template "partials/subheader.html" . }}
-    {{ $baseurl := .Site.BaseUrl }}
-
-    <section id="main">
-      <h1 id="title">{{ .Title }}</h1>
-      <div>
-            <article id="content">
-               {{ .Content }}
-            </article>
-      </div>
-    </section>
-
-    <aside id="meta">
-        <div>
-        <section>
-          <h4 id="date"> {{ .Date.Format "Mon Jan 2, 2006" }} </h4>
-          <h5 id="wc"> {{ .FuzzyWordCount }} Words </h5>
-        </section>
-        <ul id="categories">
-          {{ range .Params.topics }}
-            <li><a href="{{ $baseurl }}/topics/{{ . | urlize }}">{{ . }}</a> </li>
-          {{ end }}
-        </ul>
-        <ul id="tags">
-          {{ range .Params.tags }}
-            <li> <a href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }}</a> </li>
-          {{ end }}
-        </ul>
-        </div>
-        <div>
-            {{ if .Prev }}
-              <a class="previous" href="{{.Prev.Permalink}}"> {{.Prev.Title}}</a>
-            {{ end }}
-            {{ if .Next }}
-              <a class="next" href="{{.Next.Permalink}}"> {{.Next.Title}}</a>
-            {{ end }}
-        </div>
-    </aside>
-
-    {{ template "partials/disqus.html" . }}
-    {{ template "partials/footer.html" . }}
-
-
-## project/single.html
-This content template is used for [spf13.com](http://spf13.com).
-It makes use of [partial templates](/layout/partials)
-
-
-    {{ template "partials/header.html" . }}
-    {{ template "partials/subheader.html" . }}
-    {{ $baseurl := .Site.BaseUrl }}
-
-    <section id="main">
-      <h1 id="title">{{ .Title }}</h1>
-      <div>
-            <article id="content">
-               {{ .Content }}
-            </article>
-      </div>
-    </section>
-
-    <aside id="meta">
-        <div>
-        <section>
-          <h4 id="date"> {{ .Date.Format "Mon Jan 2, 2006" }} </h4>
-          <h5 id="wc"> {{ .FuzzyWordCount }} Words </h5>
-        </section>
-        <ul id="categories">
-          {{ range .Params.topics }}
-          <li><a href="{{ $baseurl }}/topics/{{ . | urlize }}">{{ . }}</a> </li>
-          {{ end }}
-        </ul>
-        <ul id="tags">
-          {{ range .Params.tags }}
-            <li> <a href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }}</a> </li>
-          {{ end }}
-        </ul>
-        </div>
-    </aside>
-
-    {{if isset .Params "project_url" }}
-    <div id="ribbon">
-        <a href="{{ index .Params "project_url" }}" rel="me">Fork me on GitHub</a>
-    </div>
-    {{ end }}
-
-    {{ template "partials/footer.html" }}
-
-Notice how the project/single.html template uses an additional parameter unique
-to this template. This doesn't need to be defined ahead of time. If the key is
-present in the front matter than it can be used in the template. To
-easily generate new content of this type with these keys ready use
-[content archetypes](/content/archetypes).

docs/content/templates/functions.md

@@ -1,109 +0,0 @@
----
-aliases:
-- /layout/functions/
-date: 2013-07-01
-linktitle: Functions
-menu:
-  main:
-    parent: layout
-next: /templates/variables
-prev: /templates/go-templates
-title: Hugo Template Functions
-weight: 20
----
-
-Hugo uses the excellent go html/template library for its template engine.
-It is an extremely lightweight engine that provides a very small amount of
-logic. In our experience that it is just the right amount of logic to be able
-to create a good static website.
-
-Go templates are lightweight but extensible. Hugo has added the following
-functions to the basic template logic.
-
-Go documentation for the built-in functions can be found [here](http://golang.org/pkg/text/template/)
-
-## General
-
-### isset
-Return true if the parameter is set.
-Takes either a slice, array or channel and an index or a map and a key as input.
-
-eg. {{ if isset .Params "project_url" }} {{ index .Params "project_url" }}{{ end }}
-
-### echoParam
-If parameter is set, then echo it.
-
-eg. {{echoParam .Params "project_url" }}
-
-### first
-Slices an array to only the first X elements.
-
-eg.
-    {{ range first 10 .Data.Pages }}
-        {{ .Render "summary"}}
-    {{ end }}
-
-
-## Math
-
-### add
-Adds two integers.
-
-eg {{add 1 2}} -> 3
-
-### sub
-Subtracts two integers.
-
-eg {{sub 3 2}} -> 1
-
-### div
-Divides two integers.
-
-eg {{div 6 3}} -> 2
-
-### mul
-Multiplies two integers.
-
-eg {{mul 2 3}} -> 6
-
-### mod
-Modulus of two integers.
-
-eg {{mod 15 3}} -> 0
-
-### modBool
-Boolean of modulus of two integers.
-true if modulus is 0.
-
-eg {{modBool 15 3}} -> true
-
-## Strings
-
-### urlize
-Takes a string and sanitizes it for usage in urls, converts spaces to "-".
-
-eg. <a href="/tags/{{ . | urlize }}">{{ . }}</a>
-
-### safeHtml
-Declares the provided string as "safe" so go templates will not filter it.
-
-eg. {{ .Params.CopyrightHTML | safeHtml }}
-
-### lower
-Convert all characters in string to lowercase.
-
-eg {{lower "BatMan"}} -> "batman"
-
-### upper
-Convert all characters in string to uppercase.
-
-eg {{upper "BatMan"}} -> "BATMAN"
-
-### title
-Convert all characters in string to titlecase.
-
-eg {{title "BatMan"}} -> "Batman"
-
-### highlight
-Take a string of code and a language, uses pygments to return the syntax
-highlighted code in html. Used in the [highlight shortcode](/extras/highlight).

docs/content/templates/go-templates.md

@@ -1,339 +0,0 @@
----
-aliases:
-- /layout/go-templates/
-date: 2013-07-01
-menu:
-  main:
-    parent: layout
-next: /templates/functions
-prev: /templates/overview
-title: Go Template Primer
-weight: 15
----
-
-Hugo uses the excellent [go][] [html/template][gohtmltemplate] library for
-its template engine. It is an extremely lightweight engine that provides a very
-small amount of logic. In our experience that it is just the right amount of
-logic to be able to create a good static website. If you have used other
-template systems from different languages or frameworks you will find a lot of
-similarities in go templates.
-
-This document is a brief primer on using go templates. The [go docs][gohtmltemplate]
-provide more details.
-
-## Introduction to Go Templates
-
-Go templates provide an extremely simple template language. It adheres to the
-belief that only the most basic of logic belongs in the template or view layer.
-One consequence of this simplicity is that go templates parse very quickly.
-
-A unique characteristic of go templates is they are content aware. Variables and
-content will be sanitized depending on the context of where they are used. More
-details can be found in the [go docs][gohtmltemplate].
-
-## Basic Syntax
-
-Go lang templates are html files with the addition of variables and
-functions. 
-
-**Go variables and functions are accessible within {{ }}**
-
-Accessing a predefined variable "foo":
-
-    {{ foo }}
-
-**Parameters are separated using spaces**
-
-Calling the add function with input of 1, 2:
-
-    {{ add 1 2 }}
-
-**Methods and fields are accessed via dot notation**
-
-Accessing the Page Parameter "bar"
-
-    {{ .Params.bar }}
-
-**Parentheses can be used to group items together**
-
-    {{ if or (isset .Params "alt") (isset .Params "caption") }} Caption {{ end }}
-
-
-## Variables
-
-Each go template has a struct (object) made available to it. In hugo each
-template is passed either a page or a node struct depending on which type of
-page you are rendering. More details are available on the
-[variables](/layout/variables) page.
-
-A variable is accessed by referencing the variable name.
-
-    <title>{{ .Title }}</title>
-
-Variables can also be defined and referenced.
-
-    {{ $address := "123 Main St."}}
-    {{ $address }}
-
-
-## Functions
-
-Go template ship with a few functions which provide basic functionality. The go
-template system also provides a mechanism for applications to extend the
-available functions with their own. [Hugo template
-functions](/layout/functions) provide some additional functionality we believe
-are useful for building websites. Functions are called by using their name
-followed by the required parameters separated by spaces. Template
-functions cannot be added without recompiling hugo.
-
-**Example:**
-
-    {{ add 1 2 }}
-
-## Includes
-
-When including another template you will pass to it the data it will be
-able to access. To pass along the current context please remember to
-include a trailing dot. The templates location will always be starting at
-the /layout/ directory within Hugo.
-
-**Example:**
-
-    {{ template "chrome/header.html" . }}
-
-
-## Logic
-
-Go templates provide the most basic iteration and conditional logic.
-
-### Iteration 
-
-Just like in go, the go templates make heavy use of range to iterate over
-a map, array or slice. The following are different examples of how to use
-range.
-
-**Example 1: Using Context**
-
-    {{ range array }} 
-        {{ . }}
-    {{ end }}
-
-**Example 2: Declaring value variable name**
-
-    {{range $element := array}} 
-        {{ $element }} 
-    {{ end }}
-
-**Example 2: Declaring key and value variable name**
-
-    {{range $index, $element := array}}
-        {{ $index }} 
-        {{ $element }} 
-    {{ end }}
-
-### Conditionals 
-
-If, else, with, or, & and provide the framework for handling conditional
-logic in Go Templates. Like range, each statement is closed with `end`.
-
-
-Go Templates treat the following values as false: 
-
-* false
-* 0 
-* any array, slice, map, or string of length zero
-
-**Example 1: If**
-
-    {{ if isset .Params "title" }}<h4>{{ index .Params "title" }}</h4>{{ end }}
-
-**Example 2: If -> Else** 
-
-    {{ if isset .Params "alt" }} 
-        {{ index .Params "alt" }}
-    {{else}}
-        {{ index .Params "caption" }}
-    {{ end }}
-
-**Example 3: And & Or**
-
-    {{ if and (or (isset .Params "title") (isset .Params "caption")) (isset .Params "attr")}}
-
-**Example 4: With**
-
-An alternative way of writing "if" and then referencing the same value
-is to use "with" instead. With rebinds the context `.` within its scope,
-and skips the block if the variable is absent.
-
-The first example above could be simplified as:
-
-    {{ with .Params.title }}<h4>{{ . }}</h4>{{ end }}
-
-**Example 5: If -> Else If** 
-
-    {{ if isset .Params "alt" }} 
-        {{ index .Params "alt" }}
-    {{ else if isset .Params "caption" }}
-        {{ index .Params "caption" }}
-    {{ end }}
-
-## Pipes
-
-One of the most powerful components of go templates is the ability to
-stack actions one after another. This is done by using pipes. Borrowed
-from unix pipes, the concept is simple, each pipeline's output becomes the
-input of the following pipe. 
-
-Because of the very simple syntax of go templates, the pipe is essential
-to being able to chain together function calls. One limitation of the
-pipes is that they only can work with a single value and that value
-becomes the last parameter of the next pipeline. 
-
-A few simple examples should help convey how to use the pipe.
-
-**Example 1 :**
-
-    {{ if eq 1 1 }} Same {{ end }}
-
-is the same as 
-
-    {{ eq 1 1 | if }} Same {{ end }}
-
-It does look odd to place the if at the end, but it does provide a good
-illustration of how to use the pipes.
-
-**Example 2 :**
-
-    {{ index .Params "disqus_url" | html }}
-
-Access the page parameter called "disqus_url" and escape the HTML.
-
-**Example 3 :**
-
-    {{ if or (or (isset .Params "title") (isset .Params "caption")) (isset .Params "attr")}}
-    Stuff Here
-    {{ end }}
-
-Could be rewritten as 
-
-    {{  isset .Params "caption" | or isset .Params "title" | or isset .Params "attr" | if }}
-    Stuff Here 
-    {{ end }}
-
-
-## Context (aka. the dot)
-
-The most easily overlooked concept to understand about go templates is that {{ . }}
-always refers to the current context. In the top level of your template this
-will be the data set made available to it. Inside of a iteration it will have
-the value of the current item. When inside of a loop the context has changed. .
-will no longer refer to the data available to the entire page. If you need to
-access this from within the loop you will likely want to set it to a variable
-instead of depending on the context.
-
-**Example:**
-
-      {{ $title := .Site.Title }}
-      {{ range .Params.tags }}
-        <li> <a href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }}</a> - {{ $title }} </li>
-      {{ end }}
-
-Notice how once we have entered the loop the value of {{ . }} has changed. We
-have defined a variable outside of the loop so we have access to it from within
-the loop.
-
-# Hugo Parameters 
-
-Hugo provides the option of passing values to the template language
-through the site configuration (for sitewide values), or through the meta
-data of each specific piece of content. You can define any values of any
-type (supported by your front matter/config format) and use them however
-you want to inside of your templates. 
-
-
-## Using Content (page) Parameters 
-
-In each piece of content you can provide variables to be used by the
-templates. This happens in the [front matter](/content/front-matter). 
-
-An example of this is used in this documentation site. Most of the pages
-benefit from having the table of contents provided. Sometimes the TOC just
-doesn't make a lot of sense. We've defined a variable in our front matter
-of some pages to turn off the TOC from being displayed. 
-
-Here is the example front matter:
-
-```
----
-title: "Permalinks"
-date: "2013-11-18"
-aliases:
-  - "/doc/permalinks/"
-groups: ["extras"]
-groups_weight: 30
-notoc: true
----
-```
-
-Here is the corresponding code inside of the template:
-
-      {{ if not .Params.notoc }}
-        <div id="toc" class="well col-md-4 col-sm-6">
-        {{ .TableOfContents }}
-        </div>
-      {{ end }}
-
-
-
-## Using Site (config) Parameters
-In your top-level configuration file (eg, `config.yaml`) you can define site
-parameters, which are values which will be available to you in chrome.
-
-For instance, you might declare:
-
-```yaml
-params:
-  CopyrightHTML: "Copyright &#xA9; 2013 John Doe. All Rights Reserved."
-  TwitterUser: "spf13"
-  SidebarRecentLimit: 5
-```
-
-Within a footer layout, you might then declare a `<footer>` which is only
-provided if the `CopyrightHTML` parameter is provided, and if it is given,
-you would declare it to be HTML-safe, so that the HTML entity is not escaped
-again.  This would let you easily update just your top-level config file each
-January 1st, instead of hunting through your templates.
-
-```
-{{if .Site.Params.CopyrightHTML}}<footer>
-<div class="text-center">{{.Site.Params.CopyrightHTML | safeHtml}}</div>
-</footer>{{end}}
-```
-
-An alternative way of writing the "if" and then referencing the same value
-is to use "with" instead. With rebinds the context `.` within its scope,
-and skips the block if the variable is absent:
-
-```
-{{with .Site.Params.TwitterUser}}<span class="twitter">
-<a href="https://twitter.com/{{.}}" rel="author">
-<img src="/images/twitter.png" width="48" height="48" title="Twitter: {{.}}"
- alt="Twitter"></a>
-</span>{{end}}
-```
-
-Finally, if you want to pull "magic constants" out of your layouts, you can do
-so, such as in this example:
-
-```
-<nav class="recent">
-  <h1>Recent Posts</h1>
-  <ul>{{range first .Site.Params.SidebarRecentLimit .Site.Recent}}
-    <li><a href="{{.RelPermalink}}">{{.Title}}</a></li>
-  {{end}}</ul>
-</nav>
-```
-
-
-[go]: <http://golang.org/>
-[gohtmltemplate]: <http://golang.org/pkg/html/template/>