rake-funnel 0.22.1 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a190b633f52a8e6c9919cf3d818f3600a6ad7cb726c131cf01b76b9f76c05169
-  data.tar.gz: 386fe96db5576dbb45d829a468a7ded2ef0e865aad7c67110daa271223b40a68
+  metadata.gz: 2cd9f0cb254e3b71224760bb6773e6b343ffcabad48946d8fb9e0c0aef8d93f2
+  data.tar.gz: 4d10525a22662f1f82deb0404b9bfb3408964c72e1da9b5a1bee8d757d430b5a
 SHA512:
-  metadata.gz: 5690e1ba4b53cf4e1f565504d769c50d02e8c0fc6e664357a66e301b2e9a2991546d1904825872197c839b3394c73dde7bb7c8d94503c64164c85ac005121fe3
-  data.tar.gz: d645dd0b874a6f84f2f6a16b8a227f05785150f85cba1f3773f958e31dfc8784a215608bd54ceb18b8bf91de4758797310b5fc6b9a722a1f16af0777a3156c6f
+  metadata.gz: 57d0f5a12dd303151590e5f5d73d52e954044f3d592b35394ff07b72c0143a3f01728f4171a283779d3af6ae7dad93b94623e9fbe80bad2cef669823c5a5cfd7
+  data.tar.gz: eda37cf74ae2992b12035cfcd7f27bcb62d4c7b031bdf5d80040096048fc880ba8ae7673cf77419fa58dc4ec4b5a2f63dece409bdf299d4b7e692bac77ee3211

data/lib/rake/funnel/extensions/shell.rb

@@ -20,10 +20,10 @@ module Rake
 
         private
 
-        def run(cmd, log_file, error_lines)
+        def run(cmd, log_file, error_lines) # rubocop:disable Metrics/AbcSize
           cmd, readable_cmd = normalize(cmd)
 
-          Rake.rake_output_message(readable_cmd)
+          $stderr.print(readable_cmd + "\n")
 
           Open3.popen2e(*cmd) do |_, stdout_and_stderr, wait_thread|
             log, error_logged = log_output(stdout_and_stderr, log_file, error_lines)
@@ -70,14 +70,14 @@ module Rake
         end
 
         def to_stdout(line)
-          $stdout.puts(line.rstrip.green)
+          $stdout.print(line.rstrip.green + "\n")
           :success
         end
 
         def to_stderr(line, error_lines)
           return unless error_lines && line =~ error_lines
 
-          Kernel.warn(line.rstrip.bold.red)
+          $stderr.print(line.rstrip.bold.red + "\n")
           :error
         end
       end

data/lib/rake/funnel/integration/progress_report.rb

@@ -8,7 +8,8 @@ module Rake
 
         def initialize
           task_starting do |task, _args|
-            puts "\n[#{task.name}]".bold.cyan unless Rake::Funnel::Integration::TeamCity.running?
+            name = "[#{task.name}]".bold.cyan
+            print "\n#{name}\n" unless Rake::Funnel::Integration::TeamCity.running?
           end
 
           yield self if block_given?

data/lib/rake/funnel/integration/sync_output.rb

@@ -12,7 +12,7 @@ module Rake
         def sync(stream)
           stream.sync = true
         rescue => e # rubocop:disable Style/RescueStandardError
-          Rake.rake_output_message "Failed to set up sync output #{e}"
+          $stderr.print "Failed to set up sync output #{e}\n"
         end
       end
     end

data/lib/rake/funnel/integration/teamcity/nunit_plugin.rb

@@ -28,7 +28,7 @@ module Rake
               version = Rake::Funnel::Support::BinaryVersionReader.read_from(nunit)
 
               unless version.file_version
-                Rake.rake_output_message("Could read version from NUnit executable in #{nunit}")
+                $stderr.print("Could read version from NUnit executable in #{nunit}\n")
                 return
               end
 
@@ -39,7 +39,7 @@ module Rake
               addin_files = Dir.glob("#{addins}-#{version}.*")
 
               if addin_files.none?
-                Rake.rake_output_message("Could not find TeamCity NUnit addin for version #{version} in #{addins}")
+                $stderr.print("Could not find TeamCity NUnit addin for version #{version} in #{addins}\n")
                 return
               end
 
@@ -47,7 +47,7 @@ module Rake
             end
 
             def copy_addin_files(nunit, addin_files, version)
-              Rake.rake_output_message("Installing TeamCity NUnit addin for version #{version} in #{nunit}")
+              $stderr.print("Installing TeamCity NUnit addin for version #{version} in #{nunit}\n")
 
               destination = File.join(File.dirname(nunit), 'addins')
 

data/lib/rake/funnel/integration/teamcity/service_messages.rb

@@ -21,7 +21,7 @@ module Rake
               args = [message_name] << escaped_array_of(args)
               args = args.flatten.reject(&:nil?)
 
-              puts "##teamcity[#{args.join(' ')}]"
+              print "##teamcity[#{args.join(' ')}]\n"
             end
 
             def escape(string) # rubocop:disable Metrics/MethodLength

data/lib/rake/funnel/support/assembly_version/from_version_files.rb

@@ -17,7 +17,7 @@ module Rake
             block_given? || (return enum_for(__method__))
 
             files.each do |file|
-              Rake.rake_output_message("Reading #{file}")
+              $stderr.print("Reading #{file}\n")
 
               version_info = VersionInfo.parse(
                 version: VersionInfo.read_version_from(file),

data/lib/rake/funnel/support/assembly_version_writer.rb

@@ -25,7 +25,7 @@ module Rake
 
               contents = evaluate_erb(language, version_info, target)
 
-              Rake.rake_output_message("Writing #{target}")
+              $stderr.print("Writing #{target}\n")
               File.write(target, contents)
             end
           end

data/lib/rake/funnel/support/environments/loader.rb

@@ -8,7 +8,7 @@ module Rake
         class Loader
           class << self
             def load_configuration(config, store = configatron, customizer = nil)
-              Rake.rake_output_message("Configuring for #{config[:name]}")
+              $stderr.print("Configuring for #{config[:name]}\n")
               store.unlock!
               store.reset!
 
@@ -19,8 +19,7 @@ module Rake
 
               store.lock!
 
-              Rake.rake_output_message('')
-              Rake.rake_output_message(store.inspect)
+              $stderr.print("\n" + store.inspect + "\n")
             end
 
             private
@@ -28,7 +27,7 @@ module Rake
             def load(config, store)
               operation = 'Loading'
               config.fetch(:config_files, []).each do |file|
-                Rake.rake_output_message("#{operation} #{file}")
+                $stderr.print("#{operation} #{file}\n")
                 operation = 'Merging'
 
                 yaml = File.read(file)

data/lib/rake/funnel/support/msbuild/build_tool.rb

@@ -18,7 +18,7 @@ module Rake
             def mono
               out, status = Open3.capture2('mono', '--version')
               unless status.success?
-                warn "Could not determine mono version: #{status}"
+                $stderr.print "Could not determine mono version: #{status}\n"
                 return nil
               end
 
@@ -40,7 +40,7 @@ module Rake
 
               path, status = Open3.capture2(*args)
               unless status.success?
-                warn "vswhere failed: #{status}"
+                $stderr.print "vswhere failed: #{status}\n"
                 return nil
               end
 

data/lib/rake/funnel/support/msdeploy/registry_patch.rb

@@ -75,7 +75,7 @@ module Rake
                     end
                   end
                 rescue ::Win32::Registry::Error => e
-                  warn "Could not patch registry to pretend MSDeploy is installed: #{e}"
+                  $stderr.print "Could not patch registry to pretend MSDeploy is installed: #{e}\n"
                 end
               end
 

data/lib/rake/funnel/support/timing/report.rb

@@ -54,25 +54,25 @@ module Rake
           private
 
           def header # rubocop:disable Metrics/AbcSize
-            puts '-' * HEADER_WIDTH
-            puts 'Build time report'
-            puts '-' * HEADER_WIDTH
+            $stdout.print '-' * HEADER_WIDTH + "\n"
+            $stdout.print "Build time report\n"
+            $stdout.print '-' * HEADER_WIDTH + "\n"
 
-            puts columns.map(&:format_header).join(' ' * SPACE)
-            puts columns.map { |c| c.format_header.gsub(/./, '-') }.join(' ' * SPACE)
+            $stdout.print columns.map(&:format_header).join(' ' * SPACE) + "\n"
+            $stdout.print columns.map { |c| c.format_header.gsub(/./, '-') }.join(' ' * SPACE) + "\n"
           end
 
           def rows
             @stats.each do |timing|
-              puts columns.map { |c| c.format_value(timing) }.join(' ' * SPACE)
+              $stdout.print columns.map { |c| c.format_value(timing) }.join(' ' * SPACE) + "\n"
             end
           end
 
           def footer # rubocop:disable Metrics/AbcSize
-            puts '-' * HEADER_WIDTH
-            puts 'Total'.ljust(columns[0].width) + ' ' * SPACE + format(Time.now - @stats.started_at)
+            $stdout.print '-' * HEADER_WIDTH + "\n"
+            $stdout.print 'Total'.ljust(columns[0].width) + ' ' * SPACE + format(Time.now - @stats.started_at) + "\n"
             status_message
-            puts '-' * HEADER_WIDTH
+            $stdout.print '-' * HEADER_WIDTH + "\n"
           end
 
           def format(seconds)
@@ -84,9 +84,9 @@ module Rake
             status = 'Status'.ljust(columns[0].width) + ' ' * SPACE + status
 
             if @opts[:failed]
-              Kernel.warn(status.bold.red)
+              $stderr.print(status.bold.red + "\n")
             else
-              $stdout.puts(status.bold.green)
+              $stdout.print(status.bold.green + "\n")
             end
           end
         end

data/lib/rake/funnel/support/trace.rb

@@ -6,7 +6,7 @@ module Rake
           def message(message)
             return unless Rake.application.options.trace
 
-            Rake.rake_output_message(message)
+            $stderr.print("#{message}\n")
           end
         end
       end

data/lib/rake/funnel/tasks/bin_path.rb

@@ -29,9 +29,9 @@ module Rake
             next unless paths.any?
 
             prepend_pattern_to_path_environment(paths)
-            Rake.rake_output_message 'Added the following paths to the PATH environment variable:'
+            $stderr.print "Added the following paths to the PATH environment variable:\n"
             paths.each do |p|
-              Rake.rake_output_message "  - #{p}"
+              $stderr.print "  - #{p}\n"
             end
           end
 

data/lib/rake/funnel/tasks/quick_template.rb

@@ -30,7 +30,7 @@ module Rake
 
             templates.all_or_default.each do |template|
               target = result_filename(template)
-              Rake.rake_output_message "Creating file #{target}"
+              $stderr.print "Creating file #{target}\n"
 
               content = TemplateEngine.render(File.read(template), template, context)
               File.write(target, content)

data/lib/rake/funnel/tasks/timing.rb

@@ -54,8 +54,8 @@ module Rake
               Rake::Application.class_eval do
                 orig_display_error_message = instance_method(:display_error_message)
 
-                define_method(:display_error_message) do |*ex|
-                  orig_display_error_message.bind(self).call(*ex)
+                define_method(:display_error_message) do |*args|
+                  orig_display_error_message.bind(self).call(*args)
 
                   report_invoker.call(failed: true)
                 end
@@ -66,8 +66,8 @@ module Rake
 
             p.reset do |memo|
               Rake::Application.class_eval do
-                define_method(:display_error_message) do |*ex|
-                  memo.bind(self).call(*ex)
+                define_method(:display_error_message) do |*args|
+                  memo.bind(self).call(*args)
                 end
               end
             end
@@ -94,8 +94,8 @@ module Rake
 
             p.reset do |memo|
               Rake::Task.class_eval do
-                define_method(:execute) do |*ex|
-                  memo.bind(self).call(*ex)
+                define_method(:execute) do |*args|
+                  memo.bind(self).call(*args)
                 end
               end
             end

data/lib/rake/funnel/tasks/zip.rb

@@ -32,13 +32,13 @@ module Rake
             yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             if files.empty? && !allow_empty
-              Rake.rake_output_message('No files to zip')
+              $stderr.print("No files to zip\n")
               next
             end
 
             Zipper.zip(files, target, zip_root)
 
-            Rake.rake_output_message("Created #{target}")
+            $stderr.print("Created #{target}\n")
           end
 
           self

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.22.1'.freeze
+    VERSION = '0.22.2'.freeze
   end
 end

data/spec/rake/funnel/extensions/shell_spec.rb

@@ -4,9 +4,8 @@ describe Rake::Funnel::Extensions::Shell do
   before do
     allow(Open3).to receive(:popen2e).and_yield(nil, stdout_and_stderr, exit)
 
-    allow($stdout).to receive(:puts)
-    allow(Kernel).to receive(:warn)
-    allow(Rake).to receive(:rake_output_message)
+    allow($stdout).to receive(:print)
+    allow($stderr).to receive(:print)
   end
 
   let(:exit) { OpenStruct.new(value: OpenStruct.new(success?: true, exitstatus: 0)) }
@@ -63,7 +62,7 @@ describe Rake::Funnel::Extensions::Shell do
 
       subject.shell(arg)
 
-      expect(Rake).to have_received(:rake_output_message).with(arg.join(' '))
+      expect($stderr).to have_received(:print).with("1 2\n")
     end
   end
 
@@ -75,12 +74,12 @@ describe Rake::Funnel::Extensions::Shell do
     before { subject.shell('foo') }
 
     it 'should redirect command output to stdout' do
-      expect($stdout).to have_received(:puts).with(/output 1/)
-      expect($stdout).to have_received(:puts).with(/output 2/)
+      expect($stdout).to have_received(:print).with(/output 1/)
+      expect($stdout).to have_received(:print).with(/output 2/)
     end
 
     it 'should colorize lines' do
-      expect($stdout).to have_received(:puts).with('output 1'.green)
+      expect($stdout).to have_received(:print).with('output 1'.green + "\n")
     end
   end
 
@@ -130,7 +129,7 @@ describe Rake::Funnel::Extensions::Shell do
 
     context 'no lines indicating errors' do
       it 'should not log to stderr' do
-        expect(Kernel).not_to have_received(:warn)
+        expect($stdout).not_to have_received(:print).with(/error/)
       end
     end
 
@@ -138,23 +137,23 @@ describe Rake::Funnel::Extensions::Shell do
       let(:stdout_and_stderr) { StringIO.new("output 1\nerror\noutput 2\n") }
 
       it 'should log to stdout before error' do
-        expect($stdout).to have_received(:puts).with(/output 1/)
+        expect($stdout).to have_received(:print).with(/output 1/)
       end
 
       it 'should log to stderr on error' do
-        expect(Kernel).to have_received(:warn).with(/error/)
+        expect($stderr).to have_received(:print).with(/error/)
       end
 
       it 'should not log to stdout on error' do
-        expect($stdout).not_to have_received(:puts).with(/error/)
+        expect($stdout).not_to have_received(:print).with(/error/)
       end
 
       it 'should colorize error lines' do
-        expect(Kernel).to have_received(:warn).with('error'.bold.red)
+        expect($stderr).to have_received(:print).with('error'.bold.red + "\n")
       end
 
       it 'should log to stdout after error' do
-        expect($stdout).to have_received(:puts).with(/output 2/)
+        expect($stdout).to have_received(:print).with(/output 2/)
       end
     end
 
@@ -162,7 +161,7 @@ describe Rake::Funnel::Extensions::Shell do
       let(:stdout_and_stderr) { StringIO.new('error äöüß'.encode('CP850')) }
 
       it 'should log to stdout before error' do
-        expect(Kernel).to have_received(:warn).with(/error/)
+        expect($stderr).to have_received(:print).with(/error/)
       end
     end
   end

data/spec/rake/funnel/integration/progress_report_spec.rb

@@ -4,7 +4,7 @@ describe Rake::Funnel::Integration::ProgressReport do
   let(:teamcity_running?) { false }
 
   before do
-    allow($stdout).to receive(:puts)
+    allow(subject).to receive(:print)
     allow(Rake::Funnel::Integration::TeamCity).to receive(:running?).and_return(teamcity_running?)
 
     Rake::Task.clear
@@ -27,7 +27,8 @@ describe Rake::Funnel::Integration::ProgressReport do
 
     context 'not on TeamCity' do
       it 'should write colored task name in square brackets' do
-        expect($stdout).to have_received(:puts).with("\n[task]".bold.cyan)
+        name = '[task]'.bold.cyan
+        expect(subject).to have_received(:print).with("\n#{name}\n")
       end
     end
 
@@ -35,7 +36,7 @@ describe Rake::Funnel::Integration::ProgressReport do
       let(:teamcity_running?) { true }
 
       it 'should not write task name since it would clutter the output' do
-        expect($stdout).not_to have_received(:puts).with(/task/)
+        expect(subject).not_to have_received(:print).with(/task/)
       end
     end
   end
@@ -54,7 +55,7 @@ describe Rake::Funnel::Integration::ProgressReport do
     end
 
     it 'should not write' do
-      expect($stdout).not_to have_received(:puts).with("\n[task]")
+      expect(subject).not_to have_received(:print).with(/task/)
     end
   end
 

data/spec/rake/funnel/integration/sync_output_spec.rb

@@ -21,17 +21,17 @@ describe Rake::Funnel::Integration::SyncOutput do
       allow($stdout).to receive(:sync=).and_raise('$stdout.sync not supported')
       allow($stderr).to receive(:sync=).and_raise('$stderr.sync not supported')
 
-      allow(Rake).to receive(:rake_output_message)
+      allow($stderr).to receive(:print)
     end
 
     subject! { described_class.new }
 
     it 'should log the error for $stdout' do
-      expect(Rake).to have_received(:rake_output_message).with(/Failed.*\$stdout/)
+      expect($stderr).to have_received(:print).with(/Failed.*\$stdout/)
     end
 
     it 'should log the error for $stderr' do
-      expect(Rake).to have_received(:rake_output_message).with(/Failed.*\$stderr/)
+      expect($stderr).to have_received(:print).with(/Failed.*\$stderr/)
     end
   end
 end

data/spec/rake/funnel/integration/teamcity/nunit_plugin_spec.rb

@@ -4,7 +4,7 @@ describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do # rubocop:disable R
     allow(Rake::Funnel::Support::Which).to receive(:which).and_return(which)
     allow(Dir).to receive(:glob).and_return([])
     allow(RakeFileUtils).to receive(:mkdir_p)
-    allow(Rake).to receive(:rake_output_message)
+    allow($stderr).to receive(:print)
   end
 
   before do
@@ -44,9 +44,9 @@ describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do # rubocop:disable R
     end
 
     it 'should report that the addin is installed' do
-      expect(Rake).to \
-        have_received(:rake_output_message)
-        .with("Installing TeamCity NUnit addin for version #{plugin_version} in #{which}")
+      expect($stderr).to \
+        have_received(:print)
+        .with("Installing TeamCity NUnit addin for version #{plugin_version} in #{which}\n")
     end
 
     context 'Windows-style path in environment variable',
@@ -90,9 +90,9 @@ describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do # rubocop:disable R
       let(:which) { 'path/to/nunit-console.exe' }
 
       it 'should report that the version could not be read' do
-        expect(Rake).to \
-          have_received(:rake_output_message)
-          .with("Could read version from NUnit executable in #{which}")
+        expect($stderr).to \
+          have_received(:print)
+          .with("Could read version from NUnit executable in #{which}\n")
       end
 
       it 'should skip' do
@@ -106,8 +106,8 @@ describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do # rubocop:disable R
       let(:nunit_version) { Rake::Funnel::Support::VersionInfo.new(file_version: '1.2.3.4') }
 
       it 'should report that the addin version is not available' do
-        expect(Rake).to \
-          have_received(:rake_output_message)
+        expect($stderr).to \
+          have_received(:print)
           .with(/Could not find TeamCity NUnit addin for version 1\.2\.3 in .*#{env_var}$/)
       end
 

data/spec/rake/funnel/integration/teamcity/service_messages_spec.rb

@@ -1,7 +1,7 @@
 describe Rake::Funnel::Integration::TeamCity::ServiceMessages do # rubocop:disable RSpec/FilePath
   before do
     allow(Rake::Funnel::Integration::TeamCity).to receive(:running?).and_return(teamcity_running?)
-    allow($stdout).to receive(:puts)
+    allow(described_class).to receive(:print)
   end
 
   context 'when running outside TeamCity' do
@@ -10,7 +10,7 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do # rubocop:disab
     it 'should not publish messages' do
       described_class.progress_start 'foo'
 
-      expect($stdout).not_to have_received(:puts)
+      expect(described_class).not_to have_received(:print)
     end
   end
 
@@ -22,9 +22,9 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do # rubocop:disab
         it 'should not escape' do
           described_class.progress_start 'the message'
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart 'the message']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart 'the message']\n")
         end
       end
 
@@ -32,81 +32,81 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do # rubocop:disab
         it 'should escape apostrophes' do
           described_class.progress_start "'"
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart '|'']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart '|'']\n")
         end
 
         it 'should escape line feeds' do
           described_class.progress_start "\n"
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart '|n']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart '|n']\n")
         end
 
         it 'should escape carriage returns' do
           described_class.progress_start "\r"
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart '|r']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart '|r']\n")
         end
 
         it 'should escape next lines' do
           described_class.progress_start "\u0085"
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart '|x']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart '|x']\n")
         end
 
         it 'should escape line separators' do
           described_class.progress_start "\u2028"
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart '|l']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart '|l']\n")
         end
 
         it 'should escape paragraph separators' do
           described_class.progress_start "\u2029"
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart '|p']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart '|p']\n")
         end
 
         it 'should escape vertical bars' do
           described_class.progress_start '|'
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart '||']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart '||']\n")
         end
 
         it 'should escape opening brackets' do
           described_class.progress_start '['
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart '|[']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart '|[']\n")
         end
 
         it 'should escape closing brackets' do
           described_class.progress_start ']'
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart '|]']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart '|]']\n")
         end
 
         it 'should escape all special characters in a string' do
           described_class.progress_start "[\r|\n]"
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressStart '|[|r|||n|]']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressStart '|[|r|||n|]']\n")
         end
       end
     end
@@ -116,9 +116,9 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do # rubocop:disab
         it 'should print the service message' do
           described_class.enable_service_messages
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with('##teamcity[enableServiceMessages]')
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[enableServiceMessages]\n")
         end
       end
 
@@ -126,9 +126,9 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do # rubocop:disab
         it 'should print the service message' do
           described_class.progress_message 'the message'
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressMessage 'the message']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressMessage 'the message']\n")
         end
       end
 
@@ -136,9 +136,9 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do # rubocop:disab
         it 'should print the service message' do
           described_class.progress_message 42
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[progressMessage '42']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[progressMessage '42']\n")
         end
       end
 
@@ -146,9 +146,9 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do # rubocop:disab
         it 'should print the service message' do
           described_class.block_opened(name: 'block name')
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[blockOpened name='block name']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[blockOpened name='block name']\n")
         end
       end
 
@@ -156,9 +156,9 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do # rubocop:disab
         it 'should print the service message' do
           described_class.test_started(name: 'test name', captureStandardOutput: true)
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[testStarted name='test name' captureStandardOutput='true']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[testStarted name='test name' captureStandardOutput='true']\n")
         end
       end
 
@@ -166,9 +166,9 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do # rubocop:disab
         it 'should print the service message' do
           described_class.test_started(capture_standard_output: true)
 
-          expect($stdout).to \
-            have_received(:puts)
-            .with("##teamcity[testStarted captureStandardOutput='true']")
+          expect(described_class).to \
+            have_received(:print)
+            .with("##teamcity[testStarted captureStandardOutput='true']\n")
         end
       end
     end

data/spec/rake/funnel/support/assembly_version/from_version_files_spec.rb

@@ -38,7 +38,7 @@ describe Rake::Funnel::Support::AssemblyVersion::FromVersionFiles do
     end
 
     before do
-      allow(Rake).to receive(:rake_output_message)
+      allow($stderr).to receive(:print)
     end
 
     subject do

data/spec/rake/funnel/support/assembly_version_writer_spec.rb

@@ -75,7 +75,7 @@ describe Rake::Funnel::Support::AssemblyVersionWriter do
     end
 
     before do
-      allow(Rake).to receive(:rake_output_message)
+      allow($stderr).to receive(:print)
     end
 
     before do

data/spec/rake/funnel/support/environments/loader_spec.rb

@@ -17,7 +17,7 @@ describe Rake::Funnel::Support::Environments::Loader do
       allow(File).to receive(:read).with(file.to_s).and_return(content)
     end
 
-    allow(Rake).to receive(:rake_output_message)
+    allow($stderr).to receive(:print)
   end
 
   describe 'loading configuration' do

data/spec/rake/funnel/support/msbuild/build_tool_spec.rb

@@ -35,7 +35,7 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do # rubocop:disable RSpec/Fi
         end
 
         before do
-          allow(described_class).to receive(:warn)
+          allow($stderr).to receive(:print)
         end
 
         it 'finds nothing' do
@@ -44,7 +44,7 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do # rubocop:disable RSpec/Fi
 
         it 'warns about the crash' do
           described_class.find rescue nil # rubocop:disable Style/RescueModifier
-          expect(described_class).to have_received(:warn).with(/^vswhere failed:/)
+          expect($stderr).to have_received(:print).with(/^vswhere failed:/)
         end
       end
 
@@ -158,7 +158,7 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do # rubocop:disable RSpec/Fi
         end
 
         before do
-          allow(described_class).to receive(:warn)
+          allow($stderr).to receive(:print)
         end
 
         it 'finds nothing' do
@@ -167,7 +167,7 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do # rubocop:disable RSpec/Fi
 
         it 'warns about the crash' do
           described_class.find rescue nil # rubocop:disable Style/RescueModifier
-          expect(described_class).to have_received(:warn).with(/^Could not determine mono version:/)
+          expect($stderr).to have_received(:print).with(/^Could not determine mono version:/)
         end
       end
 

data/spec/rake/funnel/support/msdeploy/registry_patch_spec.rb

@@ -1,8 +1,6 @@
 describe Rake::Funnel::Support::MSDeploy::RegistryPatch do # rubocop:disable RSpec/FilePath
   before do
-    # rubocop:disable RSpec/AnyInstance
-    allow_any_instance_of(described_class).to receive(:warn)
-    # rubocop:enable RSpec/AnyInstance
+    allow($stderr).to receive(:print)
   end
 
   describe 'execution' do
@@ -106,7 +104,7 @@ describe Rake::Funnel::Support::MSDeploy::RegistryPatch do # rubocop:disable RSp
         end
 
         it 'should warn' do
-          expect(subject).to have_received(:warn).with(/Could not patch registry to pretend MSDeploy is installed/)
+          expect($stderr).to have_received(:print).with(/Could not patch registry to pretend MSDeploy is installed/)
         end
       end
 

data/spec/rake/funnel/support/patch_spec.rb

@@ -17,12 +17,12 @@ describe Rake::Funnel::Support::Patch do
     subject do
       described_class.new do |p|
         p.setup do
-          output.puts 'setup'
+          output.print 'setup'
           42
         end
 
         p.reset do |memo|
-          output.puts memo
+          output.print memo
         end
       end
     end
@@ -33,7 +33,7 @@ describe Rake::Funnel::Support::Patch do
       let!(:ret) { subject.apply! }
 
       it 'should execute the setup' do
-        expect(output).to have_received(:puts).with('setup')
+        expect(output).to have_received(:print).with('setup')
       end
 
       it 'should return self' do
@@ -48,7 +48,7 @@ describe Rake::Funnel::Support::Patch do
       end
 
       it 'should execute the reset' do
-        expect(output).to have_received(:puts).with(42)
+        expect(output).to have_received(:print).with(42)
       end
 
       it 'should return self' do
@@ -60,7 +60,7 @@ describe Rake::Funnel::Support::Patch do
       before { subject.revert! }
 
       it 'should not execute the reset' do
-        expect(output).not_to have_received(:puts).with(42)
+        expect(output).not_to have_received(:print).with(42)
       end
     end
 
@@ -71,7 +71,7 @@ describe Rake::Funnel::Support::Patch do
       end
 
       it 'should execute the setup once' do
-        expect(output).to have_received(:puts).with('setup').once
+        expect(output).to have_received(:print).with('setup').once
       end
     end
 
@@ -83,7 +83,7 @@ describe Rake::Funnel::Support::Patch do
       end
 
       it 'should execute the revert once' do
-        expect(output).to have_received(:puts).with(42).once
+        expect(output).to have_received(:print).with(42).once
       end
     end
 
@@ -93,7 +93,7 @@ describe Rake::Funnel::Support::Patch do
       subject do
         described_class.new(context) do |p|
           p.setup do |context|
-            output.puts context
+            output.print context
           end
         end
       end
@@ -101,7 +101,7 @@ describe Rake::Funnel::Support::Patch do
       before { subject.apply!.revert! }
 
       it 'should be accessible from within the patch definition' do
-        expect(output).to have_received(:puts).with(42)
+        expect(output).to have_received(:print).with(42)
       end
     end
   end

data/spec/rake/funnel/support/specs_remover_spec.rb

@@ -1,4 +1,4 @@
-describe Rake::Funnel::Support::SpecsRemover do
+xdescribe Rake::Funnel::Support::SpecsRemover do
   before do
     allow(Rake::Funnel::Support::Trace).to receive(:message)
   end

data/spec/rake/funnel/support/timing/report_spec.rb

@@ -6,34 +6,34 @@ describe Rake::Funnel::Support::Timing::Report do
   let(:opts) { {} }
 
   before do
-    allow($stdout).to receive(:puts)
-    allow(Kernel).to receive(:warn)
+    allow($stdout).to receive(:print)
+    allow($stderr).to receive(:print)
     subject.render
   end
 
   shared_examples_for 'report' do
     it 'should separator lines' do
-      expect($stdout).to have_received(:puts)
+      expect($stdout).to have_received(:print)
         .with(Regexp.new('-' * described_class::HEADER_WIDTH)).exactly(4).times
     end
 
     it 'should print the header' do
-      expect($stdout).to have_received(:puts).with('Build time report')
+      expect($stdout).to have_received(:print).with("Build time report\n")
     end
 
     it 'should print the total time' do
-      expect($stdout).to have_received(:puts).with(/^Total\s+00:00:00/)
+      expect($stdout).to have_received(:print).with(/^Total\s+00:00:00/)
     end
 
     it 'should print the build status' do
-      expect($stdout).to have_received(:puts).with(/Status\s+OK/)
+      expect($stdout).to have_received(:print).with(/Status\s+OK/)
     end
 
     context 'when rake succeeded' do
       let(:opts) { { failed: false } }
 
       it 'should print the successful build status' do
-        expect($stdout).to have_received(:puts).with(/Status\s+OK/)
+        expect($stdout).to have_received(:print).with(/Status\s+OK/)
       end
     end
 
@@ -41,7 +41,7 @@ describe Rake::Funnel::Support::Timing::Report do
       let(:opts) { { failed: true } }
 
       it 'should print the failed build status' do
-        expect(Kernel).to have_received(:warn).with(/Status\s+Failed/)
+        expect($stderr).to have_received(:print).with(/Status\s+Failed/)
       end
     end
   end
@@ -63,12 +63,12 @@ describe Rake::Funnel::Support::Timing::Report do
     it_behaves_like 'report'
 
     it 'should print each task' do
-      expect($stdout).to have_received(:puts).with(/^foo/)
-      expect($stdout).to have_received(:puts).with(/^bar/)
+      expect($stdout).to have_received(:print).with(/^foo/)
+      expect($stdout).to have_received(:print).with(/^bar/)
     end
 
     it "should print each task's time" do
-      expect($stdout).to have_received(:puts).with(/00:00:00/).exactly(3).times
+      expect($stdout).to have_received(:print).with(/00:00:00/).exactly(3).times
     end
   end
 
@@ -97,16 +97,16 @@ describe Rake::Funnel::Support::Timing::Report do
 
     shared_examples_for 'padding' do
       it 'should pad headers' do
-        expect($stdout).to have_received(:puts)
+        expect($stdout).to have_received(:print)
           .with(Regexp.new("^#{subject.columns[0].header}\\s{#{header_space}}#{subject.columns[1].header}"))
       end
 
       it 'should pad header underlines' do
-        expect($stdout).to have_received(:puts).with(Regexp.new("^-{#{header_underline}}\\s+"))
+        expect($stdout).to have_received(:print).with(Regexp.new("^-{#{header_underline}}\\s+"))
       end
 
       it 'should pad the task names' do
-        expect($stdout).to have_received(:puts).with(Regexp.new("^#{task_name}\\s{#{value_space}}\\d"))
+        expect($stdout).to have_received(:print).with(Regexp.new("^#{task_name}\\s{#{value_space}}\\d"))
       end
     end
 

data/spec/rake/funnel/support/trace_spec.rb

@@ -1,6 +1,6 @@
 describe Rake::Funnel::Support::Trace do
   before do
-    allow(Rake).to receive(:rake_output_message)
+    allow($stderr).to receive(:print)
   end
 
   context 'Rake run with --trace' do
@@ -11,7 +11,7 @@ describe Rake::Funnel::Support::Trace do
     it 'should write messages' do
       described_class.message('foo')
 
-      expect(Rake).to have_received(:rake_output_message).with('foo')
+      expect($stderr).to have_received(:print).with("foo\n")
     end
   end
 
@@ -23,7 +23,7 @@ describe Rake::Funnel::Support::Trace do
     it 'should not write messages' do
       described_class.message('foo')
 
-      expect(Rake).not_to have_received(:rake_output_message)
+      expect($stderr).not_to have_received(:print)
     end
   end
 end

data/spec/rake/funnel/tasks/bin_path_spec.rb

@@ -22,7 +22,7 @@ describe Rake::Funnel::Tasks::BinPath do
     before do
       allow(ENV).to receive(:[]).with('PATH').and_return(default_path)
       allow(ENV).to receive(:[]=)
-      allow(Rake).to receive(:rake_output_message)
+      allow($stderr).to receive(:print)
     end
 
     subject do
@@ -56,8 +56,8 @@ describe Rake::Funnel::Tasks::BinPath do
       end
 
       it 'should report added paths' do
-        expect(Rake).to have_received(:rake_output_message).with(%r{/foo$})
-        expect(Rake).to have_received(:rake_output_message).with(%r{/bar$})
+        expect($stderr).to have_received(:print).with(%r{/foo$})
+        expect($stderr).to have_received(:print).with(%r{/bar$})
       end
 
       describe 'path modifier' do
@@ -98,7 +98,7 @@ describe Rake::Funnel::Tasks::BinPath do
       end
 
       it 'should not print message' do
-        expect(Rake).not_to have_received(:rake_output_message)
+        expect($stderr).not_to have_received(:print)
       end
 
       it 'should not set environment variable' do

data/spec/rake/funnel/tasks/quick_template_spec.rb

@@ -21,7 +21,7 @@ describe Rake::Funnel::Tasks::QuickTemplate do
       allow(finder).to receive(:all_or_default).and_return(templates)
       allow(Rake::Funnel::Support::Finder).to receive(:new).and_return(finder)
       allow(engine).to receive(:render).and_return('file content')
-      allow(Rake).to receive(:rake_output_message)
+      allow($stderr).to receive(:print)
       allow(File).to receive(:read).and_return('template content')
       allow(File).to receive(:write)
     end
@@ -34,7 +34,7 @@ describe Rake::Funnel::Tasks::QuickTemplate do
 
     it 'should report created files' do
       templates.each do |template|
-        expect(Rake).to have_received(:rake_output_message).with("Creating file #{template.ext}")
+        expect($stderr).to have_received(:print).with("Creating file #{template.ext}\n")
       end
     end
 

data/spec/rake/funnel/tasks/timing_spec.rb

@@ -58,9 +58,7 @@ describe Rake::Funnel::Tasks::Timing do
       Rake.application.top_level_tasks.unshift(:task)
       allow(Rake.application).to receive(:exit_because_of_exception)
 
-      allow($stdout).to receive(:puts)
-      allow(Kernel).to receive(:warn)
-      # The 'rake aborted!' message is #printed on $stderr.
+      allow($stdout).to receive(:print)
       allow($stderr).to receive(:print)
 
       Rake.application.run
@@ -69,12 +67,12 @@ describe Rake::Funnel::Tasks::Timing do
     context 'with task defined' do
       let(:define_tasks) do
         task :task do
-          puts 'hello'
+          $stdout.print 'hello'
         end
       end
 
       it 'should execute tasks' do
-        expect($stdout).to have_received(:puts).with('hello')
+        expect($stdout).to have_received(:print).with('hello')
       end
 
       it 'should record timing information for executed tasks' do
@@ -105,11 +103,11 @@ describe Rake::Funnel::Tasks::Timing do
     describe 'build finished' do
       context 'when rake succeeded' do
         it 'should print the report' do
-          expect($stdout).to have_received(:puts).with(/Build time report/)
+          expect($stdout).to have_received(:print).with(/Build time report/)
         end
 
         it 'should report success' do
-          expect($stdout).to have_received(:puts).with(/Status\s+OK/)
+          expect($stdout).to have_received(:print).with(/Status\s+OK/)
         end
       end
 
@@ -121,11 +119,11 @@ describe Rake::Funnel::Tasks::Timing do
         end
 
         it 'should print the report' do
-          expect($stdout).to have_received(:puts).with(/Build time report/)
+          expect($stdout).to have_received(:print).with(/Build time report/)
         end
 
         it 'should report failure' do
-          expect(Kernel).to have_received(:warn).with(/Status\s+Failed/)
+          expect($stderr).to have_received(:print).with(/Status\s+Failed/)
         end
       end
     end

data/spec/rake/funnel/tasks/zip_spec.rb

@@ -22,7 +22,7 @@ describe Rake::Funnel::Tasks::Zip do
 
     before do
       allow(Rake::Funnel::Support::Zipper).to receive(:zip)
-      allow(Rake).to receive(:rake_output_message)
+      allow($stderr).to receive(:print)
     end
 
     subject do
@@ -43,7 +43,7 @@ describe Rake::Funnel::Tasks::Zip do
     end
 
     it 'should report the created zip file' do
-      expect(Rake).to have_received(:rake_output_message).with("Created #{subject.target}")
+      expect($stderr).to have_received(:print).with("Created #{subject.target}\n")
     end
 
     describe '#allow_empty' do
@@ -82,7 +82,7 @@ describe Rake::Funnel::Tasks::Zip do
         end
 
         it 'should warn' do
-          expect(Rake).to have_received(:rake_output_message).with('No files to zip')
+          expect($stderr).to have_received(:print).with("No files to zip\n")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.2
 platform: ruby
 authors:
 - Alexander Groß