Merge pull request #91 from minnek-digital-studio/feature/90

feature/90

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,3 @@
+#### Issue Info
+
+- Related to #${ticket}

assets/darwin/build.sh

@@ -1,18 +1,46 @@
+#!/bin/bash
+
 VERSION=${1}
 DIST_DIR="./dist"
-FILE_DMG="${DIST_DIR}/cominnek-${VERSION}.dmg"
+FILE_ARM86="${DIST_DIR}/cominnek-${VERSION}-arm86.dmg"
+FILE_ARM64="${DIST_DIR}/cominnek-${VERSION}-arm64.dmg"
+FILE_AMD86="${DIST_DIR}/cominnek-${VERSION}-amd86.dmg"
+FILE_AMD64="${DIST_DIR}/cominnek-${VERSION}-amd64.dmg"
 
 if [ -z "${VERSION}" ]; then
     echo "Usage: build.sh <version>"
     exit 1
 fi
 
+mkdir -p ${DIST_DIR}
+
+# Build for ARM (32 bits)
+GOARCH=arm GOOS=darwin GO386=softfloat go build -o ./build/bin-arm86
+cp ./assets/darwin/bin/* ./build
+cp ./build/bin-arm86 ./build/bin
+rm -f ${FILE_ARM86}
+hdiutil create -fs HFS+ -srcfolder "./build" -volname "cominnek-${VERSION}-arm86" "${FILE_ARM86}"
+
+# Clean up for next build
+rm -rf ./build/*
+
+# Build for ARM (64 bits)
+GOARCH=arm64 GOOS=darwin go build -o ./build/bin-arm64
 cp ./assets/darwin/bin/* ./build
-mkdir -p ./build/bin
-rm -rf ./build/bin/*
-go mod tidy;
-go build -o ./build/bin;
-rm -f ${DIST_DIR}/cominnek-${VERSION}.zip;
-rm -f ${FILE_DMG};
-hdiutil create -fs HFS+ -srcfolder "./build" -volname "cominnek-${VERSION}" "${FILE_DMG}"
-rm -rf ./build/*
+cp ./build/bin-arm64 ./build/bin
+rm -f ${FILE_ARM64}
+hdiutil create -fs HFS+ -srcfolder "./build" -volname "cominnek-${VERSION}-arm64" "${FILE_ARM64}"
+
+# Clean up for next build
+rm -rf ./build/*
+
+# Build for AMD (64 bits)
+GOARCH=amd64 GOOS=darwin go build -o ./build/bin-amd64
+cp ./assets/darwin/bin/* ./build
+cp ./build/bin-amd64 ./build/bin
+rm -f ${FILE_AMD64}
+hdiutil create -fs HFS+ -srcfolder "./build" -volname "cominnek-${VERSION}-amd64" "${FILE_AMD64}"
+
+# Clean up
+rm -rf ./build/*
+

cmd/add.go

@@ -1,18 +1,18 @@
 package cmd
 
 import (
-	"github.com/Minnek-Digital-Studio/cominnek/pkg/git"
+	"github.com/Minnek-Digital-Studio/cominnek/pkg/extras"
 	"github.com/spf13/cobra"
 )
 
 var addCmd = &cobra.Command{
-	Use:   "add",
-	Short: "Add files to commit",
+	Use:   "add [package]",
+	Short: "Install a new package",
 	Run: func(cmd *cobra.Command, args []string) {
-		git.Add()
+		extras.AddPackage(args[0])
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(addCmd)
-}
+}

cmd/branch.go

@@ -2,26 +2,22 @@ package cmd
 
 import (
 	"github.com/Minnek-Digital-Studio/cominnek/cmd/branch"
+	"github.com/Minnek-Digital-Studio/cominnek/controllers/project"
 	pkg_action "github.com/Minnek-Digital-Studio/cominnek/pkg/cli/actions"
 	"github.com/spf13/cobra"
 )
 
 var branchCmd = &cobra.Command{
 	Use:   "branch",
-	Short: "Create a new branch. This is variant of git-flow by Minnek",
+	Short: "Create a new branch.",
 	Run: func(cmd *cobra.Command, args []string) {
+		project.ReadConfigFile(true)
+
 		pkg_action.Branch()
 	},
 }
 
 func init() {
-	branch.SetFlags()
-	branchCmd.AddCommand(branch.BranchFeatureCmd)
-	branchCmd.AddCommand(branch.BranchReleaseCmd)
-	branchCmd.AddCommand(branch.BranchHotfixCmd)
-	branchCmd.AddCommand(branch.BranchSupportCmd)
-	branchCmd.AddCommand(branch.BranchBugfixCmd)
-	branchCmd.AddCommand(branch.BranchTestCmd)
-	branchCmd.AddCommand(branch.BranchSyncCmd)
+	branch.SetCommands(branchCmd)
 	rootCmd.AddCommand(branchCmd)
 }

cmd/branch/main.go

@@ -2,19 +2,39 @@ package branch
 
 import (
 	"github.com/Minnek-Digital-Studio/cominnek/config"
+	"github.com/Minnek-Digital-Studio/cominnek/controllers/project"
+	pkg_action "github.com/Minnek-Digital-Studio/cominnek/pkg/cli/actions"
 	"github.com/spf13/cobra"
 )
 
 var stash bool
 
-func SetFlags() {
-	addFlags(BranchFeatureCmd)
-	addFlags(BranchReleaseCmd)
-	addFlags(BranchHotfixCmd)
-	addFlags(BranchSupportCmd)
-	addFlags(BranchBugfixCmd)
-	addFlags(BranchTestCmd)
-	addFlags(BranchSyncCmd)
+func SetCommands(Command *cobra.Command) {
+	project.ReadConfigFile(false)
+
+	for _, branch := range project.Config.Git.Branches {
+		if branch.Config.Hidden {
+			continue
+		}
+
+		branchName := branch.Name
+		branchData := branch
+		branchCmd := &cobra.Command{
+			Use:     branchName,
+			Example: branchName + " <name>",
+			Short:   "Create a new " + branchName + " branch",
+			Long:    branch.Config.Description,
+			Run: func(cmd *cobra.Command, args []string) {
+				setTicket(args)
+				config.AppData.Branch.Stash = stash
+				config.AppData.Branch.Data = branchData
+				pkg_action.Branch()
+			},
+		}
+
+		addFlags(branchCmd)
+		Command.AddCommand(branchCmd)
+	}
 }
 
 func addFlags(cmd *cobra.Command) {

cmd/config/pr.go

@@ -18,7 +18,7 @@ var PRConfigCmd = &cobra.Command{
 	Short: "configure the defaults for pull requests",
 	Run: func(cmd *cobra.Command, args []string) {
 		if !files.CheckExist(markdownRoute) {
-			fmt.Println(color.HiRedString("💀Error: ")+ "The file: " + color.HiYellowString(markdownRoute)  +" does not exist.")
+			fmt.Println(color.HiRedString("💀Error: ") + "The file: " + color.HiYellowString(markdownRoute) + " does not exist.")
 			os.Exit(1)
 		}
 

cmd/pr.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/Minnek-Digital-Studio/cominnek/config"
+	"github.com/Minnek-Digital-Studio/cominnek/controllers/project"
 	pkg_action "github.com/Minnek-Digital-Studio/cominnek/pkg/cli/actions"
 	"github.com/spf13/cobra"
 )
@@ -10,6 +11,8 @@ var prCmd = &cobra.Command{
 	Use:   "pr",
 	Short: "Create a new pull request",
 	Run: func(cmd *cobra.Command, args []string) {
+		project.ReadConfigFile(true)
+
 		config.AppData.PullRequest.Ticket = ticket
 		config.AppData.PullRequest.Base = baseBranch
 

cmd/publish.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/Minnek-Digital-Studio/cominnek/config"
+	"github.com/Minnek-Digital-Studio/cominnek/controllers/project"
 	pkg_action "github.com/Minnek-Digital-Studio/cominnek/pkg/cli/actions"
 	"github.com/Minnek-Digital-Studio/cominnek/pkg/git"
 	"github.com/spf13/cobra"
@@ -11,6 +12,8 @@ var publishCmd = &cobra.Command{
 	Use:   "publish <message>",
 	Short: "Publish a branch to GitHub and create a pull request as Draft",
 	Run: func(cmd *cobra.Command, args []string) {
+		project.ReadConfigFile(true)
+
 		msg := ""
 		body := ""