close #67 help and version command outside repo

Author: groenborg

cmd/auth.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/ui"
 	"github.com/spf13/cobra"

cmd/cleanup.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/praqma/git-phlow/cmdcheck"
 	"github.com/praqma/git-phlow/githandler"
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
@@ -19,6 +20,9 @@ var cleanCmd = &cobra.Command{
 %s removes all branches prefixed with 'delivered/'.
 It deletes safely by running 'git branch -d'. By default, both local and remote branches are deleted.
 `, ui.Bold("phlow clean")),
+	PreRun: func(cmd *cobra.Command, args []string) {
+		checks.IsRepository()
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		defaultBranch, _ := plugins.GitHub.Branch.Default()
 		remote := githandler.ConfigBranchRemote(defaultBranch)

cmd/deliver.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/praqma/git-phlow/cmdcheck"
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/plugins"
@@ -25,10 +26,12 @@ so integration services supporting the workflow can pick up the changes.
 if you deliver with local, the branch will be merged with your default branch,
 and pushed to your "remote default branch" and prefixed with "/delivered"
 `,
+	PreRun: func(cmd *cobra.Command, args []string) {
+		checks.IsRepository()
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 
 		defaultBranch, _ := plugins.GitHub.Branch.Default()
-
 		//Run tests before deliver
 		if len(args) > 0 {
 			if err := phlow.TestDeliver(args); err != nil {
@@ -44,10 +47,8 @@ and pushed to your "remote default branch" and prefixed with "/delivered"
 			phlow.LocalDeliver(defaultBranch)
 			return
 		}
-
 		//Deliver with ready branch
 		phlow.Deliver(defaultBranch)
-
 	},
 }
 

cmd/integrate.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/praqma/git-phlow/cmdcheck"
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/plugins"
 	"github.com/praqma/git-phlow/ui"
@@ -17,6 +18,10 @@ var integrateCmd = &cobra.Command{
 %s delivers the changes in an agent version. The current branch if will be merged into the default branch
 with your default branch and pushed to the remote.
 `, ui.Bold("integrate")),
+	PreRun: func(cmd *cobra.Command, args []string) {
+		checks.IsRepository()
+		checks.IsAuthenticated()
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 
 		defaultBranch, err := plugins.GitHub.Branch.Default()

cmd/issues.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/praqma/git-phlow/cmdcheck"
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/spf13/cobra"
@@ -13,6 +14,9 @@ var issueCmd = &cobra.Command{
 	Long: `
 List all the open issues on GitHub with it's ID. Helps you locate what needs to be worked on
 `,
+	PreRun: func(cmd *cobra.Command, args []string) {
+		checks.IsRepository()
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		phlow.IssueList()
 	},

cmd/root.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/praqma/git-phlow/githandler"
 	"github.com/praqma/git-phlow/options"
 	"github.com/spf13/cobra"
 )
@@ -17,13 +16,6 @@ var RootCmd = &cobra.Command{
 git-phlow is a git extension that provides an extra set of commands, enabling you to:
 workon, deliver and create new tasks.
 	`,
-	PersistentPreRun: func(cmd *cobra.Command, args []string) {
-		//Move as before check
-		if err := githandler.Status(); err != nil {
-			fmt.Fprintln(os.Stdout, err)
-			os.Exit(0)
-		}
-	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if options.GlobalFlagVersion != false {
 			fmt.Println("phlow specification")
@@ -34,7 +26,6 @@ workon, deliver and create new tasks.
 		}
 
 		fmt.Println(cmd.UsageString())
-
 	},
 }
 

cmd/upnext.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/praqma/git-phlow/cmdcheck"
 	"github.com/praqma/git-phlow/githandler"
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
@@ -19,7 +20,9 @@ var upNextCmd = &cobra.Command{
 %s gets the next branch ready for integration based on the branch creation time.
 The branch created first, is the branch thats up next.
 `, ui.Bold("upnext")),
-
+	PreRun: func(cmd *cobra.Command, args []string) {
+		checks.IsRepository()
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 
 		defaultBranch, _ := plugins.GitHub.Branch.Default()

cmd/web.go

@@ -3,10 +3,13 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/spf13/cobra"
-	"github.com/praqma/git-phlow/phlow"
-	"strconv"
 	"os"
+	"strconv"
+
+	"github.com/praqma/git-phlow/phlow"
+	"github.com/spf13/cobra"
+
+	"github.com/praqma/git-phlow/cmdcheck"
 )
 
 // webCmd represents the web command
@@ -18,8 +21,10 @@ web opens a github issue or githubs issue list based on it's arguments'
 If no argument is passed, it tries to locate an issue on the current checked out branch,
 if that fails it will simply open GitHubs issue list in your default browser
 `,
+	PreRun: func(cmd *cobra.Command, args []string) {
+		checks.IsRepository()
+	},
 	Run: func(cmd *cobra.Command, args []string) {
-
 		if len(args) > 0 {
 			if val, err := strconv.Atoi(args[0]); err == nil {
 				phlow.Web(val)

cmd/workon.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"strconv"
 
+	"github.com/praqma/git-phlow/cmdcheck"
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/ui"
 	"github.com/spf13/cobra"
@@ -20,12 +21,16 @@ A branch will be created from your remote default branch and named after the tit
 of the issue eg. branch => "42-calculate-meaning-of-life".
 From here you the work can start, and when finished run phlow wrapup.
 	`, ui.Bold("workon")),
+	PreRun: func(cmd *cobra.Command, args []string) {
+		checks.IsRepository()
+		checks.IsAuthenticated()
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 
 		if len(args) > 0 {
 			issue, err := strconv.Atoi(args[0])
 			if err != nil {
-				fmt.Fprintf(os.Stdout, "Whoops \nYour argument: %s, is not a 'number' I only feast on numbers \n", args[0])
+				fmt.Fprintf(os.Stdout, "Whoops \nYour argument: %s, is not a number I only want numbers \n", args[0])
 				os.Exit(0)
 			}
 

cmd/wrapup.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/praqma/git-phlow/cmdcheck"
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/ui"
@@ -13,10 +14,12 @@ var wrapupCmd = &cobra.Command{
 	Use:   "wrapup",
 	Short: "add changes and make auto-commit",
 	Long: fmt.Sprintf(`
-%s adds all your work from the working area to the index, and makes an automatic close # commit, 
+%s adds all your work from the working area to the index, and makes an automatic close # commit,
 which closes an issue on github eg. commit message => "close #42 fetch meaning of life"
 `, ui.Bold("wrapup")),
-
+	PreRun: func(cmd *cobra.Command, args []string) {
+		checks.IsRepository()
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		phlow.WrapUp()
 	},