lib/licensed/commands/command.rb in licensed-2.11.1 vs lib/licensed/commands/command.rb in licensed-2.12.0

- old
+ new

@@ -19,11 +19,13 @@ @options = options @reporter = create_reporter(options) begin result = reporter.report_run(self) do |report| # allow additional report data to be given by commands - yield report if block_given? + if block_given? + next if (yield report) == :skip + end config.apps.sort_by { |app| app["name"] } .map { |app| run_app(app) } .all? end @@ -55,11 +57,13 @@ def run_app(app) reporter.report_app(app) do |report| Dir.chdir app.source_path do begin # allow additional report data to be given by commands - yield report if block_given? + if block_given? + next if (yield report) == :skip + end app.sources.select(&:enabled?) .sort_by { |source| source.class.type } .map { |source| run_source(app, source) }.all? rescue Licensed::Shell::Error => err @@ -79,11 +83,13 @@ # Returns whether the command succeeded for the dependency source enumerator def run_source(app, source) reporter.report_source(source) do |report| begin # allow additional report data to be given by commands - yield report if block_given? + if block_given? + next if (yield report) == :skip + end source.dependencies.sort_by { |dependency| dependency.name } .map { |dependency| run_dependency(app, source, dependency) } .all? rescue Licensed::Shell::Error => err @@ -112,10 +118,12 @@ return false end begin # allow additional report data to be given by commands - yield report if block_given? + if block_given? + next if (yield report) == :skip + end evaluate_dependency(app, source, dependency, report) rescue Licensed::Shell::Error => err report.errors << err.message false