lib/licensed/reporters/cache_reporter.rb in licensed-3.1.0 vs lib/licensed/reporters/cache_reporter.rb in licensed-3.2.0

@@ -1,91 +1,75 @@
 # frozen_string_literal: true
 module Licensed
   module Reporters
     class CacheReporter < Reporter
-      # Reports on an application configuration in a cache command run
+      # Reports the start of caching records for an app
       #
       # app - An application configuration
-      #
-      # Returns the result of the yielded method
-      # Note - must be called from inside the `report_run` scope
-      def report_app(app)
-        super do |report|
-          shell.info "Caching dependency records for #{app["name"]}"
-          yield report
-        end
+      # report - A report containing information about the app evaluation
+      def begin_report_app(app, report)
+        shell.info "Caching dependency records for #{app["name"]}"
       end
 
-      # Reports on a dependency source enumerator in a cache command run.
-      # Shows the type and count of dependencies found by the source.
+      # Reports the start of caching records for a dependency source
       #
       # source - A dependency source enumerator
+      # report - A report containing information about the source evaluation
+      def begin_report_source(source, report)
+        shell.info "  #{source.class.type}"
+      end
+
+      # Reports warnings and errors found while evaluating the dependency source
       #
-      # Returns the result of the yielded method
-      # Note - must be called from inside the `report_run` scope
-      def report_source(source)
-        super do |report|
-          shell.info "  #{source.class.type}"
-          result = yield report
+      # source - A dependency source enumerator
+      # report - A report containing information about the source evaluation
+      def end_report_source(source, report)
+        warning_reports = report.all_reports.select { |r| r.warnings.any? }.to_a
+        if warning_reports.any?
+          shell.newline
+          shell.warn "  * Warnings:"
+          warning_reports.each do |r|
+            display_metadata = r.map { |k, v| "#{k}: #{v}" }.join(", ")
 
-          warning_reports = report.all_reports.select { |r| r.warnings.any? }.to_a
-          if warning_reports.any?
-            shell.newline
-            shell.warn "  * Warnings:"
-            warning_reports.each do |r|
-              display_metadata = r.map { |k, v| "#{k}: #{v}" }.join(", ")
-
-              shell.warn "    * #{r.name}"
-              shell.warn "    #{display_metadata}" unless display_metadata.empty?
-              r.warnings.each do |warning|
-                shell.warn "      - #{warning}"
-              end
-              shell.newline
+            shell.warn "    * #{r.name}"
+            shell.warn "    #{display_metadata}" unless display_metadata.empty?
+            r.warnings.each do |warning|
+              shell.warn "      - #{warning}"
             end
+            shell.newline
           end
+        end
 
-          errored_reports = report.all_reports.select { |r| r.errors.any? }.to_a
-          if errored_reports.any?
-            shell.newline
-            shell.error "  * Errors:"
-            errored_reports.each do |r|
-              display_metadata = r.map { |k, v| "#{k}: #{v}" }.join(", ")
+        errored_reports = report.all_reports.select { |r| r.errors.any? }.to_a
+        if errored_reports.any?
+          shell.newline
+          shell.error "  * Errors:"
+          errored_reports.each do |r|
+            display_metadata = r.map { |k, v| "#{k}: #{v}" }.join(", ")
 
-              shell.error "    * #{r.name}"
-              shell.error "    #{display_metadata}" unless display_metadata.empty?
-              r.errors.each do |error|
-                shell.error "      - #{error}"
-              end
-              shell.newline
+            shell.error "    * #{r.name}"
+            shell.error "    #{display_metadata}" unless display_metadata.empty?
+            r.errors.each do |error|
+              shell.error "      - #{error}"
             end
-          else
-            shell.confirm "  * #{report.reports.size} #{source.class.type} dependencies"
+            shell.newline
           end
-
-          result
+        else
+          shell.confirm "  * #{report.reports.size} #{source.class.type} dependencies"
         end
       end
 
-      # Reports on a dependency in a cache command run.
-      # Shows whether the dependency's record was cached or reused.
+      # Reports whether the dependency's record was cached or reused.
       #
       # dependency - An application dependency
-      #
-      # Returns the result of the yielded method
-      # Note - must be called from inside the `report_run` scope
-      def report_dependency(dependency)
-        super do |report|
-          result = yield report
-
-          if report.errors.any?
-            shell.error "    Error #{dependency.name} (#{dependency.version})"
-          elsif report["cached"]
-            shell.info "    Caching #{dependency.name} (#{dependency.version})"
-          else
-            shell.info "    Using #{dependency.name} (#{dependency.version})"
-          end
-
-          result
+      # report - A report containing information about the dependency evaluation
+      def end_report_dependency(dependency, report)
+        if report.errors.any?
+          shell.error "    Error #{dependency.name} (#{dependency.version})"
+        elsif report["cached"]
+          shell.info "    Caching #{dependency.name} (#{dependency.version})"
+        else
+          shell.info "    Using #{dependency.name} (#{dependency.version})"
         end
       end
     end
   end
 end