close #209 user scenarios phlow

Author: groenborg

.gitconfig

@@ -0,0 +1,7 @@
+[phlow]
+remote                 = origin
+service                = github
+integration-branch     = master
+issue-url              = https://api.github.com
+delivery-branch-prefix = ready
+

.phlow

@@ -0,0 +1,23 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/praqma/git-phlow/phlow"
+)
+
+// bootstrapCmd represents the bootstrap command
+var bootstrapCmd = &cobra.Command{
+	Use:   "bootstrap",
+	Short: "creates a .gitconfig file",
+	Long: `
+Creates a new .gitconfig file in your local repository
+	`,
+	Run: func(cmd *cobra.Command, args []string) {
+		phlow.Bootstrap()
+	},
+}
+
+func init() {
+	configCmd.AddCommand(bootstrapCmd)
+
+}

cmd/bootstrap.go

@@ -0,0 +1,45 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+// configCmd represents the config command
+var configCmd = &cobra.Command{
+	Use:   "config",
+	Short: "bootstrap or show configuration",
+	Long: `
+git phlow uses gits own configuration, so all your configurations can be placed everywhere git config can get them.
+Best practice is to create a .gitconfig in your repository with your won configurations.
+
+Git phlow comes with internal defaults configured to work natively with github. So you can use git phlow
+without any configuration at all. If you want to customize it the default setting create an INI-block
+in a local .gitconfig, and make sure all mandatory fields are set.
+
+To use a local .gitconfig file remember to add it to the config path, with this command
+	'git config --local include.path ../.gitconfig'
+
+[phlow] is the default ini block
+
+Default configuration:
+	[phlow]
+    integration_branch = master
+    remote = origin
+    service = jira
+    issue_url = https://my.jira.instance.com
+    delivery_branch_prefix = ready
+
+
+
+
+
+`,
+	Run: func(cmd *cobra.Command, args []string) {
+		cmd.Help()
+	},
+}
+
+func init() {
+	RootCmd.AddCommand(configCmd)
+
+}

cmd/config.go

@@ -0,0 +1,24 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/praqma/git-phlow/phlow"
+)
+
+// showCmd represents the show command
+var showCmd = &cobra.Command{
+	Use:   "show",
+	Short: "shows configuration",
+	Long: `
+Shows a specified configuration block on your configuration file.
+If no arguments are passed it will show the internal default configuration
+	`,
+	Run: func(cmd *cobra.Command, args []string) {
+		phlow.Show(args)
+	},
+}
+
+func init() {
+	configCmd.AddCommand(showCmd)
+
+}

cmd/show.go

@@ -72,7 +72,7 @@ func RunGit(git string, sub string, argv ...string) (string, error) {
 	argv = append([]string{sub}, argv...)
 	exe := exec.Command(git, argv...)
 
-	if true {
+	if options.GlobalFlagVerbose {
 		verboseOutput(exe.Args...)
 	}
 

executor/executor.go

@@ -22,6 +22,16 @@ func (os *Git) LSRemote(argv ...string) (string, error) {
 	return strings.TrimSpace(output), nil
 }
 
+//RevParse ...
+//Executes local git rev-parse with params
+func (os *Git) RevParse(argv ...string) (string, error) {
+	output, err := os.Run("git", "rev-parse", argv...)
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(output), nil
+}
+
 //Branch ...
 //Executes local git branch with params
 func (os *Git) Branch(argv ...string) (string, error) {

githandler/git.go

@@ -0,0 +1,36 @@
+package phlow
+
+import (
+	"github.com/praqma/git-phlow/githandler"
+	"github.com/praqma/git-phlow/executor"
+	"github.com/praqma/git-phlow/setting"
+	"fmt"
+)
+
+//Bootstrap ...
+//Creates a new .gitconfig file with a default configuration
+func Bootstrap() {
+
+	git := githandler.Git{Run: executor.RunGit}
+
+	local, err := git.RevParse("--show-toplevel")
+	if err != nil {
+		panic(err)
+	}
+
+	setting.BootstrapPhlowConfig(local, "master")
+}
+
+//Show ...
+//Shows the listed configuration
+func
+Show(args []string) {
+
+	if len(args) >= 1 {
+		conf := setting.NewProjectStg(args[0])
+		fmt.Println(conf.ToString())
+		return
+	}
+	conf := setting.NewProjectStg("")
+	fmt.Println(conf.ToString())
+}

phlow/config.go

@@ -40,6 +40,7 @@ func Deliver(conf *setting.ProjectSetting) {
 
 	_, err = git.Pull("--rebase")
 	if err != nil {
+		fmt.Println("Error in rebasing: ")
 		fmt.Println(err)
 	}
 
@@ -58,6 +59,7 @@ func Deliver(conf *setting.ProjectSetting) {
 	//git push origin name:ready/name
 	_, err = git.Push(conf.Remote, fmt.Sprintf("%s:%s/%s", branchInfo.Current, conf.DeliveryBranchPrefix, branchInfo.Current))
 	if err != nil {
+		fmt.Println("error in push")
 		fmt.Println(err)
 		return
 	}