From 6d79e7d2712046a4f0998e11775d55b45db066f7 Mon Sep 17 00:00:00 2001 From: honda-yusuke Date: Tue, 26 Nov 2019 12:45:33 +0900 Subject: [PATCH 1/2] Change way to import cli package --- Gopkg.toml | 4 ++-- realize.go | 4 ++-- realize/schema.go | 2 +- realize/schema_test.go | 3 ++- realize/utils.go | 2 +- realize/utils_test.go | 3 ++- realize_test.go | 3 ++- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Gopkg.toml b/Gopkg.toml index 87a7f7b..79c5788 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -49,8 +49,8 @@ name = "golang.org/x/net" [[constraint]] - branch = "v2" - name = "gopkg.in/urfave/cli.v2" + name = "github.com/urfave/cli/v2" + version = "2.0.0" [[constraint]] name = "gopkg.in/yaml.v2" diff --git a/realize.go b/realize.go index bbb5956..f448ef9 100644 --- a/realize.go +++ b/realize.go @@ -9,8 +9,8 @@ import ( "time" "github.com/oxequa/interact" - "github.com/oxequa/realize/realize" - "gopkg.in/urfave/cli.v2" + "github.com/yyh-gl/realize/realize" + "github.com/urfave/cli/v2" ) var r realize.Realize diff --git a/realize/schema.go b/realize/schema.go index 753578c..e2b7c67 100644 --- a/realize/schema.go +++ b/realize/schema.go @@ -5,7 +5,7 @@ import ( "path/filepath" "reflect" - "gopkg.in/urfave/cli.v2" + "github.com/urfave/cli/v2" ) // Schema projects list diff --git a/realize/schema_test.go b/realize/schema_test.go index b07f725..8aa5b89 100644 --- a/realize/schema_test.go +++ b/realize/schema_test.go @@ -2,9 +2,10 @@ package realize import ( "flag" - "gopkg.in/urfave/cli.v2" "path/filepath" "testing" + + "github.com/urfave/cli/v2" ) func TestSchema_Add(t *testing.T) { diff --git a/realize/utils.go b/realize/utils.go index 88d6497..4118d35 100644 --- a/realize/utils.go +++ b/realize/utils.go @@ -7,7 +7,7 @@ import ( "path" "strings" - "gopkg.in/urfave/cli.v2" + "github.com/urfave/cli/v2" ) // Params parse one by one the given argumentes diff --git a/realize/utils_test.go b/realize/utils_test.go index 0018295..015f653 100644 --- a/realize/utils_test.go +++ b/realize/utils_test.go @@ -2,10 +2,11 @@ package realize import ( "flag" - "gopkg.in/urfave/cli.v2" "os" "path/filepath" "testing" + + "github.com/urfave/cli/v2" ) func TestParams(t *testing.T) { diff --git a/realize_test.go b/realize_test.go index 2bc6e0b..2f9a18e 100644 --- a/realize_test.go +++ b/realize_test.go @@ -3,10 +3,11 @@ package main import ( "bytes" "errors" - "github.com/oxequa/realize/realize" "log" "strings" "testing" + + "github.com/yyh-gl/realize/realize" ) var mockResponse interface{} From 67bacdac4cbccedd756bd911f596012a7950094f Mon Sep 17 00:00:00 2001 From: honda-yusuke Date: Tue, 26 Nov 2019 12:58:34 +0900 Subject: [PATCH 2/2] Remove debug code --- realize.go | 2 +- realize_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/realize.go b/realize.go index f448ef9..c60c283 100644 --- a/realize.go +++ b/realize.go @@ -9,7 +9,7 @@ import ( "time" "github.com/oxequa/interact" - "github.com/yyh-gl/realize/realize" + "github.com/oxequa/realize/realize" "github.com/urfave/cli/v2" ) diff --git a/realize_test.go b/realize_test.go index 2f9a18e..2f579a1 100644 --- a/realize_test.go +++ b/realize_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/yyh-gl/realize/realize" + "github.com/oxequa/realize/realize" ) var mockResponse interface{}