xcode & xamarin: Auto scan directory for project files (#95)

* feat xcode: scan the directory for project files

* typo

* moved the scanForProjectFiles() to cmd/utils.go

* project dir scan for the project files like in the scanner

* clean

* deps: scanner/xamarin & scanner/ios

* xamarin option for auto scan

* warning message added about the --file flag usage

* PR: IDEType enum renamed to ProjectType; and changed from String to Int;

* PR: fix some log typo: solution => workspace / project

* ref: scanXamarinProject: move the "search for the soulition file" block in to a separated func;

* ref: scanXcodeProject: move the "search for the project file" block in to a separated func;

* dep ensure

* PR clean

* PR: make ProjectType private

Author: BirmacherAkos

Gopkg.lock

@@ -31,6 +31,10 @@
   name = "github.com/stretchr/testify"
   branch = "master"
 
+[[constraint]]
+  name = "github.com/bitrise-core/bitrise-init"
+  branch = "master"
+
 [prune]
   go-tests = true
   unused-packages = true

Gopkg.toml

@@ -0,0 +1,62 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/bitrise-core/bitrise-init/scanners/ios"
+	"github.com/bitrise-core/bitrise-init/scanners/xamarin"
+	"github.com/bitrise-core/bitrise-init/utility"
+)
+
+// projectType enum.
+// Could be iOSProjectType = 0
+// Or xamarinProjectType = 1
+type projectType int
+
+const (
+	iOSProjectType projectType = iota
+	xamarinProjectType
+)
+
+// Scans the root dir for the provided project files
+func scanForProjectFiles(projType projectType) ([]string, error) {
+	searchDir, err := os.Getwd()
+	if err != nil {
+		return nil, err
+	}
+
+	fileList, err := utility.ListPathInDirSortedByComponents(searchDir, false)
+	if err != nil {
+		return nil, fmt.Errorf("failed to search for files in (%s), error: %s", searchDir, err)
+	}
+
+	var paths []string
+	{
+		if projType == iOSProjectType {
+			paths, err = ios.FilterRelevantWorkspaceFiles(fileList)
+			if err != nil {
+				return nil, fmt.Errorf("failed to search for workspace files, error: %s", err)
+			}
+
+			if len(paths) == 0 {
+				paths, err = ios.FilterRelevantProjectFiles(fileList)
+				if err != nil {
+					return nil, fmt.Errorf("failed to search for project files, error: %s", err)
+				}
+			}
+		} else if projType == xamarinProjectType {
+			paths, err = xamarin.FilterSolutionFiles(fileList)
+			if err != nil {
+				return nil, fmt.Errorf("failed to search for solution files, error: %s", err)
+			}
+		}
+
+	}
+
+	if len(paths) == 0 {
+		return nil, fmt.Errorf("no project file found: %s", searchDir)
+
+	}
+	return paths, nil
+}

cmd/utils.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
+	"path"
 	"path/filepath"
 	"sort"
 
@@ -75,6 +76,38 @@ func archivableSolutionConfigNames(projectsByID map[string]project.Model) []stri
 	return archivableSolutionConfigNames
 }
 
+// findSolution scans the directory for Xamarin.Solution file first
+// If can't find any, ask the user to drag-and-drop the file
+func findSolution() (string, error) {
+	var solutionPth string
+	solPaths, err := scanForProjectFiles(xamarinProjectType)
+	if err != nil {
+		log.Printf("Failed: %s", err)
+		fmt.Println()
+
+		log.Infof("Provide the solution file manually")
+		askText := `Please drag-and-drop your Xamarin Solution (` + colorstring.Green(".sln") + `) file,
+and then hit Enter`
+		solutionPth, err = goinp.AskForPath(askText)
+		if err != nil {
+			return "", fmt.Errorf("failed to read input: %s", err)
+		}
+	} else {
+		if len(solPaths) == 1 {
+			log.Printf("Found one solution file: %s.", path.Base(solPaths[0]))
+			solutionPth = solPaths[0]
+		} else {
+			log.Printf("Found multiple solution file: %s.", path.Base(solutionPth))
+			solutionPth, err = goinp.SelectFromStringsWithDefault("Select the solution file you want to scan", 1, solPaths)
+			if err != nil {
+				return "", fmt.Errorf("failed to select solution file: %s", err)
+			}
+		}
+	}
+
+	return solutionPth, nil
+}
+
 func scanXamarinProject(cmd *cobra.Command, args []string) error {
 	absExportOutputDirPath, err := initExportOutputDir()
 	if err != nil {
@@ -87,14 +120,17 @@ func scanXamarinProject(cmd *cobra.Command, args []string) error {
 	// Xamarin Solution Path
 	xamarinCmd.SolutionFilePath = paramXamarinSolutionFilePath
 	if xamarinCmd.SolutionFilePath == "" {
-		askText := `Please drag-and-drop your Xamarin Solution (` + colorstring.Green(".sln") + `) file,
-and then hit Enter`
 		fmt.Println()
-		projpth, err := goinp.AskForPath(askText)
+		log.Infof("Scan the directory for solution files")
+		log.Warnf("You can specify the Xamarin Solution file to scan with the --file flag.")
+
+		//
+		// Scan the directory for Xamarin.Solution file first
+		// If can't find any, ask the user to drag-and-drop the file
+		xamarinCmd.SolutionFilePath, err = findSolution()
 		if err != nil {
-			return fmt.Errorf("failed to read input: %s", err)
+			return err
 		}
-		xamarinCmd.SolutionFilePath = projpth
 	}
 	log.Debugf("xamSolutionPth: %s", xamarinCmd.SolutionFilePath)
 

cmd/xamarin.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 
@@ -61,6 +62,41 @@ func initExportOutputDir() (string, error) {
 	return absExportOutputDirPath, nil
 }
 
+// findProject scans the directory for Xcode Project (.xcworkspace / .xcodeproject) file first
+// If can't find any, ask the user to drag-and-drop the file
+func findProject() (string, error) {
+	var projpth string
+
+	projPaths, err := scanForProjectFiles(iOSProjectType)
+	if err != nil {
+		log.Printf("Failed: %s", err)
+		fmt.Println()
+
+		log.Infof("Provide the project file manually")
+		askText := `Please drag-and-drop your Xcode Project (` + colorstring.Green(".xcodeproj") + `) or Workspace (` + colorstring.Green(".xcworkspace") + `) file, 
+the one you usually open in Xcode, then hit Enter.
+(Note: if you have a Workspace file you should most likely use that)`
+		projpth, err = goinp.AskForPath(askText)
+		if err != nil {
+			return "", fmt.Errorf("failed to read input: %s", err)
+		}
+		return projpth, err
+	}
+
+	if len(projPaths) == 1 {
+		log.Printf("Found one project file: %s.", path.Base(projPaths[0]))
+		return projPaths[0], nil
+	}
+
+	log.Printf("Found multiple project file: %s.", path.Base(projpth))
+	projpth, err = goinp.SelectFromStringsWithDefault("Select the project file you want to scan", 1, projPaths)
+	if err != nil {
+		return "", fmt.Errorf("failed to select project file: %s", err)
+	}
+
+	return projpth, nil
+}
+
 func scanXcodeProject(cmd *cobra.Command, args []string) error {
 	absExportOutputDirPath, err := initExportOutputDir()
 	if err != nil {
@@ -81,14 +117,17 @@ func scanXcodeProject(cmd *cobra.Command, args []string) error {
 
 	projectPath := paramXcodeProjectFilePath
 	if projectPath == "" {
-		askText := `Please drag-and-drop your Xcode Project (` + colorstring.Green(".xcodeproj") + `) or Workspace (` + colorstring.Green(".xcworkspace") + `) file, 
-the one you usually open in Xcode, then hit Enter.
-(Note: if you have a Workspace file you should most likely use that)`
-		projpth, err := goinp.AskForPath(askText)
+		log.Infof("Scan the directory for project files")
+		log.Warnf("You can specify the Xcode project/workscape file to scan with the --file flag.")
+
+		projpth, err := findProject()
 		if err != nil {
-			return fmt.Errorf("failed to read input: %s", err)
+			return err
 		}
 
+		//
+		// Scan the directory for Xcode Project (.xcworkspace / .xcodeproject) file first
+		// If can't find any, ask the user to drag-and-drop the file
 		projectPath = strings.Trim(strings.TrimSpace(projpth), "'\"")
 	}
 	log.Debugf("projectPath: %s", projectPath)