diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/license/finder/ext/dotnet.rb | 12 | ||||
| -rw-r--r-- | lib/license/finder/ext/nuget.rb | 16 | ||||
| -rw-r--r-- | lib/license/management.rb | 3 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
4 files changed, 20 insertions, 13 deletions
diff --git a/lib/license/finder/ext/dotnet.rb b/lib/license/finder/ext/dotnet.rb index c5ff485..d2cb998 100644 --- a/lib/license/finder/ext/dotnet.rb +++ b/lib/license/finder/ext/dotnet.rb @@ -9,17 +9,19 @@ module LicenseFinder project_path.glob('*.fsproj') end + def installed?(*) + File.exist?('/opt/asdf/installs/dotnet/latest/dotnet') + end + def prepare - shell.execute(['apt-get', :update, '-q']) - shell.execute(['apt-get', :install, '-y', '--no-install-recommends', 'dotnet-sdk-3.1']) shell.execute([:mkdir, '-p', vendor_path.to_s]) unless vendor_path.exist? shell.execute([ - :dotnet, + '/opt/asdf/installs/dotnet/latest/dotnet', :restore, detected_package_path.to_s, + '--locked-mode', '--no-cache', '--packages', vendor_path.to_s, - '--locked-mode', - '--verbosity', :detailed + '--verbosity', :normal ]) end diff --git a/lib/license/finder/ext/nuget.rb b/lib/license/finder/ext/nuget.rb index 6fb2553..93985ba 100644 --- a/lib/license/finder/ext/nuget.rb +++ b/lib/license/finder/ext/nuget.rb @@ -3,22 +3,24 @@ module LicenseFinder class Nuget def prepare - shell.execute(['apt-get', :update, '-q']) - shell.execute(['apt-get', :install, '-y', '--no-install-recommends', 'mono-complete']) + shell.execute(['apt-get', :install, '-y', '/opt/toolcache/mono/*.deb']) shell.execute([:mkdir, '-p', vendor_path.to_s]) unless vendor_path.exist? - Dir.chdir(project_path) do shell.execute([ :mono, '/usr/local/bin/nuget.exe', :restore, detected_package_path, - '-Verbosity detailed', - '-PackagesDirectory', vendor_path, + '-LockedMode', '-NoCache', - '-LockedMode' + '-PackagesDirectory', vendor_path, + '-Verbosity', :normal ]) end end + def installed?(*args) + File.exist?('/usr/local/bin/nuget.exe') + end + def current_packages dependencies.map do |dependency| nupkg = vendor_path.glob("**/#{dependency.name}*.nupkg")[0] @@ -45,6 +47,8 @@ module LicenseFinder [] end + private + def vendor_path @vendor_path ||= Pathname.pwd.join('.gitlab', 'cache', 'vendor') end diff --git a/lib/license/management.rb b/lib/license/management.rb index 58310f7..0824157 100644 --- a/lib/license/management.rb +++ b/lib/license/management.rb @@ -26,7 +26,8 @@ module License def self.logger @logger ||= Logger.new(STDOUT, level: ENV.fetch('LOG_LEVEL', Logger::WARN)).tap do |x| x.formatter = proc do |_severity, _datetime, _progname, message| - "[v#{VERSION}] #{message}\n" + prefix = message.start_with?("\n") ? "" : "[v#{VERSION}] " + "#{prefix}#{message}\n" end end end diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index 1ba7279..72c1491 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.18.1' + VERSION = '3.19.0' end end |
