Merge branch 'master' of https://github.com/gogits/gogs

README.md

@@ -30,7 +30,7 @@ More importantly, Gogs only needs one binary to setup your own project hosting o
 - User profile page.
 - Repository viewer.
 - Gravatar and cache support.
-- Mail service(register).
+- Mail service(register, issue).
 - Administration panel.
 - Supports MySQL, PostgreSQL and SQLite3(binary release only).
 

README_ZH.md

@@ -29,7 +29,7 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作，实现 **零** 依
 - 用户个人信息页面
 - 仓库浏览器
 - Gravatar 以及缓存支持
-- 邮件服务（注册）
+- 邮件服务（注册、Issue）
 - 管理员面板
 - 支持 MySQL、PostgreSQL 以及 SQLite3（仅限二进制版本）
 

gogs.go

@@ -19,7 +19,7 @@ import (
 // Test that go1.2 tag above is included in builds. main.go refers to this definition.
 const go12tag = true
 
-const APP_VER = "0.1.8.0326"
+const APP_VER = "0.1.8.0326 Alpha"
 
 func init() {
 	base.AppVer = APP_VER

models/repo.go

@@ -235,6 +235,18 @@ func initRepoCommit(tmpPath string, sig *git.Signature) (err error) {
 	return nil
 }
 
+func createHookUpdate(hookPath, content string) error {
+	pu, err := os.OpenFile(hookPath, os.O_CREATE|os.O_WRONLY, 0777)
+	if err != nil {
+		return err
+	}
+	defer pu.Close()
+	if _, err = pu.WriteString(content); err != nil {
+		return err
+	}
+	return nil
+}
+
 // InitRepository initializes README and .gitignore if needed.
 func initRepository(f string, user *User, repo *Repository, initReadme bool, repoLang, license string) error {
 	repoPath := RepoPath(user.Name, repo.Name)
@@ -245,13 +257,9 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
 	}
 
 	// hook/post-update
-	pu, err := os.OpenFile(filepath.Join(repoPath, "hooks", "update"), os.O_CREATE|os.O_WRONLY, 0777)
+	if err := createHookUpdate(filepath.Join(repoPath, "hooks", "update"),
-	if err != nil {
+		fmt.Sprintf("#!/usr/bin/env bash\n%s update $1 $2 $3\n",
-		return err
+			strings.Replace(appPath, "\\", "/", -1))); err != nil {
-	}
-	defer pu.Close()
-	// TODO: Windows .bat
-	if _, err = pu.WriteString(fmt.Sprintf("#!/usr/bin/env bash\n%s update $1 $2 $3\n", appPath)); err != nil {
 		return err
 	}
 

modules/avatar/avatar.go

@@ -9,7 +9,7 @@ It is recommend to use this way
 
 	cacheDir := "./cache"
 	defaultImg := "./default.jpg"
-	http.Handle("/avatar/", avatar.HttpHandler(cacheDir, defaultImg))
+	http.Handle("/avatar/", avatar.CacheServer(cacheDir, defaultImg))
 */
 package avatar
 
@@ -135,12 +135,12 @@ func (this *Avatar) UpdateTimeout(timeout time.Duration) error {
 	return err
 }
 
-type avatarHandler struct {
+type service struct {
 	cacheDir string
 	altImage string
 }
 
-func (this *avatarHandler) mustInt(r *http.Request, defaultValue int, keys ...string) int {
+func (this *service) mustInt(r *http.Request, defaultValue int, keys ...string) int {
 	var v int
 	for _, k := range keys {
 		if _, err := fmt.Sscanf(r.FormValue(k), "%d", &v); err == nil {
@@ -150,7 +150,7 @@ func (this *avatarHandler) mustInt(r *http.Request, defaultValue int, keys ...st
 	return defaultValue
 }
 
-func (this *avatarHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (this *service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	urlPath := r.URL.Path
 	hash := urlPath[strings.LastIndex(urlPath, "/")+1:]
 	size := this.mustInt(r, 80, "s", "size") // default size = 80*80
@@ -183,9 +183,9 @@ func (this *avatarHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// http.Handle("/avatar/", avatar.HttpHandler("./cache"))
+// http.Handle("/avatar/", avatar.CacheServer("./cache"))
-func HttpHandler(cacheDir string, defaultImgPath string) http.Handler {
+func CacheServer(cacheDir string, defaultImgPath string) http.Handler {
-	return &avatarHandler{
+	return &service{
 		cacheDir: cacheDir,
 		altImage: defaultImgPath,
 	}

modules/avatar/avatar_test.go

@@ -51,7 +51,7 @@ func TestFetchMany(t *testing.T) {
 // wget http://www.artsjournal.com/artfulmanager/wp/wp-content/uploads/2013/12/200x200xmirror_cat.jpg.pagespeed.ic.GOZSv6v1_H.jpg -O default.jpg
 /*
 func TestHttp(t *testing.T) {
-	http.Handle("/", avatar.HttpHandler("./", "default.jpg"))
+	http.Handle("/", avatar.CacheServer("./", "default.jpg"))
 	http.ListenAndServe(":8001", nil)
 }
 */

modules/base/conf.go

@@ -80,7 +80,7 @@ func ExecDir() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return path.Dir(p), nil
+	return path.Dir(strings.Replace(p, "\\", "/", -1)), nil
 }
 
 var logLevels = map[string]string{

update.go

@@ -5,18 +5,18 @@
 package main
 
 import (
-"os"
+	"container/list"
-"os/exec"
+	"os"
-"strings"
+	"os/exec"
-"strconv"
+	"strconv"
-"container/list"
+	"strings"
 
-"github.com/codegangsta/cli"
+	"github.com/codegangsta/cli"
-//"github.com/gogits/gogs/modules/log"
+	//"github.com/gogits/gogs/modules/log"
-"github.com/gogits/gogs/models"
+	"github.com/gogits/git"
-"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/models"
-"github.com/qiniu/log"
+	"github.com/gogits/gogs/modules/base"
-"github.com/gogits/git"
+	"github.com/qiniu/log"
 )
 
 var CmdUpdate = cli.Command{

web.go

@@ -96,8 +96,8 @@ func runWeb(*cli.Context) {
 	m.Get("/stars", reqSignIn, user.Stars)
 	m.Get("/help", routers.Help)
 
-	avatarCache := avatar.HttpHandler("public/img/avatar/", "public/img/avatar_default.jpg")
+	avt := avatar.CacheServer("public/img/avatar/", "public/img/avatar_default.jpg")
-	m.Get("/avatar/:hash", avatarCache.ServeHTTP)
+	m.Get("/avatar/:hash", avt.ServeHTTP)
 
 	m.Group("/user", func(r martini.Router) {
 		r.Any("/login", binding.BindIgnErr(auth.LogInForm{}), user.SignIn)