Skip to content

Commit

Permalink
Showing 36 changed files with 402 additions and 131 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ builds:
- env:
- CGO_ENABLED=0
ldflags:
- -s -w -X github.com/typefox/leeway/cmd.version={{.Version}}-{{.ShortCommit}}
- -s -w -X github.com/gitpod-io/leeway/cmd.version={{.Version}}-{{.ShortCommit}}
ignore:
- goos: darwin
goarch: 386
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"go.lintTool": "golangci-lint"
"go.lintTool": "golangci-lint",
"editor.fontFamily": "Courier New"
}
2 changes: 1 addition & 1 deletion cmd/build.go
Original file line number Diff line number Diff line change
@@ -11,10 +11,10 @@ import (
"path/filepath"
"runtime"

"github.com/gitpod-io/leeway/pkg/leeway"
"github.com/gookit/color"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/typefox/leeway/pkg/leeway"
)

// buildCmd represents the build command
4 changes: 2 additions & 2 deletions cmd/collect.go
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/leeway"
"github.com/typefox/leeway/pkg/prettyprint"
"github.com/gitpod-io/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/prettyprint"
)

type fileDescription struct {
2 changes: 1 addition & 1 deletion cmd/describe-const.go
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/prettyprint"
"github.com/gitpod-io/leeway/pkg/prettyprint"
)

// describeConstCmd represents the describeTree command
4 changes: 2 additions & 2 deletions cmd/describe-dependencies.go
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/graphview"
"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/graphview"
"github.com/gitpod-io/leeway/pkg/leeway"
)

// describeDependenciesCmd represents the describeDot command
2 changes: 1 addition & 1 deletion cmd/describe-script.go
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/prettyprint"
"github.com/gitpod-io/leeway/pkg/prettyprint"
)

// describeScriptCmd represents the describeTree command
2 changes: 1 addition & 1 deletion cmd/describe-tree.go
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

// describeTreeCmd represents the describeTree command
4 changes: 2 additions & 2 deletions cmd/describe.go
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/leeway"
"github.com/typefox/leeway/pkg/prettyprint"
"github.com/gitpod-io/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/prettyprint"
)

// describeCmd represents the describe command
2 changes: 1 addition & 1 deletion cmd/exec.go
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

// execCmd represents the version command
2 changes: 1 addition & 1 deletion cmd/experimental-mount.go
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ import (

"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

// mountCmd represents the mount command
2 changes: 1 addition & 1 deletion cmd/export.go
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import (

"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

// exportCmd represents the version command
2 changes: 1 addition & 1 deletion cmd/fmt.go
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import (

"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

// fmtCmd represents the version command
2 changes: 1 addition & 1 deletion cmd/init.go
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ import (
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

var (
2 changes: 1 addition & 1 deletion cmd/link.go
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/linker"
"github.com/gitpod-io/leeway/pkg/linker"
)

// linkCmd represents the version command
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ import (
"github.com/spf13/cobra"
"golang.org/x/xerrors"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

const (
4 changes: 2 additions & 2 deletions cmd/vet.go
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/typefox/leeway/pkg/prettyprint"
"github.com/typefox/leeway/pkg/vet"
"github.com/gitpod-io/leeway/pkg/prettyprint"
"github.com/gitpod-io/leeway/pkg/vet"
)

// versionCmd represents the version command
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
module github.com/typefox/leeway
module github.com/gitpod-io/leeway

go 1.16

require (
github.com/GeertJohan/go.rice v1.0.2
github.com/creack/pty v1.1.13
github.com/creack/pty v1.1.15
github.com/daaku/go.zipexe v1.0.1 // indirect
github.com/disiqueira/gotree v1.0.0
github.com/fsnotify/fsnotify v1.4.9
github.com/fsnotify/fsnotify v1.5.1
github.com/google/go-cmp v0.5.6
github.com/gookit/color v1.4.2
github.com/imdario/mergo v0.3.12
@@ -15,11 +16,10 @@ require (
github.com/minio/highwayhash v1.0.2
github.com/segmentio/textio v1.2.0
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/stretchr/testify v1.7.0 // indirect
golang.org/x/mod v0.4.2
github.com/spf13/cobra v1.2.1
golang.org/x/mod v0.5.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79 // indirect
golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
442 changes: 356 additions & 86 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/typefox/leeway/cmd"
import "github.com/gitpod-io/leeway/cmd"

func main() {
cmd.Execute()
2 changes: 1 addition & 1 deletion pkg/doublestar/doublestar_test.go
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/typefox/leeway/pkg/doublestar"
"github.com/gitpod-io/leeway/pkg/doublestar"
)

func TestMatch(t *testing.T) {
2 changes: 1 addition & 1 deletion pkg/graphview/graphview.go
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ import (

rice "github.com/GeertJohan/go.rice"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

// Serve serves the dependency graph view for a package
2 changes: 1 addition & 1 deletion pkg/leeway/package.go
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ import (
"golang.org/x/xerrors"
"gopkg.in/yaml.v3"

"github.com/typefox/leeway/pkg/doublestar"
"github.com/gitpod-io/leeway/pkg/doublestar"
)

// Arguments can be passed to components/packages introducing variation points
2 changes: 1 addition & 1 deletion pkg/leeway/scripts_test.go
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import (
"strings"
"testing"

"github.com/typefox/leeway/cmd"
"github.com/gitpod-io/leeway/cmd"
)

var dut = flag.Bool("dut", false, "run command/device under test")
2 changes: 1 addition & 1 deletion pkg/leeway/watcher.go
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import (
"github.com/fsnotify/fsnotify"
log "github.com/sirupsen/logrus"

"github.com/typefox/leeway/pkg/doublestar"
"github.com/gitpod-io/leeway/pkg/doublestar"
)

// WatchSources watches the source files of the packages until the context is done
2 changes: 1 addition & 1 deletion pkg/leeway/workspace.go
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ import (
"golang.org/x/xerrors"
"gopkg.in/yaml.v3"

"github.com/typefox/leeway/pkg/doublestar"
"github.com/gitpod-io/leeway/pkg/doublestar"
)

// Workspace is the root container of all compoments. All components are named relative
2 changes: 1 addition & 1 deletion pkg/linker/golang.go
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ import (
"golang.org/x/mod/module"
"golang.org/x/xerrors"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

// LinkGoModules produces the neccesary "replace"ments in all of the package's
2 changes: 1 addition & 1 deletion pkg/linker/yarn.go
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/xerrors"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

// LinkYarnPackagesWithYarn2 uses `yarn link` to link all TS packages in-situ.
2 changes: 1 addition & 1 deletion pkg/vet/components.go
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import (
"io/ioutil"
"path/filepath"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

func init() {
2 changes: 1 addition & 1 deletion pkg/vet/docker.go
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import (

log "github.com/sirupsen/logrus"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

func init() {
2 changes: 1 addition & 1 deletion pkg/vet/docker_test.go
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ import (

"github.com/google/go-cmp/cmp"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

func TestCheckDockerCopyFromPackage(t *testing.T) {
2 changes: 1 addition & 1 deletion pkg/vet/generic.go
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import (

log "github.com/sirupsen/logrus"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

func init() {
2 changes: 1 addition & 1 deletion pkg/vet/golang.go
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

func init() {
2 changes: 1 addition & 1 deletion pkg/vet/packages.go
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ package vet
import (
"fmt"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

func init() {
2 changes: 1 addition & 1 deletion pkg/vet/vet.go
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/xerrors"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

type checkFunc struct {
2 changes: 1 addition & 1 deletion pkg/vet/yarn.go
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ import (
"golang.org/x/xerrors"
"gopkg.in/yaml.v3"

"github.com/typefox/leeway/pkg/leeway"
"github.com/gitpod-io/leeway/pkg/leeway"
)

func init() {

0 comments on commit 486ac76

Please sign in to comment.