zwischenstand rewrite service

Author: evombau

.gitignore

@@ -1,2 +1,18 @@
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
 
-.env
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+out
+*.env
+go.sum

gitcontroller/github.go

@@ -10,9 +10,7 @@ import (
 )
 
 type GitConfiguration struct {
-	Hostname    string
-	ApiVersion  string
-	Actor       string
+	ApiUrl      string
 	Repository  string
 	AccessToken string
 }
@@ -82,7 +80,7 @@ func newPostRequest(endpoint string, token string, requestBody []byte) map[strin
 }
 
 func github_getLatestReleaseVersion(conf GitConfiguration) string {
-	url := fmt.Sprintf("%s/api/%s/repos/%s/releases/latest", conf.Hostname, conf.ApiVersion, conf.Repository)
+	url := fmt.Sprintf("%s/repos/%s/releases/latest", conf.ApiUrl, conf.Repository)
 	result := newGetRequest(url, conf.AccessToken)
 
 	var version string
@@ -110,11 +108,11 @@ func github_createNextGitHubRelease(conf GitConfiguration, newReleaseVersion str
 		fmt.Println("(github_createNextGitHubRelease) Error building requestBody", err)
 	}
 
-	url := fmt.Sprintf("%s/api/%s/repos/%s/releases", conf.Hostname, conf.ApiVersion, conf.Repository)
+	url := fmt.Sprintf("%s/repos/%s/releases", conf.ApiUrl, conf.Repository)
 	result := newPostRequest(url, conf.AccessToken, requestBody)
 
 	if result["name"] == "Release "+newReleaseVersion {
-		fmt.Println("Release" + newReleaseVersion + " sucsessfully created")
+		fmt.Println("Release " + newReleaseVersion + " sucsessfully created")
 	} else {
 		fmt.Println("Somethin went worng at creating release!")
 	}

gitcontroller/initsenv.go

@@ -21,11 +21,9 @@ func determanEnvironment(environment string) GitConfiguration {
 	switch environment {
 	case "Github":
 		return GitConfiguration{
-			Hostname:    os.Getenv("GITHUB_SERVER_URL"),
-			ApiVersion:  getEnv("GIT_API_VERSION", "v3", false),
-			Actor:       os.Getenv("GITHUB_ACTOR"),
+			ApiUrl:      os.Getenv("GITHUB_API_URL"),
 			Repository:  os.Getenv("GITHUB_REPOSITORY"),
-			AccessToken: os.Getenv("GIT_ACCESS_TOKEN"),
+			AccessToken: os.Getenv("GITHUB_TOKEN"),
 		}
 
 	case "Custom":

go.mod

@@ -1,3 +1,8 @@
 module awesome-ci-semver
 
 go 1.15
+
+require (
+	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
+	golang.org/x/tools v0.1.0 // indirect
+)

main.go

@@ -1,103 +1,63 @@
 package main
 
 import (
-	"awesome-ci-semver/gitcontroller"
-	"awesome-ci-semver/semver"
+	"awesome-ci-semver/service"
 	"flag"
-	"fmt"
 	"os"
-	"os/exec"
-	"regexp"
 )
 
-func runcmd(cmd string, shell bool) string {
-	if shell {
-		out, err := exec.Command("bash", "-c", cmd).Output()
-		if err != nil {
-			fmt.Println(err)
-			panic("some error found")
-		}
-		return string(out)
-	}
-	out, err := exec.Command(cmd).Output()
-	if err != nil {
-		fmt.Println(err)
-	}
-	return string(out)
-}
+var (
+	cienv         *string
+	createRelease CreateReleaseSet
+	getBuildInfos getBuildInfosSet
+)
 
-func isFlagPassed(name string) bool {
-	found := false
-	flag.Visit(func(f *flag.Flag) {
-		if f.Name == name {
-			found = true
-		}
-	})
-	return found
+type CreateReleaseSet struct {
+	fs         *flag.FlagSet
+	version    string
+	patchLevel string
+	publishNpm string
+	dryRun     bool
 }
 
-func funcCreateRelease(cienv *string, overrideVersion *string, getVersionIncrease *string, isDryRun *bool) {
-	var gitVersion string
-	if *overrideVersion != "" {
-		gitVersion = *overrideVersion
-	} else {
-		gitVersion = gitcontroller.GetLatestReleaseVersion(*cienv)
-	}
-
-	var patchLevel string
-	if *getVersionIncrease != "" {
-		patchLevel = *getVersionIncrease
-	} else {
-		if *cienv == "Github" {
-			// Output: []string {FullString, PR, FullBranch, Orga, branch, branchBegin, restOfBranch}
-			regex := `[a-zA-z ]+#([0-9]+) from (([0-9a-zA-Z-]+)/((feature|bugfix|fix)/(.+)))`
-			r := regexp.MustCompile(regex)
-
-			// mergeMessage := r.FindStringSubmatch(`Merge pull request #3 from ITC-TO-MT/feature/test-1`)
-			mergeMessage := r.FindStringSubmatch(runcmd(`git log -1 --pretty=format:"%s"`, true))
-			if len(mergeMessage) > 0 {
-				fmt.Printf("PR-Number: %s\n", mergeMessage[1])
-				fmt.Printf("Merged branch is a %s\n", mergeMessage[5])
-				patchLevel = mergeMessage[5]
-			} else {
-				fmt.Println("No merge message found pls make shure this regex matches: ", regex)
-				fmt.Print("Example: Merge pull request #3 from some-orga/feature/awesome-feature\n\n")
-				fmt.Print("If you like to set your patch level manually by flag: -level (feautre|bugfix)\n\n")
-				os.Exit(1)
-			}
-		}
-	}
+type getBuildInfosSet struct {
+	fs         *flag.FlagSet
+	version    string
+	patchLevel string
+	output     string
+}
 
-	newVersion := semver.IncreaseSemVer(patchLevel, gitVersion)
-	if *isDryRun {
-		fmt.Printf("Old version: %s\n", gitVersion)
-		fmt.Printf("Would writing new release: %s\n", newVersion)
-	} else {
-		fmt.Printf("Old version: %s\n", gitVersion)
-		fmt.Printf("Writing new release: %s\n", newVersion)
-		gitcontroller.CreateNextGitHubRelease(*cienv, newVersion)
-	}
+func init() {
+	cienv = flag.String("cienv", "Github", "set your CI Environment for Special Featueres!\nAvalible: Jenkins, Github, Gitlab, Custom\nDefault: Github")
+
+	// createReleaseSet
+	createRelease.fs = flag.NewFlagSet("createRelease", flag.ExitOnError)
+	createRelease.fs.StringVar(&createRelease.version, "version", "", "override version to Update")
+	createRelease.fs.StringVar(&createRelease.patchLevel, "patchLevel", "bugfix", "predefine version to Update")
+	createRelease.fs.StringVar(&createRelease.publishNpm, "publishNpm", "", "runs npm publish --tag <createdTag> with custom directory")
+	createRelease.fs.BoolVar(&createRelease.dryRun, "dry-run", false, "make dry-run before writing version to Git")
+
+	// getNewReleaseVersion
+	getBuildInfos.fs = flag.NewFlagSet("getBuildInfos", flag.ExitOnError)
+	getBuildInfos.fs.StringVar(&getBuildInfos.version, "version", "", "override version to Update")
+	getBuildInfos.fs.StringVar(&getBuildInfos.patchLevel, "patchLevel", "bugfix", "predefine version to Update")
+	getBuildInfos.fs.StringVar(&getBuildInfos.output, "output", "pr,version", "define output by get")
 }
 
 func main() {
 
-	cienv := flag.String("cienv", "Github", "set your CI Environment for Special Featueres!\nAvalible: Jenkins, Github, Gitlab, Custom\nDefault: Github")
-
-	createRelease := flag.NewFlagSet("createRelease", flag.ExitOnError)
-	overrideVersion := createRelease.String("version", "", "override version to Update")
-	getVersionIncrease := createRelease.String("level", "", "predefine version to Update")
-	isDryRun := createRelease.Bool("dry-run", false, "Make dry-run before writing version to Git")
+	// disable logging
+	//log.SetOutput(ioutil.Discard)
 
 	flag.Parse()
 
-	if os.Args[1] != "createRelease" {
-		fmt.Println("expected 'createRelease', '...' or 'bar' subcommands")
-		os.Exit(1)
-	}
-
 	switch os.Args[1] {
 	case "createRelease":
-		createRelease.Parse(os.Args[2:])
-		funcCreateRelease(cienv, overrideVersion, getVersionIncrease, isDryRun)
+		createRelease.fs.Parse(os.Args[2:])
+		service.CreateRelease(cienv, &createRelease.version, &createRelease.patchLevel, &createRelease.dryRun, &createRelease.publishNpm)
+	case "getBuildInfos":
+		getBuildInfos.fs.Parse(os.Args[2:])
+		service.GetBuildInfos(cienv, &getBuildInfos.version, &getBuildInfos.patchLevel, &getBuildInfos.output)
 	}
+
 }

package.json

@@ -0,0 +1,54 @@
+{
+ "dependencies": {
+  "@angular/animations": "~11.2.7",
+  "@angular/cdk": "^11.2.6",
+  "@angular/common": "~11.2.7",
+  "@angular/compiler": "~11.2.7",
+  "@angular/core": "~11.2.7",
+  "@angular/flex-layout": "^11.0.0-beta.33",
+  "@angular/forms": "~11.2.7",
+  "@angular/localize": "^11.2.7",
+  "@angular/material": "^11.2.6",
+  "@angular/platform-browser": "~11.2.7",
+  "@angular/platform-browser-dynamic": "~11.2.7",
+  "@angular/router": "~11.2.7",
+  "keycloak-angular": "^8.1.0",
+  "keycloak-js": "^12.0.4",
+  "rxjs": "~6.6.7",
+  "tslib": "^2.0.0",
+  "zone.js": "~0.10.2"
+ },
+ "devDependencies": {
+  "@angular-devkit/build-angular": "^0.1102.6",
+  "@angular/cli": "~11.2.6",
+  "@angular/compiler-cli": "~11.2.7",
+  "@types/jasmine": "~3.6.0",
+  "@types/jasminewd2": "~2.0.3",
+  "@types/node": "^12.11.1",
+  "codelyzer": "^6.0.1",
+  "jasmine-core": "~3.6.0",
+  "jasmine-spec-reporter": "~5.0.0",
+  "karma": "~5.0.0",
+  "karma-chrome-launcher": "~3.1.0",
+  "karma-coverage-istanbul-reporter": "~3.0.2",
+  "karma-jasmine": "~4.0.0",
+  "karma-jasmine-html-reporter": "^1.5.0",
+  "ng-packagr": "^11.0.0",
+  "protractor": "~7.0.0",
+  "ts-node": "~8.3.0",
+  "tslint": "~6.1.0",
+  "typescript": "~4.1.5"
+ },
+ "name": "my-workspace",
+ "private": true,
+ "scripts": {
+  "build": "ng build lib-emst-ui-frame --prod",
+  "e2e": "ng e2e",
+  "lint": "ng lint",
+  "ng": "ng",
+  "postinstall": "ngcc",
+  "start": "ng serve",
+  "test": "ng test"
+ },
+ "version": "0.3.0"
+}

service/createRelease.go

@@ -0,0 +1,117 @@
+package service
+
+import (
+	"awesome-ci-semver/gitcontroller"
+	"awesome-ci-semver/semver"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"regexp"
+	"strings"
+)
+
+func runcmd(cmd string, shell bool) string {
+	if shell {
+		out, err := exec.Command("bash", "-c", cmd).Output()
+		if err != nil {
+			fmt.Println(err)
+			panic("some error found")
+		}
+		return string(out)
+	}
+	out, err := exec.Command(cmd).Output()
+	if err != nil {
+		fmt.Println(err)
+	}
+	return string(out)
+}
+
+func CreateRelease(cienv *string, overrideVersion *string, getVersionIncrease *string, isDryRun *bool, publishNpm *string) {
+	var gitVersion string
+	if *overrideVersion != "" {
+		gitVersion = *overrideVersion
+	} else {
+		gitVersion = gitcontroller.GetLatestReleaseVersion(*cienv)
+	}
+
+	var patchLevel string
+	if *getVersionIncrease != "" {
+		patchLevel = *getVersionIncrease
+	} else {
+		if *cienv == "Github" {
+			// Output: []string {FullString, PR, FullBranch, Orga, branch, branchBegin, restOfBranch}
+			regex := `[a-zA-z ]+#([0-9]+) from (([0-9a-zA-Z-]+)/((feature|bugfix|fix)/(.+)))`
+			r := regexp.MustCompile(regex)
+
+			// mergeMessage := r.FindStringSubmatch(`Merge pull request #3 from ITC-TO-MT/feature/test-1`)
+			mergeMessage := r.FindStringSubmatch(runcmd(`git log -1 --pretty=format:"%s"`, true))
+			if len(mergeMessage) > 0 {
+				fmt.Printf("PR-Number: %s\n", mergeMessage[1])
+				fmt.Printf("Merged branch is a %s\n", mergeMessage[5])
+				patchLevel = mergeMessage[5]
+			} else {
+				fmt.Println("No merge message found pls make shure this regex matches: ", regex)
+				fmt.Print("Example: Merge pull request #3 from some-orga/feature/awesome-feature\n\n")
+				fmt.Print("If you like to set your patch level manually by flag: -level (feautre|bugfix)\n\n")
+				os.Exit(1)
+			}
+		}
+	}
+
+	newVersion := semver.IncreaseSemVer(patchLevel, gitVersion)
+	if *isDryRun {
+		fmt.Printf("Old version: %s\n", gitVersion)
+		fmt.Printf("Would writing new release: %s\n", newVersion)
+	} else {
+		fmt.Printf("Old version: %s\n", gitVersion)
+		fmt.Printf("Writing new release: %s\n", newVersion)
+		gitcontroller.CreateNextGitHubRelease(*cienv, newVersion)
+	}
+
+	if *publishNpm != "" {
+		// check if subfolder has slash
+		pathToSource := *publishNpm
+		if !strings.HasSuffix(*publishNpm, "/") {
+			pathToSource = *publishNpm + "/"
+		}
+		fmt.Printf("Puplishing npm packages under path: %s\n", pathToSource)
+		npmPublish(pathToSource, newVersion)
+	}
+}
+
+func npmPublish(pathToSource string, newVersion string) {
+
+	// opening package.json
+	jsonFile, err := os.Open(pathToSource + "package.json")
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(2)
+	}
+	defer jsonFile.Close()
+
+	var result map[string]interface{}
+	json.NewDecoder(jsonFile).Decode(&result)
+
+	result["version"] = newVersion
+
+	b, err := json.MarshalIndent(result, "", " ")
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(2)
+	}
+
+	// writing result to package.json
+	err = ioutil.WriteFile(pathToSource+"package.json", b, 0644)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(2)
+	}
+
+	command := exec.Command("npm", "publish", pathToSource, "--tag", fmt.Sprintf("%s@%s", result["name"], newVersion))
+	command.Stdout = os.Stdout
+	command.Stderr = os.Stderr
+	// Run the command
+	command.Run()
+}