rake-funnel 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6841ebbb9d8d034742f00ffb6249df517b003e65
-  data.tar.gz: e9c884b4db0309c9abbd2dea0500e39316d3c384
+  metadata.gz: 1da0eb5718b82d9a3b3276c0d5465db3ef8e6008
+  data.tar.gz: f50c9c0334e893826dda3a1bbe6e266e2ec1dea4
 SHA512:
-  metadata.gz: 941d28a728ca71c7b4127b992b821fd4124557887bce2abe0962361a4d1f2c202cf3d0262570c3fd5660c4409e15599aa26d6f270bfa35b4f1e5579f8ad3bdc0
-  data.tar.gz: 477e620f47de4991a81291d82195c43898a4c35a562a242f73d0e06e65614c7b5fea3e0d7f8dc3072f4d78bd2584e17dc2911d583ce3d05a99ebdf2ca9a756fc
+  metadata.gz: b4fda8404ed1fb5b012b00c0654e928be757a61d2e4e1a5a31395b586cca9c45d3a353c8b5dc2ef322a4bdc9fda07c2c2b598524681cc9f2ae09b7942a69d410
+  data.tar.gz: 3de0fef1d05c1aa02bb6579f398e311b6c84ef10c9186157a2bc394ab5834309af2790bad75c73fe143b53046e7d7b356b57848eb8223e4eae8bbc659a3a1d16

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

@@ -20,8 +20,10 @@ end
 
 module REXML
   module Functions
-    class << self
-      include Rake::Funnel::Extensions::REXML::Functions
+    extend Rake::Funnel::Extensions::REXML::Functions
+
+    Rake::Funnel::Extensions::REXML::Functions.public_instance_methods.each do |method|
+      singleton_method_added(method)
     end
   end
 end

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

@@ -70,14 +70,14 @@ module Rake
         end
 
         def to_stdout(line)
-          $stdout.puts line.rstrip.green
+          $stdout.puts(line.rstrip.green)
           :success
         end
 
         def to_stderr(line, error_lines)
           return unless error_lines && line =~ error_lines
 
-          $stderr.puts line.rstrip.bold.red
+          Kernel.warn(line.rstrip.bold.red)
           :error
         end
       end

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

@@ -46,7 +46,7 @@ module Rake
                   error = nil
                   begin
                     old_execute.bind(self).call(args)
-                  rescue => e
+                  rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
                     error = e
                   ensure
                     context.finished.call(self, args, error) if context.finished

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

@@ -11,7 +11,7 @@ module Rake
 
         def sync(stream)
           stream.sync = true
-        rescue => e
+        rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
           Rake.rake_output_message "Failed to set up sync output #{e}"
         end
       end

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

@@ -84,9 +84,9 @@ module Rake
             status = 'Status'.ljust(columns[0].width) + ' ' * SPACE + status
 
             if @opts[:failed]
-              $stderr.puts status.bold.red
+              Kernel.warn(status.bold.red)
             else
-              $stdout.puts status.bold.green
+              $stdout.puts(status.bold.green)
             end
           end
         end

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

@@ -8,7 +8,7 @@ module Rake
         include Rake::Funnel::Support::MSBuild
 
         attr_accessor :name, :msbuild, :msbuild_finder, :project_or_solution, :args, :search_pattern
-        attr_writer :project_or_solution
+        attr_writer :project_or_solution # rubocop:disable Lint/DuplicateMethods
 
         def initialize(*args, &task_block)
           setup_ivars(args)
@@ -16,7 +16,7 @@ module Rake
           define(args, &task_block)
         end
 
-        def project_or_solution
+        def project_or_solution # rubocop:disable Lint/DuplicateMethods
           Finder.new(@project_or_solution || search_pattern, self, 'No projects or more than one project found.')
         end
 

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.21.0'.freeze
+    VERSION = '0.21.1'.freeze
   end
 end

data/rake-funnel.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
 
   s.required_ruby_version = '>= 2.0.0'
 
+  s.add_dependency 'configatron', '~> 4.5'
   s.add_dependency 'rake', '>= 10.4', '< 13'
   s.add_dependency 'rubyzip', '~> 1.0'
   s.add_dependency 'smart_colored'
-  s.add_dependency 'configatron', '~> 4.5'
 
   git = ENV['TEAMCITY_GIT_PATH'] || 'git'
   files = `"#{git}" ls-files -z`

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

@@ -2,13 +2,13 @@
 
 describe Rake::Funnel::Extensions::REXML::Functions do
   let(:xml) do
-    <<EOF
+    <<XML
   <editors xmlns="http://example.com">
     <editor id="emacs">EMACS</editor>
     <editor id="vi">VIM</editor>
     <editor id="notepad">Notepad</editor>
   </editors>
-EOF
+XML
   end
 
   subject { REXML::Document.new(xml) }

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

@@ -1,13 +1,11 @@
 require 'open3'
 
-include Rake::Funnel
-
 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($stderr).to receive(:puts)
+    allow(Kernel).to receive(:warn)
     allow(Rake).to receive(:rake_output_message)
   end
 
@@ -126,13 +124,13 @@ describe Rake::Funnel::Extensions::Shell do
     before do
       begin
         subject.shell('foo', error_lines: error_lines)
-      rescue ExecutionError # rubocop:disable Lint/HandleExceptions
+      rescue Rake::Funnel::ExecutionError # rubocop:disable Lint/HandleExceptions
       end
     end
 
     context 'no lines indicating errors' do
       it 'should not log to stderr' do
-        expect($stderr).not_to have_received(:puts)
+        expect(Kernel).not_to have_received(:warn)
       end
     end
 
@@ -144,7 +142,7 @@ describe Rake::Funnel::Extensions::Shell do
       end
 
       it 'should log to stderr on error' do
-        expect($stderr).to have_received(:puts).with(/error/)
+        expect(Kernel).to have_received(:warn).with(/error/)
       end
 
       it 'should not log to stdout on error' do
@@ -152,7 +150,7 @@ describe Rake::Funnel::Extensions::Shell do
       end
 
       it 'should colorize error lines' do
-        expect($stderr).to have_received(:puts).with('error'.bold.red)
+        expect(Kernel).to have_received(:warn).with('error'.bold.red)
       end
 
       it 'should log to stdout after error' do
@@ -164,7 +162,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($stderr).to have_received(:puts).with(/error/)
+        expect(Kernel).to have_received(:warn).with(/error/)
       end
     end
   end
@@ -195,7 +193,7 @@ describe Rake::Funnel::Extensions::Shell do
     context 'error lines logged' do
       context 'without block' do
         it 'should fail' do
-          expect { subject.shell('foo', error_lines: /.*/) }.to raise_error(ExecutionError)
+          expect { subject.shell('foo', error_lines: /.*/) }.to raise_error(Rake::Funnel::ExecutionError)
         end
       end
 
@@ -218,7 +216,7 @@ describe Rake::Funnel::Extensions::Shell do
 
       context 'without block' do
         it 'should fail' do
-          expect { subject.shell('foo') }.to raise_error(ExecutionError)
+          expect { subject.shell('foo') }.to raise_error(Rake::Funnel::ExecutionError)
         end
 
         it 'should report the exit code' do

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

@@ -1,16 +1,13 @@
-include Rake
-include Rake::Funnel::Integration
-
 describe Rake::Funnel::Integration::ProgressReport do
-  include DSL
+  include Rake::DSL
 
   let(:teamcity_running?) { false }
 
   before do
     allow($stdout).to receive(:puts)
-    allow(TeamCity).to receive(:running?).and_return(teamcity_running?)
+    allow(Rake::Funnel::Integration::TeamCity).to receive(:running?).and_return(teamcity_running?)
 
-    Task.clear
+    Rake::Task.clear
   end
 
   after do
@@ -25,7 +22,7 @@ describe Rake::Funnel::Integration::ProgressReport do
     before do
       task :task
 
-      Task[:task].invoke
+      Rake::Task[:task].invoke
     end
 
     context 'not on TeamCity' do
@@ -53,7 +50,7 @@ describe Rake::Funnel::Integration::ProgressReport do
 
       task :task
 
-      Task[:task].invoke
+      Rake::Task[:task].invoke
     end
 
     it 'should not write' do
@@ -83,7 +80,7 @@ describe Rake::Funnel::Integration::ProgressReport do
       before do
         task :task
 
-        Task[:task].invoke
+        Rake::Task[:task].invoke
       end
 
       describe 'starting handler' do
@@ -92,11 +89,11 @@ describe Rake::Funnel::Integration::ProgressReport do
         end
 
         it 'should receive task' do
-          expect(receiver).to have_received(:task_starting).with(hash_including(task: kind_of(Task)))
+          expect(receiver).to have_received(:task_starting).with(hash_including(task: kind_of(Rake::Task)))
         end
 
         it 'should receive task arguments' do
-          expect(receiver).to have_received(:task_starting).with(hash_including(args: kind_of(TaskArguments)))
+          expect(receiver).to have_received(:task_starting).with(hash_including(args: kind_of(Rake::TaskArguments)))
         end
       end
 
@@ -106,11 +103,11 @@ describe Rake::Funnel::Integration::ProgressReport do
         end
 
         it 'should receive task' do
-          expect(receiver).to have_received(:task_finished).with(hash_including(task: kind_of(Task)))
+          expect(receiver).to have_received(:task_finished).with(hash_including(task: kind_of(Rake::Task)))
         end
 
         it 'should receive task arguments' do
-          expect(receiver).to have_received(:task_finished).with(hash_including(args: kind_of(TaskArguments)))
+          expect(receiver).to have_received(:task_finished).with(hash_including(args: kind_of(Rake::TaskArguments)))
         end
 
         it 'should not receive error' do
@@ -130,7 +127,7 @@ describe Rake::Funnel::Integration::ProgressReport do
         end
 
         begin
-          Task[:task].invoke
+          Rake::Task[:task].invoke
         rescue SpecificError # rubocop:disable Lint/HandleExceptions
         end
       end

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

@@ -4,7 +4,7 @@ describe Rake::Funnel::Integration::SyncOutput do
       allow($stdout).to receive(:sync=)
       allow($stderr).to receive(:sync=)
 
-      expect(subject).to be
+      expect(subject).to be # rubocop:disable RSpec/ExpectInHook
     end
 
     it 'should immediately flush $stdout' do
@@ -23,7 +23,7 @@ describe Rake::Funnel::Integration::SyncOutput do
 
       allow(Rake).to receive(:rake_output_message)
 
-      expect(subject).to be
+      expect(subject).to be # rubocop:disable RSpec/ExpectInHook
     end
 
     it 'should log the error for $stdout' do

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

@@ -1,25 +1,24 @@
 # rubocop:disable RSpec/FilePath
 
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do
   before do
     allow(ENV).to receive(:[]).with(described_class::ENV_VAR).and_return(env_var)
-    allow(Which).to receive(:which).and_return(which)
+    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)
   end
 
   before do
-    allow(BinaryVersionReader).to receive(:read_from).with(which).and_return(nunit_version)
+    allow(Rake::Funnel::Support::BinaryVersionReader).to receive(:read_from)
+      .with(which).and_return(nunit_version)
   end
 
   describe 'success' do
     let(:env_var) { '/path/to/nunit plugins/nunit' }
     let(:addin_dlls) { [env_var + 'addin.dll'] }
     let(:which) { 'path/to/nunit-console.exe' }
-    let(:nunit_version) { VersionInfo.new(file_version: '1.2.3.4') }
+    let(:nunit_version) { Rake::Funnel::Support::VersionInfo.new(file_version: '1.2.3.4') }
     let(:plugin_version) { nunit_version.file_version.split('.').take(3).join('.') }
 
     before do
@@ -53,7 +52,7 @@ describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do
     end
 
     context 'Windows-style path in environment variable',
-            skip: ('Windows Registry not available' unless defined?(::Win32::Registry)) do
+            skip: !Gem.win_platform? do
       let(:env_var) { 'C:\path\to\nunit plugins\nunit-' }
 
       it 'should convert path to Ruby-style' do
@@ -65,7 +64,7 @@ describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do
   describe 'failures' do
     let(:env_var) { nil }
     let(:which) { nil }
-    let(:nunit_version) { VersionInfo.new }
+    let(:nunit_version) { Rake::Funnel::Support::VersionInfo.new }
 
     before do
       described_class.setup('nunit-console.exe')
@@ -75,7 +74,7 @@ describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do
       let(:env_var) { nil }
 
       it 'should skip reading the version' do
-        expect(BinaryVersionReader).not_to have_received(:read_from)
+        expect(Rake::Funnel::Support::BinaryVersionReader).not_to have_received(:read_from)
       end
     end
 
@@ -84,7 +83,7 @@ describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do
       let(:which) { nil }
 
       it 'should skip reading the version' do
-        expect(BinaryVersionReader).not_to have_received(:read_from)
+        expect(Rake::Funnel::Support::BinaryVersionReader).not_to have_received(:read_from)
       end
     end
 
@@ -106,7 +105,7 @@ describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do
     context 'plugin for NUnit version not available' do
       let(:env_var) { '/path/to/nunit plugins/nunit' }
       let(:which) { 'path/to/nunit-console.exe' }
-      let(:nunit_version) { VersionInfo.new(file_version: '1.2.3.4') }
+      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 \

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

@@ -1,25 +1,21 @@
 # rubocop:disable RSpec/FilePath
 
-include Rake
-include Rake::Funnel::Integration
-include Rake::Funnel::Integration::TeamCity
-
 describe Rake::Funnel::Integration::TeamCity::ProgressReport do
-  include DSL
+  include Rake::DSL
 
   let(:teamcity_running?) { false }
   let(:teamcity_rake_runner?) { false }
 
   before do
-    allow(TeamCity).to receive(:running?).and_return(teamcity_running?)
-    allow(TeamCity).to receive(:rake_runner?).and_return(teamcity_rake_runner?)
-    allow(ServiceMessages).to receive(:block_opened)
-    allow(ServiceMessages).to receive(:block_closed)
-    allow(ServiceMessages).to receive(:progress_start)
-    allow(ServiceMessages).to receive(:progress_finish)
-    allow(ServiceMessages).to receive(:build_problem)
-
-    Task.clear
+    allow(Rake::Funnel::Integration::TeamCity).to receive(:running?).and_return(teamcity_running?)
+    allow(Rake::Funnel::Integration::TeamCity).to receive(:rake_runner?).and_return(teamcity_rake_runner?)
+    allow(Rake::Funnel::Integration::TeamCity::ServiceMessages).to receive(:block_opened)
+    allow(Rake::Funnel::Integration::TeamCity::ServiceMessages).to receive(:block_closed)
+    allow(Rake::Funnel::Integration::TeamCity::ServiceMessages).to receive(:progress_start)
+    allow(Rake::Funnel::Integration::TeamCity::ServiceMessages).to receive(:progress_finish)
+    allow(Rake::Funnel::Integration::TeamCity::ServiceMessages).to receive(:build_problem)
+
+    Rake::Task.clear
   end
 
   subject! do
@@ -32,21 +28,25 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
 
   shared_examples :block_report do
     it 'should write block start' do
-      expect(ServiceMessages).to have_received(:block_opened).with(name: 'task')
+      expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).to \
+        have_received(:block_opened).with(name: 'task')
     end
 
     it 'should write block end' do
-      expect(ServiceMessages).to have_received(:block_closed).with(name: 'task')
+      expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).to \
+        have_received(:block_closed).with(name: 'task')
     end
   end
 
   shared_examples :no_block_report do
     it 'should not write block start' do
-      expect(ServiceMessages).not_to have_received(:block_opened)
+      expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).not_to \
+        have_received(:block_opened)
     end
 
     it 'should not write block end' do
-      expect(ServiceMessages).not_to have_received(:block_closed)
+      expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).not_to \
+        have_received(:block_closed)
     end
   end
 
@@ -54,11 +54,12 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
     before do
       task :task
 
-      Task[:task].invoke
+      Rake::Task[:task].invoke
     end
 
     it 'should not report build problems' do
-      expect(ServiceMessages).not_to have_received(:build_problem)
+      expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).not_to \
+        have_received(:build_problem)
     end
 
     context 'not on TeamCity' do
@@ -103,8 +104,8 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
       end
 
       begin
-        Task[:task].invoke
-      rescue ApplicationAbortedException, SpecificError => e
+        Rake::Task[:task].invoke
+      rescue Rake::ApplicationAbortedException, SpecificError => e
         @raised_error = e
       end
     end
@@ -122,17 +123,18 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
 
       describe 'build problems' do
         it 'should report build problems' do
-          expect(ServiceMessages).to have_received(:build_problem)
+          expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).to \
+            have_received(:build_problem)
         end
 
         it 'should report the error message' do
-          expect(ServiceMessages).to \
+          expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).to \
             have_received(:build_problem)
             .with(hash_including(description: be_an_instance_of(String)))
         end
 
         it 'should report the first 4000 characters of the error message' do
-          expect(ServiceMessages).to \
+          expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).to \
             have_received(:build_problem)
             .with(hash_including(description: have(4000).items))
         end
@@ -142,18 +144,19 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
         it_behaves_like :block_report
 
         it 'should report the error as a build problem' do
-          expect(ServiceMessages).to have_received(:build_problem)
+          expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).to \
+            have_received(:build_problem)
         end
       end
 
       context 'with rake runner' do
         let(:teamcity_rake_runner?) { true }
         let(:error) do
-          ApplicationAbortedException.new(SpecificError.new('inner message'))
+          Rake::ApplicationAbortedException.new(SpecificError.new('inner message'))
         end
 
         it 'should report the inner error as a build problem (as it will be wrapped in a ApplicationAbortedException)' do # rubocop:disable Metrics/LineLength
-          expect(ServiceMessages).to \
+          expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).to \
             have_received(:build_problem).with(description: 'inner message')
         end
 
@@ -170,11 +173,12 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
 
       task :task
 
-      Task[:task].invoke
+      Rake::Task[:task].invoke
     end
 
     it 'should not write' do
-      expect(ServiceMessages).not_to have_received(:block_opened)
+      expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).not_to \
+        have_received(:block_opened)
     end
   end
 end

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

@@ -1,10 +1,8 @@
 # rubocop:disable RSpec/FilePath
 
-include Rake::Funnel::Integration
-
 describe Rake::Funnel::Integration::TeamCity::ServiceMessages do
   before do
-    allow(TeamCity).to receive(:running?).and_return(teamcity_running?)
+    allow(Rake::Funnel::Integration::TeamCity).to receive(:running?).and_return(teamcity_running?)
     allow($stdout).to receive(:puts)
   end
 

data/spec/rake/funnel/support/argument_mapper/styles/msdeploy_spec.rb

@@ -1,9 +1,7 @@
 # rubocop:disable RSpec/FilePath
 
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Support::Mapper::Styles::MSDeploy do
-  subject { Mapper.new(:MSDeploy) }
+  subject { Rake::Funnel::Support::Mapper.new(:MSDeploy) }
 
   describe 'no arguments' do
     it 'should convert no args to []' do

data/spec/rake/funnel/support/argument_mapper/styles/nunit_spec.rb

@@ -1,7 +1,7 @@
 # rubocop:disable RSpec/FilePath
 
 describe Rake::Funnel::Support::Mapper::Styles::NUnit do
-  subject { Mapper.new(:NUnit) }
+  subject { Rake::Funnel::Support::Mapper.new(:NUnit) }
 
   describe 'prefix' do
     before do

data/spec/rake/funnel/support/argument_mapper/styles/styles_spec.rb

@@ -1,14 +1,12 @@
-include Rake::Funnel::Support::ArgumentMapper
-
-Styles.constants.reject { |x| x == :MSDeploy }.each do |style|
-  style_path = Styles.const_get(style)
+Rake::Funnel::Support::ArgumentMapper::Styles.constants.reject { |x| x == :MSDeploy }.each do |style|
+  style_path = Rake::Funnel::Support::ArgumentMapper::Styles.const_get(style)
   describe style_path do
     subject do
-      Mapper.new(style)
+      Rake::Funnel::Support::Mapper.new(style)
     end
 
     let(:style) do
-      Styles.const_get(style).new
+      Rake::Funnel::Support::ArgumentMapper::Styles.const_get(style).new
     end
 
     def styled(switch, key = nil, value = nil) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/LineLength

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

@@ -1,5 +1,3 @@
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Support::AssemblyVersion::FromVersionFiles do
   describe 'defaults' do
     its(:search_pattern) { should == %w(**/VERSION) }
@@ -26,16 +24,17 @@ describe Rake::Funnel::Support::AssemblyVersion::FromVersionFiles do
   end
 
   describe 'enumeration' do
-    let(:finder) { instance_double(Finder).as_null_object }
+    let(:finder) { instance_double(Rake::Funnel::Support::Finder).as_null_object }
     let(:files) { %w(1 2) }
 
     before do
       allow(finder).to receive(:all_or_default).and_return(files)
-      allow(Finder).to receive(:new).and_return(finder)
+      allow(Rake::Funnel::Support::Finder).to receive(:new).and_return(finder)
     end
 
     before do
-      allow(VersionInfo).to receive(:read_version_from).and_return(*files)
+      allow(Rake::Funnel::Support::VersionInfo).to \
+        receive(:read_version_from).and_return(*files)
     end
 
     before do
@@ -50,11 +49,11 @@ describe Rake::Funnel::Support::AssemblyVersion::FromVersionFiles do
       args = files.map do |file|
         {
           source: file,
-          version_info: VersionInfo.parse(version: file, metadata: {
-                                            pre: subject.metadata[:pre],
-                                            build: subject.metadata[:build],
-                                            sha: subject.metadata[:sha]
-                                          })
+          version_info: Rake::Funnel::Support::VersionInfo.parse(version: file, metadata: {
+                                                                   pre: subject.metadata[:pre],
+                                                                   build: subject.metadata[:build],
+                                                                   sha: subject.metadata[:sha]
+                                                                 })
         }
       end