Integrate public as bindata optionally (#293)

* Dropped unused codekit config

* Integrated dynamic and static bindata for public

* Ignore public bindata

* Add a general generate make task

* Integrated flexible public assets into web command

* Updated vendoring, added all missiong govendor deps

* Made the linter happy with the bindata and dynamic code

* Moved public bindata definition to modules directory

* Ignoring the new bindata path now

* Updated to the new public modules import path

* Updated public bindata command and drop the new prefix

.gitignore

@@ -28,6 +28,8 @@ _testmain.go
 
 coverage.out
 
+/modules/public/bindata.go
+
 *.db
 *.log
 

Makefile

@@ -37,12 +37,6 @@ clean:
 	go clean -i ./...
 	rm -rf $(BIN) $(DIST)
 
-.PHONY: deps
-deps:
-	@which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \
-		go get -u github.com/jteeuwen/go-bindata/...; \
-	fi
-
 .PHONY: fmt
 fmt:
 	go fmt $(PACKAGES)
@@ -51,6 +45,13 @@ fmt:
 vet:
 	go vet $(PACKAGES)
 
+.PHONY: generate
+generate:
+	@which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \
+		go get -u github.com/jteeuwen/go-bindata/...; \
+	fi
+	go generate $(PACKAGES)
+
 .PHONY: errcheck
 errcheck:
 	@which errcheck > /dev/null; if [ $$? -ne 0 ]; then \
@@ -129,6 +130,9 @@ bindata: modules/bindata/bindata.go
 
 .IGNORE: modules/bindata/bindata.go
 modules/bindata/bindata.go: $(BINDATA)
+	@which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \
+		go get -u github.com/jteeuwen/go-bindata/...; \
+	fi
 	go-bindata -o=$@ -ignore="\\.go|README.md|TRANSLATORS" -pkg=bindata conf/...
 	go fmt $@
 	sed -i.bak 's/confLocaleLocale_/confLocaleLocale/' $@
@@ -148,5 +152,5 @@ stylesheets: public/css/index.css
 public/css/index.css: $(STYLESHEETS)
 	lessc $< $@
 
-.PHONY: generate
-generate: bindata javascripts stylesheets
+.PHONY: assets
+assets: bindata javascripts stylesheets

cmd/web.go

@@ -21,6 +21,7 @@ import (
 	"code.gitea.io/gitea/modules/bindata"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/public"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/template"
 	"code.gitea.io/gitea/routers"
@@ -125,9 +126,9 @@ func newMacaron() *macaron.Macaron {
 	if setting.Protocol == setting.FCGI {
 		m.SetURLPrefix(setting.AppSubURL)
 	}
-	m.Use(macaron.Static(
-		path.Join(setting.StaticRootPath, "public"),
-		macaron.StaticOptions{
+	m.Use(public.Static(
+		&public.Options{
+			Directory:   path.Join(setting.StaticRootPath, "public"),
 			SkipLogging: setting.DisableRouterLog,
 		},
 	))

modules/public/dynamic.go

@@ -0,0 +1,21 @@
+// +build !bindata
+
+// Copyright 2016 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package public
+
+import (
+	"gopkg.in/macaron.v1"
+)
+
+// Static implements the macaron static handler for serving assets.
+func Static(opts *Options) macaron.Handler {
+	return macaron.Static(
+		opts.Directory,
+		macaron.StaticOptions{
+			SkipLogging: opts.SkipLogging,
+		},
+	)
+}

modules/public/public.go

@@ -0,0 +1,14 @@
+// Copyright 2016 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package public
+
+//go:generate go-bindata -tags "bindata" -ignore "\\.go|\\.less" -pkg "public" -o "bindata.go" ../../public/...
+//go:generate go fmt bindata.go
+
+// Options represents the available options to configure the macaron handler.
+type Options struct {
+	Directory   string
+	SkipLogging bool
+}

modules/public/static.go

@@ -0,0 +1,29 @@
+// +build bindata
+
+// Copyright 2016 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package public
+
+import (
+	"github.com/go-macaron/bindata"
+	"gopkg.in/macaron.v1"
+)
+
+// Static implements the macaron static handler for serving assets.
+func Static(opts *Options) macaron.Handler {
+	return macaron.Static(
+		opts.Directory,
+		macaron.StaticOptions{
+			SkipLogging: opts.SkipLogging,
+			FileSystem: bindata.Static(bindata.Options{
+				Asset:      Asset,
+				AssetDir:   AssetDir,
+				AssetInfo:  AssetInfo,
+				AssetNames: AssetNames,
+				Prefix:     "../../public",
+			}),
+		},
+	)
+}