Skip to content

Simplify parse of dependency line #94

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

Merged
headius merged 1 commit into from
Feb 10, 2025
Merged

Simplify parse of dependency line #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions lib/jars/installer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@ def setup_scope(line)
REG = /:jar:|:pom:|:test:|:compile:|:runtime:|:provided:|:system:/.freeze
EMPTY = ''
def initialize(line)
# remove ANSI escape sequences and module section (https://issues.apache.org/jira/browse/MDEP-974)
line = line.gsub(/\e\[\d*m/, '')
line = line.gsub(/ -- module.*/, '')

setup_type(line)

line.strip!

# strip off trailing module output (jruby/jar-dependencies#92)
line.sub!(/\u001B.*$/, EMPTY)

@coord = line.sub(/:[^:]+:([A-Z]:\\)?[^:]+$/, EMPTY)
first, second = @coord.split(/:#{type}:/)
group_id, artifact_id = first.split(':')
Expand Down
22 changes: 22 additions & 0 deletions specs/dependency_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,27 @@
_(dep.path).must_equal 'org/sonatype/sisu/sisu-guice/3.1.0/sisu-guice-3.1.0-no_aop.jar'
_(dep.file).must_equal 'C:\\Users\\Local\\repository\\org\\sonatype\\sisu\\sisu-guice\\3.1.0\\sisu-guice-3.1.0-no_aop.jar'
end

# these next two combine every possible oddity to try to cover all combinations (classifier, windows path, ANSI and module)

it 'should parse dependency with module section' do
dep = Jars::Installer::Dependency.new(+' org.eclipse.sisu:org.eclipse.sisu.plexus:jar:no_aop:0.0.0.M2a:compile:C:\\Users\\Local\\repository\\org\\sonatype\\sisu\\org.eclipse.sisu.plexus\\0.0.0.M2a\\org.eclipse.sisu.plexus-0.0.0.M2a-no_aop.jar -- module org.sonatype.sisu.sisu-guice')
_(dep.type).must_equal :jar
_(dep.scope).must_equal :runtime
_(dep.gav).must_equal 'org.eclipse.sisu:org.eclipse.sisu.plexus:no_aop:0.0.0.M2a'
_(dep.coord).must_equal 'org.eclipse.sisu:org.eclipse.sisu.plexus:jar:no_aop:0.0.0.M2a'
_(dep.path).must_equal 'org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M2a/org.eclipse.sisu.plexus-0.0.0.M2a-no_aop.jar'
_(dep.file).must_equal 'C:\\Users\\Local\\repository\\org\\sonatype\\sisu\\org.eclipse.sisu.plexus\\0.0.0.M2a\\org.eclipse.sisu.plexus-0.0.0.M2a-no_aop.jar'
end

it 'should parse dependency with ANSI-colored module section' do
dep = Jars::Installer::Dependency.new(+" org.eclipse.sisu:org.eclipse.sisu.plexus:jar:no_aop:0.0.0.M2a:compile:C:\\Users\\Local\\repository\\org\\sonatype\\sisu\\org.eclipse.sisu.plexus\\0.0.0.M2a\\org.eclipse.sisu.plexus-0.0.0.M2a-no_aop.jar\e[31m -- module org.sonatype.sisu.sisu-guice\e[m")
_(dep.type).must_equal :jar
_(dep.scope).must_equal :runtime
_(dep.gav).must_equal 'org.eclipse.sisu:org.eclipse.sisu.plexus:no_aop:0.0.0.M2a'
_(dep.coord).must_equal 'org.eclipse.sisu:org.eclipse.sisu.plexus:jar:no_aop:0.0.0.M2a'
_(dep.path).must_equal 'org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M2a/org.eclipse.sisu.plexus-0.0.0.M2a-no_aop.jar'
_(dep.file).must_equal 'C:\\Users\\Local\\repository\\org\\sonatype\\sisu\\org.eclipse.sisu.plexus\\0.0.0.M2a\\org.eclipse.sisu.plexus-0.0.0.M2a-no_aop.jar'
end
end
# rubocop:enable Layout/LineLength