Merge pull request #82 from fossas/fix/fix-builders-config

Fix/fix builders config
fossas · Mar 3, 2018 · 7f4d52f · 7f4d52f
2 parents db9710b + a5202e0
commit 7f4d52f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/builders/common.go b/builders/common.go
@@ -108,7 +108,7 @@ func runInDir(dir string, name string, arg ...string) (string, string, error) {
 // Utilities for debug logging
 func runLogged(logger *logging.Logger, dir string, name string, arg ...string) (string, string, error) {
 	cmd := strings.Join(append([]string{name}, arg...), " ")
-	logger.Debugf("Running `%s`...", cmd)
+	logger.Debugf("Running `%s` in dir `%s`...", cmd, dir)
 	stdout, stderr, err := runInDir(dir, name, arg...)
 	if err != nil {
 		logger.Debugf("Running `%s` failed: %#v %#v", cmd, err, stderr)

diff --git a/builders/gradle.go b/builders/gradle.go
@@ -130,7 +130,7 @@ func (builder *GradleBuilder) DiscoverModules(dir string) ([]config.ModuleConfig
 						gradleTask := strings.Split(trimmed, " - ")[0]
 						gradleLogger.Debugf("found gradle dependencies task: %s", gradleTask)
 						moduleConfigurations = append(moduleConfigurations, config.ModuleConfig{
-							Name: strings.Split(gradleTask, ":")[0], // Name is the gradle task name
+							Name: strings.Split(gradleTask, ":")[0] + ":compile", // Name is the gradle `task:configuration` (default to compile)
 							Path: "build.gradle",
 							Type: "gradle",
 						})
@@ -144,7 +144,7 @@ func (builder *GradleBuilder) DiscoverModules(dir string) ([]config.ModuleConfig
 		// Fall back to "app" as default task, even though technically it would be "" (root)
 		return []config.ModuleConfig{
 			config.ModuleConfig{
-				Name: "app",
+				Name: "app:compile",
 				Path: "build.gradle",
 				Type: "gradle",
 			},

diff --git a/builders/maven.go b/builders/maven.go
@@ -184,7 +184,7 @@ func (builder *MavenBuilder) DiscoverModules(dir string) ([]config.ModuleConfig,
 	}
 	moduleConfigs := make([]config.ModuleConfig, len(pomFilePaths))
 	for i, path := range pomFilePaths {
-		artifactName := filepath.Dir(path)
+		artifactName := filepath.Base(filepath.Dir(dir))
 		var artifactPom POMFile
 		if err := parseLoggedWithUnmarshaller(mavenLogger, path, &artifactPom, xml.Unmarshal); err == nil {
 			if artifactPom.Name != "" {
@@ -193,6 +193,7 @@ func (builder *MavenBuilder) DiscoverModules(dir string) ([]config.ModuleConfig,
 				artifactName = artifactPom.ArtifactID
 			}
 		}
+		path, _ := filepath.Rel(dir, path)
 		moduleConfigs[i] = config.ModuleConfig{
 			Name: artifactName,
 			Path: path,

diff --git a/builders/ruby.go b/builders/ruby.go
@@ -137,7 +137,7 @@ func (builder *RubyBuilder) IsBuilt(m module.Module, allowUnresolved bool) (bool
 
 	output, _, err := runLogged(rubyLogger, m.Dir, builder.BundlerCmd, "check")
 	if err != nil {
-		if strings.Index(output, "Please run `bundle install`") != -1 {
+		if strings.Index(output, "`bundle install`") != -1 {
 			return false, nil
 		}
 		return false, err

diff --git a/cmd/fossa/common.go b/cmd/fossa/common.go
@@ -50,7 +50,7 @@ func makeAPIRequest(method, endpoint, apiKey string, payload []byte) ([]byte, er
 	defer resp.Body.Close()
 
 	if resp.StatusCode == http.StatusForbidden {
-		return nil, fmt.Errorf("invalid API key %#v (try setting $FOSSA_API_KEY)", apiKey)
+		return nil, fmt.Errorf("invalid API key %#v (try setting $FOSSA_API_KEY); get one at https://fossa.io", apiKey)
 	} else if resp.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("bad server response: %d", resp.StatusCode)
 	}

diff --git a/cmd/fossa/upload.go b/cmd/fossa/upload.go
@@ -174,7 +174,7 @@ func doUpload(conf config.CLIConfig, results []normalizedModule) (string, error)
 	responseStr := string(responseBytes)
 
 	if resp.StatusCode == http.StatusForbidden {
-		return "", fmt.Errorf("invalid API key (check the $FOSSA_API_KEY environment variable)")
+		return "", fmt.Errorf("invalid API key (check the $FOSSA_API_KEY environment variable); get one at https://fossa.io")
 	} else if resp.StatusCode == http.StatusPreconditionRequired {
 		// TODO: handle "Managed Project" workflow
 		return "", fmt.Errorf("invalid project or revision; make sure this version is published and FOSSA has access to your repo. To submit a custom project, set Fetcher to `custom` in `.fossa.yml`")