Merge branch 'master' into import-customize

.github/workflows/static.yml

@@ -17,5 +17,6 @@ jobs:
         with:
           key: ${{ github.ref }}
           path: .cache
+      - run: sudo apt-get install -y libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev
       - run: pip install -r docs/requirements.txt
       - run: mkdocs gh-deploy --force

.gitignore

@@ -3,3 +3,4 @@ dist
 .idea
 docs/ve
 ve
+.cache

.goreleaser.yml

@@ -7,7 +7,7 @@ builds:
   - main: ./main.go
     binary: mockery
     ldflags:
-      - -s -w -X github.com/vektra/mockery/v2/pkg/config.SemVer=v{{.Version}}
+      - -s -w -X github.com/vektra/mockery/v2/pkg/logging.SemVer=v{{.Version}}
     env:
       - CGO_ENABLED=0
     goos:

.mockery.yaml

@@ -1,4 +1,24 @@
 quiet: False
-all: True
 keeptree: True
 disable-version-string: True
+with-expecter: True
+filename: "{{.MockName}}.go"
+packages:
+  github.com/vektra/mockery/v2/pkg:
+    interfaces:
+      TypesPackage:
+  github.com/vektra/mockery/v2/pkg/fixtures:
+    interfaces:
+      RequesterArgSameAsNamedImport:
+      RequesterVariadic:
+        config:
+          with-expecter: False
+        configs:
+          - structname: RequesterVariadicOneArgument
+            unroll-variadic: False
+          - structname: RequesterVariadic
+      Expecter:
+      RequesterReturnElided:
+
+
+

Makefile

@@ -8,15 +8,12 @@ fmt:
 	go fmt ./...
 
 .PHONY: test
-test: mocks
+test:
 	go test ./...
 
-mocks: $(shell find . -type f -name '*.go' -not -name '*_test.go')
-	go run . --dir pkg/fixtures --output mocks/pkg/fixtures
-	go run . --all=false --print --dir pkg/fixtures --name RequesterVariadic --structname RequesterVariadicOneArgument --unroll-variadic=False > mocks/pkg/fixtures/RequesterVariadicOneArgument.go
-	go run . --all=false --print --dir pkg/fixtures --name Expecter --with-expecter > mocks/pkg/fixtures/Expecter.go
-	go run . --all=false --print --dir pkg/fixtures --name RequesterReturnElided --with-expecter > mocks/pkg/fixtures/RequesterReturnElided.go
-	@touch mocks
+.PHONY: mocks
+mocks:
+	go run . 
 
 .PHONY: install
 install: