Revert forced v2 migration (#72)

* Revert forced v2 migration

* Fix errors

Author: Mate Herber

cachedcarthage/mockCarthage_test.go

@@ -1,6 +1,6 @@
 package cachedcarthage
 
-import mock "github.com/stretchr/testify/mock"
+import "github.com/stretchr/testify/mock"
 
 // MockCarthageCache is an autogenerated mock type for the CarthageCache type
 type MockCarthageCache struct {

cachedcarthage/mockCommandBuilder_test.go

@@ -1,19 +1,11 @@
 package cachedcarthage
 
 import (
-	"github.com/bitrise-io/go-utils/env"
-	"github.com/stretchr/testify/mock"
-	"io"
-
 	"github.com/bitrise-io/go-steputils/stepconf"
 	"github.com/bitrise-io/go-utils/command"
+	"github.com/stretchr/testify/mock"
 )
 
-type CommandBlueprint struct {
-	Command string
-	Arguments []string
-}
-
 // MockCommandBuilder is an autogenerated mock type for the CommandBuilder type
 type MockCommandBuilder struct {
 	mock.Mock
@@ -38,9 +30,9 @@ func (m *MockCommandBuilder) Append(args ...string) CommandBuilder {
 }
 
 // Command provides a mock function with given fields:
-func (m *MockCommandBuilder) Command(stdout io.Writer, stderr io.Writer) command.Command {
-	args := m.Called(stdout, stderr)
-	return args.Get(0).(command.Command)
+func (m *MockCommandBuilder) Command() *command.Model {
+	args := m.Called()
+	return args.Get(0).(*command.Model)
 }
 
 func (m *MockCommandBuilder) GivenAddGitHubTokenSucceeds() *MockCommandBuilder {
@@ -58,27 +50,17 @@ func (m *MockCommandBuilder) GivenAppendSucceeds() *MockCommandBuilder {
 	return m
 }
 
-func (m *MockCommandBuilder) GivenCommandReturned(blueprint CommandBlueprint) *MockCommandBuilder {
-	command := command.NewFactory(env.NewRepository()).Create(blueprint.Command, blueprint.Arguments, nil)
-
-	m.On("Command", mock.Anything, mock.Anything).Return(command)
+func (m *MockCommandBuilder) GivenCommandReturned(command *command.Model) *MockCommandBuilder {
+	m.On("Command").Return(command)
 	return m
 }
 
-func (m *MockCommandBuilder) GivenCommandsReturned(commandBlueprints []CommandBlueprint) *MockCommandBuilder {
+func (m *MockCommandBuilder) GivenCommandsReturned(commands []*command.Model) *MockCommandBuilder {
 	index := 0
-
-	call := m.On("Command", mock.Anything, mock.Anything)
+	call := m.On("Command")
 	call.RunFn = func(args mock.Arguments) {
-		blueprint := commandBlueprints[index]
-		command := command.NewFactory(env.NewRepository()).Create(blueprint.Command, blueprint.Arguments, &command.Opts{
-			Stdout: args[0].(io.Writer),
-			Stderr: args[1].(io.Writer),
-		})
-		call.ReturnArguments = mock.Arguments{command, nil}
-
+		call.ReturnArguments = mock.Arguments{commands[index], nil}
 		index++
 	}
-
 	return m
 }

cachedcarthage/mockFileCache_test.go

@@ -1,6 +1,6 @@
 package cachedcarthage
 
-import mock "github.com/stretchr/testify/mock"
+import "github.com/stretchr/testify/mock"
 
 // MockFileCache is an autogenerated mock type for the FileCache type
 type MockFileCache struct {

cachedcarthage/mockProjectStateProvider_test.go

@@ -1,6 +1,6 @@
 package cachedcarthage
 
-import mock "github.com/stretchr/testify/mock"
+import "github.com/stretchr/testify/mock"
 
 // MockProjectStateProvider is an autogenerated mock type for the ProjectStateProvider type
 type MockProjectStateProvider struct {

cachedcarthage/runner.go

@@ -30,7 +30,7 @@ type CommandBuilder interface {
 	AddGitHubToken(githubToken stepconf.Secret) CommandBuilder
 	AddXCConfigFile(path string) CommandBuilder
 	Append(args ...string) CommandBuilder
-	Command(stdout io.Writer, stderr io.Writer) command.Command
+	Command() *command.Model
 }
 
 // Runner can be used to execute Carthage command and cache the results.
@@ -145,7 +145,9 @@ func (runner Runner) executeCommand() error {
 		Append(runner.args...)
 	var stderrBuf bytes.Buffer
 
-	cmd := builder.Command(os.Stdout, io.MultiWriter(os.Stderr, &stderrBuf))
+	cmd := builder.Command()
+	cmd.SetStdout(os.Stdout)
+	cmd.SetStderr(io.MultiWriter(os.Stderr, &stderrBuf))
 
 	log.Donef("$ %s", cmd.PrintableCommandArgs())
 

cachedcarthage/runner_error.go

@@ -30,8 +30,8 @@ func hasRetryableFailure(err error) bool {
 	if errors.As(err, &runnerError) {
 		output := strings.ToLower(runnerError.Output)
 
-		for _, string := range getErrorSlices(){
-			if strings.Contains(output, string) {
+		for _, str := range getErrorSlices(){
+			if strings.Contains(output, str) {
 				return true
 			}
 		}