lib/puppet-check/tasks.rb in puppet-check-1.2.1 vs lib/puppet-check/tasks.rb in puppet-check-1.3.0

@@ -10,27 +10,27 @@
     task puppetcheck: %w(puppetcheck:file puppetcheck:spec puppetcheck:beaker)
 
     namespace :puppetcheck do
       desc 'Execute Puppet-Check file checks'
       task :file do
-        exit_code = PuppetCheck.new.run(Dir.glob('*'))
-        # changes nothing if this task is run separately; aborts 'puppetcheck' task if there are errors here
-        exit exit_code if exit_code != 0
+        PuppetCheck.new.run(Dir.glob('*'))
       end
 
       desc 'Execute RSpec and RSpec-Puppet tests'
       RSpec::Core::RakeTask.new(:spec) do |task|
         RSpecPuppetSupport.run
         # generate tasks for all recognized directories and ensure spec tests inside module dependencies are ignored
         spec_dirs = Dir.glob('**/{classes,defines,facter,functions,hosts,puppet,unit,types}/**/*_spec.rb').reject { |dir| dir =~ /fixtures/ }
         task.pattern = spec_dirs.empty? ? 'skip_rspec' : spec_dirs
+        task.rspec_opts = '-f json' if PuppetCheck.output_format == 'json'
       end
 
       desc 'Execute Beaker acceptance tests'
       RSpec::Core::RakeTask.new(:beaker) do |task|
         # generate tasks for all recognized directories and ensure acceptance tests inside module dependencies are ignored
         acceptance_dirs = Dir.glob('**/acceptance').reject { |dir| dir =~ /fixtures/ }
         task.pattern = acceptance_dirs.empty? ? 'skip_beaker' : acceptance_dirs
+        task.rspec_opts = '-f json' if PuppetCheck.output_format == 'json'
       end
     end
   end
 end