Add --inpackage-suffix option

This allows users to choose whether they prefer mock_name.go or
name_mock.go for their filenames.

cmd/mockery.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	homedir "github.com/mitchellh/go-homedir"
+	"github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -57,6 +57,7 @@ func NewRootCmd() *cobra.Command {
 	pFlags.BoolP("recursive", "r", false, "recurse search into sub-directories")
 	pFlags.Bool("all", false, "generates mocks for all found interfaces in all sub-directories")
 	pFlags.Bool("inpackage", false, "generate a mock that goes inside the original package")
+	pFlags.Bool("inpackage-suffix", false, "use filename '_mock' suffix instead of 'mock_' prefix for InPackage mocks")
 	pFlags.Bool("testonly", false, "generate a mock in a _test.go file")
 	pFlags.String("case", "camel", "name the mocked file using casing convention [camel, snake, underscore]")
 	pFlags.String("note", "", "comment to insert into prologue of each generated file")
@@ -213,6 +214,7 @@ func (r *RootApp) Run() error {
 			Config:                    r.Config,
 			BaseDir:                   r.Config.Output,
 			InPackage:                 r.Config.InPackage,
+			InPackageSuffix:           r.Config.InPackageSuffix,
 			TestOnly:                  r.Config.TestOnly,
 			Case:                      r.Config.Case,
 			KeepTree:                  r.Config.KeepTree,

pkg/config/config.go

@@ -32,6 +32,7 @@ type Config struct {
 	Exported             bool `mapstructure:"exported"`
 	FileName             string
 	InPackage            bool
+	InPackageSuffix      bool `mapstructure:"inpackage-suffix"`
 	KeepTree             bool
 	LogLevel             string `mapstructure:"log-level"`
 	Name                 string

pkg/outputter.go

@@ -30,6 +30,7 @@ type FileOutputStreamProvider struct {
 	Config                    config.Config
 	BaseDir                   string
 	InPackage                 bool
+	InPackageSuffix           bool
 	TestOnly                  bool
 	Case                      string
 	KeepTree                  bool
@@ -86,13 +87,24 @@ func (p *FileOutputStreamProvider) GetWriter(ctx context.Context, iface *Interfa
 func (p *FileOutputStreamProvider) filename(name string) string {
 	if p.FileName != "" {
 		return p.FileName
-	} else if p.InPackage && p.TestOnly {
+	}
+
+	if p.InPackage && p.TestOnly {
+		if p.InPackageSuffix {
+			return name + "_mock_test.go"
+		}
+
 		return "mock_" + name + "_test.go"
 	} else if p.InPackage && !p.KeepTree {
+		if p.InPackageSuffix {
+			return name + "_mock.go"
+		}
+
 		return "mock_" + name + ".go"
 	} else if p.TestOnly {
 		return name + "_test.go"
 	}
+
 	return name + ".go"
 }
 

pkg/outputter_test.go

@@ -16,11 +16,21 @@ func TestFilenameMockOnly(t *testing.T) {
 	assert.Equal(t, "mock_name.go", out.filename("name"))
 }
 
+func TestFilenameMockOnlyWithSuffix(t *testing.T) {
+	out := FileOutputStreamProvider{InPackage: true, InPackageSuffix: true, TestOnly: false}
+	assert.Equal(t, "name_mock.go", out.filename("name"))
+}
+
 func TestFilenameMockTest(t *testing.T) {
 	out := FileOutputStreamProvider{InPackage: true, TestOnly: true}
 	assert.Equal(t, "mock_name_test.go", out.filename("name"))
 }
 
+func TestFilenameMockTestWithSuffix(t *testing.T) {
+	out := FileOutputStreamProvider{InPackage: true, InPackageSuffix: true, TestOnly: true}
+	assert.Equal(t, "name_mock_test.go", out.filename("name"))
+}
+
 func TestFilenameKeepTreeInPackage(t *testing.T) {
 	out := FileOutputStreamProvider{KeepTree: true, InPackage: true}
 	assert.Equal(t, "name.go", out.filename("name"))