From add2f9698a0f3c02d3148655a4b538e2f557d2be Mon Sep 17 00:00:00 2001 From: Simon Warren <33803336+swarren12@users.noreply.github.com> Date: Sat, 8 Jul 2023 21:50:10 +0100 Subject: [PATCH] [Fixed] Print subproject paths when logging When running the LicenseFinder with the `--recursive` option the output becomes unclear as to which subproject is currently being processed. By adding in the subproject path to the logging, it becomes slightly easier to tell what is going on when running on large monorepos. --- lib/license_finder/core.rb | 4 ++-- lib/license_finder/scanner.rb | 4 ++-- spec/lib/license_finder/scanner_spec.rb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/license_finder/core.rb b/lib/license_finder/core.rb index 38defd3a9..9c127e5df 100644 --- a/lib/license_finder/core.rb +++ b/lib/license_finder/core.rb @@ -61,9 +61,9 @@ def prepare_projects clear_logs package_managers = @scanner.active_package_managers package_managers.each do |manager| - logger.debug manager.class, 'Running prepare on project' + logger.debug manager.class, "Running prepare on project '#{config.project_path}'" manager.prepare - logger.debug manager.class, 'Finished prepare on project', color: :green + logger.debug manager.class, "Finished prepare on project '#{config.project_path}'", color: :green end end diff --git a/lib/license_finder/scanner.rb b/lib/license_finder/scanner.rb index afccf281c..045124008 100644 --- a/lib/license_finder/scanner.rb +++ b/lib/license_finder/scanner.rb @@ -50,10 +50,10 @@ def active_package_managers active = pm_class.new(@config).active? if active - @logger.info pm_class, 'is active', color: :green + @logger.info pm_class, "is active for '#{@project_path}'", color: :green active_pm_classes << pm_class else - @logger.debug pm_class, 'is not active', color: :red + @logger.debug pm_class, "is not active for '#{@project_path}'", color: :red end end diff --git a/spec/lib/license_finder/scanner_spec.rb b/spec/lib/license_finder/scanner_spec.rb index 9dffc3c24..7f7606205 100644 --- a/spec/lib/license_finder/scanner_spec.rb +++ b/spec/lib/license_finder/scanner_spec.rb @@ -30,7 +30,7 @@ module LicenseFinder context 'when package manager is NOT installed' do it 'should log all active packages' do allow(bundler).to receive(:command_exists?).and_return false - expect(logger).to receive(:info).with(Bundler, 'is active', color: :green) + expect(logger).to receive(:info).with(Bundler, 'is active for \'\'', color: :green) expect(logger).to receive(:info).with(Bundler, 'is not installed', color: :red) expect(subject.active_packages).to_not be_nil end @@ -47,7 +47,7 @@ module LicenseFinder it 'should log active states of package managers' do bundler = double(:bundler, active?: true) allow(Bundler).to receive(:new).and_return bundler - expect(logger).to receive(:info).with(Bundler, 'is active', color: :green) + expect(logger).to receive(:info).with(Bundler, 'is active for \'\'', color: :green) subject.active_package_managers end @@ -55,7 +55,7 @@ module LicenseFinder it 'should log inactive states of package managers' do bundler = double(:bundler, active?: false) allow(Bundler).to receive(:new).and_return bundler - expect(logger).to receive(:debug).with(Bundler, 'is not active', color: :red) + expect(logger).to receive(:debug).with(Bundler, 'is not active for \'\'', color: :red) subject.active_package_managers end