summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-04-17 14:34:53 -0600
committermo khan <mo.khan@gmail.com>2020-04-17 14:34:53 -0600
commit8c21c18441195a01f6487de613350e265f2275ac (patch)
treebf1bf581ba39bd42ee8c8fbccbd4be99d907bbf2 /lib
parent80ae633768b7d25369f708931f126616ea4d3a87 (diff)
Check for nil match instead of catching error
Diffstat (limited to 'lib')
-rw-r--r--lib/license/finder/ext/gradle.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/license/finder/ext/gradle.rb b/lib/license/finder/ext/gradle.rb
index 05eca79..e532094 100644
--- a/lib/license/finder/ext/gradle.rb
+++ b/lib/license/finder/ext/gradle.rb
@@ -52,15 +52,14 @@ module LicenseFinder
def valid_gradle?
major = gradle_major_version
major.nil? || major > 1
- rescue StandardError => error
- License::Management.logger.error(error)
end
- def gradle_major_version
+ def gradle_major_version(regex: /Gradle (?<major>\d+)\.\d+/)
stdout, _, status = shell.execute([package_management_command, '--version'])
return unless status.success?
- stdout.match(/Gradle (?<major>\d+)\.\d+/)&.[](:major).to_i
+ major = stdout.match(regex)[:major]
+ major ? major.to_i : nil
end
end
end