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

merge

pull/103/head
Unknown 11 years ago
parent
09e21eac46 b51fa8e02d
commit
8f83381fc9
16 changed files with 181 additions and 53 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. 2
      cmd/build.go
  2. 16
      cmd/get.go
  3. 23
      cmd/gopath.go
  4. 2
      cmd/install.go
  5. 2
      cmd/run.go
  6. 46
      cmd/test.go
  7. 7
      doc/bitbucket.go
  8. 28
      doc/conf.go
  9. 41
      doc/github.go
  10. 38
      doc/google.go
  11. 5
      doc/launchpad.go
  12. 3
      doc/oschina.go
  13. 5
      doc/struct.go
  14. 11
      doc/vcs.go
  15. 3
      gopm.go
  16. 2
      log/log.go

2
cmd/build.go
Unescape View File

@ -31,7 +31,7 @@ gopm build <go build commands>`,
}
func runBuild(ctx *cli.Context) {
genNewGoPath(ctx)
genNewGoPath(ctx, false)
log.Trace("Building...")

16
cmd/get.go
Unescape View File

@ -160,6 +160,7 @@ func getByPath(ctx *cli.Context) {
nodes = append(nodes, node)
}
doc.LoadLocalNodes()
downloadPackages(ctx, nodes)
if doc.LocalNodes != nil {
@ -197,16 +198,16 @@ func downloadPackages(ctx *cli.Context, nodes []*doc.Node) {
if !downloadCache[n.ImportPath] {
// Download package.
nod, imports := downloadPackage(n)
nod, imports := downloadPackage(ctx, n)
if len(imports) > 0 {
var gf *goconfig.ConfigFile
// Check if has gopmfile
if com.IsFile(installPath + "/.gopmfile") {
if com.IsFile(installPath + "/" + doc.GopmFileName) {
log.Log("Found gopmgile: %s@%s:%s",
n.ImportPath, n.Type, doc.CheckNodeValue(n.Value))
gf = doc.NewGopmfile(installPath + "/.gopmfile")
gf = doc.NewGopmfile(installPath /* + "/.gopmfile"*/)
}
// Need to download dependencies.
@ -242,8 +243,8 @@ func downloadPackages(ctx *cli.Context, nodes []*doc.Node) {
downloadCount++
// Only save non-commit node.
if len(nod.Value) == 0 {
doc.SaveNode(nod)
if len(nod.Value) == 0 && len(nod.Revision) > 0 {
doc.LocalNodes.SetValue(nod.ImportPath, "value", nod.Revision)
}
}
} else {
@ -262,13 +263,14 @@ func downloadPackages(ctx *cli.Context, nodes []*doc.Node) {
}
// downloadPackage downloads package either use version control tools or not.
func downloadPackage(nod *doc.Node) (*doc.Node, []string) {
func downloadPackage(ctx *cli.Context, nod *doc.Node) (*doc.Node, []string) {
log.Message("Downloading", fmt.Sprintf("package: %s@%s:%s",
nod.ImportPath, nod.Type, doc.CheckNodeValue(nod.Value)))
// Mark as donwloaded.
downloadCache[nod.ImportPath] = true
imports, err := doc.PureDownload(nod, installRepoPath, nil) //CmdGet.Flags)
nod.Revision = doc.LocalNodes.MustValue(nod.ImportPath, "value")
imports, err := doc.PureDownload(nod, installRepoPath, ctx) //CmdGet.Flags)
if err != nil {
log.Error("Get", "Fail to download pakage: "+nod.ImportPath)

23
cmd/gopath.go
Unescape View File

@ -15,7 +15,7 @@ import (
"github.com/gpmgo/gopm/log"
)
func getGopmPkgs(dirPath string) (pkgs map[string]*doc.Pkg, err error) {
func getGopmPkgs(dirPath string, isTest bool) (pkgs map[string]*doc.Pkg, err error) {
absPath, err := filepath.Abs(dirPath)
if err != nil {
log.Error("", "Fail to get absolute path of work directory")
@ -38,10 +38,19 @@ func getGopmPkgs(dirPath string) (pkgs map[string]*doc.Pkg, err error) {
}
pkgs = make(map[string]*doc.Pkg)
for _, name := range pkg.Imports {
var imports []string = pkg.Imports
if isTest {
imports = append(imports, pkg.TestImports...)
}
for _, name := range imports {
if name == "C" {
//panic("nonono")
continue
}
if !doc.IsGoRepoPath(name) {
if builds != nil {
if dep, ok := builds[name]; ok {
// TODO: need version
pkgs[name] = &doc.Pkg{ImportPath: dep}
continue
}
@ -64,8 +73,8 @@ func autoLink(oldPath, newPath string) error {
return makeLink(oldPath, newPath)
}
func getChildPkgs(ctx *cli.Context, cpath string, ppkg *doc.Pkg, cachePkgs map[string]*doc.Pkg) error {
pkgs, err := getGopmPkgs(cpath)
func getChildPkgs(ctx *cli.Context, cpath string, ppkg *doc.Pkg, cachePkgs map[string]*doc.Pkg, isTest bool) error {
pkgs, err := getGopmPkgs(cpath, isTest)
if err != nil {
return err
}
@ -91,7 +100,7 @@ func getChildPkgs(ctx *cli.Context, cpath string, ppkg *doc.Pkg, cachePkgs map[s
return err
}
}
err = getChildPkgs(ctx, newPath, pkg, cachePkgs)
err = getChildPkgs(ctx, newPath, pkg, cachePkgs, false)
if err != nil {
return err
}
@ -161,7 +170,7 @@ func execCmd(gopath, curPath string, args ...string) error {
return err
}
func genNewGoPath(ctx *cli.Context) {
func genNewGoPath(ctx *cli.Context, isTest bool) {
var err error
curPath, err = os.Getwd()
if err != nil {
@ -194,7 +203,7 @@ func genNewGoPath(ctx *cli.Context) {
}
cachePkgs := make(map[string]*doc.Pkg)
err = getChildPkgs(ctx, curPath, nil, cachePkgs)
err = getChildPkgs(ctx, curPath, nil, cachePkgs, isTest)
if err != nil {
log.Error("", "Fail to get child pakcages")
log.Fatal("", err.Error())

2
cmd/install.go
Unescape View File

@ -58,7 +58,7 @@ func runInstall(ctx *cli.Context) {
log.Fatal("Install", "Too many arguments")
}
genNewGoPath(ctx)
genNewGoPath(ctx, false)
log.Trace("Installing...")

2
cmd/run.go
Unescape View File

@ -30,7 +30,7 @@ gopm run <go run commands>`,
}
func runRun(ctx *cli.Context) {
genNewGoPath(ctx)
genNewGoPath(ctx, false)
log.Trace("Running...")

46
cmd/test.go
Unescape View File

@ -0,0 +1,46 @@
// 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/codegangsta/cli"
"github.com/gpmgo/gopm/log"
)
var CmdTest = cli.Command{
Name: "test",
Usage: "link dependencies and go test",
Description: `Command test links dependencies according to gopmfile,
and execute 'go test'
gopm test <go test commands>`,
Action: runTest,
}
func runTest(ctx *cli.Context) {
genNewGoPath(ctx, true)
log.Trace("Testing...")
cmdArgs := []string{"go", "test"}
cmdArgs = append(cmdArgs, ctx.Args()...)
err := execCmd(newGoPath, newCurPath, cmdArgs...)
if err != nil {
log.Error("Test", "Fail to test program")
log.Fatal("", err.Error())
}
log.Success("SUCC", "Test", "Command execute successfully!")
}

7
doc/bitbucket.go
Unescape View File

@ -27,6 +27,9 @@ import (
"strings"
"github.com/Unknwon/com"
"github.com/codegangsta/cli"
//"github.com/gpmgo/gopm/log"
)
var (
@ -35,7 +38,7 @@ var (
)
// getBitbucketDoc downloads tarball from bitbucket.org.
func getBitbucketDoc(client *http.Client, match map[string]string, installRepoPath string, nod *Node, cmdFlags map[string]bool) ([]string, error) {
func getBitbucketDoc(client *http.Client, match map[string]string, installRepoPath string, nod *Node, ctx *cli.Context) ([]string, error) {
// Check version control.
if m := bitbucketEtagRe.FindStringSubmatch(nod.Value); m != nil {
match["vcs"] = m[1]
@ -152,7 +155,7 @@ func getBitbucketDoc(client *http.Client, match map[string]string, installRepoPa
// Create diretory before create file.
dir := path.Dir(absPath)
if !checkDir(dir, dirs) && !(!cmdFlags["-e"] && strings.Contains(absPath, "example")) {
if !checkDir(dir, dirs) && !(!ctx.Bool("example") && strings.Contains(absPath, "example")) {
dirs = append(dirs, dir)
os.MkdirAll(dir+"/", os.ModePerm)
}

28
doc/conf.go
Unescape View File

@ -72,23 +72,19 @@ func LoadPkgNameList(filePath string) {
}
}
func SaveNode(nod *Node) {
if LocalNodes == nil {
if !com.IsDir(HomeDir + "/data") {
os.Mkdir(HomeDir+"/data", os.ModePerm)
}
if !com.IsFile(HomeDir + LocalNodesFile) {
os.Create(HomeDir + LocalNodesFile)
}
func LoadLocalNodes() {
if !com.IsDir(HomeDir + "/data") {
os.MkdirAll(HomeDir+"/data", os.ModePerm)
}
var err error
LocalNodes, err = goconfig.LoadConfigFile(HomeDir + LocalNodesFile)
if err != nil {
log.Error("Save node", "Fail to load localnodes.list")
log.Fatal("", err.Error())
}
if !com.IsFile(HomeDir + LocalNodesFile) {
os.Create(HomeDir + LocalNodesFile)
}
LocalNodes.SetValue(nod.ImportPath, "value", nod.Value)
var err error
LocalNodes, err = goconfig.LoadConfigFile(HomeDir + LocalNodesFile)
if err != nil {
log.Error("Load node", "Fail to load localnodes.list")
log.Fatal("", err.Error())
}
}

41
doc/github.go
Unescape View File

@ -26,6 +26,9 @@ import (
"strings"
"github.com/Unknwon/com"
"github.com/codegangsta/cli"
"github.com/gpmgo/gopm/log"
)
var (
@ -33,12 +36,46 @@ var (
)
// getGithubDoc downloads tarball from github.com.
func getGithubDoc(client *http.Client, match map[string]string, installRepoPath string, nod *Node, cmdFlags map[string]bool) ([]string, error) {
func getGithubDoc(client *http.Client, match map[string]string, installRepoPath string, nod *Node, ctx *cli.Context) ([]string, error) {
// Check downlaod type.
switch nod.Type {
case BRANCH:
if len(nod.Value) == 0 {
match["sha"] = MASTER
// Only get and check revision with the latest version.
var refs []*struct {
Ref string
Url string
Object struct {
Sha string
Type string
Url string
}
}
err := com.HttpGetJSON(client, com.Expand("https://api.github.com/repos/{owner}/{repo}/git/refs?{cred}", match), &refs)
if err != nil {
log.Error("GET", "Fail to get revision")
log.Error("", err.Error())
break
}
var etag string
COMMIT_LOOP:
for _, ref := range refs {
switch {
case strings.HasPrefix(ref.Ref, "refs/heads/master"):
etag = ref.Object.Sha
break COMMIT_LOOP
}
}
if etag == nod.Revision {
log.Log("GET Package hasn't changed: %s", nod.ImportPath)
return nil, nil
}
nod.Revision = etag
} else {
match["sha"] = nod.Value
}
@ -97,7 +134,7 @@ func getGithubDoc(client *http.Client, match map[string]string, installRepoPath
switch {
case strings.HasSuffix(absPath, "/"): // Directory.
// Check if current directory is example.
if !(!cmdFlags["-e"] && strings.Contains(absPath, "example")) {
if !(!ctx.Bool("example") && strings.Contains(absPath, "example")) {
for _, d := range dirs {
if d == absPath {
break compareDir

38
doc/google.go
Unescape View File

@ -26,17 +26,21 @@ import (
"strings"
"github.com/Unknwon/com"
"github.com/codegangsta/cli"
"github.com/gpmgo/gopm/log"
)
var (
googleRepoRe = regexp.MustCompile(`id="checkoutcmd">(hg|git|svn)`)
googleFileRe = regexp.MustCompile(`<li><a href="([^"/]+)"`)
googleDirRe = regexp.MustCompile(`<li><a href="([^".]+)"`)
googlePattern = regexp.MustCompile(`^code\.google\.com/p/(?P<repo>[a-z0-9\-]+)(:?\.(?P<subrepo>[a-z0-9\-]+))?(?P<dir>/[a-z0-9A-Z_.\-/]+)?$`)
googleRepoRe = regexp.MustCompile(`id="checkoutcmd">(hg|git|svn)`)
googleRevisionRe = regexp.MustCompile(`<h2>(?:[^ ]+ - )?Revision *([^:]+):`)
googleFileRe = regexp.MustCompile(`<li><a href="([^"/]+)"`)
googleDirRe = regexp.MustCompile(`<li><a href="([^".]+)"`)
googlePattern = regexp.MustCompile(`^code\.google\.com/p/(?P<repo>[a-z0-9\-]+)(:?\.(?P<subrepo>[a-z0-9\-]+))?(?P<dir>/[a-z0-9A-Z_.\-/]+)?$`)
)
// getGoogleDoc downloads raw files from code.google.com.
func getGoogleDoc(client *http.Client, match map[string]string, installRepoPath string, nod *Node, cmdFlags map[string]bool) ([]string, error) {
func getGoogleDoc(client *http.Client, match map[string]string, installRepoPath string, nod *Node, ctx *cli.Context) ([]string, error) {
setupGoogleMatch(match)
// Check version control.
if err := getGoogleVCS(client, match); err != nil {
@ -47,6 +51,28 @@ func getGoogleDoc(client *http.Client, match map[string]string, installRepoPath
case BRANCH:
if len(nod.Value) == 0 {
match["tag"] = defaultTags[match["vcs"]]
// Only get and check revision with the latest version.
p, err := com.HttpGetBytes(client,
com.Expand("http://{subrepo}{dot}{repo}.googlecode.com/{vcs}{dir}/?r={tag}", match), nil)
if err != nil {
log.Error("GET", "Fail to get revision")
log.Error("", err.Error())
break
}
if m := googleRevisionRe.FindSubmatch(p); m == nil {
log.Error("GET", "Fail to get revision")
log.Error("", err.Error())
} else {
etag := string(m[1])
if etag == nod.Revision {
log.Log("GET Package hasn't changed: %s", nod.ImportPath)
return nil, nil
}
nod.Revision = etag
}
} else {
match["tag"] = nod.Value
}
@ -106,7 +132,7 @@ func getGoogleDoc(client *http.Client, match map[string]string, installRepoPath
// Create diretory before create file.
dir := path.Dir(absPath)
if !checkDir(dir, dirs) && !(!cmdFlags["-e"] && strings.Contains(absPath, "example")) {
if !checkDir(dir, dirs) && !(!ctx.Bool("example") && strings.Contains(absPath, "example")) {
dirs = append(dirs, dir+"/")
os.MkdirAll(dir+"/", os.ModePerm)
}

5
doc/launchpad.go
Unescape View File

@ -25,12 +25,13 @@ import (
"strings"
"github.com/Unknwon/com"
"github.com/codegangsta/cli"
)
var launchpadPattern = regexp.MustCompile(`^launchpad\.net/(?P<repo>(?P<project>[a-z0-9A-Z_.\-]+)(?P<series>/[a-z0-9A-Z_.\-]+)?|~[a-z0-9A-Z_.\-]+/(\+junk|[a-z0-9A-Z_.\-]+)/[a-z0-9A-Z_.\-]+)(?P<dir>/[a-z0-9A-Z_.\-/]+)*$`)
// getLaunchpadDoc downloads tarball from launchpad.net.
func getLaunchpadDoc(client *http.Client, match map[string]string, installRepoPath string, nod *Node, cmdFlags map[string]bool) ([]string, error) {
func getLaunchpadDoc(client *http.Client, match map[string]string, installRepoPath string, nod *Node, ctx *cli.Context) ([]string, error) {
if match["project"] != "" && match["series"] != "" {
rc, err := com.HttpGet(client, com.Expand("https://code.launchpad.net/{project}{series}/.bzr/branch-format", match), nil)
@ -99,7 +100,7 @@ func getLaunchpadDoc(client *http.Client, match map[string]string, installRepoPa
// Create diretory before create file.
os.MkdirAll(absPath+"/", os.ModePerm)
// Check if current directory is example.
if !(!cmdFlags["-e"] && strings.Contains(absPath, "example")) {
if !(!ctx.Bool("example") && strings.Contains(absPath, "example")) {
dirs = append(dirs, absPath)
}
case !strings.HasPrefix(fn, "."):

3
doc/oschina.go
Unescape View File

@ -25,6 +25,7 @@ import (
"strings"
"github.com/Unknwon/com"
"github.com/codegangsta/cli"
)
var (
@ -33,7 +34,7 @@ var (
)
// getGithubDoc downloads tarball from git.oschina.com.
func getOSCDoc(client *http.Client, match map[string]string, installRepoPath string, nod *Node, cmdFlags map[string]bool) ([]string, error) {
func getOSCDoc(client *http.Client, match map[string]string, installRepoPath string, nod *Node, ctx *cli.Context) ([]string, error) {
// Check downlaod type.
switch nod.Type {
case BRANCH:

5
doc/struct.go
Unescape View File

@ -21,6 +21,8 @@ import (
"os"
"regexp"
"time"
"github.com/codegangsta/cli"
)
const (
@ -58,6 +60,7 @@ type Node struct {
DownloadURL string
Synopsis string
IsGetDeps bool
Revision string
}
func NewNode(importPath, downloadUrl, tp, value string, isGetDeps bool) *Node {
@ -96,7 +99,7 @@ type walker struct {
type service struct {
pattern *regexp.Regexp
prefix string
get func(*http.Client, map[string]string, string, *Node, map[string]bool) ([]string, error)
get func(*http.Client, map[string]string, string, *Node, *cli.Context) ([]string, error)
}
// services is the list of source code control services handled by gopkgdoc.

11
doc/vcs.go
Unescape View File

@ -25,6 +25,7 @@ import (
"strings"
"github.com/Unknwon/com"
"github.com/codegangsta/cli"
)
var (
@ -97,7 +98,7 @@ func bestTag(tags map[string]string, defaultTag string) (string, string, error)
}
// PureDownload downloads package without version control.
func PureDownload(nod *Node, installRepoPath string, flags map[string]bool) ([]string, error) {
func PureDownload(nod *Node, installRepoPath string, ctx *cli.Context) ([]string, error) {
for _, s := range services {
if s.get == nil || !strings.HasPrefix(nod.DownloadURL, s.prefix) {
continue
@ -115,14 +116,14 @@ func PureDownload(nod *Node, installRepoPath string, flags map[string]bool) ([]s
match[n] = m[i]
}
}
return s.get(HttpClient, match, installRepoPath, nod, flags)
return s.get(HttpClient, match, installRepoPath, nod, ctx)
}
com.ColorLog("[TRAC] Cannot match any service, getting dynamic...\n")
return getDynamic(HttpClient, nod, installRepoPath, flags)
return getDynamic(HttpClient, nod, installRepoPath, ctx)
}
func getDynamic(client *http.Client, nod *Node, installRepoPath string, flags map[string]bool) ([]string, error) {
func getDynamic(client *http.Client, nod *Node, installRepoPath string, ctx *cli.Context) ([]string, error) {
match, err := fetchMeta(client, nod.ImportPath)
if err != nil {
return nil, err
@ -139,7 +140,7 @@ func getDynamic(client *http.Client, nod *Node, installRepoPath string, flags ma
}
nod.DownloadURL = com.Expand("{repo}{dir}", match)
return PureDownload(nod, installRepoPath, flags)
return PureDownload(nod, installRepoPath, ctx)
}
func fetchMeta(client *http.Client, importPath string) (map[string]string, error) {

3
gopm.go
Unescape View File

@ -29,7 +29,7 @@ import (
// Test that go1.1 tag above is included in builds. main.go refers to this definition.
const go11tag = true
const APP_VER = "0.5.5.1116"
const APP_VER = "0.5.5.1129"
// //cmd.CmdSearch,
// cmdClean,
@ -57,6 +57,7 @@ func main() {
cmd.CmdRun,
cmd.CmdBuild,
cmd.CmdInstall,
//cmd.CmdTest,
}
app.Run(os.Args)
}

2
log/log_nonwindows.go → log/log.go
Unescape View File

@ -12,6 +12,8 @@
// License for the specific language governing permissions and limitations
// under the License.
// +build !windows
package log
import (
Write Preview
Loading…
Cancel
Save