rake-funnel 0.21.0 → 0.21.1

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

@@ -1,13 +1,8 @@
 # rubocop:disable RSpec/FilePath
 
-include Rake
-include Rake::Funnel
-include Rake::Funnel::Integration::TeamCity
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Tasks::NUnit do
   before do
-    Task.clear
+    Rake::Task.clear
   end
 
   describe 'defaults' do
@@ -20,23 +15,23 @@ describe Rake::Funnel::Tasks::NUnit do
   describe 'execution' do
     let(:args) { {} }
 
-    let(:mapper) { instance_double(Mapper).as_null_object }
-    let(:finder) { instance_double(Finder).as_null_object }
+    let(:mapper) { instance_double(Rake::Funnel::Support::Mapper).as_null_object }
+    let(:finder) { instance_double(Rake::Funnel::Support::Finder).as_null_object }
 
     before do
       allow(subject).to receive(:sh)
 
-      allow(Mapper).to receive(:new).and_return(mapper)
-      allow(Finder).to receive(:new).and_return(finder)
-      allow(NUnitPlugin).to receive(:setup)
+      allow(Rake::Funnel::Support::Mapper).to receive(:new).and_return(mapper)
+      allow(Rake::Funnel::Support::Finder).to receive(:new).and_return(finder)
+      allow(Rake::Funnel::Integration::TeamCity::NUnitPlugin).to receive(:setup)
 
-      allow(Mono).to receive(:invocation).and_wrap_original do |_original_method, *args, &_block|
+      allow(Rake::Funnel::Support::Mono).to receive(:invocation).and_wrap_original do |_original_method, *args, &_block|
         args.compact
       end
     end
 
     before do
-      Task[subject.name].invoke
+      Rake::Task[subject.name].invoke
     end
 
     it 'should use test assembly finder' do
@@ -44,11 +39,11 @@ describe Rake::Funnel::Tasks::NUnit do
     end
 
     it 'should set up TeamCity plugin' do
-      expect(NUnitPlugin).to have_received(:setup).with(subject.nunit)
+      expect(Rake::Funnel::Integration::TeamCity::NUnitPlugin).to have_received(:setup).with(subject.nunit)
     end
 
     it 'should use NUnit mapper' do
-      expect(Mapper).to have_received(:new).with(:NUnit)
+      expect(Rake::Funnel::Support::Mapper).to have_received(:new).with(:NUnit)
     end
 
     it 'should map arguments' do
@@ -56,7 +51,7 @@ describe Rake::Funnel::Tasks::NUnit do
     end
 
     it 'should use mono invocation' do
-      expect(Mono).to have_received(:invocation).with(subject.nunit)
+      expect(Rake::Funnel::Support::Mono).to have_received(:invocation).with(subject.nunit)
     end
 
     it 'should run with sh' do

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

@@ -1,9 +1,6 @@
-include Rake
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Tasks::Paket do
   before do
-    Task.clear
+    Rake::Task.clear
   end
 
   describe 'defaults' do
@@ -17,7 +14,7 @@ describe Rake::Funnel::Tasks::Paket do
   describe 'execution' do
     before do
       allow(subject).to receive(:sh)
-      allow(Mono).to receive(:invocation).and_wrap_original do |_original_method, *args, &_block|
+      allow(Rake::Funnel::Support::Mono).to receive(:invocation).and_wrap_original do |_original_method, *args, &_block|
         args.compact
       end
     end
@@ -38,7 +35,7 @@ describe Rake::Funnel::Tasks::Paket do
       end
 
       before do
-        Task[subject.name].invoke
+        Rake::Task[subject.name].invoke
       end
 
       it 'should use custom bootstrapper' do
@@ -52,15 +49,19 @@ describe Rake::Funnel::Tasks::Paket do
 
     describe 'mono invocation' do
       before do
-        Task[subject.name].invoke
+        Rake::Task[subject.name].invoke
       end
 
       it 'should use mono invocation for bootstrapper' do
-        expect(Mono).to have_received(:invocation).with(subject.bootstrapper, subject.bootstrapper_args)
+        expect(Rake::Funnel::Support::Mono).to have_received(:invocation)
+          .with(subject.bootstrapper,
+                subject.bootstrapper_args)
       end
 
       it 'should use mono invocation for paket' do
-        expect(Mono).to have_received(:invocation).with(subject.paket, subject.paket_args)
+        expect(Rake::Funnel::Support::Mono).to have_received(:invocation)
+          .with(subject.paket,
+                subject.paket_args)
       end
     end
 
@@ -72,7 +73,7 @@ describe Rake::Funnel::Tasks::Paket do
 
       context 'success' do
         before do
-          Task[subject.name].invoke
+          Rake::Task[subject.name].invoke
         end
 
         context 'paket.exe exists' do
@@ -110,7 +111,7 @@ describe Rake::Funnel::Tasks::Paket do
             end
 
             it 'should fail' do
-              expect { Task[subject.name].invoke }.to raise_error(RuntimeError)
+              expect { Rake::Task[subject.name].invoke }.to raise_error(RuntimeError)
             end
           end
         end
@@ -120,13 +121,13 @@ describe Rake::Funnel::Tasks::Paket do
 
           context 'bootstrapper failed' do
             before do
-              allow(subject).to receive(:sh).with(subject.bootstrapper).and_raise
+              allow(subject).to receive(:sh).with(subject.bootstrapper).and_raise(RuntimeError)
             end
 
             it 'should not run paket' do
               begin
-                Task[subject.name].invoke
-              rescue
+                Rake::Task[subject.name].invoke
+              rescue RuntimeError
                 nil
               end
 
@@ -134,7 +135,7 @@ describe Rake::Funnel::Tasks::Paket do
             end
 
             it 'should fail' do
-              expect { Task[subject.name].invoke }.to raise_error(RuntimeError)
+              expect { Rake::Task[subject.name].invoke }.to raise_error(RuntimeError)
             end
           end
         end

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

@@ -1,11 +1,8 @@
 require 'tmpdir'
 
-include Rake
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Tasks::QuickTemplate do
   before do
-    Task.clear
+    Rake::Task.clear
   end
 
   describe 'defaults' do
@@ -17,12 +14,12 @@ describe Rake::Funnel::Tasks::QuickTemplate do
   describe 'execution' do
     let(:templates) { %w(1.template two/2.template) }
 
-    let(:finder) { instance_double(Finder).as_null_object }
-    let(:engine) { TemplateEngine }
+    let(:finder) { instance_double(Rake::Funnel::Support::Finder).as_null_object }
+    let(:engine) { Rake::Funnel::Support::TemplateEngine }
 
     before do
       allow(finder).to receive(:all_or_default).and_return(templates)
-      allow(Finder).to receive(:new).and_return(finder)
+      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(File).to receive(:read).and_return('template content')
@@ -32,7 +29,7 @@ describe Rake::Funnel::Tasks::QuickTemplate do
     subject! { described_class.new }
 
     before do
-      Task[subject.name].invoke
+      Rake::Task[subject.name].invoke
     end
 
     it 'should report created files' do

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

@@ -1,11 +1,8 @@
 require 'tmpdir'
 
-include Rake
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Tasks::SideBySideSpecs do
   before do
-    Task.clear
+    Rake::Task.clear
   end
 
   describe 'defaults' do
@@ -29,18 +26,18 @@ describe Rake::Funnel::Tasks::SideBySideSpecs do
     end
 
     before do
-      allow(SpecsRemover).to receive(:remove)
+      allow(Rake::Funnel::Support::SpecsRemover).to receive(:remove)
     end
 
     before do
-      Task[subject.name].invoke
+      Rake::Task[subject.name].invoke
     end
 
     context 'enabled' do
       let(:enabled) { true }
 
       it 'should use remover' do
-        expect(SpecsRemover).to have_received(:remove)
+        expect(Rake::Funnel::Support::SpecsRemover).to have_received(:remove)
           .with(projects: subject.projects,
                 references: subject.references,
                 specs: subject.specs,
@@ -52,7 +49,7 @@ describe Rake::Funnel::Tasks::SideBySideSpecs do
       let(:enabled) { false }
 
       it 'should do nothing' do
-        expect(SpecsRemover).not_to have_received(:remove)
+        expect(Rake::Funnel::Support::SpecsRemover).not_to have_received(:remove)
       end
     end
   end

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

@@ -1,14 +1,14 @@
-include Rake
-
 describe Rake::Funnel::Tasks::Timing do
-  include DSL
+  include Rake::DSL
 
   before do
     Rake.application = nil
-    Task.clear
+    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 }
@@ -59,7 +59,7 @@ describe Rake::Funnel::Tasks::Timing do
       allow(Rake.application).to receive(:exit_because_of_exception)
 
       allow($stdout).to receive(:puts)
-      allow($stderr).to receive(:puts)
+      allow(Kernel).to receive(:warn)
       # The 'rake aborted!' message is #printed on $stderr.
       allow($stderr).to receive(:print)
 
@@ -125,7 +125,7 @@ describe Rake::Funnel::Tasks::Timing do
         end
 
         it 'should report failure' do
-          expect($stderr).to have_received(:puts).with(/Status\s+Failed/)
+          expect(Kernel).to have_received(:warn).with(/Status\s+Failed/)
         end
       end
     end

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

@@ -1,9 +1,6 @@
-include Rake
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Tasks::Zip do
   before do
-    Task.clear
+    Rake::Task.clear
   end
 
   describe 'defaults' do
@@ -16,15 +13,15 @@ describe Rake::Funnel::Tasks::Zip do
 
   describe 'execution' do
     let(:source) { %w(bin/1 bin/2 bin/3/4) }
-    let(:finder) { instance_double(Finder).as_null_object }
+    let(:finder) { instance_double(Rake::Funnel::Support::Finder).as_null_object }
 
     before do
       allow(finder).to receive(:all_or_default).and_return(source)
-      allow(Finder).to receive(:new).and_return(finder)
+      allow(Rake::Funnel::Support::Finder).to receive(:new).and_return(finder)
     end
 
     before do
-      allow(Zipper).to receive(:zip)
+      allow(Rake::Funnel::Support::Zipper).to receive(:zip)
       allow(Rake).to receive(:rake_output_message)
     end
 
@@ -37,11 +34,12 @@ describe Rake::Funnel::Tasks::Zip do
     end
 
     before do
-      Task[subject.name].invoke
+      Rake::Task[subject.name].invoke
     end
 
     it 'should delegate to Zipper' do
-      expect(Zipper).to have_received(:zip).with(subject.source, subject.target, subject.zip_root)
+      expect(Rake::Funnel::Support::Zipper).to have_received(:zip)
+        .with(subject.source, subject.target, subject.zip_root)
     end
 
     it 'should report the created zip file' do
@@ -63,11 +61,11 @@ describe Rake::Funnel::Tasks::Zip do
         let(:allow_empty) { true }
 
         before do
-          Task[subject.name].invoke
+          Rake::Task[subject.name].invoke
         end
 
         it 'should invoker Zipper' do
-          expect(Zipper).to have_received(:zip)
+          expect(Rake::Funnel::Support::Zipper).to have_received(:zip)
         end
       end
 
@@ -76,11 +74,11 @@ describe Rake::Funnel::Tasks::Zip do
         let(:allow_empty) { false }
 
         before do
-          Task[subject.name].invoke
+          Rake::Task[subject.name].invoke
         end
 
         it 'should not invoker Zipper' do
-          expect(Zipper).not_to have_received(:zip)
+          expect(Rake::Funnel::Support::Zipper).not_to have_received(:zip)
         end
 
         it 'should warn' do

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@ end
 Rake::Funnel::Integration::SyncOutput.new
 
 RSpec.configure do |config|
+  config.filter_run_when_matching(:focus)
+
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2017-10-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: configatron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: configatron
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.5'
 description: A standardized build pipeline
 email:
 - agross@therightstuff.de
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A build pipeline targeted at .NET projects. Supports environment configuration