Skip to content
This repository has been archived by the owner on May 11, 2022. It is now read-only.

Commit

Permalink
fix #52: define go mod first, dep as fallback
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilsk committed Jan 25, 2020
1 parent 84a8251 commit f647a37
Show file tree
Hide file tree
Showing 18 changed files with 2,747 additions and 13 deletions.
3 changes: 2 additions & 1 deletion go.mod
Expand Up @@ -4,9 +4,10 @@ go 1.11

require (
github.com/izumin5210/gex v0.6.0
github.com/spf13/afero v1.1.2
github.com/spf13/cobra v0.0.5
github.com/stretchr/testify v1.4.0
go.octolab.org/toolkit/cli v0.0.6
)

replace github.com/izumin5210/gex => github.com/kamilsk/gex v0.6.0-e3
replace github.com/izumin5210/gex => github.com/kamilsk/gex v0.6.0-e4
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -19,8 +19,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/izumin5210/execx v0.1.0 h1:QLtjHrG2nZmb/kvJ8/fXAlGcp+ECAfsWha+Yx2R6Czs=
github.com/izumin5210/execx v0.1.0/go.mod h1:qrIQVE0XTXWXoNpeA+OWZgAjpBxiztOKHfHpPIzc5t0=
github.com/kamilsk/gex v0.6.0-e3 h1:lcTpIATU75B9D4YuwlYJFyZpchmncr5uxbG/ubVlRg0=
github.com/kamilsk/gex v0.6.0-e3/go.mod h1:nDH4zt3QvsIJipyYDoedHcNrNzawwkseKfpqGTUDN2Q=
github.com/kamilsk/gex v0.6.0-e4 h1:76L0Z7DUgrhiqfFZiIEbjU1mH7/AInv7R3AeggsZJOY=
github.com/kamilsk/gex v0.6.0-e4/go.mod h1:nDH4zt3QvsIJipyYDoedHcNrNzawwkseKfpqGTUDN2Q=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
Expand Down
38 changes: 38 additions & 0 deletions internal/cmd/tools/add_test.go
@@ -0,0 +1,38 @@
package tools

import (
"bytes"
"os"
"path/filepath"
"testing"

"github.com/izumin5210/gex"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestAddCommand_GoModWithDep(t *testing.T) {
var (
issue = "testdata/issue-52/tools"
expected = "tools.golden"
obtained = "tools.go"
)
golden, err := os.Stat(filepath.Join(issue, expected))
require.NoError(t, err)

buf, cfg := new(bytes.Buffer), &(*gex.Default)
cfg.FS = afero.NewMemMapFs()
cfg.ErrWriter = buf
cfg.OutWriter = buf
cfg.RootDir = issue
cfg.WorkingDir = issue
cmd := NewAddCommand(cfg)
cmd.SetOut(buf)

assert.NoError(t, cmd.RunE(cmd, []string{"golang.org/x/vgo"}))

manifest, err := cfg.FS.Stat(filepath.Join(issue, obtained))
assert.NoError(t, err)
assert.Equal(t, golden.Size(), manifest.Size())
}
9 changes: 9 additions & 0 deletions internal/cmd/tools/testdata/issue-52/Gopkg.lock

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

30 changes: 30 additions & 0 deletions internal/cmd/tools/testdata/issue-52/Gopkg.toml
@@ -0,0 +1,30 @@
# Gopkg.toml example
#
# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
#
# [prune]
# non-go = false
# go-tests = true
# unused-packages = true


[prune]
go-tests = true
unused-packages = true
3 changes: 3 additions & 0 deletions internal/cmd/tools/testdata/issue-52/go.mod
@@ -0,0 +1,3 @@
module github.com/kamilsk/egg/test/issue-52

go 1.11
3 changes: 3 additions & 0 deletions internal/cmd/tools/testdata/issue-52/tools/go.mod
@@ -0,0 +1,3 @@
module github.com/kamilsk/egg/test/issue-52/tools

go 1.11
11 changes: 11 additions & 0 deletions internal/cmd/tools/testdata/issue-52/tools/tools.golden
@@ -0,0 +1,11 @@
// Code generated by github.com/kamilsk/egg. DO NOT EDIT.

// +build tools

package tools

import (
_ "golang.org/x/vgo"
)

//go:generate go install golang.org/x/vgo
10 changes: 5 additions & 5 deletions vendor/github.com/izumin5210/gex/pkg/manager/type.go

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

8 changes: 4 additions & 4 deletions vendor/github.com/izumin5210/gex/pkg/tool/writer.go

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

28 changes: 28 additions & 0 deletions vendor/github.com/stretchr/testify/require/doc.go

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

16 changes: 16 additions & 0 deletions vendor/github.com/stretchr/testify/require/forward_requirements.go

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

0 comments on commit f647a37

Please sign in to comment.