Merge pull request #48 from rande/move_skeleton_code

Move skeleton code

Author: rande

.gitignore

@@ -2,11 +2,11 @@
 explorer/node_modules
 explorer/dist
 dist/*
-assets/bindata.go
+app/assets/bindata.go
 data
 admin/build
 admin/node_modules
 vendor
-skeleton
 runtime
 .glide
+fork

.travis.yml

@@ -43,7 +43,7 @@ script:
         go get golang.org/x/tools/cmd/cover;
         go get golang.org/x/tools/cmd/goimports;
         go get -u github.com/jteeuwen/go-bindata/...;
-        ./assets/bindata.sh;
+        ./app/assets/bindata.sh;
         mkdir -p build/coverage && rm -rf build/coverage/*.cov;
         export GOPKG="./core/bindata,./core/commands,./core/config,./core/guard,./core/helper,./core/logger,./core/router,./core/security,./core/squirrel,./core/vault,./modules/api,./modules/base,./modules/blog,./modules/debug,./modules/feed,./modules/guard,./modules/media,./modules/prism,./modules/raw,./modules/search,./modules/setup,./modules/user";
         go test -v -coverpkg ${GOPKG} -covermode count -coverprofile=build/coverage/core_bindata.cov ./core/bindata;

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 Thomas Rabaix
+Copyright (c) 2014-2018 Thomas Rabaix
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

Makefile

@@ -25,16 +25,23 @@ shell:
 	docker-compose run back /bin/bash
 
 install:
-	mkdir -p runtime/src
 	$(call back,glide install)
 	$(call back,go get github.com/wadey/gocovmerge && go get golang.org/x/tools/cmd/cover && go get golang.org/x/tools/cmd/goimports && go get -u github.com/jteeuwen/go-bindata/...)
-	$(call back,cp -rvf /usr/local/go/src/* ./runtime/src/ )
 
 test:
-	$(call back,./assets/bindata.sh && go test -v $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
+	$(call back,./app/assets/bindata.sh && go test -v $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
 	$(call back,go vet $(GONODE_CORE) $(GONODE_MODULES) ./test/modules/)
 
 format:
 	$(call back,gofmt -w $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
 	$(call back,go fix $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
 	$(call back,go vet $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
+
+run:
+	docker-compose kill
+	docker-compose up
+
+load:    ## Load fixtures
+	curl -XPOST http://localhost:2508/setup/uninstall && exit 0
+	curl -XPOST http://localhost:2508/setup/install
+	curl -XPOST http://localhost:2508/setup/data/load

app/assets/README.md

@@ -0,0 +1,37 @@
+Assets
+======
+
+This directory will only contains a gofile generated by go-bindata with all assets required by the project.
+
+The ``bindata.go`` is generated only on build and should not be commited.
+
+The assets can contains any template files or front files (js, css, images, ...)
+
+Please note, the ``go-bindata`` must be run from ``GOPATH`` folder, so the assets references will be unique accross different projects.
+ 
+    github.com/rande/gonode/modules/setup/templates/core.setup.base.html.tpl
+    github.com/rande/gonode/explorer/dist/css/app-0-f3673f84.css
+    github.com/rande/gonode/explorer/dist/d317f3fe02c697f8b2d3c4c3e940ea7f.gif
+    github.com/rande/gonode/explorer/dist/fonts/arrow-left-icon-5fc0d629.svg
+
+
+The ``Makefile`` lines to generate the file will be:
+
+    ```Makefile
+
+    bin:
+    	app/assets/bindata.sh
+
+    run: bin
+    	go run app/main.go server -config=app/server.toml.dist
+    
+    build: bin
+    	rm -rf dist && mkdir dist
+    	app/assets/bindata.sh
+    	go build -a -o ./dist/gonode app/main.go
+
+
+Usage
+-----
+
+Just import the package ``assets`` and refer to the ``go-bindata`` documentation.

app/assets/assets.go

@@ -0,0 +1,17 @@
+// Copyright © 2014-2018 Thomas Rabaix <[email protected]>.
+//
+// Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package assets
+
+var rootDir = ""
+
+func UpdateRootDir(path string) {
+
+	if len(path) == 0 {
+		return
+	}
+
+	rootDir = path
+}

app/assets/bindata.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+GO_BINDATA_PATHS="${GOPATH}/src/github.com/rande/gonode/modules/..."
+GO_BINDATA_IGNORE="(.*)\.(go|DS_Store)"
+GO_BINDATA_OUTPUT="${GOPATH}/src/github.com/rande/gonode/app/assets/bindata.go"
+GO_BINDATA_PACKAGE="assets"
+
+echo "Generating bindata file..."
+cd ${GOPATH}/src && go-bindata -dev -prefix ${GOPATH}/src -o ${GO_BINDATA_OUTPUT} -pkg ${GO_BINDATA_PACKAGE} -ignore ${GO_BINDATA_IGNORE} ${GO_BINDATA_PATHS}
+
+echo "Done!"

app/assets/doc.go

@@ -0,0 +1,6 @@
+// Copyright © 2014-2018 Thomas Rabaix <[email protected]>.
+//
+// Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package assets

app/main.go

@@ -0,0 +1,96 @@
+// Copyright © 2014-2018 Thomas Rabaix <[email protected]>.
+//
+// Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"os"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/mitchellh/cli"
+	"github.com/rande/goapp"
+	"github.com/rande/gonode/app/assets"
+	"github.com/rande/gonode/core/bindata"
+	"github.com/rande/gonode/core/commands"
+	"github.com/rande/gonode/core/config"
+	"github.com/rande/gonode/core/logger"
+	"github.com/rande/gonode/core/router"
+	"github.com/rande/gonode/core/security"
+	"github.com/rande/gonode/modules/api"
+	"github.com/rande/gonode/modules/base"
+	"github.com/rande/gonode/modules/blog"
+	"github.com/rande/gonode/modules/debug"
+	"github.com/rande/gonode/modules/feed"
+	node_guard "github.com/rande/gonode/modules/guard"
+	"github.com/rande/gonode/modules/media"
+	"github.com/rande/gonode/modules/prism"
+	"github.com/rande/gonode/modules/raw"
+	"github.com/rande/gonode/modules/search"
+	"github.com/rande/gonode/modules/setup"
+	"github.com/rande/gonode/modules/user"
+)
+
+func Configure(configFile string) *goapp.Lifecycle {
+	l := goapp.NewLifecycle()
+
+	conf := config.NewConfig()
+	config.LoadConfigurationFromFile(configFile, conf)
+
+	l.Config(func(app *goapp.App) error {
+		assets.UpdateRootDir(conf.BinData.BasePath)
+
+		app.Set("gonode.asset", func(app *goapp.App) interface{} {
+			return assets.Asset
+		})
+
+		return nil
+	})
+
+	base.Configure(l, conf)
+	debug.Configure(l, conf)
+	user.Configure(l, conf)
+	raw.Configure(l, conf)
+	blog.Configure(l, conf)
+	media.Configure(l, conf)
+	search.Configure(l, conf)
+	feed.Configure(l, conf)
+
+	logger.Configure(l, conf)
+	commands.Configure(l, conf)
+	security.ConfigureCors(l, conf)
+	node_guard.Configure(l, conf)
+	security.ConfigureSecurity(l, conf)
+	api.Configure(l, conf)
+	setup.Configure(l, conf)
+	bindata.Configure(l, conf)
+	prism.Configure(l, conf)
+	router.Configure(l, conf)
+
+	return l
+}
+
+func main() {
+	ui := &cli.BasicUi{Writer: os.Stdout}
+
+	c := cli.NewCLI("gonode", "0.0.2-DEV")
+	c.Args = os.Args[1:]
+
+	c.Commands = map[string]cli.CommandFactory{
+		"server": func() (cli.Command, error) {
+			return &commands.ServerCommand{
+				Ui:        ui,
+				Configure: Configure,
+			}, nil
+		},
+	}
+
+	exitStatus, err := c.Run()
+
+	if err != nil {
+		log.Println(err)
+	}
+
+	os.Exit(exitStatus)
+}

app/server.toml.dist

@@ -0,0 +1,80 @@
+name= "GoNode - poc"
+bind= "0.0.0.0:2508"
+test= true
+
+[databases.master]
+type    = "master"
+dsn     = "postgres://postgres:gonode@database/gonode?sslmode=disable"
+enabled = true
+prefix  = "prod"
+
+[filesystem]
+path = "/tmp/gnode"
+
+[guard]
+    key = "ZeSecretKey0oo"
+
+    [guard.jwt]
+        [guard.jwt.login]
+        path = "\\/api\\/v([0-9\\.]*)\\/login"
+
+        [guard.jwt.token]
+        path = "^\\/api\\/v([0-9\\.]*)"
+
+    [guard.anonymous]
+        roles = [
+            "IS_AUTHENTICATED_ANONYMOUSLY",
+            "node:prism:read"
+        ]
+
+[security]
+    voters = [
+        "security.voter.role",
+        "security.voter.is",
+        "gonode.security.voter.access",
+        "gonode.security.voter.role",
+    ]
+
+    [security.cors]
+    allowed_origins = ["http://localhost:8000"]
+    allowed_methods = ["GET", "PUT", "POST"]
+    allowed_headers = ["Origin", "Accept", "Content-Type", "Authorization"]
+
+    [[security.access]]
+    path  = "^\\/admin"
+    roles = ["ROLE_ADMIN"]
+
+    [[security.access]]
+    path  = "^\\/api\\/v([0-9\\.]*)\\/hello"
+    roles = ["IS_AUTHENTICATED_ANONYMOUSLY", "ROLE_API"]
+
+    [[security.access]]
+    path  = "^\\/api"
+    roles = ["ROLE_API"]
+
+    [[security.access]]
+    path  = "^\\/"
+    roles = ["IS_AUTHENTICATED_ANONYMOUSLY"]
+
+[bindata]
+    templates = [
+        "github.com/rande/gonode/modules/setup/templates",
+        "github.com/rande/gonode/modules/blog/templates",
+        "github.com/rande/gonode/modules/prism/templates",
+        "github.com/rande/gonode/modules/search/templates",
+        "github.com/rande/gonode/modules/feed/templates",
+    ]
+
+    [bindata.assets]
+        [bindata.assets.explorer]
+        index = "index.html"
+        public = "/explorer"
+        private = "github.com/rande/gonode/explorer/dist"
+
+[media]
+    [media.image]
+    allowed_widths = [100, 250, 500, 1024]
+    max_width = 1024
+
+[logger]
+    level = "debug"