correct ordering

analyzers/ruby/ruby.go

@@ -127,13 +127,13 @@ func (a *Analyzer) IsBuilt() (bool, error) {
 }
 
 func (a *Analyzer) Analyze() (graph.Deps, error) {
-	strategy := "list"
+	strategy := "list-lockfile"
 
 	if a.Options.Strategy != "" {
 		strategy = a.Options.Strategy
 	}
 
-	lockfilePath := a.getLockfilePath()
+	lockfilePath := a.lockfilePath()
 
 	switch strategy {
 	case "list":
@@ -143,14 +143,29 @@ func (a *Analyzer) Analyze() (graph.Deps, error) {
 	case "list-lockfile":
 		fallthrough
 	default:
-		return a.defaultAnalyzerStrategy(lockfilePath)
+		lockfile, err := bundler.FromLockfile(lockfilePath)
+		if err != nil {
+			return a.lockfileAnalyzerStrategy(lockfilePath)
+		}
+
+		gems, err := a.Bundler.List()
+		if err != nil {
+			return graph.Deps{}, err
+		}
+
+		imports, deps := FilteredLockfile(gems, lockfile)
+
+		return graph.Deps{
+			Direct:     imports,
+			Transitive: deps,
+		}, nil
 	}
 }
 
 func (a *Analyzer) bundlerListAnalyzerStrategy() (graph.Deps, error) {
 	gems, err := a.Bundler.List()
 	if err != nil {
-		lockfilePath := a.getLockfilePath()
+		lockfilePath := a.lockfilePath()
 
 		return a.lockfileAnalyzerStrategy(lockfilePath)
 	}
@@ -166,7 +181,7 @@ func (a *Analyzer) bundlerListAnalyzerStrategy() (graph.Deps, error) {
 func (a *Analyzer) lockfileAnalyzerStrategy(lockfilePath string) (graph.Deps, error) {
 	lockfile, err := bundler.FromLockfile(lockfilePath)
 	if err != nil {
-		return a.defaultAnalyzerStrategy(lockfilePath)
+		return a.bundlerListAnalyzerStrategy()
 	}
 
 	imports, deps := FromLockfile(lockfile)
@@ -177,9 +192,10 @@ func (a *Analyzer) lockfileAnalyzerStrategy(lockfilePath string) (graph.Deps, er
 	}, nil
 }
 
-func (a *Analyzer) defaultAnalyzerStrategy(lockfilePath string) (graph.Deps, error) {
+func (a *Analyzer) listLockfileAnalyzerStrategy(lockfilePath string) (graph.Deps, error) {
 	lockfile, err := bundler.FromLockfile(lockfilePath)
 	if err != nil {
+
 		return graph.Deps{}, err
 	}
 
@@ -196,12 +212,9 @@ func (a *Analyzer) defaultAnalyzerStrategy(lockfilePath string) (graph.Deps, err
 	}, nil
 }
 
-func (a *Analyzer) getLockfilePath() string {
-	lockfilePath := filepath.Join(a.Module.Dir, "Gemfile.lock")
-
+func (a *Analyzer) lockfilePath() string {
 	if a.Options.LockfilePath != "" {
-		lockfilePath = a.Options.LockfilePath
+		return a.Options.LockfilePath
 	}
-
-	return lockfilePath
+	return filepath.Join(a.Module.Dir, "Gemfile.lock")
 }

analyzers/ruby/ruby_test.go

@@ -4,11 +4,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/fossas/fossa-cli/buildtools/bundler"
-
 	"github.com/stretchr/testify/assert"
 
 	"github.com/fossas/fossa-cli/analyzers/ruby"
+	"github.com/fossas/fossa-cli/buildtools/bundler"
 	"github.com/fossas/fossa-cli/module"
 	"github.com/fossas/fossa-cli/pkg"
 )