Skip to content
This repository has been archived by the owner on Sep 9, 2020. It is now read-only.

Commit

Permalink
String replacing for import paths
Browse files Browse the repository at this point in the history
sed/g the following strings (somewhat blindly)
github.com/sdboyer/gps -> github.com/golang/go/gps
github.com/sdboyer/gps/internal -> github.com/golang/dep/gps/internal
github.com/sdboyer/gps/pkgtree -> github.com/golang/dep/gps/pkgtree
  • Loading branch information
krisnova committed Apr 21, 2017
1 parent 20761df commit 122ade3
Show file tree
Hide file tree
Showing 143 changed files with 435 additions and 435 deletions.
2 changes: 1 addition & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
version = ">=0.8.0, <1.0.0"

[[dependencies]]
name = "github.com/sdboyer/gps"
name = "github.com/golang/dep/gps"
version = ">=0.16.0, <1.0.0"
4 changes: 2 additions & 2 deletions analyzer.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"path/filepath"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

type Analyzer struct{}
Expand All @@ -32,7 +32,7 @@ func (a Analyzer) DeriveManifestAndLock(path string, n gps.ProjectRoot) (gps.Man
return nil, nil, err
}
// TODO: No need to return lock til we decide about preferred versions, see
// https://github.com/sdboyer/gps/wiki/gps-for-Implementors#preferred-versions.
// https://github.com/golang/dep/gps/wiki/gps-for-Implementors#preferred-versions.
return m, nil, nil
}

Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/ensure.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (

"github.com/golang/dep"
"github.com/pkg/errors"
"github.com/sdboyer/gps"
"github.com/sdboyer/gps/pkgtree"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/pkgtree"
)

const ensureShortHelp = `Ensure a dependency is safely vendored in the project`
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/ensure_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package main
import (
"testing"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

func TestDeduceConstraint(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/hash_in.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/golang/dep"
"github.com/pkg/errors"
"github.com/sdboyer/gps"
"github.com/sdboyer/gps/pkgtree"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/pkgtree"
)

func (cmd *hashinCommand) Name() string { return "hash-inputs" }
Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (

"github.com/golang/dep"
"github.com/pkg/errors"
"github.com/sdboyer/gps"
"github.com/sdboyer/gps/pkgtree"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/pkgtree"
)

const initShortHelp = `Initialize a new project with manifest and lock files`
Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/prune.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"os"

"github.com/golang/dep"
"github.com/sdboyer/gps"
"github.com/sdboyer/gps/pkgtree"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/pkgtree"

"github.com/pkg/errors"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

"github.com/golang/dep"
"github.com/pkg/errors"
"github.com/sdboyer/gps"
"github.com/sdboyer/gps/pkgtree"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/pkgtree"
)

const removeShortHelp = `Remove a dependency from the project`
Expand Down
4 changes: 2 additions & 2 deletions cmd/dep/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (

"github.com/golang/dep"
"github.com/pkg/errors"
"github.com/sdboyer/gps"
"github.com/sdboyer/gps/pkgtree"
"github.com/golang/dep/gps"
"github.com/golang/dep/gps/pkgtree"
)

const statusShortHelp = `Report the status of the project's dependencies`
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package main
import (
"testing"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

func TestStatusFormatVersion(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion context.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/Masterminds/vcs"
"github.com/pkg/errors"
"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

// Ctx defines the supporting context of the tool.
Expand Down
2 changes: 1 addition & 1 deletion context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"unicode"

"github.com/golang/dep/test"
"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

func TestNewContextNoGOPATH(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions gps/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ a strong, motivating design behind `gps`, but we are always open to discussion
on ways we can improve the library, particularly if it allows `gps` to cover
more of the Go package management possibility space.

`gps` has no CLA, but we do have a [Code of Conduct](https://github.com/sdboyer/gps/blob/master/CODE_OF_CONDUCT.md). By
`gps` has no CLA, but we do have a [Code of Conduct](https://github.com/golang/dep/gps/blob/master/CODE_OF_CONDUCT.md). By
participating, you are expected to uphold this code.

## How can I contribute?

It may be best to start by getting a handle on what `gps` actually is. Our
wiki has a [general introduction](https://github.com/sdboyer/gps/wiki/Introduction-to-gps), a
[guide for tool implementors](https://github.com/sdboyer/gps/wiki/gps-for-Implementors), and
a [guide for contributors](https://github.com/sdboyer/gps/wiki/gps-for-contributors).
wiki has a [general introduction](https://github.com/golang/dep/gps/wiki/Introduction-to-gps), a
[guide for tool implementors](https://github.com/golang/dep/gps/wiki/gps-for-Implementors), and
a [guide for contributors](https://github.com/golang/dep/gps/wiki/gps-for-contributors).
There's also a [discursive essay](https://medium.com/@sdboyer/so-you-want-to-write-a-package-manager-4ae9c17d9527)
that lays out the big-picture goals and considerations driving the `gps` design.

Expand All @@ -29,12 +29,12 @@ appreciated:
* **Identifying missed use cases:** the loose `gps` rule of thumb is, "if you can do
it in Go, we support it in `gps`." Posting issues about cases we've missed
helps us reach that goal.
* **Writing tests:** in the same vein, `gps` has a [large suite](https://github.com/sdboyer/gps/blob/master/CODE_OF_CONDUCT.md) of solving tests, but
* **Writing tests:** in the same vein, `gps` has a [large suite](https://github.com/golang/dep/gps/blob/master/CODE_OF_CONDUCT.md) of solving tests, but
they still only scratch the surface. Writing tests is not only helpful, but is
also a great way to get a feel for how `gps` works.
* **Suggesting enhancements:** `gps` has plenty of missing chunks. Help fill them in!
* **Reporting bugs**: `gps` being a library means this isn't always the easiest.
However, you could always compile the [example](https://github.com/sdboyer/gps/blob/master/example.go), run that against some of
However, you could always compile the [example](https://github.com/golang/dep/gps/blob/master/example.go), run that against some of
your projects, and report problems you encounter.
* **Building experimental tools with `gps`:** probably the best and fastest ways to
kick the tires!
Expand Down
44 changes: 22 additions & 22 deletions gps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<br>
<a href="https://circleci.com/gh/sdboyer/gps"><img src="https://circleci.com/gh/sdboyer/gps.svg?style=shield" alt="Build Status"></a>
<a href="https://ci.appveyor.com/project/sdboyer/gps"><img src="https://ci.appveyor.com/api/projects/status/github/sdboyer/gps?svg=true&branch=master&passingText=Windows%20-%20OK&failingText=Windows%20-%20failed&pendingText=Windows%20-%20pending" alt="Windows Build Status"></a>
<a href="https://goreportcard.com/report/github.com/sdboyer/gps"><img src="https://goreportcard.com/badge/github.com/sdboyer/gps" alt="Build Status"></a>
<a href="https://goreportcard.com/report/github.com/golang/dep/gps"><img src="https://goreportcard.com/badge/github.com/golang/dep/gps" alt="Build Status"></a>
<a href="https://codecov.io/gh/sdboyer/gps"><img src="https://codecov.io/gh/sdboyer/gps/branch/master/graph/badge.svg" alt="Codecov" /></a>
<a href="https://godoc.org/github.com/sdboyer/gps"><img src="https://godoc.org/github.com/sdboyer/gps?status.svg" alt="GoDoc"></a>
<a href="https://godoc.org/github.com/golang/dep/gps"><img src="https://godoc.org/github.com/golang/dep/gps?status.svg" alt="GoDoc"></a>
</p>

---

`gps` is the Go Packaging Solver. It is an engine for tackling dependency
management problems in Go. It is trivial - [about 35 lines of
code](https://github.com/sdboyer/gps/blob/master/example.go) - to replicate the
code](https://github.com/golang/dep/gps/blob/master/example.go) - to replicate the
fetching bits of `go get` using `gps`.

`gps` is _not_ Yet Another Go Package Management Tool. Rather, it's a library
Expand All @@ -34,14 +34,14 @@ discontinued in favor of gps powering the [experimental, eventually-official
Go tooling](https://github.com/golang/dep).

The wiki has a [general introduction to the `gps`
approach](https://github.com/sdboyer/gps/wiki/Introduction-to-gps), as well
approach](https://github.com/golang/dep/gps/wiki/Introduction-to-gps), as well
as guides for folks [implementing
tools](https://github.com/sdboyer/gps/wiki/gps-for-Implementors) or [looking
to contribute](https://github.com/sdboyer/gps/wiki/gps-for-Contributors).
tools](https://github.com/golang/dep/gps/wiki/gps-for-Implementors) or [looking
to contribute](https://github.com/golang/dep/gps/wiki/gps-for-Contributors).

## Wait...a package management _library_?!

Yup. See [the rationale](https://github.com/sdboyer/gps/wiki/Rationale).
Yup. See [the rationale](https://github.com/golang/dep/gps/wiki/Rationale).

## Features

Expand All @@ -62,18 +62,18 @@ productive.
* Go >=1.6, or 1.5 with `GO15VENDOREXPERIMENT = 1` set
* Everything under `vendor/` is volatile and controlled solely by the tool
* A central cache of repositories is used (cannot be `GOPATH`)
* A [**project**](https://godoc.org/github.com/sdboyer/gps#ProjectRoot) concept:
* A [**project**](https://godoc.org/github.com/golang/dep/gps#ProjectRoot) concept:
a tree of packages, all covered by one `vendor` directory
* A [**manifest** and
**lock**](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#manifests-and-locks)
**lock**](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#manifests-and-locks)
approach to tracking version and constraint information
* Upstream sources are one of `git`, `bzr`, `hg` or `svn` repositories
* What the available versions are for a given project/repository (all branches, tags, or revs are eligible)
* In general, semver tags are preferred to branches, are preferred to plain tags
* The actual packages that must be present (determined through import graph static analysis)
* How the import graph is statically analyzed - similar to `go/build`, but with a combinatorial view of build tags ([not yet implemented](https://github.com/sdboyer/gps/issues/99))
* How the import graph is statically analyzed - similar to `go/build`, but with a combinatorial view of build tags ([not yet implemented](https://github.com/golang/dep/gps/issues/99))
* All packages from the same source (repository) must be the same version
* Package import cycles are not allowed ([not yet implemented](https://github.com/sdboyer/gps/issues/66))
* Package import cycles are not allowed ([not yet implemented](https://github.com/golang/dep/gps/issues/66))

There are also some current non-choices that we would like to push into the realm of choice:

Expand All @@ -93,23 +93,23 @@ general library could know _a priori_.
* Which of the other package managers to interoperate with
* Which types of version constraints to allow the user to specify (e.g., allowing [semver ranges](https://docs.npmjs.com/misc/semver) or not)
* Whether or not to strip nested `vendor` directories
* Which packages in the import graph to [ignore](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#ignoring-packages) (if any)
* What constraint [overrides](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#overrides) to apply (if any)
* What [informational output](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#trace-and-tracelogger) to show the end user
* What dependency version constraints are declared by the [root project](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#manifest-data)
* What dependency version constraints are declared by [all dependencies](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#the-projectanalyzer)
* Given a [previous solution](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#lock-data), [which versions to let change, and how](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#tochange-changeall-and-downgrade)
* In the absence of a previous solution, whether or not to use [preferred versions](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#preferred-versions)
* Allowing, or not, the user to [swap in different source locations](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#projectidentifier) for import paths (e.g. forks)
* Which packages in the import graph to [ignore](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#ignoring-packages) (if any)
* What constraint [overrides](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#overrides) to apply (if any)
* What [informational output](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#trace-and-tracelogger) to show the end user
* What dependency version constraints are declared by the [root project](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#manifest-data)
* What dependency version constraints are declared by [all dependencies](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#the-projectanalyzer)
* Given a [previous solution](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#lock-data), [which versions to let change, and how](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#tochange-changeall-and-downgrade)
* In the absence of a previous solution, whether or not to use [preferred versions](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#preferred-versions)
* Allowing, or not, the user to [swap in different source locations](https://github.com/golang/dep/gps/wiki/gps-for-Implementors#projectidentifier) for import paths (e.g. forks)
* Specifying additional input/source packages not reachable from the root import graph

This list may not be exhaustive - see the
[implementor's guide](https://github.com/sdboyer/gps/wiki/gps-for-Implementors)
[implementor's guide](https://github.com/golang/dep/gps/wiki/gps-for-Implementors)
for a proper treatment.

## Contributing

Yay, contributing! Please see
[CONTRIBUTING.md](https://github.com/sdboyer/gps/blob/master/CONTRIBUTING.md).
[CONTRIBUTING.md](https://github.com/golang/dep/gps/blob/master/CONTRIBUTING.md).
Note that `gps` also abides by a [Code of
Conduct](https://github.com/sdboyer/gps/blob/master/CODE_OF_CONDUCT.md), and is MIT-licensed.
Conduct](https://github.com/golang/dep/gps/blob/master/CODE_OF_CONDUCT.md), and is MIT-licensed.
2 changes: 1 addition & 1 deletion gps/_testdata/src/cycle/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cycle

import (
"cycle/one"
"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/cycle/one/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package one

import (
"cycle/two"
"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/cycle/two/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package two

import (
"cycle"
"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/disallow/.m1p/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package m1p
import (
"sort"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/disallow/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"sort"
"disallow/testdata"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/doublenest/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package base
import (
"go/parser"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/doublenest/namemismatch/m1p/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package m1p
import (
"sort"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/github.com/example/varied/m1p/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package m1p
import (
"sort"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package simple
import (
"go/parser"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/igmain/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package simple
import (
"sort"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/igmainfirst/z.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package simple
import (
"sort"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/igmainlong/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package simple
import (
"sort"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/igmaint/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package simple
import (
"sort"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gps/_testdata/src/m1p/a.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package m1p
import (
"sort"

"github.com/sdboyer/gps"
"github.com/golang/dep/gps"
)

var (
Expand Down
Loading

0 comments on commit 122ade3

Please sign in to comment.