Skip to content

Support allegro custom maven packages #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emmanu-bacancy wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Support allegro custom maven packages #8

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
914ad3b
support allegro custom maven packages
emmanu-bacancy Sep 14, 2023
d323724
Update matchers.rb
emmanu-bacancy Feb 5, 2024
a558633
Update matchers.rb
emmanu-bacancy Feb 5, 2024
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
29 changes: 19 additions & 10 deletions lib/bibliothecary/parsers/maven.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class Maven
GRADLE_GAV_REGEX = /([\w.-]+)\:([\w.-]+)(?:\:(#{GRADLE_VERSION_REGEX}|#{GRADLE_VAR_INTERPOLATION_REGEX}|#{GRADLE_CODE_INTERPOLATION_REGEX}))?/ # e.g. "group:artifactId:1.2.3"
GRADLE_GROOVY_SIMPLE_REGEX = /(#{GRADLE_DEPENDENCY_METHODS.join('|')})\s*\(?\s*['"]#{GRADLE_GAV_REGEX}['"]/m
GRADLE_KOTLIN_SIMPLE_REGEX = /(#{GRADLE_DEPENDENCY_METHODS.join('|')})\s*\(\s*"#{GRADLE_GAV_REGEX}"/m
GRADLE_KOTLIN_CUSTOM_REGEX = /implementation\(group = "(.*?)".*?(?:version = "(.*?)".*?)?\)/

MAVEN_PROPERTY_REGEX = /\$\{(.+?)\}/
MAX_DEPTH = 5
Expand Down Expand Up @@ -296,16 +297,24 @@ def self.parse_gradle(file_contents, options: {})
end

def self.parse_gradle_kts(file_contents, options: {})
file_contents
.scan(GRADLE_KOTLIN_SIMPLE_REGEX) # match 'implementation("group:artifactId:version")'
.reject { |(_type, group, artifactId, _version)| group.nil? || artifactId.nil? } # remove any matches with missing group/artifactId
.map { |(type, group, artifactId, version)|
{
name: [group, artifactId].join(":"),
requirement: version || "*",
type: type
}
}
bibliothecary_list =
file_contents
.scan(GRADLE_KOTLIN_SIMPLE_REGEX) # match 'implementation("group:artifactId:version")'
.reject do |(_type, group, artifactId, _version)|
group.nil? || artifactId.nil?
end
.map do |(type, group, artifactId, version)|
{ name: [group, artifactId].join(':'), requirement: version || '*', type: type }
end

custom_list_for_allegro =
file_contents
.scan(GRADLE_KOTLIN_CUSTOM_REGEX)
.map do |(name, version)|
{ name: name, requirement: version || '*', type: 'implementation' }
end

bibliothecary_list + custom_list_for_allegro
end

def self.gradle_dependency_name(group, name)
Expand Down
1 change: 1 addition & 0 deletions spec/fixtures/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ repositories {
dependencies {
// Align versions of all Kotlin components
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation(group = "pl.allegro.bigdata.hadoop", name = "vault-gcp-java", version = "0.3.0")

// Use the Kotlin JDK 8 standard library.
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
Expand Down
3 changes: 2 additions & 1 deletion spec/parsers/maven_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@
{ name: "com.google.guava:guava", requirement: "30.1.1-jre", type: "implementation" },
{ name: "org.jetbrains.kotlin:kotlin-test", requirement: "*", type: "testImplementation" },
{ name: "org.jetbrains.kotlin:kotlin-test-junit", requirement: "1.0.0", type: "testImplementation" },
{ name: "androidx.annotation:annotation", requirement: "${rootProject.extra[\"androidx_annotation_version\"]}", type: "implementation" }
{ name: "androidx.annotation:annotation", requirement: "${rootProject.extra[\"androidx_annotation_version\"]}", type: "implementation" },
{ name: "pl.allegro.bigdata.hadoop", requirement: "0.3.0", type: "implementation"}
],
kind: 'manifest',
success: true
Expand Down