Merge pull request #32 from Nightapes/fix.beta-release

fix(prerelease): calculate right version if branch is set to alpha,beta or rc

.dockerignore

@@ -0,0 +1,2 @@
+*
+!build/

.github/workflows/main.yml

@@ -1,16 +1,14 @@
 name: Go
 on: [push, pull_request]
 jobs:
-
   build:
     name: Build
     runs-on: ubuntu-latest
     steps:
-    
+      - name: Set up Go 1.13
-    - name: Set up Go 1.12
         uses: actions/setup-go@v1
         with:
-        go-version: 1.12
+          go-version: 1.13
         id: go
 
       - name: Check out code into the Go module directory
@@ -19,7 +17,7 @@ jobs:
       - name: Lint
         run: |
           export PATH=$PATH:$(go env GOPATH)/bin
-        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.16.0
+          curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.18.0
           golangci-lint run ./...
 
       - name: Run tests
@@ -30,10 +28,28 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           go build -o build/go-semantic-release-temp ./cmd/go-semantic-release/
-        go build -o build/go-semantic-release  -ldflags "-w -s --X main.version=`./build/go-semantic-release-temp next`" ./cmd/go-semantic-release/
+          ./build/go-semantic-release-temp next --no-cache --loglevel trace
-        GOOS=windows GOARCH=386 go build -o build/go-semantic-release.exe  -ldflags "-w -s -X main.version=`./build/go-semantic-release-temp next`" ./cmd/go-semantic-release/
+          GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/go-semantic-release  -ldflags "-w -s --X main.version=`./build/go-semantic-release-temp next`" ./cmd/go-semantic-release/
+          GOOS=windows GOARCH=386 CGO_ENABLED=0 go build -o build/go-semantic-release.exe  -ldflags "-w -s -X main.version=`./build/go-semantic-release-temp next`" ./cmd/go-semantic-release/
+
+      - name: Build Docker image
+        if: github.ref != 'refs/heads/master'
+        run: |
+          docker login -u nightapes -p ${{ secrets.DOCKER_PASSWORD }}
+          docker login -u nightapes -p ${{ secrets.GITHUB_TOKEN }} docker.pkg.github.com
+          docker build -t nightapes/go-semantic-release:development .
+          docker push nightapes/go-semantic-release:development
+          docker tag nightapes/go-semantic-release:development docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:development
+          docker push docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:development
+
+      - name: Push Docker image
+        if: github.ref != 'refs/heads/master'
+        run: |
 
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: ./build/go-semantic-release-temp release --loglevel trace
+        run: |
+          docker login -u nightapes -p ${{ secrets.DOCKER_PASSWORD }}
+          docker login -u nightapes -p $GITHUB_TOKEN docker.pkg.github.com
+          ./build/go-semantic-release-temp release --loglevel trace

.gitignore

@@ -16,3 +16,5 @@ go-semantic-release
 .vscode/settings.json
 CHANGELOG.md
 cover.html
+build/
+.idea/

.release.yml

@@ -1,21 +1,26 @@
+release: "github"
+github:
+  repo: "go-semantic-release"
+  user: "nightapes"
 commitFormat: angular
-title: "go-semantic-release release"
 branch:
-  master: beta
+  master: release
-  rc: rc
   beta: beta
-  alpha: alpha
-changelog:
-  printAll: false
-  template: ''
-  templatePath: ''
-release: 'github'
 assets:
   - name: ./build/go-semantic-release
     compress: false
   - name: ./build/go-semantic-release.exe
     compress: false
-github:
+changelog:
-  repo: "go-semantic-release"
+  docker:
-  user: "nightapes"
+    latest: true
-  customUrl: ""
+    repository: "nightapes/go-semantic-release"
+hooks:
+  preRelease:
+    - docker build -t nightapes/go-semantic-release:latest .
+    - docker tag nightapes/go-semantic-release:latest docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:$RELEASE_VERSION
+    - docker tag nightapes/go-semantic-release:latest nightapes/go-semantic-release:$RELEASE_VERSION
+  postRelease:
+    - docker push nightapes/go-semantic-release:latest
+    - docker push nightapes/go-semantic-release:$RELEASE_VERSION
+    - docker push docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:$RELEASE_VERSION

Dockerfile

@@ -0,0 +1,9 @@
+FROM alpine:3.10.2
+
+WORKDIR /code
+
+COPY ./build/go-semantic-release .
+
+USER 1000
+
+ENTRYPOINT [ "./go-semantic-release" ]

README.md

@@ -2,24 +2,217 @@
 
 ## Release Types
 
-| Type      | Git tag               | Changelog             | Release           |  Write access git | Api token           |
+| Type        |    Implemendet     |      Git tag       |     Changelog      |      Release       |  Write access git  |     Api token      |
-|---        |:---:                  |:---:                  |:---:              |:---:              |:---:                |
+| ----------- | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: |
-| `git`     | :white_check_mark:    |                       |                   | :white_check_mark:|                     |
+| `github`    | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                    | :white_check_mark: |
-| `github`  | :white_check_mark:	| :white_check_mark:    | :white_check_mark:|                   | :white_check_mark:  |
+| `gitlab`    | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |                    | :white_check_mark: |
-| `gitlab`  | :white_check_mark:	| :white_check_mark:    | :white_check_mark:|                   | :white_check_mark:  |
+| `git`       | :white_check_mark: | :white_check_mark: |                    |                    | :white_check_mark: |                    |
+| `bitbucket` |    Comming soon    | :white_check_mark: |                    |                    | :white_check_mark: |                    |
+
+
+## Supported CI Pipelines
+
+* Github Actions
+* Gitlab CI
+* Travis CI
+* Custom CI, set enviroment `CI=true`
+
+## How to use
+
+`go-semantic-release` config file 
+Create a file with the name `.release.yml` or anything else, but you need to set to every command `-c <your config file>`
+
+### Example config
+
+```yml
+commitFormat: angular
+branch:
+  master: release
+release: 'github'
+github:
+  repo: "go-semantic-release"
+  user: "nightapes"
+assets:
+  - name: ./build/go-semantic-release
+    compress: false
+  - name: ./build/go-semantic-release.exe
+    compress: false
+hooks:
+  preRelease:
+    - name: echo $RELEASE_VERSION
+  postRelease:
+    - name: echo $RELEASE_VERSION
+```
+
+#### CommitFormat
+
+Set the commit format, at the moment we support ony [angular](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit-message-format), more coming soon.
+
+```yml
+commitFormat: angular
+```
+
+#### Branch
+
+You can define which kind of release should be created for different branches. 
+
+Supported release kinds: 
+
+* `release` -> `v1.0.0`
+* `rc` -> `v1.0.0-rc.0`
+* `beta` -> `v1.0.0-beta.0`
+* `alpha` -> `v1.0.0-alpha.0`
+
+Add a branch config to your config
+
+```yml
+branch:
+  <branch-name>: <kind>
+```
+
+#### Release
+
+At the moment we support releases to gitlab and github.
+
+##### Github 
+
+You need to set the env `GITHUB_TOKEN` with an access token.
+
+```yml
+release: 'github'
+github:
+  user: "<user/group"
+  repo: "<repositroyname>"
+  ## Optional, if your not using github.com
+  customUrl: <https://your.github>
+```
+
+##### Gitlab 
+
+You need to set the env `GITLAB_ACCESS_TOKEN` with an personal access token.
+
+
+```yml
+release: 'gitlab'
+gitlab:
+  repo: "<repositroyname>"  ## Example group/project
+  ## Optional, if your not using gitlab.com
+  customUrl: <https://your.gitlab>
+```
+
+##### Git only 
+
+Only via https at the moment. You need write access to your git repository
+
+
+```yml
+release: 'git'
+git:
+  email: "<email>" # Used for creating tag
+  user: "<user>" : # Used for creating tag and pushing
+  auth: "<token>" # Used for pushing, can be env "$GIT_TOKEN", will be replaced with env
+```
+
+
+#### Assets
+
+You can upload assets to a release
+
+Support for gitlab and github.
+If you want, you can let the file be compressed before uploading 
+
+```yml
+assets:
+  - name: ./build/go-semantic-release
+    compress: false
+```
+
+#### Hooks
+
+Hooks will run when calling `release`. Hooks run only if a release will be triggered.  
+
+#### Changelog
+
+Following variables can be used for templates:
+*   `Commits` string
+*	`Version` string
+* 	`Now` time.Time
+* 	`Backtick` string
+* 	`HasDocker` bool
+* 	`HasDockerLatest` bool
+* 	`DockerRepository` string
+
+```yml
+changelog:
+  printAll: false ## Print all valid commits to changelog
+  title: "v{{.Version}} ({{.Now.Format "2006-01-02"}})" ## Used for releases (go template)
+  templatePath: "./examples/changelog.tmpl"    ## Path to a template file (go template)
+```
+
+##### Docker 
+
+You can print a help text for a docker image
+
+```yml
+changelog:
+  docker: 
+    latest: false ## If you uploaded a latest image
+    repository: ## Your docker repository, which is used for docker run
+```
+
+### Version
+
+`go-semantic-release` has two modes for calcualting the version: automatic or manual.
+
+#### Automatic
+
+Version will be calculated on the `next` or `release` command
+
+#### Manual
+
+If you don't want that `go-semantic-release` is calculating the version from the commits, you can set the version by hand with
+following command:
+
+```bash
+./go-semantic-release set 1.1.1
+```
+
+### Print version
+
+Print the next version, can be used to add version to your program
+
+```bash
+./go-semantic-release next
+```
+Example with go-lang
+
+```bash
+go build -ldflags "--X main.version=`./go-semantic-release next`"
+```
+
+### Create release 
+
+```bash
+./go-semantic-release release 
+```
 
 
 
-## Build
+## Build from source
 
-`go build ./cmd/go-semantic-release/`
+```bash
+go build ./cmd/go-semantic-release/
+```
 
-## Run
+### Testing
 
-Print the next version
+```bash
+go test ./... 
+```
 
-`./go-semantic-release version next`
+### Linting
 
-Set a version
+```
-
+curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.16.0
-`./go-semantic-release version set v1.1.1`
+golangci-lint run ./...
+```

README2.md

@@ -1,2 +0,0 @@
-go build ./cmd/main.go && ./main.exe version next --path /f/Repro/ambassador/
-go build ./cmd/main.go && ./main.exe --loglevel debug version set v1.1.1 --path /f/Repro/ambassador/

_config.yml

@@ -0,0 +1,3 @@
+theme: jekyll-theme-cayman
+plugins:
+  - jemoji

cmd/go-semantic-release/commands/changelog.go

@@ -35,7 +35,12 @@ var changelogCmd = &cobra.Command{
 			return err
 		}
 
-		s, err := semanticrelease.New(readConfig(config), repository)
+		ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
+		if err != nil {
+			return err
+		}
+
+		s, err := semanticrelease.New(readConfig(config), repository, !ignoreConfigChecks)
 		if err != nil {
 			return err
 		}

cmd/go-semantic-release/commands/hooks.go

@@ -0,0 +1,64 @@
+package commands
+
+import (
+	"github.com/Nightapes/go-semantic-release/internal/hooks"
+	"github.com/Nightapes/go-semantic-release/pkg/semanticrelease"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(hooksCmd)
+}
+
+var hooksCmd = &cobra.Command{
+	Use:   "hooks",
+	Short: "Run all hooks",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		config, err := cmd.Flags().GetString("config")
+		if err != nil {
+			return err
+		}
+
+		repository, err := cmd.Flags().GetString("repository")
+		if err != nil {
+			return err
+		}
+
+		force, err := cmd.Flags().GetBool("no-cache")
+		if err != nil {
+			return err
+		}
+
+		ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
+		if err != nil {
+			return err
+		}
+
+		releaseConfig := readConfig(config)
+
+		s, err := semanticrelease.New(releaseConfig, repository, !ignoreConfigChecks)
+		if err != nil {
+			return err
+		}
+
+		provider, err := s.GetCIProvider()
+
+		if err != nil {
+			return err
+		}
+
+		releaseVersion, err := s.GetNextVersion(provider, force)
+		if err != nil {
+			return err
+		}
+
+		hook := hooks.New(releaseConfig, releaseVersion)
+
+		err = hook.PreRelease()
+		if err != nil {
+			return err
+		}
+
+		return hook.PostRelease()
+	},
+}

cmd/go-semantic-release/commands/next.go

@@ -30,7 +30,12 @@ var nextCmd = &cobra.Command{
 			return err
 		}
 
-		s, err := semanticrelease.New(readConfig(config), repository)
+		ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
+		if err != nil {
+			return err
+		}
+
+		s, err := semanticrelease.New(readConfig(config), repository, !ignoreConfigChecks)
 		if err != nil {
 			return err
 		}

cmd/go-semantic-release/commands/release.go

@@ -28,7 +28,12 @@ var releaseCmd = &cobra.Command{
 			return err
 		}
 
-		s, err := semanticrelease.New(readConfig(config), repository)
+		ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
+		if err != nil {
+			return err
+		}
+
+		s, err := semanticrelease.New(readConfig(config), repository, !ignoreConfigChecks)
 		if err != nil {
 			return err
 		}

cmd/go-semantic-release/commands/root.go

@@ -35,6 +35,7 @@ func init() {
 	rootCmd.PersistentFlags().StringP("loglevel", "l", "error", "Set loglevel")
 	rootCmd.PersistentFlags().StringP("config", "c", ".release.yml", "Path to config file")
 	rootCmd.PersistentFlags().Bool("no-cache", false, "Ignore cache, don't use in ci build")
+	rootCmd.PersistentFlags().Bool("no-checks", false, "Ignore missing values and envs")
 }
 
 func readConfig(file string) *config.ReleaseConfig {

cmd/go-semantic-release/commands/set.go

@@ -26,7 +26,12 @@ var setCmd = &cobra.Command{
 			return err
 		}
 
-		s, err := semanticrelease.New(readConfig(config), repository)
+		ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
+		if err != nil {
+			return err
+		}
+
+		s, err := semanticrelease.New(readConfig(config), repository, !ignoreConfigChecks)
 		if err != nil {
 			return err
 		}

cmd/go-semantic-release/commands/zip.go

@@ -11,7 +11,7 @@ func init() {
 
 var zipCmd = &cobra.Command{
 	Use:   "zip",
-	Short: "Zip configured artifact from release config",
+	Short: "Zip configured artifact from release config (internal)",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		config, err := cmd.Flags().GetString("config")
 		if err != nil {
@@ -23,7 +23,12 @@ var zipCmd = &cobra.Command{
 			return err
 		}
 
-		s, err := semanticrelease.New(readConfig(config), repository)
+		ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
+		if err != nil {
+			return err
+		}
+
+		s, err := semanticrelease.New(readConfig(config), repository, !ignoreConfigChecks)
 		if err != nil {
 			return err
 		}

examples/changelog.tmpl

@@ -0,0 +1,16 @@
+# My custom release template v{{$.Version}} ({{.Now.Format "2006-01-02"}})
+{{ .Commits -}}
+{{ if .HasDocker}}
+## Docker image
+
+New docker image is released under {{$.Backtick}}{{.DockerRepository}}:{{.Version}}{{$.Backtick}}
+
+### Usage
+
+{{$.Backtick}}docker run {{.DockerRepository}}:{{.Version}}{{$.Backtick}}
+{{ if .HasDockerLatest}}
+or
+
+{{$.Backtick}}docker run {{.DockerRepository}}:latest{{$.Backtick}}
+{{ end -}}
+{{ end -}}

go.mod

@@ -1,6 +1,6 @@
 module github.com/Nightapes/go-semantic-release
 
-go 1.12
+go 1.13
 
 require (
 	github.com/Masterminds/semver v1.4.2
@@ -8,6 +8,7 @@ require (
 	github.com/google/go-cmp v0.3.0 // indirect
 	github.com/google/go-github/v25 v25.1.3
 	github.com/kevinburke/ssh_config v0.0.0-20190630040420-2e50c441276c // indirect
+	github.com/pkg/errors v0.8.1
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
 	github.com/stretchr/testify v1.3.0

go.sum

@@ -55,6 +55,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -62,6 +63,7 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA=
 github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
+github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -72,14 +74,17 @@ github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
 github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=

internal/analyzer/angular.go

@@ -22,7 +22,7 @@ const ANGULAR = "angular"
 
 func newAngular() *angular {
 	return &angular{
-		regex: `(TAG)(?:\((.*)\))?: (.*)`,
+		regex: `^(TAG)(?:\((.*)\))?: (.*)`,
 		log:   log.WithField("analyzer", ANGULAR),
 		rules: []Rule{
 			{

internal/analyzer/angular_test.go

@@ -107,6 +107,11 @@ func TestAngular(t *testing.T) {
 					Author:  "me",
 					Hash:    "12345667",
 				},
+				shared.Commit{
+					Message: "Merge feat(internal/changelog): my first commit",
+					Author:  "me",
+					Hash:    "12345667",
+				},
 			},
 		},
 		{

internal/cache/cache_test.go

@@ -63,7 +63,7 @@ func TestWriteAndReadCache(t *testing.T) {
 						Author:  "Author",
 						Hash:    "Hash",
 					},
-					ParsedMessage:               "add gitlab as relase option",
+					ParsedMessage:               "add gitlab as release option",
 					Scope:                       "releaser",
 					ParsedBreakingChangeMessage: "",
 					Tag:                         "feat",

internal/calculator/calculator.go

@@ -19,9 +19,9 @@ func New() *Calculator {
 }
 
 //IncPrerelease increase prerelease by one
-func (c *Calculator) IncPrerelease(preReleaseType string, version *semver.Version) (semver.Version, error) {
+func (c *Calculator) IncPrerelease(preReleaseType string, version semver.Version) (semver.Version, error) {
 	defaultPrerelease := preReleaseType + ".0"
-	if version.Prerelease() == "" || !strings.HasPrefix(version.Prerelease(), preReleaseType) {
+	if !c.hasPrerelease(version, preReleaseType) {
 		return version.SetPrerelease(defaultPrerelease)
 	}
 
@@ -32,32 +32,56 @@ func (c *Calculator) IncPrerelease(preReleaseType string, version *semver.Versio
 			log.Warnf("Could not parse release tag %s, use version %s", version.Prerelease(), version.String())
 			return version.SetPrerelease(defaultPrerelease)
 		}
-		return version.SetPrerelease(preReleaseType + "." + strconv.Itoa((i + 1)))
+		return version.SetPrerelease(preReleaseType + "." + strconv.Itoa(i+1))
 
 	}
 	log.Warnf("Could not parse release tag %s, use version %s", version.Prerelease(), version.String())
 	return version.SetPrerelease(defaultPrerelease)
 }
 
+func (c *Calculator) hasPrerelease(version semver.Version, preReleaseType string) bool {
+	if version.Prerelease() == "" || !strings.HasPrefix(version.Prerelease(), preReleaseType) {
+		return false
+	}
+	return true
+}
+
 //CalculateNewVersion from given commits and lastversion
 func (c *Calculator) CalculateNewVersion(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version, releaseType string, firstRelease bool) semver.Version {
 	switch releaseType {
 	case "beta", "alpha", "rc":
+		var version = *lastVersion
+		if !c.hasPrerelease(*lastVersion, releaseType) {
+			version, _ = c.inc(commits, lastVersion)
+		}
+
 		if len(commits["major"]) > 0 || len(commits["minor"]) > 0 || len(commits["patch"]) > 0 {
-			version, _ := c.IncPrerelease(releaseType, lastVersion)
+			version, _ := c.IncPrerelease(releaseType, version)
 			return version
 		}
 	case "release":
 		if !firstRelease {
-			if len(commits["major"]) > 0 {
+			if lastVersion.Prerelease() != "" {
-				return lastVersion.IncMajor()
+				newVersion, _ := lastVersion.SetPrerelease("")
-			} else if len(commits["minor"]) > 0 {
+				return newVersion
-				return lastVersion.IncMinor()
+			}
-			} else if len(commits["patch"]) > 0 {
+			version, done := c.inc(commits, lastVersion)
-				return lastVersion.IncPatch()
+			if done {
+				return version
 			}
 		}
 	}
 
 	return *lastVersion
 }
+
+func (c *Calculator) inc(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version) (semver.Version, bool) {
+	if len(commits["major"]) > 0 {
+		return lastVersion.IncMajor(), true
+	} else if len(commits["minor"]) > 0 {
+		return lastVersion.IncMinor(), true
+	} else if len(commits["patch"]) > 0 {
+		return lastVersion.IncPatch(), true
+	}
+	return semver.Version{}, false
+}

internal/calculator/calculator_test.go

@@ -58,9 +58,11 @@ func TestCalculator_IncPrerelease(t *testing.T) {
 	c := calculator.New()
 
 	for _, test := range testConfigs {
-		next, err := c.IncPrerelease(test.preReleaseType, test.lastVersion)
+		t.Run(test.testCase, func(t *testing.T) {
+			next, err := c.IncPrerelease(test.preReleaseType, *test.lastVersion)
 			assert.Equalf(t, test.hasError, err != nil, "Testcase %s should have error: %t -> %s", test.testCase, test.hasError, err)
 			assert.Equal(t, test.nextVersion, next.String())
+		})
 	}
 
 }
@@ -79,7 +81,7 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
 			testCase:    "version with preRelease alpha",
 			releaseType: "alpha",
 			lastVersion: createVersion("1.0.0"),
-			nextVersion: "1.0.0-alpha.0",
+			nextVersion: "1.1.0-alpha.0",
 			analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
 				"major": []shared.AnalyzedCommit{},
 				"minor": []shared.AnalyzedCommit{
@@ -94,7 +96,7 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
 			testCase:    "version with preRelease beta",
 			releaseType: "beta",
 			lastVersion: createVersion("1.0.0"),
-			nextVersion: "1.0.0-beta.0",
+			nextVersion: "1.1.0-beta.0",
 			analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
 				"major": []shared.AnalyzedCommit{},
 				"minor": []shared.AnalyzedCommit{
@@ -135,7 +137,7 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
 			testCase:    "version with commits and rc release",
 			releaseType: "rc",
 			lastVersion: createVersion("1.0.0"),
-			nextVersion: "1.0.0-rc.0",
+			nextVersion: "2.0.0-rc.0",
 			analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
 				"major": []shared.AnalyzedCommit{shared.AnalyzedCommit{}},
 				"minor": []shared.AnalyzedCommit{shared.AnalyzedCommit{}},
@@ -201,8 +203,10 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
 	c := calculator.New()
 
 	for _, test := range testConfigs {
+		t.Run(test.testCase, func(t *testing.T) {
 			next := c.CalculateNewVersion(test.analyzedCommits, test.lastVersion, test.releaseType, test.isFirst)
 			assert.Equalf(t, test.nextVersion, next.String(), "Should have version %s for testcase %s", test.nextVersion, test.testCase)
+		})
 	}
 
 }

internal/changelog/changelog.go

@@ -2,6 +2,7 @@ package changelog
 
 import (
 	"bytes"
+	"io/ioutil"
 	"strings"
 	"text/template"
 	"time"
@@ -13,27 +14,53 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-const defaultChangelogTitle string = `v{{.Version}} ({{.Now.Format "2006-01-02"}})`
+const defaultCommitList string = `{{ range $index,$commit := .BreakingChanges -}}
-const defaultChangelog string = `# v{{$.Version}} ({{.Now.Format "2006-01-02"}})
+{{ if eq $index 0 -}}
-{{ range $index,$commit := .BreakingChanges -}}
-{{ if eq $index 0 }}
 ## BREAKING CHANGES
-{{ end}}
-* **{{$.Backtick}}{{$commit.Scope}}{{$.Backtick}}** {{$commit.ParsedBreakingChangeMessage}}  
-introduced by commit: 
-{{$commit.ParsedMessage}} {{if $.HasURL}} ([{{ printf "%.7s" $commit.Commit.Hash}}]({{ replace $.URL "{{hash}}" $commit.Commit.Hash}}))  {{end}}
 {{ end -}}
-{{ range $key := .Order }}
+* {{ if $commit.Scope }}**{{$.Backtick}}{{$commit.Scope}}{{$.Backtick}}**{{ end }} {{$commit.ParsedBreakingChangeMessage}}  
-{{ $commits := index $.Commits $key}} {{if $commits -}}
+introduced by commit: 
+{{$commit.ParsedMessage}} {{if $.HasURL}} ([{{ printf "%.7s" $commit.Commit.Hash}}]({{ replace $.URL "{{hash}}" $commit.Commit.Hash}})){{end}}
+{{ end -}}
+{{ range $key := .Order  -}}
+{{ $commits := index $.Commits $key -}}
+{{ if $commits -}}
 ### {{ $key }}
 {{ range $index,$commit := $commits -}}
-* **{{$.Backtick}}{{$commit.Scope}}{{$.Backtick}}** {{$commit.ParsedMessage}} {{if $.HasURL}} ([{{ printf "%.7s" $commit.Commit.Hash}}]({{ replace $.URL "{{hash}}" $commit.Commit.Hash}}))  {{end}}
+* {{ if $commit.Scope }}**{{$.Backtick}}{{$commit.Scope}}{{$.Backtick}}** {{end}}{{$commit.ParsedMessage}}{{if $.HasURL}} ([{{ printf "%.7s" $commit.Commit.Hash}}]({{ replace $.URL "{{hash}}" $commit.Commit.Hash}})){{end}}
 {{ end -}}
 {{ end -}}
+{{ end -}}`
+const defaultChangelogTitle string = `v{{.Version}} ({{.Now.Format "2006-01-02"}})`
+const defaultChangelog string = `# v{{$.Version}} ({{.Now.Format "2006-01-02"}})
+{{ .Commits -}}
+{{ if .HasDocker}}
+## Docker image
+
+New docker image is released under {{$.Backtick}}{{.DockerRepository}}:{{.Version}}{{$.Backtick}}
+
+### Usage
+
+{{$.Backtick}}docker run {{.DockerRepository}}:{{.Version}}{{$.Backtick}}
+{{ if .HasDockerLatest}}
+or
+
+{{$.Backtick}}docker run {{.DockerRepository}}:latest{{$.Backtick}}
+{{ end -}}
 {{ end -}}
 `
 
 type changelogContent struct {
+	Commits          string
+	Version          string
+	Now              time.Time
+	Backtick         string
+	HasDocker        bool
+	HasDockerLatest  bool
+	DockerRepository string
+}
+
+type commitsContent struct {
 	Commits         map[string][]shared.AnalyzedCommit
 	BreakingChanges []shared.AnalyzedCommit
 	Order           []string
@@ -91,7 +118,7 @@ func (c *Changelog) GenerateChanglog(templateConfig shared.ChangelogTemplateConf
 		}
 	}
 
-	changelogContent := changelogContent{
+	commitsContent := commitsContent{
 		Version:         templateConfig.Version,
 		Commits:         commitsPerScope,
 		Now:             c.releaseTime,
@@ -102,16 +129,50 @@ func (c *Changelog) GenerateChanglog(templateConfig shared.ChangelogTemplateConf
 		URL:             templateConfig.CommitURL,
 	}
 
-	title, err := generateTemplate(defaultChangelogTitle, changelogContent)
+	changelogContent := changelogContent{
+		Version:          templateConfig.Version,
+		Now:              c.releaseTime,
+		Backtick:         "`",
+		HasDocker:        c.config.Changelog.Docker.Repository != "",
+		HasDockerLatest:  c.config.Changelog.Docker.Latest,
+		DockerRepository: c.config.Changelog.Docker.Repository,
+	}
+	template := defaultChangelog
+	if c.config.Changelog.TemplatePath != "" {
+		content, err := ioutil.ReadFile(c.config.Changelog.TemplatePath)
 		if err != nil {
 			return nil, err
 		}
-	content, err := generateTemplate(defaultChangelog, changelogContent)
+		template = string(content)
+	}
 
-	return &shared.GeneratedChangelog{Title: title, Content: content}, err
+	templateTitle := defaultChangelogTitle
+	if c.config.Changelog.TemplateTitle != "" {
+		templateTitle = c.config.Changelog.TemplateTitle
+	}
+
+	log.Debugf("Render title")
+	renderedTitle, err := generateTemplate(templateTitle, changelogContent)
+	if err != nil {
+		return nil, err
+	}
+
+	log.Debugf("Render commits")
+	renderedCommitList, err := generateTemplate(defaultCommitList, commitsContent)
+	if err != nil {
+		return nil, err
+	}
+
+	log.Tracef("Commits %s", renderedCommitList)
+
+	changelogContent.Commits = renderedCommitList
+	log.Debugf("Render changelog")
+	renderedContent, err := generateTemplate(template, changelogContent)
+
+	return &shared.GeneratedChangelog{Title: renderedTitle, Content: renderedContent}, err
 }
 
-func generateTemplate(text string, values changelogContent) (string, error) {
+func generateTemplate(text string, values interface{}) (string, error) {
 
 	funcMap := template.FuncMap{
 		"replace": replace,

internal/changelog/changelog_test.go

@@ -32,7 +32,7 @@ func TestChangelog(t *testing.T) {
 				"minor": []shared.AnalyzedCommit{
 					shared.AnalyzedCommit{
 						Commit: shared.Commit{
-							Message: "feat(test): my first commit",
+							Message: "feat(internal/changelog): my first commit",
 							Author:  "me",
 							Hash:    "12345667",
 						},
@@ -46,7 +46,30 @@ func TestChangelog(t *testing.T) {
 			},
 			result: &shared.GeneratedChangelog{
 				Title:   "v1.0.0 (2019-07-19)",
-				Content: "# v1.0.0 (2019-07-19)\n\n ### Features\n* **`internal/changelog`** my first commit  ([1234566](https://commit.url))  \n\n ",
+				Content: "# v1.0.0 (2019-07-19)\n### Features\n* **`internal/changelog`** my first commit ([1234566](https://commit.url))\n",
+			},
+			hasError: false,
+		},
+		{
+			testCase: "feat no scope",
+			analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
+				"minor": []shared.AnalyzedCommit{
+					shared.AnalyzedCommit{
+						Commit: shared.Commit{
+							Message: "feat: my first commit",
+							Author:  "me",
+							Hash:    "12345667",
+						},
+						ParsedMessage: "my first commit",
+						Tag:           "feat",
+						TagString:     "Features",
+						Print:         true,
+					},
+				},
+			},
+			result: &shared.GeneratedChangelog{
+				Title:   "v1.0.0 (2019-07-19)",
+				Content: "# v1.0.0 (2019-07-19)\n### Features\n* my first commit ([1234566](https://commit.url))\n",
 			},
 			hasError: false,
 		},
@@ -56,7 +79,7 @@ func TestChangelog(t *testing.T) {
 				"minor": []shared.AnalyzedCommit{
 					shared.AnalyzedCommit{
 						Commit: shared.Commit{
-							Message: "feat(test): my first commit",
+							Message: "feat(internal/changelog): my first commit",
 							Author:  "me",
 							Hash:    "12345667",
 						},
@@ -68,7 +91,7 @@ func TestChangelog(t *testing.T) {
 					},
 					shared.AnalyzedCommit{
 						Commit: shared.Commit{
-							Message: "feat(test): my first break: BREAKING CHANGE: change api to v2",
+							Message: "feat(internal/changelog): my first break: BREAKING CHANGE: change api to v2",
 							Author:  "me",
 							Hash:    "12345668",
 						},
@@ -83,7 +106,7 @@ func TestChangelog(t *testing.T) {
 			},
 			result: &shared.GeneratedChangelog{
 				Title:   "v1.0.0 (2019-07-19)",
-				Content: "# v1.0.0 (2019-07-19)\n\n## BREAKING CHANGES\n\n* **`internal/changelog`** change api to v2  \nintroduced by commit: \nmy first break  ([1234566](https://commit.url))  \n\n ### Features\n* **`internal/changelog`** my first commit  ([1234566](https://commit.url))  \n\n ",
+				Content: "# v1.0.0 (2019-07-19)\n## BREAKING CHANGES\n* **`internal/changelog`** change api to v2  \nintroduced by commit: \nmy first break  ([1234566](https://commit.url))\n### Features\n* **`internal/changelog`** my first commit ([1234566](https://commit.url))\n",
 			},
 			hasError: false,
 		},
@@ -111,9 +134,11 @@ func TestChangelog(t *testing.T) {
 	}, time.Date(2019, 7, 19, 0, 0, 0, 0, time.UTC))
 
 	for _, config := range testConfigs {
+		t.Run(config.testCase, func(t *testing.T) {
 			generatedChangelog, err := cl.GenerateChanglog(templateConfig, config.analyzedCommits)
 			assert.Equalf(t, config.hasError, err != nil, "Testcase %s should have error: %t -> %s", config.testCase, config.hasError, err)
 			assert.Equalf(t, config.result, generatedChangelog, "Testcase %s should have generated changelog", config.testCase)
+		})
 	}
 
 }

internal/ci/ci.go

@@ -3,10 +3,11 @@ package ci
 import (
 	"fmt"
 
-	"github.com/Nightapes/go-semantic-release/internal/gitutil"
-	log "github.com/sirupsen/logrus"
 	"os"
 	"strings"
+
+	"github.com/Nightapes/go-semantic-release/internal/gitutil"
+	log "github.com/sirupsen/logrus"
 )
 
 //ProviderConfig struct
@@ -38,21 +39,27 @@ func ReadAllEnvs() map[string]string {
 }
 
 //GetCIProvider get provider
-func GetCIProvider(gitUtil *gitutil.GitUtil, envs map[string]string) (*ProviderConfig, error) {
+func GetCIProvider(gitUtil *gitutil.GitUtil, configCheck bool, envs map[string]string) (*ProviderConfig, error) {
 
 	services := []Service{
 		Travis{},
 		GithubActions{},
-		Git{gitUtil: gitUtil}, // GIt must be the last option to check
+		GitlabCI{},
+		Git{gitUtil: gitUtil}, // Git must be the last option to check
 	}
 
 	for _, service := range services {
 		config, err := service.detect(envs)
 		if err == nil {
 			log.Infof("Found CI: %s", config.Name)
+			log.Tracef("Found CI config: %+v", config)
 			return config, nil
 		}
 		log.Debugf("%s", err.Error())
 	}
+	if configCheck {
 		return nil, fmt.Errorf("could not find any CI, if running locally set env CI=true")
+
+	}
+	return Git{gitUtil: gitUtil}.detect(map[string]string{"CI": "true"})
 }

internal/ci/ci_test.go

@@ -111,10 +111,23 @@ func TestCi(t *testing.T) {
 			result:   &ci.ProviderConfig{IsPR: false, PR: "", PRBranch: "", Branch: "feature-branch-1", Tag: "", Commit: "190bfd6aa60022afd0ef830342cfb07e33c45f37", BuildURL: "", Service: "GithubActions", Name: "GithubActions CI"},
 			hasError: false,
 		},
+		{
+			service: "GitLab CI/CD PR",
+			envs: map[string]string{
+				"GITLAB_CI":          "true",
+				"CI_COMMIT_SHA":      "190bfd6aa60022afd0ef830342cfb07e33c45f37",
+				"CI_COMMIT_REF_NAME": "master",
+				"CI_COMMIT_TAG":      "tag",
+				"CI_PROJECT_URL":     "https://my.gitlab.com",
+				"CI_PIPELINE_ID":     "1",
+			},
+			result:   &ci.ProviderConfig{IsPR: false, PR: "", PRBranch: "", Branch: "master", Tag: "tag", Commit: "190bfd6aa60022afd0ef830342cfb07e33c45f37", BuildURL: "https://my.gitlab.com/pipelines/1", Service: "gitlab", Name: "GitLab CI/CD"},
+			hasError: false,
+		},
 	}
 
 	for _, config := range testConfigs {
-		provider, err := ci.GetCIProvider(gitUtilInMemory, config.envs)
+		provider, err := ci.GetCIProvider(gitUtilInMemory, true, config.envs)
 		assert.Equalf(t, config.hasError, err != nil, "Service %s should have error: %t -> %s", config.service, config.hasError, err)
 		assert.Equalf(t, config.result, provider, "Service %s should have provider", config.service)
 	}

internal/ci/gitlab_ci.go

@@ -0,0 +1,26 @@
+package ci
+
+import (
+	"fmt"
+)
+
+//GitlabCI struct
+type GitlabCI struct{}
+
+//Detect if on GitlabCI
+func (t GitlabCI) detect(envs map[string]string) (*ProviderConfig, error) {
+
+	if _, exists := envs["GITLAB_CI"]; !exists {
+		return nil, fmt.Errorf("not running on gitlab")
+	}
+
+	return &ProviderConfig{
+		Service:  "gitlab",
+		Name:     "GitLab CI/CD",
+		Commit:   envs["CI_COMMIT_SHA"],
+		Tag:      envs["CI_COMMIT_TAG"],
+		BuildURL: envs["CI_PROJECT_URL"] + "/pipelines/" + envs["CI_PIPELINE_ID"],
+		Branch:   envs["CI_COMMIT_REF_NAME"],
+		IsPR:     false,
+	}, nil
+}

internal/gitutil/gitutil.go

@@ -5,12 +5,15 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/pkg/errors"
+
 	"github.com/Masterminds/semver"
+	"github.com/Nightapes/go-semantic-release/internal/shared"
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
-	"github.com/Nightapes/go-semantic-release/internal/shared"
+	"gopkg.in/src-d/go-git.v4/plumbing/storer"
 )
 
 // GitUtil struct
@@ -87,7 +90,7 @@ func (g *GitUtil) GetLastVersion() (*semver.Version, string, error) {
 
 	err = gitTags.ForEach(func(p *plumbing.Reference) error {
 		v, err := semver.NewVersion(p.Name().Short())
-		log.Tracef("%+v with hash: %s", p.Target(), p.Hash())
+		log.Tracef("Tag %+v with hash: %s", p.Name().Short(), p.Hash())
 
 		if err == nil {
 			tags = append(tags, v)
@@ -139,7 +142,7 @@ func (g *GitUtil) GetCommits(lastTagHash string) ([]shared.Commit, error) {
 		if c.Hash.String() == lastTagHash {
 			log.Debugf("Found commit with hash %s, will stop here", c.Hash.String())
 			foundEnd = true
-
+			return storer.ErrStop
 		}
 		if !foundEnd {
 			log.Tracef("Found commit with hash %s", c.Hash.String())
@@ -153,5 +156,9 @@ func (g *GitUtil) GetCommits(lastTagHash string) ([]shared.Commit, error) {
 		return nil
 	})
 
-	return commits, err
+	if err != nil {
+		return commits, errors.Wrap(err, "Could not read commits, check git clone depth in your ci")
+	}
+
+	return commits, nil
 }

internal/hooks/hooks.go

@@ -0,0 +1,77 @@
+package hooks
+
+import (
+	"bufio"
+	"os/exec"
+	"runtime"
+	"strings"
+
+	"github.com/Nightapes/go-semantic-release/internal/shared"
+	"github.com/Nightapes/go-semantic-release/pkg/config"
+	log "github.com/sirupsen/logrus"
+)
+
+//Hooks struct
+type Hooks struct {
+	version *shared.ReleaseVersion
+	config  *config.ReleaseConfig
+}
+
+// New hooks struct
+func New(config *config.ReleaseConfig, version *shared.ReleaseVersion) *Hooks {
+	return &Hooks{
+		config:  config,
+		version: version,
+	}
+}
+
+// PreRelease runs before creating release
+func (h *Hooks) PreRelease() error {
+	log.Infof("Run pre release hooks")
+	for _, cmd := range h.config.Hooks.PreRelease {
+		log.Debugf("Run %s", cmd)
+		err := h.runCommand(cmd)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// PostRelease runs after creating release
+func (h *Hooks) PostRelease() error {
+	log.Infof("Run post release hooks")
+	for _, cmd := range h.config.Hooks.PostRelease {
+		err := h.runCommand(cmd)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (h *Hooks) runCommand(command string) error {
+
+	cmdReplaced := strings.ReplaceAll(command, "$RELEASE_VERSION", h.version.Next.Version.String())
+
+	var cmd *exec.Cmd
+	if runtime.GOOS == "windows" {
+		cmd = exec.Command("cmd.exe", "/C", cmdReplaced)
+	} else {
+		cmd = exec.Command("sh", "-c", cmdReplaced)
+	}
+
+	cmdReader, err := cmd.StdoutPipe()
+	if err != nil {
+		return err
+	}
+
+	scanner := bufio.NewScanner(cmdReader)
+	go func() {
+		for scanner.Scan() {
+			log.WithField("cmd", strings.Fields(cmdReplaced)[0]).Infof("%s\n", scanner.Text())
+		}
+	}()
+
+	return cmd.Run()
+}

internal/hooks/hooks_test.go

@@ -0,0 +1,103 @@
+package hooks_test
+
+import (
+	"os"
+	"testing"
+
+	"github.com/Masterminds/semver"
+	"github.com/Nightapes/go-semantic-release/internal/hooks"
+	"github.com/Nightapes/go-semantic-release/internal/shared"
+	"github.com/Nightapes/go-semantic-release/pkg/config"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPreReleaseHooks(t *testing.T) {
+
+	os.Setenv("GO_WANT_HELPER_PROCESS", "1")
+	hooks := hooks.New(&config.ReleaseConfig{
+		Hooks: config.Hooks{
+			PreRelease: []string{
+				"go test -test.run=TestHelperProcess -- " + "$RELEASE_VERSION",
+			},
+		},
+	},
+		&shared.ReleaseVersion{
+			Next: shared.ReleaseVersionEntry{
+				Version: createVersion("1.0.0"),
+			},
+		})
+	err := hooks.PreRelease()
+	assert.NoError(t, err)
+	os.Unsetenv("GO_WANT_HELPER_PROCESS")
+
+}
+
+func TestPreReleaseHooksError(t *testing.T) {
+
+	hooks := hooks.New(&config.ReleaseConfig{
+		Hooks: config.Hooks{
+			PreRelease: []string{
+				"exit 1",
+			},
+		},
+	},
+		&shared.ReleaseVersion{
+			Next: shared.ReleaseVersionEntry{
+				Version: createVersion("1.0.0"),
+			},
+		})
+	err := hooks.PreRelease()
+	assert.Error(t, err)
+}
+
+func TestPostReleaseHooks(t *testing.T) {
+
+	os.Setenv("GO_WANT_HELPER_PROCESS", "1")
+	hooks := hooks.New(&config.ReleaseConfig{
+		Hooks: config.Hooks{
+			PostRelease: []string{
+				"go test -test.run=TestHelperProcess -- " + "$RELEASE_VERSION",
+			},
+		},
+	},
+		&shared.ReleaseVersion{
+			Next: shared.ReleaseVersionEntry{
+				Version: createVersion("1.0.0"),
+			},
+		})
+	err := hooks.PostRelease()
+	assert.NoError(t, err)
+	os.Unsetenv("GO_WANT_HELPER_PROCESS")
+
+}
+
+func TestPostReleaseHooksError(t *testing.T) {
+
+	hooks := hooks.New(&config.ReleaseConfig{
+		Hooks: config.Hooks{
+			PostRelease: []string{
+				"exit 1",
+			},
+		},
+	},
+		&shared.ReleaseVersion{
+			Next: shared.ReleaseVersionEntry{
+				Version: createVersion("1.0.0"),
+			},
+		})
+	err := hooks.PostRelease()
+	assert.Error(t, err)
+}
+
+func TestHelperProcess(t *testing.T) {
+	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
+
+		return
+	}
+	assert.Contains(t, os.Args, "1.0.0")
+}
+
+func createVersion(version string) *semver.Version {
+	ver, _ := semver.NewVersion(version)
+	return ver
+}

internal/releaser/git/git.go

@@ -0,0 +1,101 @@
+package git
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/Nightapes/go-semantic-release/internal/gitutil"
+	"github.com/Nightapes/go-semantic-release/internal/shared"
+	"github.com/Nightapes/go-semantic-release/pkg/config"
+	"gopkg.in/src-d/go-git.v4"
+	gitConfig "gopkg.in/src-d/go-git.v4/config"
+	"gopkg.in/src-d/go-git.v4/plumbing/object"
+	"gopkg.in/src-d/go-git.v4/plumbing/transport/http"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// GITONLY identifer for git interface
+const GITONLY = "git"
+
+// Client type struct
+type Client struct {
+	config *config.GitProvider
+	log    *log.Entry
+	git    *gitutil.GitUtil
+}
+
+// New initialize a new gitRelease
+func New(config *config.GitProvider, git *gitutil.GitUtil, checkConfig bool) (*Client, error) {
+
+	logger := log.WithField("releaser", GITONLY)
+
+	if config.Email == "" && checkConfig {
+		return nil, fmt.Errorf("git email not set")
+	}
+
+	if config.Username == "" && checkConfig {
+		return nil, fmt.Errorf("git username not set")
+	}
+
+	if !config.SSH && config.Auth == "" && checkConfig {
+		return nil, fmt.Errorf("git auth not set")
+	}
+
+	if config.SSH {
+		return nil, fmt.Errorf("git ssh not supported yet")
+	}
+
+	return &Client{
+		config: config,
+		log:    logger,
+		git:    git,
+	}, nil
+}
+
+//GetCommitURL for git
+func (g *Client) GetCommitURL() string {
+	return ""
+}
+
+//GetCompareURL for git
+func (g *Client) GetCompareURL(oldVersion, newVersion string) string {
+	return ""
+}
+
+// CreateRelease creates release on remote
+func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedChangelog *shared.GeneratedChangelog) error {
+
+	tag := "v" + releaseVersion.Next.Version.String()
+	g.log.Infof("create release with version %s", tag)
+
+	head, err := g.git.Repository.Head()
+	if err != nil {
+		return err
+	}
+
+	_, err = g.git.Repository.CreateTag(tag, head.Hash(), &git.CreateTagOptions{Message: "Release " + tag, Tagger: &object.Signature{
+		Name:  g.config.Username,
+		Email: g.config.Email,
+		When:  time.Now(),
+	}})
+	if err != nil {
+		return err
+	}
+
+	g.log.Infof("Created release")
+
+	return g.git.Repository.Push(&git.PushOptions{
+		Auth: &http.BasicAuth{
+			Username: g.config.Username,
+			Password: g.config.Auth,
+		},
+		RefSpecs: []gitConfig.RefSpec{"refs/tags/*:refs/tags/*"},
+	})
+
+}
+
+// UploadAssets uploads specified assets
+func (g *Client) UploadAssets(repoDir string, assets []config.Asset) error {
+	return nil
+}

internal/releaser/github/github.go

@@ -29,17 +29,27 @@ type Client struct {
 }
 
 // New initialize a new GitHubRelease
-func New(c *config.GitHubProvider) (*Client, error) {
+func New(c *config.GitHubProvider, checkConfig bool) (*Client, error) {
-	var err error
 
-	if c.AccessToken, err = util.GetAccessToken("GITHUB_TOKEN"); err != nil {
+	token, err := util.GetAccessToken("GITHUB_TOKEN")
+	if err != nil && checkConfig {
 		return &Client{}, err
 	}
+	c.AccessToken = token
 	ctx := context.Background()
 	httpClient := util.CreateBearerHTTPClient(ctx, c.AccessToken)
 
 	var client *github.Client
 	baseURL := "https://github.com"
+
+	if c.Repo == "" && checkConfig {
+		return nil, fmt.Errorf("github repro is not set")
+	}
+
+	if c.User == "" && checkConfig {
+		return nil, fmt.Errorf("github user is not set")
+	}
+
 	if c.CustomURL == "" {
 		client = github.NewClient(httpClient)
 	} else {
@@ -54,7 +64,7 @@ func New(c *config.GitHubProvider) (*Client, error) {
 		context: ctx,
 		baseURL: baseURL,
 		log:     log.WithField("releaser", GITHUB),
-	}, err
+	}, nil
 }
 
 //GetCommitURL for github
@@ -67,26 +77,10 @@ func (g *Client) GetCompareURL(oldVersion, newVersion string) string {
 	return fmt.Sprintf("%s/%s/%s/compare/%s...%s", g.baseURL, g.config.User, g.config.Repo, oldVersion, newVersion)
 }
 
-//ValidateConfig for github
-func (g *Client) ValidateConfig() error {
-	g.log.Debugf("validate GitHub provider config")
-
-	if g.config.Repo == "" {
-		return fmt.Errorf("github Repro is not set")
-	}
-
-	if g.config.User == "" {
-		return fmt.Errorf("github User is not set")
-	}
-
-	return nil
-
-}
-
 // CreateRelease creates release on remote
 func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedChangelog *shared.GeneratedChangelog) error {
 
-	tag := releaseVersion.Next.Version.String()
+	tag := "v" + releaseVersion.Next.Version.String()
 	g.log.Debugf("create release with version %s", tag)
 
 	prerelease := releaseVersion.Next.Version.Prerelease() != ""

internal/releaser/github/github_test.go

@@ -48,29 +48,6 @@ var testNewClient = []testHelperMethodStruct{
 	},
 }
 
-var testHelperMethod = []testHelperMethodStruct{
-	testHelperMethodStruct{config: config.GitHubProvider{
-		Repo: "foo",
-		User: "bar",
-	},
-		valid: true,
-	},
-
-	testHelperMethodStruct{config: config.GitHubProvider{
-		Repo: "",
-		User: "bar",
-	},
-		valid: false,
-	},
-
-	testHelperMethodStruct{config: config.GitHubProvider{
-		Repo: "foo",
-		User: "",
-	},
-		valid: false,
-	},
-}
-
 var lastVersion, _ = semver.NewVersion("1.0.0")
 var newVersion, _ = semver.NewVersion("2.0.0")
 
@@ -146,7 +123,7 @@ func TestNew(t *testing.T) {
 			os.Setenv("GITHUB_TOKEN", "XXX")
 		}
 
-		_, err := github.New(&testOject.config)
+		_, err := github.New(&testOject.config, true)
 		assert.Equal(t, testOject.valid, err == nil)
 
 		os.Unsetenv("GITHUB_TOKEN")
@@ -157,7 +134,7 @@ func TestNew(t *testing.T) {
 func TestGetCommitURL(t *testing.T) {
 	os.Setenv("GITHUB_TOKEN", "XX")
 	for _, testOject := range testNewClient {
-		client, _ := github.New(&testOject.config)
+		client, _ := github.New(&testOject.config, false)
 		actualURL := client.GetCommitURL()
 		if testOject.config.CustomURL != "" {
 			expectedURL := fmt.Sprintf("%s/%s/%s/commit/{{hash}}", testOject.config.CustomURL, testOject.config.User, testOject.config.Repo)
@@ -175,7 +152,7 @@ func TestGetCommitURL(t *testing.T) {
 func TestGetCompareURL(t *testing.T) {
 	os.Setenv("GITHUB_TOKEN", "XX")
 	for _, testOject := range testNewClient {
-		client, _ := github.New(&testOject.config)
+		client, _ := github.New(&testOject.config, false)
 		actualURL := client.GetCompareURL("1", "2")
 		if testOject.config.CustomURL != "" {
 			expectedURL := fmt.Sprintf("%s/%s/%s/compare/%s...%s", testOject.config.CustomURL, testOject.config.User, testOject.config.Repo, "1", "2")
@@ -190,18 +167,6 @@ func TestGetCompareURL(t *testing.T) {
 
 }
 
-func TestValidateConfig(t *testing.T) {
-	os.Setenv("GITHUB_TOKEN", "XX")
-	for _, testOject := range testHelperMethod {
-		client, _ := github.New(&testOject.config)
-		err := client.ValidateConfig()
-
-		assert.Equal(t, testOject.valid, err == nil)
-
-	}
-	os.Unsetenv("GITHUB_TOKEN")
-}
-
 func TestCreateRelease(t *testing.T) {
 	os.Setenv("GITHUB_TOKEN", "XX")
 
@@ -209,7 +174,7 @@ func TestCreateRelease(t *testing.T) {
 		if testObejct.valid {
 			server := initHTTPServer(testObejct.requestResponseCode, testObejct.requestResponseBody)
 			testObejct.config.CustomURL = server.URL
-			client, _ := github.New(&testObejct.config)
+			client, _ := github.New(&testObejct.config, false)
 
 			err := client.CreateRelease(testObejct.releaseVersion, testObejct.generatedChangelog)
 			if err != nil {
@@ -221,7 +186,7 @@ func TestCreateRelease(t *testing.T) {
 
 		} else {
 			testObejct.config.CustomURL = "http://foo"
-			client, _ := github.New(&testObejct.config)
+			client, _ := github.New(&testObejct.config, false)
 
 			err := client.CreateRelease(testObejct.releaseVersion, testObejct.generatedChangelog)
 			if err != nil {

internal/releaser/gitlab/gitlab.go

@@ -2,7 +2,6 @@ package gitlab
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -26,7 +25,6 @@ const GITLAB = "gitlab"
 // Client type struct
 type Client struct {
 	config  *config.GitLabProvider
-	context context.Context
 	client  *http.Client
 	baseURL string
 	apiURL  string
@@ -36,12 +34,17 @@ type Client struct {
 }
 
 // New initialize a new gitlabRelease
-func New(config *config.GitLabProvider, accessToken string) (*Client, error) {
+func New(config *config.GitLabProvider, checkConfig bool) (*Client, error) {
-	ctx := context.Background()
+	accessToken, err := util.GetAccessToken(fmt.Sprintf("%s_ACCESS_TOKEN", strings.ToUpper(GITLAB)))
+	if err != nil && checkConfig {
+		return nil, err
+	}
+
 	tokenHeader := util.NewAddHeaderTransport(nil, "PRIVATE-TOKEN", accessToken)
 	acceptHeader := util.NewAddHeaderTransport(tokenHeader, "Accept", "application/json")
+	contentHeader := util.NewAddHeaderTransport(acceptHeader, "Content-Type", "application/json")
 	httpClient := &http.Client{
-		Transport: acceptHeader,
+		Transport: contentHeader,
 		Timeout:   time.Second * 60,
 	}
 
@@ -49,7 +52,7 @@ func New(config *config.GitLabProvider, accessToken string) (*Client, error) {
 
 	logger.Debugf("validate gitlab provider config")
 
-	if config.Repo == "" {
+	if config.Repo == "" && checkConfig {
 		return nil, fmt.Errorf("gitlab Repro is not set")
 	}
 
@@ -65,7 +68,6 @@ func New(config *config.GitLabProvider, accessToken string) (*Client, error) {
 	return &Client{
 		token:   accessToken,
 		config:  config,
-		context: ctx,
 		baseURL: config.CustomURL,
 		apiURL:  config.CustomURL + "/api/v4",
 		client:  httpClient,
@@ -83,16 +85,10 @@ func (g *Client) GetCompareURL(oldVersion, newVersion string) string {
 	return fmt.Sprintf("%s/%s/compare/%s...%s", g.baseURL, g.config.Repo, oldVersion, newVersion)
 }
 
-//ValidateConfig for gitlab
-func (g *Client) ValidateConfig() error {
-	return nil
-
-}
-
 // CreateRelease creates release on remote
 func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedChangelog *shared.GeneratedChangelog) error {
 
-	tag := releaseVersion.Next.Version.String()
+	tag := "v" + releaseVersion.Next.Version.String()
 	g.Release = tag
 	g.log.Infof("create release with version %s", tag)
 	url := fmt.Sprintf("%s/projects/%s/releases", g.apiURL, util.PathEscape(g.config.Repo))
@@ -108,6 +104,8 @@ func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedC
 		return err
 	}
 
+	g.log.Tracef("Send release config %s", bodyBytes)
+
 	req, err := http.NewRequest("POST", url, bytes.NewReader(bodyBytes))
 	if err != nil {
 		return fmt.Errorf("could not create request: %s", err.Error())
@@ -123,7 +121,7 @@ func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedC
 		return err
 	}
 
-	g.log.Infof("Crated release")
+	g.log.Infof("Created release")
 
 	return nil
 }

internal/releaser/gitlab/gitlab_test.go

@@ -13,54 +13,61 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 
-	//"github.com/Nightapes/go-semantic-release/internal/releaser/util"
 	"github.com/Nightapes/go-semantic-release/internal/releaser/gitlab"
 	"github.com/Nightapes/go-semantic-release/internal/shared"
 	"github.com/Nightapes/go-semantic-release/pkg/config"
 )
 
 func TestGetCommitURL(t *testing.T) {
-
+	os.Setenv("GITLAB_ACCESS_TOKEN", "XXX")
+	defer os.Unsetenv("GITLAB_ACCESS_TOKEN")
 	client, err := gitlab.New(&config.GitLabProvider{
 		CustomURL: "https://localhost/",
 		Repo:      "test/test",
-	}, "aToken")
+	}, true)
 	assert.NoError(t, err)
 	assert.Equal(t, "https://localhost/test/test/commit/{{hash}}", client.GetCommitURL())
 }
 
 func TestGetCompareURL(t *testing.T) {
-
+	os.Setenv("GITLAB_ACCESS_TOKEN", "XXX")
+	defer os.Unsetenv("GITLAB_ACCESS_TOKEN")
 	client, err := gitlab.New(&config.GitLabProvider{
 		CustomURL: "https://localhost/",
 		Repo:      "test/test",
-	}, "aToken")
+	}, true)
 	assert.NoError(t, err)
 	assert.Equal(t, "https://localhost/test/test/compare/1.0.0...1.0.1", client.GetCompareURL("1.0.0", "1.0.1"))
 }
 
 func TestValidateConfig_EmptyRepro(t *testing.T) {
+	os.Setenv("GITLAB_ACCESS_TOKEN", "XXX")
+	defer os.Unsetenv("GITLAB_ACCESS_TOKEN")
 	_, err := gitlab.New(&config.GitLabProvider{
 		CustomURL: "https://localhost/",
-	}, "aToken")
+	}, true)
 	assert.Error(t, err)
 }
 
 func TestValidateConfig_DefaultURL(t *testing.T) {
+	os.Setenv("GITLAB_ACCESS_TOKEN", "XXX")
+	defer os.Unsetenv("GITLAB_ACCESS_TOKEN")
 	config := &config.GitLabProvider{
 		Repo: "localhost/test",
 	}
-	_, err := gitlab.New(config, "aToken")
+	_, err := gitlab.New(config, true)
 	assert.NoError(t, err)
 	assert.Equal(t, "https://gitlab.com", config.CustomURL)
 }
 
 func TestValidateConfig_CustomURL(t *testing.T) {
+	os.Setenv("GITLAB_ACCESS_TOKEN", "XXX")
+	defer os.Unsetenv("GITLAB_ACCESS_TOKEN")
 	config := &config.GitLabProvider{
 		Repo:      "/localhost/test/",
 		CustomURL: "https://localhost/",
 	}
-	_, err := gitlab.New(config, "aToken")
+	_, err := gitlab.New(config, true)
 	assert.NoError(t, err)
 	assert.Equal(t, "https://localhost", config.CustomURL)
 	assert.Equal(t, "localhost/test", config.Repo)
@@ -101,7 +108,7 @@ func TestCreateRelease(t *testing.T) {
 			},
 			responseBody: "{}",
 			responseCode: 200,
-			requestBody:  `{"tag_name":"2.0.0","name":"title","ref":"master","description":"content","assets":{"links":null}}`,
+			requestBody:  `{"tag_name":"v2.0.0","name":"title","ref":"master","description":"content"}`,
 			valid:        true,
 		},
 		{
@@ -125,7 +132,7 @@ func TestCreateRelease(t *testing.T) {
 			},
 			responseBody: "{}",
 			responseCode: 500,
-			requestBody:  `{"tag_name":"2.0.0","name":"title","ref":"master","description":"content","assets":{"links":null}}`,
+			requestBody:  `{"tag_name":"v2.0.0","name":"title","ref":"master","description":"content"}`,
 			valid:        false,
 		},
 		{
@@ -150,7 +157,7 @@ func TestCreateRelease(t *testing.T) {
 			},
 			responseCode: 400,
 			responseBody: "{}",
-			requestBody:  `{"tag_name":"2.0.0","name":"title","ref":"master","description":"content","assets":{"links":null}}`,
+			requestBody:  `{"tag_name":"v2.0.0","name":"title","ref":"master","description":"content"}`,
 			valid:        false,
 		},
 	}
@@ -181,8 +188,9 @@ func TestCreateRelease(t *testing.T) {
 		if testObject.config.CustomURL == "" {
 			testObject.config.CustomURL = testServer.URL
 		}
-
+		os.Setenv("GITLAB_ACCESS_TOKEN", "aToken")
-		client, err := gitlab.New(&testObject.config, "aToken")
+		defer os.Unsetenv("GITLAB_ACCESS_TOKEN")
+		client, err := gitlab.New(&testObject.config, false)
 		assert.NoError(t, err)
 
 		err = client.CreateRelease(testObject.releaseVersion, testObject.generatedChangelog)
@@ -307,8 +315,9 @@ func TestUploadAssets(t *testing.T) {
 		if testObject.config.CustomURL == "" {
 			testObject.config.CustomURL = testServer.URL
 		}
-
+		os.Setenv("GITLAB_ACCESS_TOKEN", "aToken")
-		client, err := gitlab.New(&testObject.config, "aToken")
+		defer os.Unsetenv("GITLAB_ACCESS_TOKEN")
+		client, err := gitlab.New(&testObject.config, false)
 		assert.NoError(t, err)
 		client.Release = "1.0.0"
 

internal/releaser/gitlab/types.go

@@ -6,9 +6,6 @@ type Release struct {
 	Name        string `json:"name"`
 	Ref         string `json:"ref"`
 	Description string `json:"description,omitempty"`
-	Assets      struct {
-		Links []*ReleaseLink `json:"links"`
-	} `json:"assets"`
 }
 
 // ReleaseLink struct

internal/releaser/releaser.go

@@ -2,11 +2,11 @@ package releaser
 
 import (
 	"fmt"
-	"strings"
 
+	"github.com/Nightapes/go-semantic-release/internal/gitutil"
+	"github.com/Nightapes/go-semantic-release/internal/releaser/git"
 	"github.com/Nightapes/go-semantic-release/internal/releaser/github"
 	"github.com/Nightapes/go-semantic-release/internal/releaser/gitlab"
-	"github.com/Nightapes/go-semantic-release/internal/releaser/util"
 	"github.com/Nightapes/go-semantic-release/internal/shared"
 
 	"github.com/Nightapes/go-semantic-release/pkg/config"
@@ -16,37 +16,37 @@ import (
 // Releasers struct type
 type Releasers struct {
 	config *config.ReleaseConfig
+	git    *gitutil.GitUtil
 }
 
 // Releaser interface for providers
 type Releaser interface {
-	ValidateConfig() error
 	CreateRelease(*shared.ReleaseVersion, *shared.GeneratedChangelog) error
 	UploadAssets(repoDir string, assets []config.Asset) error
 	GetCommitURL() string
 	GetCompareURL(oldVersion, newVersion string) string
 }
 
-// New initialize a Relerser
+// New initialize a releaser
-func New(c *config.ReleaseConfig) *Releasers {
+func New(c *config.ReleaseConfig, git *gitutil.GitUtil) *Releasers {
 	return &Releasers{
 		config: c,
+		git:    git,
 	}
 }
 
 //GetReleaser returns an initialized releaser
-func (r *Releasers) GetReleaser() (Releaser, error) {
+func (r *Releasers) GetReleaser(checkConfig bool) (Releaser, error) {
 	switch r.config.Release {
 	case github.GITHUB:
 		log.Debugf("initialize new %s-provider", github.GITHUB)
-		return github.New(&r.config.GitHubProvider)
+		return github.New(&r.config.GitHubProvider, checkConfig)
 	case gitlab.GITLAB:
 		log.Debugf("initialize new %s-provider", gitlab.GITLAB)
-		accessToken, err := util.GetAccessToken(fmt.Sprintf("%s_ACCESS_TOKEN", strings.ToUpper(gitlab.GITLAB)))
+		return gitlab.New(&r.config.GitLabProvider, checkConfig)
-		if err != nil {
+	case git.GITONLY:
-			return nil, err
+		log.Debugf("initialize new %s-provider", git.GITONLY)
-		}
+		return git.New(&r.config.GitProvider, r.git, checkConfig)
-		return gitlab.New(&r.config.GitLabProvider, accessToken)
 	}
 	return nil, fmt.Errorf("could not initialize a releaser from this type: %s", r.config.Release)
 }

pkg/config/config.go

@@ -3,6 +3,7 @@ package config
 
 import (
 	"io/ioutil"
+	"os"
 
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
@@ -11,8 +12,22 @@ import (
 // ChangelogConfig struct
 type ChangelogConfig struct {
 	PrintAll      bool            `yaml:"printAll,omitempty"`
-	Template     string `yaml:"template,omitempty"`
+	TemplateTitle string          `yaml:"title,omitempty"`
 	TemplatePath  string          `yaml:"templatePath,omitempty"`
+	Docker        ChangelogDocker `yaml:"docker,omitempty"`
+	NPM           ChangelogNPM    `yaml:"npm,omitempty"`
+}
+
+//ChangelogDocker type struct
+type ChangelogDocker struct {
+	Latest     bool   `yaml:"latest"`
+	Repository string `yaml:"repository"`
+}
+
+//ChangelogNPM type struct
+type ChangelogNPM struct {
+	YARN       bool   `yaml:"latest"`
+	Repository string `yaml:"repository"`
 }
 
 //Asset type struct
@@ -36,6 +51,20 @@ type GitLabProvider struct {
 	AccessToken string
 }
 
+// GitProvider struct
+type GitProvider struct {
+	Email    string `yaml:"email"`
+	Username string `yaml:"user"`
+	Auth     string `yaml:"auth"`
+	SSH      bool   `yaml:"ssh"`
+}
+
+// Hooks struct
+type Hooks struct {
+	PreRelease  []string `yaml:"preRelease"`
+	PostRelease []string `yaml:"postRelease"`
+}
+
 // ReleaseConfig struct
 type ReleaseConfig struct {
 	CommitFormat   string            `yaml:"commitFormat"`
@@ -44,7 +73,9 @@ type ReleaseConfig struct {
 	Release        string            `yaml:"release,omitempty"`
 	GitHubProvider GitHubProvider    `yaml:"github,omitempty"`
 	GitLabProvider GitLabProvider    `yaml:"gitlab,omitempty"`
+	GitProvider    GitProvider       `yaml:"git,omitempty"`
 	Assets         []Asset           `yaml:"assets"`
+	Hooks          Hooks             `yaml:"hooks"`
 	ReleaseTitle   string            `yaml:"title"`
 	IsPreRelease   bool
 }
@@ -57,13 +88,31 @@ func Read(configPath string) (*ReleaseConfig, error) {
 		return &ReleaseConfig{}, err
 	}
 
-	var releaseConfig ReleaseConfig
+	log.Tracef("Found config %s", string(content))
-	err = yaml.Unmarshal(content, &releaseConfig)
+	releaseConfig := &ReleaseConfig{}
+	err = yaml.Unmarshal(content, releaseConfig)
 	if err != nil {
 		return &ReleaseConfig{}, err
 	}
 
-	log.Tracef("Found config %+v", releaseConfig)
+	org := *releaseConfig
 
-	return &releaseConfig, nil
+	releaseConfig.Hooks = Hooks{}
+
+	configWithoutHooks, err := yaml.Marshal(releaseConfig)
+	if err != nil {
+		return &ReleaseConfig{}, err
+	}
+	configWithoutHooks = []byte(os.ExpandEnv(string(configWithoutHooks)))
+	releaseConfigWithExpanedEnvs := &ReleaseConfig{}
+	err = yaml.Unmarshal(configWithoutHooks, releaseConfigWithExpanedEnvs)
+	if err != nil {
+		return &ReleaseConfig{}, err
+	}
+
+	releaseConfigWithExpanedEnvs.Hooks = org.Hooks
+
+	log.Tracef("Found config %+v", releaseConfigWithExpanedEnvs)
+
+	return releaseConfigWithExpanedEnvs, nil
 }

pkg/config/config_test.go

@@ -41,6 +41,9 @@ func TestWriteAndReadCache(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(dir)
 
+	os.Setenv("TEST_CONFIG", "value")
+	defer os.Unsetenv("TEST_CONFIG")
+
 	completePath := path.Join(path.Dir(dir), ".release.yml")
 	content := []byte(`
 commitFormat: angular
@@ -53,9 +56,12 @@ branch:
   add_git_releases: alpha
 changelog:
   printAll: false
-  template: ''
+  template: ""
-  templatePath: ''
+  templatePath: '${TEST_CONFIG}'
 release: 'github'
+hooks:
+  preRelease:
+    - "Test hook ${RELEASE_VERSION}"
 assets:
   - name: ./build/go-semantic-release
     compress: false
@@ -75,14 +81,19 @@ github:
 		Branch:       map[string]string{"add_git_releases": "alpha", "alpha": "alpha", "beta": "beta", "master": "release", "rc": "rc"},
 		Changelog: config.ChangelogConfig{
 			PrintAll:      false,
-			Template:     "",
+			TemplateTitle: "",
-			TemplatePath: ""},
+			TemplatePath:  "value"},
 		Release: "github",
 		GitHubProvider: config.GitHubProvider{
 			Repo:        "go-semantic-release",
 			User:        "nightapes",
 			CustomURL:   "",
 			AccessToken: ""},
+		Hooks: config.Hooks{
+			PreRelease: []string{
+				"Test hook ${RELEASE_VERSION}",
+			},
+		},
 		Assets: []config.Asset{
 			config.Asset{
 				Name:     "./build/go-semantic-release",
@@ -92,20 +103,3 @@ github:
 	}, result)
 
 }
-
-// func TestWriteNotFound(t *testing.T) {
-
-// 	err := cache.Write("notfound/dir", shared.ReleaseVersion{
-// 		Last: shared.ReleaseVersionEntry{
-// 			Commit:  "12345",
-// 			Version: createVersion("1.0.0"),
-// 		},
-// 		Next: shared.ReleaseVersionEntry{
-// 			Commit:  "12346",
-// 			Version: createVersion("1.1.0"),
-// 		},
-// 		Branch: "master",
-// 	})
-// 	assert.Errorf(t, err, "Write non exsiting file")
-
-// }

pkg/semanticrelease/semantic-release.go

@@ -2,7 +2,6 @@ package semanticrelease
 
 import (
 	"io/ioutil"
-	"strings"
 	"time"
 
 	"github.com/Masterminds/semver"
@@ -12,6 +11,7 @@ import (
 	"github.com/Nightapes/go-semantic-release/internal/changelog"
 	"github.com/Nightapes/go-semantic-release/internal/ci"
 	"github.com/Nightapes/go-semantic-release/internal/gitutil"
+	"github.com/Nightapes/go-semantic-release/internal/hooks"
 	"github.com/Nightapes/go-semantic-release/internal/releaser"
 	"github.com/Nightapes/go-semantic-release/internal/releaser/util"
 	"github.com/Nightapes/go-semantic-release/internal/shared"
@@ -27,10 +27,11 @@ type SemanticRelease struct {
 	calculator  *calculator.Calculator
 	releaser    releaser.Releaser
 	repository  string
+	checkConfig bool
 }
 
 // New SemanticRelease struct
-func New(c *config.ReleaseConfig, repository string) (*SemanticRelease, error) {
+func New(c *config.ReleaseConfig, repository string, checkConfig bool) (*SemanticRelease, error) {
 	util, err := gitutil.New(repository)
 	if err != nil {
 		return nil, err
@@ -41,7 +42,11 @@ func New(c *config.ReleaseConfig, repository string) (*SemanticRelease, error) {
 		return nil, err
 	}
 
-	releaser, err := releaser.New(c).GetReleaser()
+	if !checkConfig {
+		log.Infof("Ignore config checks!. No guarantee to run without issues")
+	}
+
+	releaser, err := releaser.New(c, util).GetReleaser(checkConfig)
 	if err != nil {
 		return nil, err
 	}
@@ -52,13 +57,14 @@ func New(c *config.ReleaseConfig, repository string) (*SemanticRelease, error) {
 		releaser:    releaser,
 		analyzer:    analyzer,
 		repository:  repository,
+		checkConfig: checkConfig,
 		calculator:  calculator.New(),
 	}, nil
 }
 
 //GetCIProvider result with ci config
 func (s *SemanticRelease) GetCIProvider() (*ci.ProviderConfig, error) {
-	return ci.GetCIProvider(s.gitutil, ci.ReadAllEnvs())
+	return ci.GetCIProvider(s.gitutil, s.checkConfig, ci.ReadAllEnvs())
 }
 
 // GetNextVersion from .version or calculate new from commits
@@ -83,8 +89,8 @@ func (s *SemanticRelease) GetNextVersion(provider *ci.ProviderConfig, force bool
 	firstRelease := false
 
 	if lastVersion == nil {
-		defaultVersion, _ := semver.NewVersion("1.0.0")
+		lastVersion, _ = semver.NewVersion("1.0.0")
-		lastVersion = defaultVersion
+		log.Infof("This is the first release, will set version to %s", lastVersion.String())
 		firstRelease = true
 	}
 
@@ -98,14 +104,21 @@ func (s *SemanticRelease) GetNextVersion(provider *ci.ProviderConfig, force bool
 	analyzedCommits := s.analyzer.Analyze(commits)
 
 	var newVersion semver.Version
+	foundBranchConfig := false
 	for branch, releaseType := range s.config.Branch {
-		if provider.Branch == branch || strings.HasPrefix(provider.Branch, branch) {
+		if provider.Branch == branch {
 			log.Debugf("Found branch config for branch %s with release type %s", provider.Branch, releaseType)
 			newVersion = s.calculator.CalculateNewVersion(analyzedCommits, lastVersion, releaseType, firstRelease)
+			foundBranchConfig = true
 			break
 		}
 	}
 
+	if !foundBranchConfig {
+		log.Warnf("No branch config found for branch %s, will return last known version", provider.Branch)
+		newVersion = *lastVersion
+	}
+
 	releaseVersion := shared.ReleaseVersion{
 		Next: shared.ReleaseVersionEntry{
 			Commit:  provider.Commit,
@@ -119,6 +132,10 @@ func (s *SemanticRelease) GetNextVersion(provider *ci.ProviderConfig, force bool
 		Commits: analyzedCommits,
 	}
 
+	if firstRelease {
+		releaseVersion.Last.Version, _ = semver.NewVersion("0.0.0")
+	}
+
 	log.Infof("New version %s -> %s", lastVersion.String(), newVersion.String())
 	err = cache.Write(s.repository, releaseVersion)
 	if err != nil {
@@ -173,7 +190,7 @@ func (s *SemanticRelease) WriteChangeLog(changelogContent, file string) error {
 	return ioutil.WriteFile(file, []byte(changelogContent), 0644)
 }
 
-// Release pusblish release to provider
+// Release publish release to provider
 func (s *SemanticRelease) Release(provider *ci.ProviderConfig, force bool) error {
 
 	if provider.IsPR {
@@ -197,27 +214,31 @@ func (s *SemanticRelease) Release(provider *ci.ProviderConfig, force bool) error
 		return nil
 	}
 
-	generatedChanglog, err := s.GetChangelog(releaseVersion)
+	hook := hooks.New(s.config, releaseVersion)
+
+	generatedChangelog, err := s.GetChangelog(releaseVersion)
 	if err != nil {
 		log.Debugf("Could not get changelog")
 		return err
 	}
 
-	releaser, err := releaser.New(s.config).GetReleaser()
+	err = hook.PreRelease()
 	if err != nil {
+		log.Debugf("Error during pre release hook")
 		return err
 	}
 
-	err = releaser.ValidateConfig()
+	if err = s.releaser.CreateRelease(releaseVersion, generatedChangelog); err != nil {
+		return err
+	}
+
+	if err = s.releaser.UploadAssets(s.repository, s.config.Assets); err != nil {
+		return err
+	}
+
+	err = hook.PostRelease()
 	if err != nil {
-		return err
+		log.Debugf("Error during post release hook")
-	}
-
-	if err = releaser.CreateRelease(releaseVersion, generatedChanglog); err != nil {
-		return err
-	}
-
-	if err = releaser.UploadAssets(s.repository, s.config.Assets); err != nil {
 		return err
 	}