Remove interface

The interface was added to make testing the struct easier.  However,
I don't believe it was all that useful given this particular project.

git/git.go

@@ -35,23 +35,6 @@ var (
  FilePathAbs = filepath.Abs
 )
 
-type GitCommander interface {
- clone(repository repository.Repository) error
- reset(repository repository.Repository) error
-}
-
-type Cloneable struct {
- GC GitCommander
- Debug bool // Debug option set from CLI with debug state.
-}
-
-// NewCloneable factory to create a new NewCloneable instance.
-func NewCloneable(debug bool) *Cloneable {
- return &Cloneable{
- Debug: debug,
- }
-}
-
 // Git struct for adding methods.
 type Git struct {
  Debug bool // Debug option set from CLI with debug state.
@@ -66,7 +49,7 @@ func NewGit(debug bool) *Git {
 
 // Clone clone Repository.URL to Repository.getCloneDir, and hard checkout
 // to Repository.Version.
-func (c *Cloneable) Clone(repository repository.Repository) error {
+func (g *Git) Clone(repository repository.Repository) error {
  cloneDir := repository.GetCloneDir()
 
  msg := fmt.Sprintf("[%s@%s]:", aurora.Magenta(repository.URL), aurora.Magenta(repository.Version))
@@ -76,11 +59,11 @@ func (c *Cloneable) Clone(repository repository.Repository) error {
  fmt.Println(msg)
 
  if _, err := os.Stat(cloneDir); os.IsNotExist(err) {
- if err := c.GC.clone(repository); err != nil {
+ if err := g.clone(repository); err != nil {
  return err
  }
 
- if err := c.GC.reset(repository); err != nil {
+ if err := g.reset(repository); err != nil {
  return err
  }
  } else {

git/git_public_test.go

@@ -37,17 +37,11 @@ import (
 type GitTestSuite struct {
  suite.Suite
  g *git.Git
- c *git.Cloneable
  r repository.Repository
 }
 
 func (suite *GitTestSuite) SetupTest() {
- g := git.NewGit(false)
- c := git.NewCloneable(false)
- c.GC = g // Real Git Implementation
-
- suite.g = g
- suite.c = c
+ suite.g = git.NewGit(false)
  suite.r = repository.Repository{
  URL: "https://example.com/user/repo.git",
  Version: "abc1234",
@@ -66,54 +60,36 @@ func (suite *GitTestSuite) TestCloneAlreadyExists() {
  os.Mkdir(cloneDir, 0755)
  }
 
- suite.c.Clone(suite.r)
+ suite.g.Clone(suite.r)
 
  defer os.RemoveAll(cloneDir)
 }
 
-type FakeGitCloneErrors struct {
- git.Git
-}
-
-func (fg FakeGitCloneErrors) clone(repository repository.Repository) error {
- return errors.New("clone had an error")
-}
-
-func (fg FakeGitCloneErrors) reset(repository repository.Repository) error {
- return nil
-}
-
 func (suite *GitTestSuite) TestCloneErrorsOnCloneReturnsError() {
- fg := FakeGitCloneErrors{}
- c := git.Cloneable{}
- c.GC = fg // Inject FakeGitCloneErrors{}
-
- c.Clone(suite.r)
-}
-
-type FakeGitResetErrors struct {
- git.Git
-}
+ anon := func() error {
+ err := suite.g.Clone(suite.r)
+ assert.Error(suite.T(), err)
 
-func (fg FakeGitResetErrors) clone(repository repository.Repository) error {
- return nil
-}
+ return err
+ }
 
-func (fg FakeGitResetErrors) reset(repository repository.Repository) error {
- return errors.New("reset had an error")
+ git.MockRunCommandErrorsOn("clone", anon)
 }
 
 func (suite *GitTestSuite) TestCloneErrorsOnResetReturnsError() {
- fg := FakeGitResetErrors{}
- c := git.Cloneable{}
- c.GC = fg // Inject FakeGitResetErrors{}
+ anon := func() error {
+ err := suite.g.Clone(suite.r)
+ assert.Error(suite.T(), err)
+
+ return err
+ }
 
- c.Clone(suite.r)
+ git.MockRunCommandErrorsOn("reset", anon)
 }
 
 func (suite *GitTestSuite) TestClone() {
  anon := func() error {
- err := suite.c.Clone(suite.r)
+ err := suite.g.Clone(suite.r)
  assert.NoError(suite.T(), err)
 
  return err

git/git_test.go

@@ -33,17 +33,11 @@ import (
 type GitTestSuite struct {
  suite.Suite
  g *Git
- c *Cloneable
  r repository.Repository
 }
 
 func (suite *GitTestSuite) SetupTest() {
- g := NewGit(false)
- c := NewCloneable(false)
- c.GC = g // Real Git Implementation
-
- suite.g = g
- suite.c = c
+ suite.g = NewGit(false)
  suite.r = repository.Repository{
  URL: "https://example.com/user/repo.git",
  Version: "abc1234",

repositories/repositories.go

@@ -109,12 +109,10 @@ func (r *Repositories) validate(data []byte) error {
 // Overlay clone and extract the Repository items.
 func (r *Repositories) Overlay() error {
  g := git.NewGit(r.Debug)
- c := git.NewCloneable(r.Debug)
- c.GC = g
 
  for _, repository := range r.Items {
  repository.GiltDir = GiltDir
- err := c.Clone(repository)
+ err := g.Clone(repository)
  if err != nil {
  return err
  }