Merge branch 'master' into develop

oxequa · Apr 14, 2018 · e823573 · e823573
2 parents f0e28d1 + 7f988a2
commit e823573
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 166 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -41,7 +41,7 @@
   version = "1.0.4"
 
 [[constraint]]
-  name = "github.com/tockins/interact"
+  name = "github.com/oxequa/interact"
   version = "1.1.1"
 
 [[constraint]]

diff --git a/README.md b/README.md
@@ -1,23 +1,16 @@
-# Realize
-
-[![GoDoc](https://img.shields.io/badge/documentation-godoc-blue.svg?style=flat-square)](https://godoc.org/github.com/tockins/realize)
-[![Travis](https://img.shields.io/travis/tockins/realize.svg?style=flat-square)](https://travis-ci.org/tockins/realize)
-[![AUR](https://img.shields.io/aur/license/yaourt.svg?style=flat-square)](https://raw.githubusercontent.com/tockins/realize/v1/LICENSE)
-[![](https://img.shields.io/badge/realize-examples-yellow.svg?style=flat-square)](https://github.com/tockins/realize-examples)
-[![Gitter](https://img.shields.io/gitter/room/tockins/realize.svg?style=flat-square)](https://gitter.im/tockins/realize?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Go Report Card](https://goreportcard.com/badge/github.com/tockins/realize?style=flat-square)](https://goreportcard.com/report/github.com/tockins/realize)
-<!--[![OpenCollective](https://opencollective.com/realize/backers/badge.svg?style=flat-square)](#backers)
-[![OpenCollective](https://opencollective.com/realize/sponsors/badge.svg?style=flat-square)](#sponsors)-->
-
-<br>
-
-<div align="center">
-    <img src="https://i.imgur.com/7XiZyR1.png" width="125px">
-    <h1 style="">The #1 Golang Task Runner</h1>
-	<p style="font-size: 18px; font-weight: 400;">Enhance your workflow by automating the most common tasks and using the best performing Golang live reloading.</p>
-</div>
-
-<br>
+<p align="center">
+  <img src="https://i.imgur.com/vJfIiId.png" width="125px">
+</p>
+<p align="center">
+  <a href="https://travis-ci.org/oxequa/realize"><img src="https://img.shields.io/travis/oxequa/realize.svg?style=flat-square" alt="Build status"></a>
+  <a href="https://goreportcard.com/report/github.com/oxequa/realize"><img src="https://goreportcard.com/badge/github.com/oxequa/realize?style=flat-square" alt="GoReport"></a>
+  <a href="http://godoc.org/github.com/oxequa/realize"><img src="http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square" alt="GoDoc"></a>
+  <a href="https://raw.githubusercontent.com/oxequa/realize/master/LICENSE"><img src="https://img.shields.io/aur/license/yaourt.svg?style=flat-square" alt="License"></a>
+  <a href="https://gitter.im/oxequa/realize?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"><img src="https://img.shields.io/gitter/room/oxequa/realize.svg?style=flat-square" alt="Gitter"></a>
+</p>
+<hr>
+<h3 align="center">#1 Golang live reload and task runner</h3>
+<hr>
 
 <p align="center">
     <img src="https://gorealize.io/img/realize-ui-2.png">
@@ -45,15 +38,17 @@
 - Export logs and errors to an external file.
 - Step-by-step project initialization.
 - Redesigned panel that displays build errors, console outputs and warnings.
-- Any suggestion? [Suggest an amazing feature! 🕺🏻](https://github.com/tockins/realize/issues/new)
+- Any suggestion? [Suggest an amazing feature! 🕺🏻](https://github.com/oxequa/realize/issues/new)
 
 ## Supporters
 <p align="center"><br>
     <img src="http://gorealize.io/img/do_logo.png" width="180px">
 </p>
 
-## Get started
-	$ go get github.com/tockins/realize
+## Quickstart
+```
+go get github.com/oxequa/realize
+```
 
 ## Commands List
 
@@ -87,7 +82,7 @@ Some examples:
     $ realize start --name="realize" --build
     $ realize start --path="realize" --run --no-config
     $ realize start --install --test --fmt --no-config
-    $ realize start --path="/Users/username/go/src/github.com/tockins/realize-examples/coin/"
+    $ realize start --path="/Users/username/go/src/github.com/oxequa/realize-examples/coin/"
 
 If you want, you can specify additional arguments for your project:
 
@@ -126,7 +121,7 @@ Remove a project by its name
 
 *** there is no more a .realize dir, but only a .realize.yaml file ***
 
-For more examples check: [Realize Examples](https://github.com/tockins/realize-examples)
+For more examples check: [Realize Examples](https://github.com/oxequa/realize-examples)
 
     settings:
         legacy:
@@ -197,8 +192,8 @@ For more examples check: [Realize Examples](https://github.com/tockins/realize-e
           errorOutputPattern: mypattern   //custom error pattern
 
 ## Support and Suggestions
-💬 Chat with us [Gitter](https://gitter.im/tockins/realize)<br>
-⭐️ Suggest a new [Feature](https://github.com/tockins/realize/issues/new)
+💬 Chat with us [Gitter](https://gitter.im/oxequa/realize)<br>
+⭐️ Suggest a new [Feature](https://github.com/oxequa/realize/issues/new)
 
 ## Backers
 

diff --git a/realize/bindata.go b/realize/bindata.go
@@ -392,19 +392,19 @@ func AssetNames() []string {
 
 // _bindata is a table, holding each asset generator, mapped to its name.
 var _bindata = map[string]func() (*asset, error){
-	"assets/app/components/index.html": assetsAppComponentsIndexHtml,
-	"assets/app/components/project/index.html": assetsAppComponentsProjectIndexHtml,
-	"assets/app/components/settings/index.html": assetsAppComponentsSettingsIndexHtml,
-	"assets/assets/css/app.css": assetsAssetsCssAppCss,
-	"assets/assets/img/logo.png": assetsAssetsImgLogoPng,
-	"assets/assets/img/svg/github-logo.svg": assetsAssetsImgSvgGithubLogoSvg,
+	"assets/app/components/index.html":                   assetsAppComponentsIndexHtml,
+	"assets/app/components/project/index.html":           assetsAppComponentsProjectIndexHtml,
+	"assets/app/components/settings/index.html":          assetsAppComponentsSettingsIndexHtml,
+	"assets/assets/css/app.css":                          assetsAssetsCssAppCss,
+	"assets/assets/img/logo.png":                         assetsAssetsImgLogoPng,
+	"assets/assets/img/svg/github-logo.svg":              assetsAssetsImgSvgGithubLogoSvg,
 	"assets/assets/img/svg/ic_arrow_back_black_48px.svg": assetsAssetsImgSvgIc_arrow_back_black_48pxSvg,
-	"assets/assets/img/svg/ic_clear_white_48px.svg": assetsAssetsImgSvgIc_clear_white_48pxSvg,
-	"assets/assets/img/svg/ic_menu_white_48px.svg": assetsAssetsImgSvgIc_menu_white_48pxSvg,
-	"assets/assets/img/svg/ic_settings_black_48px.svg": assetsAssetsImgSvgIc_settings_black_48pxSvg,
-	"assets/assets/js/all.js": assetsAssetsJsAllJs,
-	"assets/assets/js/all.min.js": assetsAssetsJsAllMinJs,
-	"assets/index.html": assetsIndexHtml,
+	"assets/assets/img/svg/ic_clear_white_48px.svg":      assetsAssetsImgSvgIc_clear_white_48pxSvg,
+	"assets/assets/img/svg/ic_menu_white_48px.svg":       assetsAssetsImgSvgIc_menu_white_48pxSvg,
+	"assets/assets/img/svg/ic_settings_black_48px.svg":   assetsAssetsImgSvgIc_settings_black_48pxSvg,
+	"assets/assets/js/all.js":                            assetsAssetsJsAllJs,
+	"assets/assets/js/all.min.js":                        assetsAssetsJsAllMinJs,
+	"assets/index.html":                                  assetsIndexHtml,
 }
 
 // AssetDir returns the file names below a certain
@@ -446,6 +446,7 @@ type bintree struct {
 	Func     func() (*asset, error)
 	Children map[string]*bintree
 }
+
 var _bintree = &bintree{nil, map[string]*bintree{
 	"assets": &bintree{nil, map[string]*bintree{
 		"app": &bintree{nil, map[string]*bintree{
@@ -466,15 +467,15 @@ var _bintree = &bintree{nil, map[string]*bintree{
 			"img": &bintree{nil, map[string]*bintree{
 				"logo.png": &bintree{assetsAssetsImgLogoPng, map[string]*bintree{}},
 				"svg": &bintree{nil, map[string]*bintree{
-					"github-logo.svg": &bintree{assetsAssetsImgSvgGithubLogoSvg, map[string]*bintree{}},
+					"github-logo.svg":              &bintree{assetsAssetsImgSvgGithubLogoSvg, map[string]*bintree{}},
 					"ic_arrow_back_black_48px.svg": &bintree{assetsAssetsImgSvgIc_arrow_back_black_48pxSvg, map[string]*bintree{}},
-					"ic_clear_white_48px.svg": &bintree{assetsAssetsImgSvgIc_clear_white_48pxSvg, map[string]*bintree{}},
-					"ic_menu_white_48px.svg": &bintree{assetsAssetsImgSvgIc_menu_white_48pxSvg, map[string]*bintree{}},
-					"ic_settings_black_48px.svg": &bintree{assetsAssetsImgSvgIc_settings_black_48pxSvg, map[string]*bintree{}},
+					"ic_clear_white_48px.svg":      &bintree{assetsAssetsImgSvgIc_clear_white_48pxSvg, map[string]*bintree{}},
+					"ic_menu_white_48px.svg":       &bintree{assetsAssetsImgSvgIc_menu_white_48pxSvg, map[string]*bintree{}},
+					"ic_settings_black_48px.svg":   &bintree{assetsAssetsImgSvgIc_settings_black_48pxSvg, map[string]*bintree{}},
 				}},
 			}},
 			"js": &bintree{nil, map[string]*bintree{
-				"all.js": &bintree{assetsAssetsJsAllJs, map[string]*bintree{}},
+				"all.js":     &bintree{assetsAssetsJsAllJs, map[string]*bintree{}},
 				"all.min.js": &bintree{assetsAssetsJsAllMinJs, map[string]*bintree{}},
 			}},
 		}},
@@ -528,4 +529,3 @@ func _filePath(dir, name string) string {
 	cannonicalName := strings.Replace(name, "\\", "/", -1)
 	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
 }
-
diff --git a/realize/cli.go b/realize/cli.go
@@ -65,7 +65,8 @@ func init() {
 	if build.Default.GOPATH == "" {
 		log.Fatal("$GOPATH isn't set properly")
 	}
-	if err := os.Setenv("GOBIN", filepath.Join(build.Default.GOPATH, "bin")); err != nil {
+	path := filepath.SplitList(build.Default.GOPATH)
+	if err := os.Setenv("GOBIN", filepath.Join(path[len(path)-1], "bin")); err != nil {
 		log.Fatal(err)
 	}
 }

diff --git a/realize/projects.go b/realize/projects.go
@@ -69,7 +69,7 @@ type Project struct {
 }
 
 // Last is used to save info about last file changed
-type last struct{
+type last struct {
 	file string
 	time time.Time
 }
@@ -495,7 +495,7 @@ func (p *Project) walk(path string, info os.FileInfo, err error) error {
 		result := p.watcher.Walk(path, p.init)
 		if result != "" {
 			if p.parent.Settings.Recovery.Index {
-				log.Println("Indexing",path)
+				log.Println("Indexing", path)
 			}
 			p.tools(p.stop, path, info)
 			if info.IsDir() {
@@ -596,6 +596,9 @@ func (p *Project) run(path string, stream chan Response, stop <-chan bool) (err
 		name = filepath.Base(dirPath)
 	}
 	path = filepath.Join(dirPath, name)
+	if p.Tools.Run.Method != "" {
+        path = p.Tools.Run.Method
+	}
 	if _, err := os.Stat(path); err == nil {
 		build = exec.Command(path, args...)
 	} else if _, err := os.Stat(path + RExtWin); err == nil {