Skip to content
This repository has been archived by the owner on Apr 1, 2022. It is now read-only.

Analysis-target filtering #140

Merged
merged 91 commits into from
Oct 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
49ef5e9
prototype a split for discovery/analysis
cnr Sep 15, 2020
652ad58
Separate findProjects from discover
cnr Sep 16, 2020
68b63e0
Use discover' name for new discovers
cnr Sep 16, 2020
b397535
remove redundant constraint
cnr Sep 16, 2020
9284634
Convert pipenv to new project structure
cnr Sep 16, 2020
c6847c0
Add combineSuccessful combinator
cnr Sep 18, 2020
747aa8e
Rename analyze to getDeps
cnr Sep 18, 2020
e1a41cd
Convert cocoapods to new project structure
cnr Sep 18, 2020
f3095bc
Convert glide to new project structure
cnr Sep 18, 2020
fbe2f52
Convert gomodules to new project structure
cnr Sep 18, 2020
7302355
Convert godep to new project structure
cnr Sep 18, 2020
62a42d9
Hook up OutputStdout route
cnr Sep 21, 2020
d77f538
stub out maven projectLicenses
cnr Sep 21, 2020
e0fa3fe
Hook up UploadScan route
cnr Sep 21, 2020
aed2ed9
Remove dead code from Analyze
cnr Sep 21, 2020
c8b17f4
Re-introduce parallelism
cnr Sep 21, 2020
94c8ae3
Extract runDiscoverFuncs
cnr Sep 21, 2020
fe849d2
Re-introduce archive unpacking
cnr Sep 21, 2020
bd4f92c
Add BuildTargets field to NewProject
cnr Sep 22, 2020
16dbd68
Add BuildTargets as an input to projectDependencyGraph
cnr Sep 22, 2020
3ef0aba
Convert gradle to new project structure
cnr Sep 22, 2020
aba650b
Enumerate gradle subprojects
cnr Sep 22, 2020
eb2515d
Don't silently fail when `gradle projects` fails
cnr Sep 23, 2020
2897f75
Use absolute paths for gradle wrappers
cnr Sep 23, 2020
81909fe
Implement buildtarget filtering for gradle
cnr Sep 23, 2020
cfe018f
Scan the root project when no subprojects exist
cnr Sep 23, 2020
a5aea14
Simplify subproject parsing
cnr Sep 23, 2020
aade2d8
Factor out withDiscoveredProjects
cnr Sep 24, 2020
2b92019
Remove unnecessary language extensions
cnr Sep 24, 2020
cd43b8a
Convert bundler to new project structure
cnr Sep 25, 2020
5164f5b
Fix project creation check for godep
cnr Sep 25, 2020
5f25e9e
Convert cargo to new project structure
cnr Sep 25, 2020
8441db1
Convert carthage to new project structure
cnr Sep 25, 2020
adf1e90
Stub BuildTargetFilter arg
cnr Sep 26, 2020
543495d
Plumb filters through analyze
cnr Sep 26, 2020
ad4d787
Add BuildTargetFilter parser
cnr Sep 26, 2020
b7b7eda
Parse BuildTargetFilters with optparse
cnr Sep 26, 2020
3c83de9
Implement buildtarget filtering logic
cnr Sep 26, 2020
8c53e6a
Pass the current directory to walk'
cnr Sep 26, 2020
fe4b4c5
Print projects we find
cnr Sep 26, 2020
23c0fb7
Move applyFilters to App.Fossa.Analyze.Filters
cnr Sep 28, 2020
7070b9f
Move App.Fossa.Analyze.Filters to Discovery.Filters
cnr Sep 28, 2020
a5a6f25
Add docs to applyFilter(s)
cnr Sep 28, 2020
11815f7
Remove m type variable from NewProject
cnr Sep 28, 2020
f040f72
Rename setuptools and pipenv
cnr Sep 28, 2020
53a8fbd
Move runDiagnosticsIO and withResult to DiagnosticsC carrier
cnr Sep 28, 2020
037e86f
Move withDiscoveredProjects to a new module
cnr Sep 28, 2020
1717ec9
Move Archive modules to Discovery hierarchy
cnr Sep 28, 2020
729224d
Add tests for filterParser, applyFilter, applyFilters
cnr Sep 28, 2020
36ba63e
remove outdated fixme
cnr Sep 28, 2020
571594f
Implement list-targets command
cnr Sep 28, 2020
d0fc2c0
Rename maven
cnr Sep 28, 2020
a22cb8c
Remove quotes from 'found project' output
cnr Sep 28, 2020
fa7f0d4
Fix shadowing warning in RepoManifestSpec
cnr Sep 28, 2020
9e1bab1
Fix --unpack-archives
cnr Sep 28, 2020
9c65dac
Kill outdated comments and Output.Interpret carrier
cnr Sep 28, 2020
135812d
Convert leiningen to new project structure
cnr Sep 29, 2020
0a50daa
Convert composer to new project structure
cnr Sep 29, 2020
d07a5c9
Fix clojure test
cnr Sep 29, 2020
5dcfda6
Convert cabal to new project structure
cnr Sep 29, 2020
42f4d94
Convert stack to new project structure
cnr Sep 29, 2020
08638cf
Convert yarn to new project structure
cnr Sep 29, 2020
e5bd8a9
Convert npm to new project structure
cnr Oct 2, 2020
d01aac2
Convert scala to new project structure
cnr Oct 2, 2020
4d78024
Convert rpm to new project structure
cnr Oct 2, 2020
a6f1abd
Convert repomanifest to new project structure
cnr Oct 2, 2020
7437a0c
Address review feedback
cnr Oct 2, 2020
d321422
Address more review feedback
cnr Oct 2, 2020
fb48728
Add findFileNamed helper
cnr Oct 2, 2020
c4f5556
Re-add licenses to maven projects
cnr Oct 8, 2020
f90f307
Disable tests for yarn-lock
cnr Oct 8, 2020
5a05e8a
Fix rpm analyzer name
cnr Oct 8, 2020
0faf506
Convert nuspec to new project structure
cnr Oct 8, 2020
6222b07
Convert packagereference to new project structure
cnr Oct 8, 2020
b5d29a3
Convert packagesconfig to new project structure
cnr Oct 8, 2020
6007a51
Convert paket to new project structure
cnr Oct 8, 2020
e3b2078
Convert projectassetsjson to new project structure
cnr Oct 8, 2020
c88c163
Convert projectjson to new project structure
cnr Oct 8, 2020
2d13922
Re-add licenses to nuspec projects
cnr Oct 8, 2020
fa91a86
Update pathfinder to use new project discovery
cnr Oct 8, 2020
2eba6ae
Delete all the dead code
cnr Oct 8, 2020
5db037a
Fix GoListSpec test cases
cnr Oct 8, 2020
1004cfb
Rename NewProject to DiscoveredProject
cnr Oct 8, 2020
c58a028
Rename discover' to discover
cnr Oct 8, 2020
ca00e9e
Remove outdated FIXME
cnr Oct 8, 2020
6999eb1
Add context to applyFiltersToProject FIXME
cnr Oct 8, 2020
9749a71
Add more tests for filterParser
cnr Oct 8, 2020
a93793f
Remove outdated FIXME
cnr Oct 8, 2020
6f8b0ad
Merge remote-tracking branch 'origin/master' into archery
cnr Oct 8, 2020
c885c45
Use DEL in filterParser tests (supported on windows)
cnr Oct 8, 2020
a1732bb
Update changelog for 2.3.2
cnr Oct 8, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# v2.3.2

- Adds `fossa list-targets` to list "analysis-targets" (projects and subprojects) available for analysis ([#140](https://github.com/fossas/spectrometer/pull/140))
- Adds `--filter TARGET` option to `fossa analyze` ([#140](https://github.com/fossas/spectrometer/pull/140))
- Merges the dependencies of `*req*.txt` and `setup.py` files we find ([#140](https://github.com/fossas/spectrometer/pull/140))
- Improves maven project discovery ([#140](https://github.com/fossas/spectrometer/pull/140))
- Fixes gradle wrapper integration ([#140](https://github.com/fossas/spectrometer/pull/140))
- Adds support for "detached HEAD" state in git and svn ([#141](https://github.com/fossas/spectrometer/pull/141))

# v2.3.1

- RPM: Merge spec file results in the analyzer. ([#138](https://github.com/fossas/spectrometer/pull/138))
Expand Down
3 changes: 3 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ packages: .
tests: True
optimization: False

package yarn-lock
tests: False

source-repository-package
type: git
location: https://github.com/fossas/yarn-lock.git
Expand Down
3 changes: 3 additions & 0 deletions cabal.project.ci.linux
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ packages: .
package spectrometer
ghc-options: -Werror

package yarn-lock
tests: False

source-repository-package
type: git
location: https://github.com/fossas/yarn-lock.git
Expand Down
3 changes: 3 additions & 0 deletions cabal.project.ci.macos
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ packages: .
package spectrometer
ghc-options: -Werror

package yarn-lock
tests: False

source-repository-package
type: git
location: https://github.com/fossas/yarn-lock.git
Expand Down
3 changes: 3 additions & 0 deletions cabal.project.ci.windows
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ packages: .
package spectrometer
ghc-options: -Werror

package yarn-lock
tests: False

source-repository-package
type: git
location: https://github.com/fossas/yarn-lock.git
Expand Down
23 changes: 18 additions & 5 deletions spectrometer.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ library
App.Fossa.Analyze.GraphMangler
App.Fossa.Analyze.Project
App.Fossa.FossaAPIV1
App.Fossa.ListTargets
App.Fossa.Main
App.Fossa.ProjectInference
App.Fossa.Report
Expand Down Expand Up @@ -111,9 +112,14 @@ library
Control.Effect.Output
Control.Effect.Path
Control.Effect.TaskPool
Control.Exception.Extra
Data.FileEmbed.Extra
Data.Text.Extra
DepTypes
Discovery.Archive
Discovery.Archive.RPM
Discovery.Filters
Discovery.Projects
Discovery.Walk
Effect.Exec
Effect.Grapher
Expand All @@ -123,27 +129,31 @@ library
Parse.XML
Srclib.Converter
Srclib.Types
Strategy.Archive
Strategy.Archive.RPM
Strategy.Bundler
Strategy.Cargo
Strategy.Carthage
Strategy.Clojure
Strategy.Cocoapods
Strategy.Cocoapods.Podfile
Strategy.Cocoapods.PodfileLock
Strategy.Composer
Strategy.Erlang.ConfigParser
Strategy.Erlang.Rebar3Tree
Strategy.Glide
Strategy.Go.GlideLock
Strategy.Go.GoList
Strategy.Go.Gomod
Strategy.Go.GopkgLock
Strategy.Go.GopkgToml
Strategy.Go.Transitive
Strategy.Go.Types
Strategy.Godep
Strategy.Gomodules
Strategy.Googlesource.RepoManifest
Strategy.Gradle
Strategy.Haskell.Cabal
Strategy.Haskell.Stack
Strategy.Leiningen
Strategy.Maven
Strategy.Maven.Plugin
Strategy.Maven.PluginStrategy
Strategy.Maven.Pom
Expand All @@ -154,21 +164,24 @@ library
Strategy.Node.NpmLock
Strategy.Node.PackageJson
Strategy.Node.YarnLock
Strategy.Npm
Strategy.NuGet.Nuspec
Strategy.NuGet.PackageReference
Strategy.NuGet.PackagesConfig
Strategy.NuGet.Paket
Strategy.NuGet.ProjectAssetsJson
Strategy.NuGet.ProjectJson
Strategy.Python.PipList
Strategy.Python.Pipenv
Strategy.Python.ReqTxt
Strategy.Python.SetupPy
Strategy.Python.Setuptools
Strategy.Python.Util
Strategy.RPM
Strategy.Rebar3
Strategy.Ruby.BundleShow
Strategy.Ruby.GemfileLock
Strategy.Scala
Strategy.Yarn
Types
VCS.Git

Expand Down Expand Up @@ -213,6 +226,7 @@ test-suite unit-tests
Cocoapods.PodfileLockSpec
Cocoapods.PodfileSpec
Composer.ComposerLockSpec
Discovery.FiltersSpec
Effect.ExecSpec
Erlang.ConfigParserSpec
Erlang.Rebar3TreeSpec
Expand All @@ -237,7 +251,6 @@ test-suite unit-tests
NuGet.PaketSpec
NuGet.ProjectAssetsJsonSpec
NuGet.ProjectJsonSpec
Python.PipListSpec
Python.PipenvSpec
Python.ReqTxtSpec
Python.RequirementsSpec
Expand Down
Loading