rake-funnel 0.21.2 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 38b45b7ac59fc6d322fc922dc101998e82127b90
-  data.tar.gz: 70934ba3d057a57f1463850f458e6d496c68bef2
+SHA256:
+  metadata.gz: ba6054ccf746282d7b18f44405a4a1f24e3f2dabc36dfc1ce5b8a5fd90bbc9b1
+  data.tar.gz: ad1ba7b758b76396150182661dcf4936b133f3b52007e2ceb582dd0339e9af7c
 SHA512:
-  metadata.gz: 4d1c427c3189d23be7a625bb9f8149283d21068b9811e4341df0dd2ab49ae52551af021a2d5668ce767a91ac622b585c91d13dfccfffa52cc56ba186f4831b9c
-  data.tar.gz: 1df053f403858d78d261b80abd2d6bf0dfdc4ec48278245f87ff919d056ee777e4b934a5aa4d026d4170dde4e740bb2662c17b23b8ad1376309f722e3f173386
+  metadata.gz: 51eaeeef60d39328f4a0b6ef35b66560b5d5f0b8d61291282aae964bffcd4043d22432dd261d5879a8324535058f2284fc680b7b852277d5dc761f0abb91213a
+  data.tar.gz: afe151343b40f3c2510a575140c4a42df399196d58e98f6ef4e88c199ea6b1e7138575cc43e2fa962299b4abfaf5994791737926a74f2d5f59cec9d74e6b066f

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# 0.22.0 / 2018-05-05
+
+* [FEATURE] Support [vswhere](https://github.com/Microsoft/vswhere) to locate
+  MSBuild. It's advised to install vswhere as a NuGet package and add it to the
+  `PATH`. You can use `Rake::Funnel::Tasks::BinPath` for that.

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 # rubocop:disable Lint/RescueWithoutErrorClass
+                  rescue => e # rubocop:disable Style/RescueStandardError
                     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 # rubocop:disable Lint/RescueWithoutErrorClass
+        rescue => e # rubocop:disable Style/RescueStandardError
           Rake.rake_output_message "Failed to set up sync output #{e}"
         end
       end

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

@@ -12,17 +12,13 @@ module Rake
               task_starting do |task, _args|
                 next unless TeamCity.running?
 
-                unless TeamCity.rake_runner?
-                  ServiceMessages.block_opened(name: task.name)
-                end
+                ServiceMessages.block_opened(name: task.name) unless TeamCity.rake_runner?
               end
 
               task_finished do |task, _args, error|
                 next unless TeamCity.running?
 
-                if error.respond_to?(:inner_exception)
-                  error = error.inner_exception
-                end
+                error = error.inner_exception if error.respond_to?(:inner_exception)
 
                 ServiceMessages.build_problem(description: error.message[0..4000 - 1]) if error
 

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

@@ -7,41 +7,64 @@ module Rake
         class BuildTool
           class << self
             def find
-              mono_build || from_registry.compact.first
+              vswhere ||
+                from_registry ||
+                mono ||
+                raise('No compatible MSBuild build tool was found')
             end
 
             private
 
-            def mono_build
-              return nil if Rake::Win32.windows?
-
-              begin
-                out, status = Open3.capture2('mono', '--version')
-                raise "Could not determine mono version: #{status}" unless status.success?
-              rescue Errno::ENOENT
-                raise 'mono is not installed'
+            def mono
+              out, status = Open3.capture2('mono', '--version')
+              unless status.success?
+                warn "Could not determine mono version: #{status}"
+                return nil
               end
 
               return 'msbuild'.freeze if out[/^Mono JIT compiler version ([\d\.]+)/, 1] >= '5.0'
 
               'xbuild'.freeze
+            rescue Errno::ENOENT
+              nil
+            end
+
+            def vswhere # rubocop:disable Metrics/MethodLength
+              # -products * is required.
+              # https://github.com/Microsoft/vswhere/issues/61#issuecomment-298691077
+              args = %w(vswhere.exe
+                        -products *
+                        -latest
+                        -requires Microsoft.Component.MSBuild
+                        -property installationPath)
+
+              path, status = Open3.capture2(*args)
+              unless status.success?
+                warn "vswhere failed: #{status}"
+                return nil
+              end
+
+              Dir[File.join(Rake::Win32.normalize(path.strip),
+                            'MSBuild/*/Bin/MSBuild.exe')]
+                .find { |e| File.file?(e) }
+            rescue Errno::ENOENT
+              nil
             end
 
             KEY = 'SOFTWARE\Microsoft\MSBuild\ToolsVersions'.freeze
+            REGISTRY_VERSIONS = %w(14.0 12.0 4.0 3.5 2.0).freeze
 
             def from_registry
               return nil unless require_registry
 
-              versions.map do |version|
+              candidates = REGISTRY_VERSIONS.map do |version|
                 version_key(version) do |reg|
                   candidate = File.join(reg['MSBuildToolsPath'] || '', 'msbuild.exe')
                   next candidate if File.exist?(candidate)
                 end
               end
-            end
 
-            def versions
-              %w(14.0 12.0 4.0 3.5 2.0)
+              candidates.compact.first
             end
 
             def require_registry

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

@@ -26,7 +26,7 @@ module Rake
           @name = args.shift || :compile
 
           @msbuild = nil
-          @msbuild_finder = ->() { BuildTool.find }
+          @msbuild_finder = -> { BuildTool.find }
           @args = {}
           @search_pattern = %w(**/*.sln)
         end

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.21.2'.freeze
+    VERSION = '0.22.0'.freeze
   end
 end

data/rake-funnel.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rake/funnel/version'
 
@@ -13,7 +13,8 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.description = 'A standardized build pipeline'
   s.summary     = 'A build pipeline targeted at .NET projects. Supports environment configuration and makes invoking .NET-related tasks easier.' # rubocop:disable Metrics/LineLength
 
-  s.required_ruby_version = '>= 2.0.0'
+  # We support Ruby 2.0 whereas rubocop does not.
+  s.required_ruby_version = '>= 2.0.0' # rubocop:disable Gemspec/RequiredRubyVersion
 
   s.add_dependency 'configatron', '~> 4.5'
   s.add_dependency 'rake', '>= 10.4', '< 13'

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

@@ -1,7 +1,7 @@
 describe Rake::Funnel::Extensions::CommonPath do
   describe 'Manual debugging test case' do
     it 'should work' do
-      expect(%w(/common/one /com/two).common_path).to be
+      expect(%w(/common/one /com/two).common_path).to be_truthy
 
       skip('for manual testing only')
     end
@@ -12,7 +12,8 @@ describe Rake::Funnel::Extensions::CommonPath do
       input = FileList[File.join(File.dirname(__FILE__), '**/*')]
       duped = input.dup
 
-      expect(input.common_path).to be
+      expect(input.common_path).to be_truthy
+
       expect(input).to match_array(duped)
     end
   end

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

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Extensions::REXML::Functions do
+describe Rake::Funnel::Extensions::REXML::Functions do # rubocop:disable RSpec/FilePath
   let(:xml) do
     <<XML
   <editors xmlns="http://example.com">

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

@@ -3,10 +3,10 @@ describe Rake::Funnel::Integration::SyncOutput do
     before do
       allow($stdout).to receive(:sync=)
       allow($stderr).to receive(:sync=)
-
-      expect(subject).to be # rubocop:disable RSpec/ExpectInHook
     end
 
+    subject! { described_class.new }
+
     it 'should immediately flush $stdout' do
       expect($stdout).to have_received(:sync=).with(true)
     end
@@ -22,10 +22,10 @@ describe Rake::Funnel::Integration::SyncOutput do
       allow($stderr).to receive(:sync=).and_raise('$stderr.sync not supported')
 
       allow(Rake).to receive(:rake_output_message)
-
-      expect(subject).to be # rubocop:disable RSpec/ExpectInHook
     end
 
+    subject! { described_class.new }
+
     it 'should log the error for $stdout' do
       expect(Rake).to have_received(:rake_output_message).with(/Failed.*\$stdout/)
     end

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

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do
+describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do # rubocop:disable RSpec/FilePath
   before do
     allow(ENV).to receive(:[]).with(described_class::ENV_VAR).and_return(env_var)
     allow(Rake::Funnel::Support::Which).to receive(:which).and_return(which)

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

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Integration::TeamCity::ProgressReport do
+describe Rake::Funnel::Integration::TeamCity::ProgressReport do # rubocop:disable RSpec/FilePath
   include Rake::DSL
 
   let(:teamcity_running?) { false }
@@ -26,7 +24,7 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
     subject.disable!
   end
 
-  shared_examples :block_report do
+  shared_examples 'block report' do
     it 'should write block start' do
       expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).to \
         have_received(:block_opened).with(name: 'task')
@@ -38,7 +36,7 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
     end
   end
 
-  shared_examples :no_block_report do
+  shared_examples 'no block report' do
     it 'should not write block start' do
       expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).not_to \
         have_received(:block_opened)
@@ -63,20 +61,20 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
     end
 
     context 'not on TeamCity' do
-      it_behaves_like :no_block_report
+      it_behaves_like 'no block report'
     end
 
     context 'on TeamCity' do
       let(:teamcity_running?) { true }
 
       context 'without rake runner' do
-        it_behaves_like :block_report
+        it_behaves_like 'block report'
       end
 
       context 'with rake runner' do
         let(:teamcity_rake_runner?) { true }
 
-        it_behaves_like :no_block_report
+        it_behaves_like 'no block report'
       end
     end
   end
@@ -111,7 +109,7 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
     end
 
     context 'not on TeamCity' do
-      it_behaves_like :no_block_report
+      it_behaves_like 'no block report'
 
       it 'should not swallow the error' do
         expect(@raised_error).to be_a_kind_of(SpecificError) # rubocop:disable RSpec/InstanceVariable
@@ -141,7 +139,7 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
       end
 
       context 'without rake runner' do
-        it_behaves_like :block_report
+        it_behaves_like 'block report'
 
         it 'should report the error as a build problem' do
           expect(Rake::Funnel::Integration::TeamCity::ServiceMessages).to \
@@ -160,7 +158,7 @@ describe Rake::Funnel::Integration::TeamCity::ProgressReport do
             have_received(:build_problem).with(description: 'inner message')
         end
 
-        it_behaves_like :no_block_report
+        it_behaves_like 'no block report'
       end
     end
   end

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

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Integration::TeamCity::ServiceMessages do
+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)

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

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Integration::TeamCity do
+describe Rake::Funnel::Integration::TeamCity do # rubocop:disable RSpec/FilePath
   describe 'runner detection' do
     before do
       allow(ENV).to receive(:include?).with(described_class::PROJECT_ENV_VAR).and_return(teamcity_running?)

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

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Support::Mapper::Styles::MSDeploy do
+describe Rake::Funnel::Support::Mapper::Styles::MSDeploy do # rubocop:disable RSpec/FilePath
   subject { Rake::Funnel::Support::Mapper.new(:MSDeploy) }
 
   describe 'no arguments' do

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

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

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

@@ -43,12 +43,8 @@ describe Rake::Funnel::Support::AssemblyVersionWriter do
         ]
       end
 
-      subject do
-        described_class.new(source)
-      end
-
       it 'should succeed' do
-        expect(subject).to be
+        described_class.new(source)
       end
     end
   end

data/spec/rake/funnel/support/internal/finder_spec.rb

@@ -1,8 +1,6 @@
-# rubocop:disable RSpec/FilePath
-
 require 'tmpdir'
 
-describe Rake::Funnel::Support::Finder do
+describe Rake::Funnel::Support::Finder do # rubocop:disable RSpec/FilePath
   let(:pattern) { %W(#{temp_dir}/**/*.sln #{temp_dir}/**/*.??proj) }
   let(:generate) { [] }
   let(:temp_dir) { Dir.mktmpdir }

data/spec/rake/funnel/support/internal/instantiate_symbol_spec.rb

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Support::InstantiateSymbol do
+describe Rake::Funnel::Support::InstantiateSymbol do # rubocop:disable RSpec/FilePath
   module Creatable
     class One
     end

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

@@ -17,7 +17,7 @@ describe Rake::Funnel::Support::Mapper do
   end
 
   class CustomMapper
-    def generate_from(_)
+    def generate_from(_ignored)
       [
         ['-', 'switch'],
         ['-', :some_switch],
@@ -40,7 +40,7 @@ describe Rake::Funnel::Support::Mapper do
   describe 'mapper style' do
     context 'default mapper' do
       it 'should use default mapper' do
-        expect(described_class.new).to be
+        expect(described_class.new).to be_kind_of(described_class)
       end
     end
 
@@ -59,7 +59,7 @@ describe Rake::Funnel::Support::Mapper do
 
     context 'custom mapper' do
       it 'should take custom mapper instance' do
-        expect(described_class.new(CustomMapper.new)).to be
+        expect(described_class.new(CustomMapper.new)).to be_kind_of(described_class)
       end
     end
   end

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

@@ -1,75 +1,155 @@
-# rubocop:disable RSpec/FilePath
-
 require 'ostruct'
 
-describe Rake::Funnel::Support::MSBuild::BuildTool do
-  before do
-    allow(Rake::Win32).to receive(:windows?).and_return(windows?)
-  end
+describe Rake::Funnel::Support::MSBuild::BuildTool do # rubocop:disable RSpec/FilePath
+  context 'vswhere' do
+    let(:vswhere_args) do
+      %w(vswhere.exe -products * -latest -requires Microsoft.Component.MSBuild -property installationPath)
+    end
+
+    before do
+      allow(described_class).to receive(:require).with('win32/registry').and_raise(LoadError)
+      allow(Open3).to receive(:capture2).with('mono', any_args).and_raise(Errno::ENOENT)
+    end
+
+    context 'not installed' do
+      before do
+        allow(Open3).to receive(:capture2).with(*vswhere_args).and_raise(Errno::ENOENT)
+      end
+
+      it 'finds nothing' do
+        expect { described_class.find }.to raise_error('No compatible MSBuild build tool was found')
+      end
+    end
+
+    context 'installed' do
+      before do
+        allow(Open3).to receive(:capture2).with(*vswhere_args).and_return(vswhere_path)
+      end
+
+      context 'fails' do
+        let(:vswhere_path) do
+          [
+            'vswhere crashed',
+            OpenStruct.new(success?: false)
+          ]
+        end
 
-  context 'on Windows',
-          skip: ('Windows Registry not available' unless defined?(::Win32::Registry)) do
-    let(:windows?) { true }
+        before do
+          allow(described_class).to receive(:warn)
+        end
 
+        it 'finds nothing' do
+          expect { described_class.find }.to raise_error('No compatible MSBuild build tool was found')
+        end
+
+        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:/)
+        end
+      end
+
+      describe 'MSBuild executable' do
+        let(:vswhere_path) do
+          [
+            'c:\path',
+            OpenStruct.new(success?: true)
+          ]
+        end
+
+        before do
+          allow(Dir).to receive(:[]).with('c:/path/MSBuild/*/Bin/MSBuild.exe')
+                                    .and_return(['c:/path/msbuild.exe'])
+        end
+
+        context 'exists' do
+          before do
+            allow(File).to receive(:file?).with('c:/path/msbuild.exe').and_return(true)
+          end
+
+          it 'finds msbuild.exe' do
+            expect(described_class.find).to eq('c:/path/msbuild.exe')
+          end
+        end
+
+        context 'does not exist' do
+          before do
+            allow(File).to receive(:exist?).with('c:/path/msbuild.exe').and_return(false)
+          end
+
+          it 'finds nothing' do
+            expect { described_class.find }.to raise_error('No compatible MSBuild build tool was found')
+          end
+        end
+      end
+    end
+  end
+
+  context 'Registry',
+          skip: ('Windows Registry not available on this platform' unless defined?(::Win32::Registry)) do
     before do
       allow(::Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).and_yield('MSBuildToolsPath' => 'path')
     end
 
-    it 'should search the registry for known MSBuild versions' do
-      described_class.find
+    it 'searches the registry for known MSBuild versions' do
+      described_class.find rescue nil # rubocop:disable Style/RescueModifier
       expect(::Win32::Registry::HKEY_LOCAL_MACHINE).to have_received(:open).at_least(:once)
     end
 
-    context 'key not found' do
+    context 'Registry key not found' do
       before do
         allow(::Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).and_raise(::Win32::Registry::Error.new(3))
       end
 
       it 'finds nothing' do
-        expect(described_class.find).to be_nil
+        expect { described_class.find }.to raise_error('No compatible MSBuild build tool was found')
       end
     end
 
-    context 'MSBuild exists' do
-      before do
-        allow(File).to receive(:exist?).with('path/msbuild.exe').and_return(true)
-      end
+    describe 'MSBuild executable' do
+      context 'exists' do
+        before do
+          allow(File).to receive(:exist?).with('path/msbuild.exe').and_return(true)
+        end
 
-      it 'should find msbuild.exe' do
-        expect(described_class.find).to eq('path/msbuild.exe')
+        it 'finds msbuild.exe' do
+          expect(described_class.find).to eq('path/msbuild.exe')
+        end
       end
-    end
 
-    context 'MSBuild does not exist' do
-      before do
-        allow(File).to receive(:exist?).with('path/msbuild.exe').and_return(false)
-      end
+      context 'does not exist' do
+        before do
+          allow(File).to receive(:exist?).with('path/msbuild.exe').and_return(false)
+        end
 
-      it 'should not find msbuild.exe' do
-        expect(described_class.find).to be_nil
+        it 'finds nothing' do
+          expect { described_class.find }.to raise_error('No compatible MSBuild build tool was found')
+        end
       end
     end
   end
 
-  context 'not on Windows' do
-    let(:windows?) { false }
+  context 'mono' do
+    before do
+      allow(described_class).to receive(:require).with('win32/registry').and_raise(LoadError)
+      allow(Open3).to receive(:capture2).with('vswhere.exe', any_args).and_raise(Errno::ENOENT)
+    end
 
-    context 'mono not installed' do
+    context 'not installed' do
       before do
         allow(Open3).to receive(:capture2).with('mono', '--version').and_raise(Errno::ENOENT)
       end
 
-      it 'fails' do
-        expect { described_class.find }.to raise_error('mono is not installed')
+      it 'finds nothing' do
+        expect { described_class.find }.to raise_error('No compatible MSBuild build tool was found')
       end
     end
 
-    context 'mono installed' do
+    context 'installed' do
       before do
         allow(Open3).to receive(:capture2).with('mono', '--version').and_return(mono_version)
       end
 
-      context 'mono fails' do
+      context 'fails' do
         let(:mono_version) do
           [
             'mono crashed',
@@ -77,8 +157,17 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do
           ]
         end
 
-        it 'should find nothing' do
-          expect { described_class.find }.to raise_error(/^Could not determine mono version:/)
+        before do
+          allow(described_class).to receive(:warn)
+        end
+
+        it 'finds nothing' do
+          expect { described_class.find }.to raise_error('No compatible MSBuild build tool was found')
+        end
+
+        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:/)
         end
       end
 
@@ -90,7 +179,7 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do
           ]
         end
 
-        it 'should find xbuild' do
+        it 'finds xbuild' do
           expect(described_class.find).to eq('xbuild')
         end
       end
@@ -103,7 +192,7 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do
           ]
         end
 
-        it 'should find msbuild' do
+        it 'finds msbuild' do
           expect(described_class.find).to eq('msbuild')
         end
       end

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

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Support::MSDeploy::RegistryPatch do
+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)

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

@@ -11,7 +11,7 @@ describe Rake::Funnel::Support::Timing::Report do
     subject.render
   end
 
-  shared_examples_for :report do
+  shared_examples_for 'report' do
     it 'should separator lines' do
       expect($stdout).to have_received(:puts)
         .with(Regexp.new('-' * described_class::HEADER_WIDTH)).exactly(4).times
@@ -49,7 +49,7 @@ describe Rake::Funnel::Support::Timing::Report do
   describe 'empty report', include: Rake::Funnel::Support::Timing do
     let(:stats) { Rake::Funnel::Support::Timing::Statistics.new }
 
-    it_behaves_like :report
+    it_behaves_like 'report'
   end
 
   describe 'report for 2 tasks' do
@@ -60,7 +60,7 @@ describe Rake::Funnel::Support::Timing::Report do
       s
     end
 
-    it_behaves_like :report
+    it_behaves_like 'report'
 
     it 'should print each task' do
       expect($stdout).to have_received(:puts).with(/^foo/)
@@ -95,7 +95,7 @@ describe Rake::Funnel::Support::Timing::Report do
       diff + described_class::SPACE
     end
 
-    shared_examples_for :padding do
+    shared_examples_for 'padding' do
       it 'should pad headers' do
         expect($stdout).to have_received(:puts)
           .with(Regexp.new("^#{subject.columns[0].header}\\s{#{header_space}}#{subject.columns[1].header}"))
@@ -113,13 +113,13 @@ describe Rake::Funnel::Support::Timing::Report do
     context 'task names are shorter than headers' do
       let(:task_name) { :a }
 
-      it_behaves_like :padding
+      it_behaves_like 'padding'
     end
 
     context 'task names are longer than headers' do
       let(:task_name) { :aaaaaaaaaaaa }
 
-      it_behaves_like :padding
+      it_behaves_like 'padding'
     end
   end
 end

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

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Tasks::MSBuild do
+describe Rake::Funnel::Tasks::MSBuild do # rubocop:disable RSpec/FilePath
   before do
     Rake::Task.clear
   end

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

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Tasks::MSDeploy do
+describe Rake::Funnel::Tasks::MSDeploy do # rubocop:disable RSpec/FilePath
   before do
     Rake::Task.clear
   end

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

@@ -1,6 +1,4 @@
-# rubocop:disable RSpec/FilePath
-
-describe Rake::Funnel::Tasks::NUnit do
+describe Rake::Funnel::Tasks::NUnit do # rubocop:disable RSpec/FilePath
   before do
     Rake::Task.clear
   end

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

@@ -4,15 +4,15 @@ describe Rake::Funnel::Tasks::Timing do
   before do
     Rake.application = nil
     Rake::Task.clear
-
-    # rubocop:disable RSpec/ExpectInHook
-    expect(define_tasks).to be
-    expect(subject).to be
-    # rubocop:enable RSpec/ExpectInHook
   end
 
   let(:define_tasks) { task :task }
 
+  subject! do
+    define_tasks
+    described_class.new
+  end
+
   after do
     subject.reset!
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.22.0
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configatron
@@ -81,6 +81,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".simplecov"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - lib/rake/funnel.rb
@@ -233,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A build pipeline targeted at .NET projects. Supports environment configuration