From d5e8f54214b8c850434c216a5196dbd453afb6b2 Mon Sep 17 00:00:00 2001 From: bjiang Date: Fri, 6 May 2016 17:55:21 -0400 Subject: [PATCH] fix RubyBundlerAnalyzer.accept --- .../analyzer/RubyBundlerAnalyzer.java | 12 +++++++++++- .../analyzer/RubyBundlerAnalyzerTest.java | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzer.java index 6d17f7aa1..7bfda9cf0 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzer.java @@ -55,6 +55,16 @@ public class RubyBundlerAnalyzer extends RubyGemspecAnalyzer { //Folder name that contains the gems by "bundle install" private static final String GEMS = "gems"; + /** + * Returns the name of the analyzer. + * + * @return the name of the analyzer. + */ + @Override + public String getName() { + return ANALYZER_NAME; + } + /** * Only accept *.gemspec files generated by "bundle install --deployment" under "specifications" folder. */ @@ -64,7 +74,7 @@ public class RubyBundlerAnalyzer extends RubyGemspecAnalyzer { boolean accepted = super.accept(pathname); if(accepted == true) { File parentDir = pathname.getParentFile(); - accepted = parentDir != null && parentDir.exists() && parentDir.getName().equals(SPECIFICATIONS); + accepted = parentDir != null && parentDir.getName().equals(SPECIFICATIONS); } return accepted; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzerTest.java index bff57eeff..d304a4200 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzerTest.java @@ -78,7 +78,8 @@ public class RubyBundlerAnalyzerTest extends BaseTest { */ @Test public void testSupportsFiles() { - assertThat(analyzer.accept(new File("test.gemspec")), is(true)); + assertThat(analyzer.accept(new File("test.gemspec")), is(false)); + assertThat(analyzer.accept(new File("specifications" + File.separator + "test.gemspec")), is(true)); } /**