Moved Client and bitbucket into root

craftamap · Nov 24, 2020 · b5cd563 · b5cd563
1 parent 8472e6a
commit b5cd563
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 142 deletions.
diff --git a/cmd/commands/api/api.go b/cmd/commands/api/api.go
@@ -23,6 +23,9 @@ func Add(rootCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 		Use:   "api <url> [<body>]",
 		Short: "Make an authenticated api.bitbucket.org request to the rest 2.0 api",
 		Long:  "Make an authenticated api.bitbucket.org request to the rest 2.0 api",
+		Annotations: map[string]string{
+			"RequiresClient": "true",
+		},
 		Run: func(cmd *cobra.Command, args []string) {
 			fmt.Println(Headers)
 
@@ -44,7 +47,7 @@ func Add(rootCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
 				return
 			}
-			req.SetBasicAuth(globalOpts.Username, globalOpts.Password)
+			req.SetBasicAuth(globalOpts.Client.Username, globalOpts.Client.Username)
 
 			for _, header := range Headers {
 				splitted := strings.SplitN(header, "=", 2)

diff --git a/cmd/commands/downloads/download/download.go b/cmd/commands/downloads/download/download.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/craftamap/bb/cmd/options"
-	bbgit "github.com/craftamap/bb/git"
 	"github.com/craftamap/bb/internal"
 	"github.com/logrusorgru/aurora"
 	"github.com/spf13/cobra"
@@ -18,22 +17,16 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 	downloadCmd := &cobra.Command{
 		Use:   "download <filename> [<target path>]",
 		Short: "download files from bitbucket",
+		Annotations: map[string]string{
+			"RequiresClient":     "true",
+			"RequiresRepository": "true",
+		},
 		Run: func(cmd *cobra.Command, args []string) {
 			// TODO: Get rid of this "list" workaround
-			c := internal.Client{
-				Username: globalOpts.Username,
-				Password: globalOpts.Password,
-			}
 
-			bbrepo, err := bbgit.GetBitbucketRepo()
-			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
-				return
-			}
-			if !bbrepo.IsBitbucketOrg() {
-				fmt.Printf("%s%s%s\n", aurora.Yellow(":: "), aurora.Bold("Warning: "), "Are you sure this is a bitbucket repo?")
-				return
-			}
+			c := globalOpts.Client
+			bbrepo := globalOpts.BitbucketRepo
+
 			downloads, err := c.GetDownloads(bbrepo.RepoOrga, bbrepo.RepoSlug)
 			if err != nil {
 				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)

diff --git a/cmd/commands/downloads/list/list.go b/cmd/commands/downloads/list/list.go
@@ -4,8 +4,6 @@ import (
 	"fmt"
 
 	"github.com/craftamap/bb/cmd/options"
-	bbgit "github.com/craftamap/bb/git"
-	"github.com/craftamap/bb/internal"
 	"github.com/dustin/go-humanize"
 	"github.com/logrusorgru/aurora"
 	"github.com/pkg/browser"
@@ -19,21 +17,15 @@ var (
 func Add(downloadsCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 	listCmd := &cobra.Command{
 		Use: "list",
+		Annotations: map[string]string{
+			"RequiresClient":     "true",
+			"RequiresRepository": "true",
+		},
 		Run: func(cmd *cobra.Command, args []string) {
-			c := internal.Client{
-				Username: globalOpts.Username,
-				Password: globalOpts.Password,
-			}
 
-			bbrepo, err := bbgit.GetBitbucketRepo()
-			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
-				return
-			}
-			if !bbrepo.IsBitbucketOrg() {
-				fmt.Printf("%s%s%s\n", aurora.Yellow(":: "), aurora.Bold("Warning: "), "Are you sure this is a bitbucket repo?")
-				return
-			}
+			c := globalOpts.Client
+			bbrepo := globalOpts.BitbucketRepo
+
 			if Web {
 				err := browser.OpenURL(fmt.Sprintf("https://bitbucket.org/%s/%s/downloads", bbrepo.RepoOrga, bbrepo.RepoSlug))
 				if err != nil {

diff --git a/cmd/commands/downloads/upload/upload.go b/cmd/commands/downloads/upload/upload.go
@@ -6,30 +6,20 @@ import (
 	"path/filepath"
 
 	"github.com/craftamap/bb/cmd/options"
-	bbgit "github.com/craftamap/bb/git"
-	"github.com/craftamap/bb/internal"
 	"github.com/logrusorgru/aurora"
 	"github.com/spf13/cobra"
 )
 
 func Add(downloadsCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 	uploadCmd := &cobra.Command{
 		Use: "upload",
+		Annotations: map[string]string{
+			"RequiresClient":     "true",
+			"RequiresRepository": "true",
+		},
 		Run: func(cmd *cobra.Command, args []string) {
-			c := internal.Client{
-				Username: globalOpts.Username,
-				Password: globalOpts.Password,
-			}
-
-			bbrepo, err := bbgit.GetBitbucketRepo()
-			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
-				return
-			}
-			if !bbrepo.IsBitbucketOrg() {
-				fmt.Printf("%s%s%s\n", aurora.Yellow(":: "), aurora.Bold("Warning: "), "Are you sure this is a bitbucket repo?")
-				return
-			}
+			c := globalOpts.Client
+			bbrepo := globalOpts.BitbucketRepo
 
 			if len(args) == 0 {
 				fmt.Printf("%s%s%s\n", aurora.Yellow(":: "), aurora.Bold("Warning: "), "No file specified")
@@ -45,7 +35,7 @@ func Add(downloadsCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 			}
 			fmt.Printf("%s Uploading file %s\n", aurora.Green(":: "), filepath.Base(fpath))
 
-			_, err = c.UploadDownload(bbrepo.RepoOrga, bbrepo.RepoSlug, fpath)
+			_, err := c.UploadDownload(bbrepo.RepoOrga, bbrepo.RepoSlug, fpath)
 			if err != nil {
 				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
 				return

diff --git a/cmd/commands/pr/create/create.go b/cmd/commands/pr/create/create.go
@@ -9,8 +9,6 @@ import (
 	"github.com/cli/cli/git"
 	"github.com/cli/cli/pkg/surveyext"
 	"github.com/craftamap/bb/cmd/options"
-	bbgit "github.com/craftamap/bb/git"
-	"github.com/craftamap/bb/internal"
 	"github.com/logrusorgru/aurora"
 	"github.com/spf13/cobra"
 )
@@ -26,41 +24,31 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 	createCmd := &cobra.Command{
 		Use:   "create",
 		Short: "Create a pull request",
+		Annotations: map[string]string{
+			"RequiresClient":     "true",
+			"RequiresRepository": "true",
+		},
 		Run: func(cmd *cobra.Command, args []string) {
-			var (
-				sourceBranch string
-			)
 			// Initialisation
-			c := internal.Client{
-				Username: globalOpts.Username,
-				Password: globalOpts.Password,
-			}
-
-			bbrepo, err := bbgit.GetBitbucketRepo()
-			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
-				return
-			}
-			if !bbrepo.IsBitbucketOrg() {
-				fmt.Printf("%s%s%s\n", aurora.Yellow(":: "), aurora.Bold("Warning: "), "Are you sure this is a bitbucket repo?")
-				return
-			}
 
-			// Get Current Branch
-			sourceBranch, err = git.CurrentBranch()
-			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
-				return
-			}
+			c := globalOpts.Client
+			bbrepo := globalOpts.BitbucketRepo
 
-			// Prepare required data
 			var (
+				sourceBranch string
 				targetBranch string
 				title        string
 				body         string
 				defaultBody  string
 				reviewers    []string
 			)
+			sourceBranch, err := git.CurrentBranch()
+			if err != nil {
+				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
+				return
+			}
+
+			// Prepare required data
 			// First, init default data
 			repo, err := c.RepositoryGet(bbrepo.RepoOrga, bbrepo.RepoSlug)
 			if err != nil {

diff --git a/cmd/commands/pr/list/list.go b/cmd/commands/pr/list/list.go
@@ -5,8 +5,6 @@ import (
 	"strings"
 
 	"github.com/craftamap/bb/cmd/options"
-	bbgit "github.com/craftamap/bb/git"
-	"github.com/craftamap/bb/internal"
 	"github.com/logrusorgru/aurora"
 	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
@@ -23,20 +21,13 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 		Use:   "list",
 		Short: "List and filter pull requests in this repository",
 		Long:  "List and filter pull requests in this repository",
+		Annotations: map[string]string{
+			"RequiresClient":     "true",
+			"RequiresRepository": "true",
+		},
 		Run: func(cmd *cobra.Command, args []string) {
-			c := internal.Client{
-				Username: globalOpts.Username,
-				Password: globalOpts.Password,
-			}
-			bbrepo, err := bbgit.GetBitbucketRepo()
-			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
-				return
-			}
-			if !bbrepo.IsBitbucketOrg() {
-				fmt.Printf("%s%s%s\n", aurora.Yellow(":: "), aurora.Bold("Warning: "), "Are you sure this is a bitbucket repo?")
-				return
-			}
+			c := globalOpts.Client
+			bbrepo := globalOpts.BitbucketRepo
 
 			if Web {
 				repo, err := c.RepositoryGet(bbrepo.RepoOrga, bbrepo.RepoSlug)

diff --git a/cmd/commands/pr/merge/merge.go b/cmd/commands/pr/merge/merge.go
@@ -7,8 +7,6 @@ import (
 	"github.com/cli/cli/git"
 	"github.com/craftamap/bb/cmd/commands/pr/view"
 	"github.com/craftamap/bb/cmd/options"
-	bbgit "github.com/craftamap/bb/git"
-	"github.com/craftamap/bb/internal"
 	"github.com/logrusorgru/aurora"
 	"github.com/spf13/cobra"
 )
@@ -18,24 +16,16 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 		Use:   "merge",
 		Long:  "Merge a pull request on Bitbucket.org",
 		Short: "Merge a pull request",
+		Annotations: map[string]string{
+			"RequiresClient":     "true",
+			"RequiresRepository": "true",
+		},
 		Run: func(cmd *cobra.Command, args []string) {
 			var id int
 			var err error
 
-			c := internal.Client{
-				Username: globalOpts.Username,
-				Password: globalOpts.Password,
-			}
-
-			bbrepo, err := bbgit.GetBitbucketRepo()
-			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
-				return
-			}
-			if !bbrepo.IsBitbucketOrg() {
-				fmt.Printf("%s%s%s\n", aurora.Yellow(":: "), aurora.Bold("Warning: "), "Are you sure this is a bitbucket repo?")
-				return
-			}
+			c := globalOpts.Client
+			bbrepo := globalOpts.BitbucketRepo
 
 			if len(args) > 0 {
 				id, err = strconv.Atoi(args[0])

diff --git a/cmd/commands/pr/statuses/statuses.go b/cmd/commands/pr/statuses/statuses.go
@@ -6,8 +6,6 @@ import (
 
 	"github.com/cli/cli/git"
 	"github.com/craftamap/bb/cmd/options"
-	bbgit "github.com/craftamap/bb/git"
-	"github.com/craftamap/bb/internal"
 	"github.com/logrusorgru/aurora"
 	"github.com/spf13/cobra"
 )
@@ -17,24 +15,16 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 		Use:   "statuses",
 		Short: "Show CI status for a single pull request",
 		Long:  "Show CI status for a single pull request",
+		Annotations: map[string]string{
+			"RequiresClient":     "true",
+			"RequiresRepository": "true",
+		},
 		Run: func(cmd *cobra.Command, args []string) {
 			var id int
 			var err error
 
-			c := internal.Client{
-				Username: globalOpts.Username,
-				Password: globalOpts.Password,
-			}
-
-			bbrepo, err := bbgit.GetBitbucketRepo()
-			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
-				return
-			}
-			if !bbrepo.IsBitbucketOrg() {
-				fmt.Printf("%s%s%s\n", aurora.Yellow(":: "), aurora.Bold("Warning: "), "Are you sure this is a bitbucket repo?")
-				return
-			}
+			c := globalOpts.Client
+			bbrepo := globalOpts.BitbucketRepo
 
 			if len(args) > 0 {
 				id, err = strconv.Atoi(args[0])

diff --git a/cmd/commands/pr/view/view.go b/cmd/commands/pr/view/view.go
@@ -7,7 +7,6 @@ import (
 	"github.com/charmbracelet/glamour"
 	"github.com/cli/cli/git"
 	"github.com/craftamap/bb/cmd/options"
-	bbgit "github.com/craftamap/bb/git"
 	"github.com/craftamap/bb/internal"
 	"github.com/logrusorgru/aurora"
 	"github.com/pkg/browser"
@@ -23,24 +22,16 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 		Use:   "view",
 		Short: "View a pull request",
 		Long:  "Display the title, body, and other information about a pull request.",
+		Annotations: map[string]string{
+			"RequiresClient":     "true",
+			"RequiresRepository": "true",
+		},
 		Run: func(cmd *cobra.Command, args []string) {
 			var id int
 			var err error
-			c := internal.Client{
-				Username: globalOpts.Username,
-				Password: globalOpts.Password,
-			}
-
-			bbrepo, err := bbgit.GetBitbucketRepo()
 
-			if err != nil {
-				fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occured: "), err)
-				return
-			}
-			if !bbrepo.IsBitbucketOrg() {
-				fmt.Printf("%s%s%s\n", aurora.Yellow(":: "), aurora.Bold("Warning: "), "Are you sure this is a bitbucket repo?")
-				return
-			}
+			c := globalOpts.Client
+			bbrepo := globalOpts.BitbucketRepo
 
 			if len(args) > 0 {
 				id, err = strconv.Atoi(args[0])

diff --git a/cmd/options/global_options.go b/cmd/options/global_options.go
@@ -1,6 +1,11 @@
 package options
 
+import (
+	bbgit "github.com/craftamap/bb/git"
+	"github.com/craftamap/bb/internal"
+)
+
 type GlobalOptions struct {
-	Username string `mapstructure:"username"`
-	Password string `mapstructure:"password"`
+	BitbucketRepo *bbgit.BitbucketRepo
+	Client        *internal.Client
 }