Skip to content

Commit

Permalink
Fix package rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@roblaszczak
roblaszczak committed Nov 20, 2021
1 parent e214306 commit bd46161
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ proto:

.PHONY: install
install:
go install .
go install ./tdl/


.PHONY: lint
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.17

require (
github.com/BurntSushi/toml v0.4.1
github.com/ThreeDotsLabs/cli/tdl/trainings/genproto v0.0.0-00010101000000-000000000000
github.com/ThreeDotsLabs/cli/trainings/genproto v0.0.0-00010101000000-000000000000
github.com/fatih/color v1.12.0
github.com/golang/protobuf v1.5.2
github.com/hexops/gotextdiff v1.0.3
Expand Down
4 changes: 2 additions & 2 deletions main.go → tdl/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"

"github.com/ThreeDotsLabs/cli/tdl/trainings"
"github.com/ThreeDotsLabs/cli/tdl/trainings/web"
"github.com/ThreeDotsLabs/cli/trainings"
"github.com/ThreeDotsLabs/cli/trainings/web"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions trainings/config/global.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/ThreeDotsLabs/cli/tdl/internal"
"github.com/ThreeDotsLabs/cli/tdl/trainings/web"
"github.com/ThreeDotsLabs/cli/internal"
"github.com/ThreeDotsLabs/cli/trainings/web"
)

type GlobalConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion trainings/config/training.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/ThreeDotsLabs/cli/tdl/internal"
"github.com/ThreeDotsLabs/cli/internal"
)

const trainingConfigFile = ".tdl-training"
Expand Down
4 changes: 2 additions & 2 deletions trainings/configure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"errors"

"github.com/ThreeDotsLabs/cli/tdl/trainings/config"
"github.com/ThreeDotsLabs/cli/tdl/trainings/genproto"
"github.com/ThreeDotsLabs/cli/trainings/config"
"github.com/ThreeDotsLabs/cli/trainings/genproto"
)

func (h *Handlers) ConfigureGlobally(ctx context.Context, token, serverAddr string, override bool) error {
Expand Down
2 changes: 1 addition & 1 deletion trainings/files/files_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/ThreeDotsLabs/cli/tdl/trainings/genproto"
"github.com/ThreeDotsLabs/cli/trainings/genproto"
)

func testDataDir(t *testing.T, testName string) string {
Expand Down
2 changes: 1 addition & 1 deletion trainings/files/read.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/afero"

"github.com/ThreeDotsLabs/cli/tdl/trainings/genproto"
"github.com/ThreeDotsLabs/cli/trainings/genproto"
)

func (f Files) ReadSolutionFiles(dir string) ([]*genproto.File, error) {
Expand Down
4 changes: 2 additions & 2 deletions trainings/files/read_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/ThreeDotsLabs/cli/tdl/trainings/files"
"github.com/ThreeDotsLabs/cli/tdl/trainings/genproto"
"github.com/ThreeDotsLabs/cli/trainings/files"
"github.com/ThreeDotsLabs/cli/trainings/genproto"
)

func TestFiles_ReadSolutionFiles(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions trainings/files/write.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/afero"

"github.com/ThreeDotsLabs/cli/tdl/internal"
"github.com/ThreeDotsLabs/cli/tdl/trainings/genproto"
"github.com/ThreeDotsLabs/cli/internal"
"github.com/ThreeDotsLabs/cli/trainings/genproto"
)

type Files struct {
Expand Down
4 changes: 2 additions & 2 deletions trainings/files/write_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/ThreeDotsLabs/cli/tdl/trainings/files"
"github.com/ThreeDotsLabs/cli/tdl/trainings/genproto"
"github.com/ThreeDotsLabs/cli/trainings/files"
"github.com/ThreeDotsLabs/cli/trainings/genproto"
)

func TestFiles_WriteExerciseFiles(t *testing.T) {
Expand Down
8 changes: 5 additions & 3 deletions trainings/handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ package trainings

import (
"context"
"crypto/tls"

"google.golang.org/grpc"
"google.golang.org/grpc/credentials"

"github.com/ThreeDotsLabs/cli/tdl/trainings/config"
"github.com/ThreeDotsLabs/cli/tdl/trainings/files"
"github.com/ThreeDotsLabs/cli/tdl/trainings/genproto"
"github.com/ThreeDotsLabs/cli/trainings/config"
"github.com/ThreeDotsLabs/cli/trainings/files"
"github.com/ThreeDotsLabs/cli/trainings/genproto"
)

type Handlers struct {
Expand Down
6 changes: 3 additions & 3 deletions trainings/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/ThreeDotsLabs/cli/tdl/internal"
"github.com/ThreeDotsLabs/cli/tdl/trainings/config"
"github.com/ThreeDotsLabs/cli/tdl/trainings/genproto"
"github.com/ThreeDotsLabs/cli/internal"
"github.com/ThreeDotsLabs/cli/trainings/config"
"github.com/ThreeDotsLabs/cli/trainings/genproto"
)

func (h *Handlers) Init(ctx context.Context, trainingName string) error {
Expand Down
8 changes: 4 additions & 4 deletions trainings/next.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"github.com/ThreeDotsLabs/cli/tdl/internal"
"github.com/ThreeDotsLabs/cli/tdl/trainings/config"
"github.com/ThreeDotsLabs/cli/tdl/trainings/genproto"
"github.com/ThreeDotsLabs/cli/tdl/trainings/web"
"github.com/ThreeDotsLabs/cli/internal"
"github.com/ThreeDotsLabs/cli/trainings/config"
"github.com/ThreeDotsLabs/cli/trainings/genproto"
"github.com/ThreeDotsLabs/cli/trainings/web"
)

func (h *Handlers) nextExercise(ctx context.Context, currentExerciseID string, dir string) error {
Expand Down
6 changes: 3 additions & 3 deletions trainings/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/ThreeDotsLabs/cli/tdl/internal"
"github.com/ThreeDotsLabs/cli/tdl/trainings/config"
"github.com/ThreeDotsLabs/cli/tdl/trainings/genproto"
"github.com/ThreeDotsLabs/cli/internal"
"github.com/ThreeDotsLabs/cli/trainings/config"
"github.com/ThreeDotsLabs/cli/trainings/genproto"
)

func (h *Handlers) Run(ctx context.Context) (bool, error) {
Expand Down

0 comments on commit bd46161

Please sign in to comment.