From 5511c230b678a181cc596238bf6669428d1b1902 Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Thu, 18 Aug 2022 23:34:05 +0200 Subject: move {bug,identity} to /entities, move input to /commands --- bridge/core/config.go | 2 +- bridge/github/config.go | 2 +- bridge/github/export.go | 4 ++-- bridge/github/import.go | 2 +- bridge/github/import_integration_test.go | 11 ++++++----- bridge/github/import_test.go | 4 ++-- bridge/gitlab/config.go | 2 +- bridge/gitlab/export.go | 4 ++-- bridge/gitlab/import.go | 2 +- bridge/gitlab/import_test.go | 4 ++-- bridge/jira/client.go | 2 +- bridge/jira/config.go | 2 +- bridge/jira/export.go | 4 ++-- bridge/jira/import.go | 2 +- bridge/jira/jira.go | 2 +- bridge/launchpad/config.go | 2 +- bridge/launchpad/import.go | 2 +- 17 files changed, 27 insertions(+), 26 deletions(-) (limited to 'bridge') diff --git a/bridge/core/config.go b/bridge/core/config.go index 7f8d7e13..45f1afa4 100644 --- a/bridge/core/config.go +++ b/bridge/core/config.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/identity" + "github.com/MichaelMure/git-bug/entities/identity" ) func FinishConfig(repo *cache.RepoCache, metaKey string, login string) error { diff --git a/bridge/github/config.go b/bridge/github/config.go index 3dfbd14b..6b847394 100644 --- a/bridge/github/config.go +++ b/bridge/github/config.go @@ -19,7 +19,7 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/input" + "github.com/MichaelMure/git-bug/commands/input" "github.com/MichaelMure/git-bug/repository" ) diff --git a/bridge/github/export.go b/bridge/github/export.go index 5164fcab..fab5c861 100644 --- a/bridge/github/export.go +++ b/bridge/github/export.go @@ -17,11 +17,11 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" + "github.com/MichaelMure/git-bug/entities/identity" "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/entity/dag" - "github.com/MichaelMure/git-bug/identity" ) var ( diff --git a/bridge/github/import.go b/bridge/github/import.go index 1db67469..722bf256 100644 --- a/bridge/github/import.go +++ b/bridge/github/import.go @@ -9,8 +9,8 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/util/text" ) diff --git a/bridge/github/import_integration_test.go b/bridge/github/import_integration_test.go index b969f6bd..50cbd5c8 100644 --- a/bridge/github/import_integration_test.go +++ b/bridge/github/import_integration_test.go @@ -6,15 +6,16 @@ import ( "testing" "time" - "github.com/MichaelMure/git-bug/bridge/github/mocks" - "github.com/MichaelMure/git-bug/bug" - "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/repository" - "github.com/MichaelMure/git-bug/util/interrupt" "github.com/pkg/errors" "github.com/shurcooL/githubv4" m "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + + "github.com/MichaelMure/git-bug/bridge/github/mocks" + "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" + "github.com/MichaelMure/git-bug/repository" + "github.com/MichaelMure/git-bug/util/interrupt" ) // using testify/mock and mockery diff --git a/bridge/github/import_test.go b/bridge/github/import_test.go index f1c863ac..652d7ca1 100644 --- a/bridge/github/import_test.go +++ b/bridge/github/import_test.go @@ -11,10 +11,10 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" + "github.com/MichaelMure/git-bug/entities/identity" "github.com/MichaelMure/git-bug/entity/dag" - "github.com/MichaelMure/git-bug/identity" "github.com/MichaelMure/git-bug/repository" "github.com/MichaelMure/git-bug/util/interrupt" ) diff --git a/bridge/gitlab/config.go b/bridge/gitlab/config.go index c9d95adb..9411ba2e 100644 --- a/bridge/gitlab/config.go +++ b/bridge/gitlab/config.go @@ -13,7 +13,7 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/input" + "github.com/MichaelMure/git-bug/commands/input" "github.com/MichaelMure/git-bug/repository" ) diff --git a/bridge/gitlab/export.go b/bridge/gitlab/export.go index bb83662e..507b552c 100644 --- a/bridge/gitlab/export.go +++ b/bridge/gitlab/export.go @@ -12,11 +12,11 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" + "github.com/MichaelMure/git-bug/entities/identity" "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/entity/dag" - "github.com/MichaelMure/git-bug/identity" ) var ( diff --git a/bridge/gitlab/import.go b/bridge/gitlab/import.go index 879ef102..8228c4a0 100644 --- a/bridge/gitlab/import.go +++ b/bridge/gitlab/import.go @@ -10,8 +10,8 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/util/text" ) diff --git a/bridge/gitlab/import_test.go b/bridge/gitlab/import_test.go index a4a9ce15..197e2148 100644 --- a/bridge/gitlab/import_test.go +++ b/bridge/gitlab/import_test.go @@ -11,10 +11,10 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" + "github.com/MichaelMure/git-bug/entities/identity" "github.com/MichaelMure/git-bug/entity/dag" - "github.com/MichaelMure/git-bug/identity" "github.com/MichaelMure/git-bug/repository" "github.com/MichaelMure/git-bug/util/interrupt" ) diff --git a/bridge/jira/client.go b/bridge/jira/client.go index 5e1db26f..c5fd1776 100644 --- a/bridge/jira/client.go +++ b/bridge/jira/client.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" - "github.com/MichaelMure/git-bug/bug" + "github.com/MichaelMure/git-bug/entities/bug" ) var errDone = errors.New("Iteration Done") diff --git a/bridge/jira/config.go b/bridge/jira/config.go index 3ce6ad9a..4fb267db 100644 --- a/bridge/jira/config.go +++ b/bridge/jira/config.go @@ -7,7 +7,7 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/input" + "github.com/MichaelMure/git-bug/commands/input" "github.com/MichaelMure/git-bug/repository" ) diff --git a/bridge/jira/export.go b/bridge/jira/export.go index 0cadf754..763d6a1c 100644 --- a/bridge/jira/export.go +++ b/bridge/jira/export.go @@ -12,11 +12,11 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" + "github.com/MichaelMure/git-bug/entities/identity" "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/entity/dag" - "github.com/MichaelMure/git-bug/identity" ) var ( diff --git a/bridge/jira/import.go b/bridge/jira/import.go index 572c393e..fb551b47 100644 --- a/bridge/jira/import.go +++ b/bridge/jira/import.go @@ -11,8 +11,8 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/entity/dag" "github.com/MichaelMure/git-bug/util/text" diff --git a/bridge/jira/jira.go b/bridge/jira/jira.go index 6423843c..024bf9a2 100644 --- a/bridge/jira/jira.go +++ b/bridge/jira/jira.go @@ -9,7 +9,7 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/input" + "github.com/MichaelMure/git-bug/commands/input" ) const ( diff --git a/bridge/launchpad/config.go b/bridge/launchpad/config.go index f97714bd..669d36bf 100644 --- a/bridge/launchpad/config.go +++ b/bridge/launchpad/config.go @@ -8,7 +8,7 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/input" + "github.com/MichaelMure/git-bug/commands/input" ) var ErrBadProjectURL = errors.New("bad Launchpad project URL") diff --git a/bridge/launchpad/import.go b/bridge/launchpad/import.go index 01f6e53b..598ef80b 100644 --- a/bridge/launchpad/import.go +++ b/bridge/launchpad/import.go @@ -6,8 +6,8 @@ import ( "time" "github.com/MichaelMure/git-bug/bridge/core" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/util/text" ) -- cgit