Skip to content

Commit

Permalink
Rename Github org to github.com/buildpacks
Browse files Browse the repository at this point in the history 
Signed-off-by: Joe Kutner <jpkutner@gmail.com>
  • Loading branch information
@jkutner
jkutner committed Dec 12, 2019
1 parent c394f39 commit f8a34ce
Show file tree
Hide file tree
Showing 155 changed files with 462 additions and 462 deletions.
26 changes: 13 additions & 13 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
We're glad you are interested in contributing to this project. We hope that this
document helps you get started.
We're glad you are interested in contributing to this project. We hope that this
document helps you get started.

If something is missing, incorrect, or made irrelevant please feel free to make
a PR to keep it up-to-date.
If something is missing, incorrect, or made irrelevant please feel free to make
a PR to keep it up-to-date.

## Prerequisites

- [Go](https://golang.org/dl/)
- including [Git](https://git-scm.com/)
- [Docker](https://www.docker.com/)
- [Docker](https://www.docker.com/)

## Development

Expand Down Expand Up @@ -68,35 +68,35 @@ make verify

## Pull Requests

1. **[Fork]((https://help.github.com/en/articles/fork-a-repo)) the repo**
1. **[Fork]((https://help.github.com/en/articles/fork-a-repo)) the repo**
2. **Code, Test, Commit...**

_Don't forget utilize the convenient make functions above._

3. **Preparing a Branch**

We prefer to have PRs that are encompassed in a single commit. This might
require that you execute some of these commands:

If you are no up-to-date with master:
```bash
# rebase from master (applies your changes on top of master)
git pull -r origin master
```

If you made more than one commit:
```bash
# squash multiple commits, if applicable
# set the top most commit to `pick` and all subsequent to `squash`
git rebase -i origin/master
```

Another requirement is that you sign your work. See [DCO](https://probot.github.io/apps/dco/) for more details.
```bash
git commit --amend --signoff
```

4. **Submit a Pull Request**
Submitting the pull request is done in [GitHub](https://github.com/buildpack/pack/compare/) by selecting

Submitting the pull request is done in [GitHub](https://github.com/buildpacks/pack/compare/) by selecting
your branch as the `compare` branch.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ GOENV=CGO_ENABLED=0
GOFLAGS?=-mod=vendor
PACK_VERSION?=dev-$(shell date +%Y-%m-%d-%H:%M:%S)
PACK_BIN?=pack
PACKAGE_BASE=github.com/buildpack/pack
PACKAGE_BASE=github.com/buildpacks/pack
PACKAGES:=$(shell $(GOCMD) list ./... | grep -v /testdata/)
SRC:=$(shell find . -type f -name '*.go' -not -path "*/vendor/*")
ARCHIVE_NAME=pack-$(PACK_VERSION)
Expand All @@ -15,7 +15,7 @@ all: clean verify test build
build:
@echo "> Building..."
mkdir -p ./out
$(GOENV) $(GOCMD) build -ldflags "-X 'github.com/buildpack/pack/cmd.Version=${PACK_VERSION}'" -o ./out/$(PACK_BIN) -a ./cmd/pack
$(GOENV) $(GOCMD) build -ldflags "-X 'github.com/buildpacks/pack/cmd.Version=${PACK_VERSION}'" -o ./out/$(PACK_BIN) -a ./cmd/pack

package:
tar czf ./out/$(ARCHIVE_NAME).tgz -C out/ pack
Expand Down
12 changes: 6 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# pack - Buildpack CLI

[![Travis Build Status](https://travis-ci.org/buildpack/pack.svg?branch=master)](https://travis-ci.org/buildpack/pack)
[![Go Report Card](https://goreportcard.com/badge/github.com/buildpack/pack)](https://goreportcard.com/report/github.com/buildpack/pack)
[![GoDoc](https://godoc.org/github.com/buildpack/pack?status.svg)](https://godoc.org/github.com/buildpack/pack)
[![GitHub license](https://img.shields.io/github/license/buildpack/pack)](https://github.com/buildpack/pack/blob/master/LICENSE)
[![Go Report Card](https://goreportcard.com/badge/github.com/buildpacks/pack)](https://goreportcard.com/report/github.com/buildpacks/pack)
[![GoDoc](https://godoc.org/github.com/buildpacks/pack?status.svg)](https://godoc.org/github.com/buildpacks/pack)
[![GitHub license](https://img.shields.io/github/license/buildpack/pack)](https://github.com/buildpacks/pack/blob/master/LICENSE)
[![Slack](https://slack.buildpacks.io/badge.svg)](https://slack.buildpacks.io/)

`pack` makes it easy for...
Expand All @@ -20,14 +20,14 @@

## Contributing

For information on how to contribute to this project including its development
For information on how to contribute to this project including its development
process see [CONTRIBUTING.md](CONTRIBUTING.md).

## Resources
- [Buildpack Specification](https://github.com/buildpack/spec/blob/master/buildpack.md)
- [Buildpack Specification](https://github.com/buildpacks/spec/blob/master/buildpack.md)
- [Platform Specification][platform-spec]

[buildpacks.io]: https://buildpacks.io/
[install-pack]: https://buildpacks.io/docs/install-pack/
[getting-started]: https://buildpacks.io/docs/app-journey
[platform-spec]: https://github.com/buildpack/spec/blob/master/platform.md
[platform-spec]: https://github.com/buildpacks/spec/blob/master/platform.md
14 changes: 7 additions & 7 deletions acceptance/acceptance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpack/pack/internal/api"
"github.com/buildpack/pack/internal/archive"
"github.com/buildpack/pack/internal/blob"
"github.com/buildpack/pack/internal/builder"
"github.com/buildpack/pack/internal/cache"
"github.com/buildpack/pack/internal/style"
h "github.com/buildpack/pack/testhelpers"
"github.com/buildpacks/pack/internal/api"
"github.com/buildpacks/pack/internal/archive"
"github.com/buildpacks/pack/internal/blob"
"github.com/buildpacks/pack/internal/builder"
"github.com/buildpacks/pack/internal/cache"
"github.com/buildpacks/pack/internal/style"
h "github.com/buildpacks/pack/testhelpers"
)

const (
Expand Down
22 changes: 11 additions & 11 deletions build.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ import (
"runtime"
"strings"

"github.com/buildpack/imgutil"
"github.com/buildpacks/imgutil"
"github.com/docker/docker/api/types"
"github.com/google/go-containerregistry/pkg/name"
"github.com/pkg/errors"

"github.com/buildpack/pack/cmd"
"github.com/buildpack/pack/internal/api"
"github.com/buildpack/pack/internal/archive"
"github.com/buildpack/pack/internal/build"
"github.com/buildpack/pack/internal/builder"
"github.com/buildpack/pack/internal/dist"
"github.com/buildpack/pack/internal/paths"
"github.com/buildpack/pack/internal/stack"
"github.com/buildpack/pack/internal/stringset"
"github.com/buildpack/pack/internal/style"
"github.com/buildpacks/pack/cmd"
"github.com/buildpacks/pack/internal/api"
"github.com/buildpacks/pack/internal/archive"
"github.com/buildpacks/pack/internal/build"
"github.com/buildpacks/pack/internal/builder"
"github.com/buildpacks/pack/internal/dist"
"github.com/buildpacks/pack/internal/paths"
"github.com/buildpacks/pack/internal/stack"
"github.com/buildpacks/pack/internal/stringset"
"github.com/buildpacks/pack/internal/style"
)

type Lifecycle interface {
Expand Down
20 changes: 10 additions & 10 deletions build_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ import (
"time"

"github.com/Masterminds/semver"
"github.com/buildpack/imgutil/fakes"
"github.com/buildpacks/imgutil/fakes"
"github.com/docker/docker/client"
"github.com/heroku/color"
"github.com/onsi/gomega/ghttp"
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpack/pack/internal/api"
"github.com/buildpack/pack/internal/blob"
"github.com/buildpack/pack/internal/builder"
"github.com/buildpack/pack/internal/dist"
ifakes "github.com/buildpack/pack/internal/fakes"
ilogging "github.com/buildpack/pack/internal/logging"
"github.com/buildpack/pack/internal/style"
"github.com/buildpack/pack/logging"
h "github.com/buildpack/pack/testhelpers"
"github.com/buildpacks/pack/internal/api"
"github.com/buildpacks/pack/internal/blob"
"github.com/buildpacks/pack/internal/builder"
"github.com/buildpacks/pack/internal/dist"
ifakes "github.com/buildpacks/pack/internal/fakes"
ilogging "github.com/buildpacks/pack/internal/logging"
"github.com/buildpacks/pack/internal/style"
"github.com/buildpacks/pack/logging"
h "github.com/buildpacks/pack/testhelpers"
)

func TestBuild(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions builder/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/BurntSushi/toml"
"github.com/pkg/errors"

"github.com/buildpack/pack/internal/dist"
"github.com/buildpack/pack/internal/paths"
"github.com/buildpack/pack/internal/style"
"github.com/buildpacks/pack/internal/dist"
"github.com/buildpacks/pack/internal/paths"
"github.com/buildpacks/pack/internal/style"
)

type Config struct {
Expand Down
4 changes: 2 additions & 2 deletions builder/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpack/pack/builder"
h "github.com/buildpack/pack/testhelpers"
"github.com/buildpacks/pack/builder"
h "github.com/buildpacks/pack/testhelpers"
)

func TestConfig(t *testing.T) {
Expand Down
18 changes: 9 additions & 9 deletions client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@ import (
"os"
"path/filepath"

"github.com/buildpack/imgutil"
"github.com/buildpacks/imgutil"
dockerClient "github.com/docker/docker/client"
"github.com/google/go-containerregistry/pkg/authn"
"github.com/pkg/errors"

"github.com/buildpack/pack/internal/blob"
"github.com/buildpack/pack/internal/build"
"github.com/buildpack/pack/internal/config"
"github.com/buildpack/pack/internal/image"
"github.com/buildpack/pack/logging"
"github.com/buildpacks/pack/internal/blob"
"github.com/buildpacks/pack/internal/build"
"github.com/buildpacks/pack/internal/config"
"github.com/buildpacks/pack/internal/image"
"github.com/buildpacks/pack/logging"
)

//go:generate mockgen -package testmocks -destination testmocks/mock_image_fetcher.go github.com/buildpack/pack ImageFetcher
//go:generate mockgen -package testmocks -destination testmocks/mock_image_fetcher.go github.com/buildpacks/pack ImageFetcher
type ImageFetcher interface {
// Fetch fetches an image by resolving it both remotely and locally depending on provided parameters.
// If daemon is true, it will look return a `local.Image`. Pull, applicable only when daemon is true, will
// attempt to pull a remote image first.
Fetch(ctx context.Context, name string, daemon, pull bool) (imgutil.Image, error)
}

//go:generate mockgen -package testmocks -destination testmocks/mock_downloader.go github.com/buildpack/pack Downloader
//go:generate mockgen -package testmocks -destination testmocks/mock_downloader.go github.com/buildpacks/pack Downloader
type Downloader interface {
Download(ctx context.Context, pathOrURI string) (blob.Blob, error)
}

//go:generate mockgen -package testmocks -destination testmocks/mock_image_factory.go github.com/buildpack/pack ImageFactory
//go:generate mockgen -package testmocks -destination testmocks/mock_image_factory.go github.com/buildpacks/pack ImageFactory
type ImageFactory interface {
NewImage(repoName string, local bool) (imgutil.Image, error)
}
Expand Down
12 changes: 6 additions & 6 deletions cmd/pack/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"github.com/buildpack/pack"
"github.com/buildpack/pack/cmd"
"github.com/buildpack/pack/internal/commands"
"github.com/buildpack/pack/internal/config"
clilogger "github.com/buildpack/pack/internal/logging"
"github.com/buildpack/pack/logging"
"github.com/buildpacks/pack"
"github.com/buildpacks/pack/cmd"
"github.com/buildpacks/pack/internal/commands"
"github.com/buildpacks/pack/internal/config"
clilogger "github.com/buildpacks/pack/internal/logging"
"github.com/buildpacks/pack/logging"
)

var packClient pack.Client
Expand Down
4 changes: 2 additions & 2 deletions common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/google/go-containerregistry/pkg/name"

"github.com/buildpack/pack/internal/builder"
"github.com/buildpack/pack/internal/style"
"github.com/buildpacks/pack/internal/builder"
"github.com/buildpacks/pack/internal/style"
)

func (c *Client) parseTagReference(imageName string) (name.Reference, error) {
Expand Down
14 changes: 7 additions & 7 deletions create_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"fmt"

"github.com/Masterminds/semver"
"github.com/buildpack/imgutil"
"github.com/buildpacks/imgutil"
"github.com/pkg/errors"

pubbldr "github.com/buildpack/pack/builder"
"github.com/buildpack/pack/internal/builder"
"github.com/buildpack/pack/internal/dist"
"github.com/buildpack/pack/internal/image"
"github.com/buildpack/pack/internal/style"
pubbldr "github.com/buildpacks/pack/builder"
"github.com/buildpacks/pack/internal/builder"
"github.com/buildpacks/pack/internal/dist"
"github.com/buildpacks/pack/internal/image"
"github.com/buildpacks/pack/internal/style"
)

type CreateBuilderOptions struct {
Expand Down Expand Up @@ -150,7 +150,7 @@ func (c *Client) fetchLifecycle(ctx context.Context, config pubbldr.LifecycleCon
}

func uriFromLifecycleVersion(version semver.Version) string {
return fmt.Sprintf("https://github.com/buildpack/lifecycle/releases/download/v%s/lifecycle-v%s+linux.x86-64.tgz", version.String(), version.String())
return fmt.Sprintf("https://github.com/buildpacks/lifecycle/releases/download/v%s/lifecycle-v%s+linux.x86-64.tgz", version.String(), version.String())
}

func validateBuilderConfig(conf pubbldr.Config) error {
Expand Down
24 changes: 12 additions & 12 deletions create_builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ import (
"runtime"
"testing"

"github.com/buildpack/imgutil/fakes"
"github.com/buildpacks/imgutil/fakes"
"github.com/golang/mock/gomock"
"github.com/heroku/color"
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

pubbldr "github.com/buildpack/pack/builder"
"github.com/buildpack/pack/internal/blob"
"github.com/buildpack/pack/internal/builder"
"github.com/buildpack/pack/internal/dist"
ifakes "github.com/buildpack/pack/internal/fakes"
ilogging "github.com/buildpack/pack/internal/logging"
"github.com/buildpack/pack/logging"
h "github.com/buildpack/pack/testhelpers"
"github.com/buildpack/pack/testmocks"
pubbldr "github.com/buildpacks/pack/builder"
"github.com/buildpacks/pack/internal/blob"
"github.com/buildpacks/pack/internal/builder"
"github.com/buildpacks/pack/internal/dist"
ifakes "github.com/buildpacks/pack/internal/fakes"
ilogging "github.com/buildpacks/pack/internal/logging"
"github.com/buildpacks/pack/logging"
h "github.com/buildpacks/pack/testhelpers"
"github.com/buildpacks/pack/testmocks"
)

func TestCreateBuilder(t *testing.T) {
Expand Down Expand Up @@ -221,7 +221,7 @@ func testCreateBuilder(t *testing.T, when spec.G, it spec.S) {
it("should download from predetermined uri", func() {
mockDownloader.EXPECT().Download(
gomock.Any(),
"https://github.com/buildpack/lifecycle/releases/download/v3.4.5/lifecycle-v3.4.5+linux.x86-64.tgz",
"https://github.com/buildpacks/lifecycle/releases/download/v3.4.5/lifecycle-v3.4.5+linux.x86-64.tgz",
).Return(
blob.NewBlob(filepath.Join("testdata", "lifecycle")), nil,
).MinTimes(1)
Expand All @@ -241,7 +241,7 @@ func testCreateBuilder(t *testing.T, when spec.G, it spec.S) {
mockDownloader.EXPECT().Download(
gomock.Any(),
fmt.Sprintf(
"https://github.com/buildpack/lifecycle/releases/download/v%s/lifecycle-v%s+linux.x86-64.tgz",
"https://github.com/buildpacks/lifecycle/releases/download/v%s/lifecycle-v%s+linux.x86-64.tgz",
builder.DefaultLifecycleVersion,
builder.DefaultLifecycleVersion,
),
Expand Down
8 changes: 4 additions & 4 deletions create_buildpackage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"
"io"

"github.com/buildpack/imgutil"
"github.com/buildpacks/imgutil"
"github.com/pkg/errors"

"github.com/buildpack/pack/internal/buildpackage"
"github.com/buildpack/pack/internal/dist"
"github.com/buildpack/pack/internal/style"
"github.com/buildpacks/pack/internal/buildpackage"
"github.com/buildpacks/pack/internal/dist"
"github.com/buildpacks/pack/internal/style"
)

type CreatePackageOptions struct {
Expand Down
Loading

0 comments on commit f8a34ce

Please sign in to comment.