Merge pull request #23 from kaypee90/handle-keyboard-interupt-error

Handle emitted prompt errors

cmd/depbot/main.go

@@ -13,6 +13,12 @@ func displayAppVersion() {
 	os.Exit(0)
 }
 
+func handlePromptError(err error) {
+	if err != nil {
+		os.Exit(0)
+	}
+}
+
 func launchApplicaton() {
 	// display introduction text
 	printIntroductoryText()
@@ -23,18 +29,27 @@ func launchApplicaton() {
 	// get dependabot configuration details
 	for {
 		if !existingConfigurationChecked && dependabotFileExists() {
-			if getConfigurationOverrideConfirmation() == NO {
+			if result, err := getConfigurationOverrideConfirmation(); err != nil || result == NO {
 				os.Exit(0)
 			}
 
 			existingConfigurationChecked = true
 		}
 
-		packageEcosystem := getPackageEcosystem()
-		directory := getDirectory()
-		interval := getInterval()
-		reviewer := getReviewer()
-		openPullRequestsLimit := getOpenPullRequestLimit()
+		packageEcosystem, err := getPackageEcosystem()
+		handlePromptError(err)
+
+		directory, err := getDirectory()
+		handlePromptError(err)
+
+		interval, err := getInterval()
+		handlePromptError(err)
+
+		reviewer, err := getReviewer()
+		handlePromptError(err)
+
+		openPullRequestsLimit, err := getOpenPullRequestLimit()
+		handlePromptError(err)
 
 		updates = append(updates, Update{
 			PackageEcosystem: packageEcosystem,
@@ -46,7 +61,8 @@ func launchApplicaton() {
 			OpenPullRequestsLimit: openPullRequestsLimit,
 		})
 
-		if addAdditionalPackageManager() == NO {
+		if result, err := addAdditionalPackageManager(); err != nil || result == NO {
+			handlePromptError(err)
 			break
 		}
 	}

cmd/depbot/prompts.go

@@ -9,22 +9,18 @@ import (
 const YES = "yes"
 const NO = "no"
 
-func getConfigurationOverrideConfirmation() string {
+func getConfigurationOverrideConfirmation() (string, error) {
 	prompt := promptui.Select{
 		Label: "Dependabot is currently configured for this project. Would you like to override the current configuration?",
 		Items: []string{YES, NO},
 	}
 
 	_, result, err := prompt.Run()
 
-	if err != nil {
-		panic(err)
-	}
-
-	return result
+	return result, err
 }
 
-func getPackageEcosystem() string {
+func getPackageEcosystem() (string, error) {
 	prompt := promptui.Select{
 		Label: "Select Package Ecosystem",
 		Items: []string{"cargo", "docker", "gomod", "gradle", "maven",
@@ -35,89 +31,67 @@ func getPackageEcosystem() string {
 
 	_, result, err := prompt.Run()
 
-	if err != nil {
-		panic(err)
-	}
-
-	return result
+	return result, err
 }
 
-// TOD0: Add validataion
-func getDirectory() string {
+func getDirectory() (string, error) {
 	prompt := promptui.Prompt{
 		Label:   "Provide Directory (/)",
 		Default: "/",
 	}
 
 	result, err := prompt.Run()
 
-	if err != nil {
-		panic(err)
-	}
-
-	return result
+	return result, err
 }
 
-func getInterval() string {
+func getInterval() (string, error) {
 	prompt := promptui.Select{
 		Label: "Select Interval",
 		Items: []string{"daily", "weekly", "monthly"},
 	}
 
 	_, result, err := prompt.Run()
 
-	if err != nil {
-		panic(err)
-	}
-
-	return result
+	return result, err
 }
 
-// TOD0: Add validataion
-func getReviewer() string {
+func getReviewer() (string, error) {
 	prompt := promptui.Prompt{
 		Label: "Provide Reviewer (optional)",
 	}
 
 	result, err := prompt.Run()
 
-	if err != nil {
-		panic(err)
-	}
-
-	return result
+	return result, err
 }
 
-func getOpenPullRequestLimit() int {
+func getOpenPullRequestLimit() (int, error) {
 	prompt := promptui.Prompt{
 		Label: "Provide Open Pull Request Limit (optional)",
 	}
 
 	result, err := prompt.Run()
 
 	if err != nil {
-		panic(err)
+		return 0, err
 	}
 
 	limit, err := strconv.Atoi(result)
 	if err != nil {
-		return 5
+		return 5, nil
 	}
 
-	return limit
+	return limit, nil
 }
 
-func addAdditionalPackageManager() string {
+func addAdditionalPackageManager() (string, error) {
 	prompt := promptui.Select{
 		Label: "Do you want to add another package manager?",
 		Items: []string{YES, NO},
 	}
 
 	_, result, err := prompt.Run()
 
-	if err != nil {
-		panic(err)
-	}
-
-	return result
+	return result, err
 }