playground
/
gogs
mirror of https://github.com/gogits/gogs.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

add run command

pull/103/head
Lunny Xiao 11 years ago
parent
58d75a92d7
commit
c75aafb9aa
5 changed files with 345 additions and 203 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 188
      cmd/build.go
  2. 190
      cmd/gopath.go
  3. 66
      cmd/install.go
  4. 66
      cmd/run.go
  5. 6
      gopm.go

188
cmd/build.go
Unescape View File

@ -15,22 +15,17 @@
package cmd
import (
//"errors"
"github.com/Unknwon/com"
"github.com/gpmgo/gopm/doc"
"go/build"
"os"
"path/filepath"
//"syscall"
"os/exec"
"strings"
)
var CmdBuild = &Command{
UsageLine: "build",
Short: "build according a gopmfile",
Long: `
build
build just like go build
`,
}
@ -42,185 +37,10 @@ func init() {
func printBuildPrompt(flag string) {
}
func getGopmPkgs(path string, inludeSys bool) (map[string]*doc.Pkg, error) {
abs, err := filepath.Abs(filepath.Join(path, doc.GopmFileName))
if err != nil {
return nil, err
}
// load import path
gf := doc.NewGopmfile()
var builds *doc.Section
if com.IsExist(abs) {
err := gf.Load(abs)
if err != nil {
return nil, err
}
var ok bool
if builds, ok = gf.Sections["build"]; !ok {
builds = nil
}
}
pkg, err := build.ImportDir(path, build.AllowBinary)
if err != nil {
return map[string]*doc.Pkg{}, err
}
pkgs := make(map[string]*doc.Pkg)
for _, name := range pkg.Imports {
if inludeSys || !isStdPkg(name) {
if builds != nil {
if dep, ok := builds.Deps[name]; ok {
pkgs[name] = dep.Pkg
continue
}
}
pkgs[name] = doc.NewDefaultPkg(name)
}
}
return pkgs, nil
}
func pkgInCache(name string, cachePkgs map[string]*doc.Pkg) bool {
//pkgs := strings.Split(name, "/")
_, ok := cachePkgs[name]
return ok
}
func autoLink(oldPath, newPath string) error {
newPPath, _ := filepath.Split(newPath)
os.MkdirAll(newPPath, os.ModePerm)
return makeLink(oldPath, newPath)
}
func getChildPkgs(cpath string, ppkg *doc.Pkg, cachePkgs map[string]*doc.Pkg) error {
pkgs, err := getGopmPkgs(cpath, false)
if err != nil {
return err
}
for name, pkg := range pkgs {
if !pkgInCache(name, cachePkgs) {
var newPath string
if !build.IsLocalImport(name) {
newPath = filepath.Join(installRepoPath, pkg.ImportPath)
if !com.IsExist(newPath) {
var t, ver string = doc.BRANCH, ""
node := doc.NewNode(pkg.ImportPath, pkg.ImportPath, t, ver, true)
nodes := []*doc.Node{node}
downloadPackages(nodes)
// should handler download failed
}
} else {
newPath, err = filepath.Abs(name)
if err != nil {
return err
}
}
err = getChildPkgs(newPath, pkg, cachePkgs)
if err != nil {
return err
}
}
}
if ppkg != nil && !build.IsLocalImport(ppkg.ImportPath) {
cachePkgs[ppkg.ImportPath] = ppkg
}
return nil
}
func runBuild(cmd *Command, args []string) {
curPath, err := os.Getwd()
if err != nil {
com.ColorLog("[ERRO] %v\n", err)
return
}
hd, err := com.HomeDir()
if err != nil {
com.ColorLog("[ERRO] Fail to get current user[ %s ]\n", err)
return
}
gf := doc.NewGopmfile()
var pkgName string
gpmPath := filepath.Join(curPath, doc.GopmFileName)
if com.IsExist(gpmPath) {
com.ColorLog("[INFO] loading .gopmfile ...\n")
err := gf.Load(gpmPath)
if err != nil {
com.ColorLog("[ERRO] load .gopmfile failed: %v\n", err)
return
}
}
if target, ok := gf.Sections["target"]; ok {
pkgName = target.Props["path"]
com.ColorLog("[INFO] target name is %v\n", pkgName)
}
installRepoPath = strings.Replace(reposDir, "~", hd, -1)
cachePkgs := make(map[string]*doc.Pkg)
err = getChildPkgs(curPath, nil, cachePkgs)
if err != nil {
com.ColorLog("[ERRO] %v\n", err)
return
}
newGoPath := filepath.Join(curPath, "vendor")
os.RemoveAll(newGoPath)
newGoPathSrc := filepath.Join(newGoPath, "src")
os.MkdirAll(newGoPathSrc, os.ModePerm)
for name, _ := range cachePkgs {
oldPath := filepath.Join(installRepoPath, name)
newPath := filepath.Join(newGoPathSrc, name)
paths := strings.Split(name, "/")
var isExistP bool
var isCurChild bool
for i := 0; i < len(paths)-1; i++ {
pName := strings.Join(paths[:len(paths)-1-i], "/")
if _, ok := cachePkgs[pName]; ok {
isExistP = true
break
}
if pkgName == pName {
isCurChild = true
break
}
}
if isCurChild {
continue
}
if !isExistP {
com.ColorLog("[INFO] linked %v\n", name)
err = autoLink(oldPath, newPath)
if err != nil {
com.ColorLog("[ERRO] make link error %v\n", err)
return
}
}
}
if pkgName != "" {
newPath := filepath.Join(newGoPathSrc, pkgName)
com.ColorLog("[INFO] linked %v\n", pkgName)
err = autoLink(curPath, newPath)
if err != nil {
com.ColorLog("[ERRO] make link error %v\n", err)
return
}
}
gopath := build.Default.GOPATH
com.ColorLog("[TRAC] set GOPATH=%v\n", newGoPath)
err = os.Setenv("GOPATH", newGoPath)
if err != nil {
com.ColorLog("[ERRO] %v\n", err)
return
}
genNewGoPath()
com.ColorLog("[INFO] building ...\n")
@ -229,7 +49,7 @@ func runBuild(cmd *Command, args []string) {
bCmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
bCmd.Stdout = os.Stdout
bCmd.Stderr = os.Stderr
err = bCmd.Run()
err := bCmd.Run()
if err != nil {
com.ColorLog("[ERRO] build failed: %v\n", err)
return

190
cmd/gopath.go
Unescape View File

@ -0,0 +1,190 @@
package cmd
import (
"github.com/Unknwon/com"
"github.com/gpmgo/gopm/doc"
"go/build"
"os"
"path/filepath"
"strings"
)
func getGopmPkgs(path string, inludeSys bool) (map[string]*doc.Pkg, error) {
abs, err := filepath.Abs(filepath.Join(path, doc.GopmFileName))
if err != nil {
return nil, err
}
// load import path
gf := doc.NewGopmfile()
var builds *doc.Section
if com.IsExist(abs) {
err := gf.Load(abs)
if err != nil {
return nil, err
}
var ok bool
if builds, ok = gf.Sections["build"]; !ok {
builds = nil
}
}
pkg, err := build.ImportDir(path, build.AllowBinary)
if err != nil {
return map[string]*doc.Pkg{}, err
}
pkgs := make(map[string]*doc.Pkg)
for _, name := range pkg.Imports {
if inludeSys || !isStdPkg(name) {
if builds != nil {
if dep, ok := builds.Deps[name]; ok {
pkgs[name] = dep.Pkg
continue
}
}
pkgs[name] = doc.NewDefaultPkg(name)
}
}
return pkgs, nil
}
func pkgInCache(name string, cachePkgs map[string]*doc.Pkg) bool {
//pkgs := strings.Split(name, "/")
_, ok := cachePkgs[name]
return ok
}
func autoLink(oldPath, newPath string) error {
newPPath, _ := filepath.Split(newPath)
os.MkdirAll(newPPath, os.ModePerm)
return makeLink(oldPath, newPath)
}
func getChildPkgs(cpath string, ppkg *doc.Pkg, cachePkgs map[string]*doc.Pkg) error {
pkgs, err := getGopmPkgs(cpath, false)
if err != nil {
return err
}
for name, pkg := range pkgs {
if !pkgInCache(name, cachePkgs) {
var newPath string
if !build.IsLocalImport(name) {
newPath = filepath.Join(installRepoPath, pkg.ImportPath)
if !com.IsExist(newPath) {
var t, ver string = doc.BRANCH, ""
node := doc.NewNode(pkg.ImportPath, pkg.ImportPath, t, ver, true)
nodes := []*doc.Node{node}
downloadPackages(nodes)
// should handler download failed
}
} else {
newPath, err = filepath.Abs(name)
if err != nil {
return err
}
}
err = getChildPkgs(newPath, pkg, cachePkgs)
if err != nil {
return err
}
}
}
if ppkg != nil && !build.IsLocalImport(ppkg.ImportPath) {
cachePkgs[ppkg.ImportPath] = ppkg
}
return nil
}
func genNewGoPath() {
curPath, err := os.Getwd()
if err != nil {
com.ColorLog("[ERRO] %v\n", err)
return
}
hd, err := com.HomeDir()
if err != nil {
com.ColorLog("[ERRO] Fail to get current user[ %s ]\n", err)
return
}
gf := doc.NewGopmfile()
var pkgName string
gpmPath := filepath.Join(curPath, doc.GopmFileName)
if com.IsExist(gpmPath) {
com.ColorLog("[INFO] loading .gopmfile ...\n")
err := gf.Load(gpmPath)
if err != nil {
com.ColorLog("[ERRO] load .gopmfile failed: %v\n", err)
return
}
}
if target, ok := gf.Sections["target"]; ok {
pkgName = target.Props["path"]
com.ColorLog("[INFO] target name is %v\n", pkgName)
}
installRepoPath = strings.Replace(reposDir, "~", hd, -1)
cachePkgs := make(map[string]*doc.Pkg)
err = getChildPkgs(curPath, nil, cachePkgs)
if err != nil {
com.ColorLog("[ERRO] %v\n", err)
return
}
newGoPath := filepath.Join(curPath, "vendor")
os.RemoveAll(newGoPath)
newGoPathSrc := filepath.Join(newGoPath, "src")
os.MkdirAll(newGoPathSrc, os.ModePerm)
for name, _ := range cachePkgs {
oldPath := filepath.Join(installRepoPath, name)
newPath := filepath.Join(newGoPathSrc, name)
paths := strings.Split(name, "/")
var isExistP bool
var isCurChild bool
for i := 0; i < len(paths)-1; i++ {
pName := strings.Join(paths[:len(paths)-1-i], "/")
if _, ok := cachePkgs[pName]; ok {
isExistP = true
break
}
if pkgName == pName {
isCurChild = true
break
}
}
if isCurChild {
continue
}
if !isExistP {
com.ColorLog("[INFO] linked %v\n", name)
err = autoLink(oldPath, newPath)
if err != nil {
com.ColorLog("[ERRO] make link error %v\n", err)
return
}
}
}
if pkgName != "" {
newPath := filepath.Join(newGoPathSrc, pkgName)
com.ColorLog("[INFO] linked %v\n", pkgName)
err = autoLink(curPath, newPath)
if err != nil {
com.ColorLog("[ERRO] make link error %v\n", err)
return
}
}
com.ColorLog("[TRAC] set GOPATH=%v\n", newGoPath)
err = os.Setenv("GOPATH", newGoPath)
if err != nil {
com.ColorLog("[ERRO] %v\n", err)
return
}
}

66
cmd/install.go
Unescape View File

@ -0,0 +1,66 @@
// Copyright 2013 gopm authors.
//
// 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 cmd
import (
"github.com/Unknwon/com"
"go/build"
"os"
"os/exec"
)
var CmdInstall = &Command{
UsageLine: "install",
Short: "install according a gopmfile",
Long: `
install just like go install
`,
}
func init() {
CmdInstall.Run = runInstall
CmdInstall.Flags = map[string]bool{}
}
func printInstallPrompt(flag string) {
}
func runInstall(cmd *Command, args []string) {
gopath := build.Default.GOPATH
genNewGoPath()
com.ColorLog("[INFO] installing ...\n")
cmdArgs := []string{"go", "install"}
cmdArgs = append(cmdArgs, args...)
bCmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
bCmd.Stdout = os.Stdout
bCmd.Stderr = os.Stderr
err := bCmd.Run()
if err != nil {
com.ColorLog("[ERRO] install failed: %v\n", err)
return
}
com.ColorLog("[TRAC] set GOPATH=%v\n", gopath)
err = os.Setenv("GOPATH", gopath)
if err != nil {
com.ColorLog("[ERRO] %v\n", err)
return
}
com.ColorLog("[SUCC] install successfully!\n")
}

66
cmd/run.go
Unescape View File

@ -0,0 +1,66 @@
// Copyright 2013 gopm authors.
//
// 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 cmd
import (
"github.com/Unknwon/com"
"go/build"
"os"
"os/exec"
)
var CmdRun = &Command{
UsageLine: "run",
Short: "run according a gopmfile",
Long: `
run just like go run
`,
}
func init() {
CmdRun.Run = runRun
CmdRun.Flags = map[string]bool{}
}
func printRunPrompt(flag string) {
}
func runRun(cmd *Command, args []string) {
gopath := build.Default.GOPATH
genNewGoPath()
com.ColorLog("[INFO] running ...\n")
cmdArgs := []string{"go", "run"}
cmdArgs = append(cmdArgs, args...)
bCmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
bCmd.Stdout = os.Stdout
bCmd.Stderr = os.Stderr
err := bCmd.Run()
if err != nil {
com.ColorLog("[ERRO] run failed: %v\n", err)
return
}
com.ColorLog("[TRAC] set GOPATH=%v\n", gopath)
err = os.Setenv("GOPATH", gopath)
if err != nil {
com.ColorLog("[ERRO] %v\n", err)
return
}
com.ColorLog("[SUCC] run successfully!\n")
}

6
gopm.go
Unescape View File

@ -47,15 +47,15 @@ var commands = []*cmd.Command{
cmd.CmdServe,
cmd.CmdGen,
cmd.CmdBuild,
/*
cmd.CmdRun,
/*cmd.CmdInstall,
cmdClean,
cmdDoc,
cmdEnv,
cmdFix,
cmdFmt,
cmdInstall,
cmdList,
cmdRun,
cmdTest,
cmdTool,
cmdVersion,

Write Preview
Loading…
Cancel
Save