rake-funnel 0.18.0 → 0.19.0

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

@@ -1,12 +1,14 @@
+# rubocop:disable RSpec/FilePath
+
 include Rake
 include Rake::Funnel
 include Rake::Funnel::Support
 include Rake::Funnel::Support::MSBuild
 
 describe Rake::Funnel::Tasks::MSBuild do
-  before {
+  before do
     Task.clear
-  }
+  end
 
   describe 'defaults' do
     its(:name) { should == :compile }
@@ -15,9 +17,9 @@ describe Rake::Funnel::Tasks::MSBuild do
     its(:search_pattern) { should == %w(**/*.sln) }
 
     describe 'build tool' do
-      before {
+      before do
         allow(BuildTool).to receive(:find).and_return('build tool')
-      }
+      end
 
       it 'should use build tool finder' do
         expect(subject.msbuild).to eq('build tool')
@@ -28,19 +30,19 @@ describe Rake::Funnel::Tasks::MSBuild do
   describe 'execution' do
     let(:args) { {} }
 
-    let(:mapper) { double(Mapper).as_null_object }
-    let(:finder) { double(Finder).as_null_object }
+    let(:mapper) { instance_double(Mapper).as_null_object }
+    let(:finder) { instance_double(Finder).as_null_object }
 
-    before {
+    before do
       allow(subject).to receive(:sh)
 
       allow(Mapper).to receive(:new).and_return(mapper)
       allow(Finder).to receive(:new).and_return(finder)
-    }
+    end
 
-    before {
+    before do
       Task[subject.name].invoke
-    }
+    end
 
     it 'should use solution finder' do
       expect(finder).to have_received(:single)
@@ -60,30 +62,32 @@ describe Rake::Funnel::Tasks::MSBuild do
 
     describe 'overriding defaults' do
       context 'when msbuild executable is specified' do
-        subject {
+        subject do
           described_class.new do |t|
             t.msbuild = 'custom build tool.exe'
           end
-        }
+        end
 
         its(:msbuild) { should == 'custom build tool.exe' }
       end
 
       context 'when project or solution is specified' do
-        before {
+        before do
           allow(Finder).to receive(:new).and_call_original
-        }
+        end
 
-        subject {
+        subject do
           described_class.new do |t|
             t.project_or_solution = 'project.sln'
           end
-        }
+        end
 
         its(:project_or_solution) { should be_instance_of(Finder) }
 
         it 'should set project or solution' do
-          expect(Finder).to have_received(:new).with('project.sln', subject, 'No projects or more than one project found.')
+          expect(Finder).to have_received(:new).with('project.sln',
+                                                     subject,
+                                                     'No projects or more than one project found.')
         end
       end
     end

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

@@ -1,12 +1,14 @@
+# rubocop:disable RSpec/FilePath
+
 include Rake
 include Rake::Funnel
 include Rake::Funnel::Support
 include Rake::Funnel::Support::MSDeploy
 
 describe Rake::Funnel::Tasks::MSDeploy do
-  before {
+  before do
     Task.clear
-  }
+  end
 
   describe 'defaults' do
     its(:name) { should == :msdeploy }
@@ -25,29 +27,29 @@ describe Rake::Funnel::Tasks::MSDeploy do
     let(:msdeploy) { 'msdeploy' }
     let(:args) { {} }
 
-    subject {
+    subject do
       described_class.new do |t|
         t.msdeploy = msdeploy
         t.args = args
       end
-    }
+    end
 
-    before {
+    before do
       allow(subject).to receive(:shell)
 
       allow(RegistryPatch).to receive(:new).and_yield
-    }
+    end
 
     describe 'argument mapping and invocation' do
-      let(:mapper) { double(Mapper).as_null_object }
+      let(:mapper) { instance_double(Mapper).as_null_object }
 
-      before {
+      before do
         allow(Mapper).to receive(:new).and_return(mapper)
-      }
+      end
 
-      before {
+      before do
         Task[subject.name].invoke
-      }
+      end
 
       it 'should use MSDeploy mapper' do
         expect(Mapper).to have_received(:new).with(:MSDeploy)
@@ -59,20 +61,18 @@ describe Rake::Funnel::Tasks::MSDeploy do
 
       it 'should run with shell' do
         expect(subject).to have_received(:shell).with(/^msdeploy /,
-            {
-              log_file: 'msdeploy.log',
-              error_lines: /^(error|[\w\.]*exception)/i
-            })
+                                                      log_file: 'msdeploy.log',
+                                                      error_lines: /^(error|[\w\.]*exception)/i)
       end
     end
 
     describe 'arg examples' do
-      before {
+      before do
         Task[subject.name].invoke
-      }
+      end
 
       context 'skip actions' do
-        let (:args) {
+        let(:args) do
           {
             verb: :sync,
             source: {
@@ -95,7 +95,7 @@ describe Rake::Funnel::Tasks::MSDeploy do
             use_checksum: nil,
             allow_untrusted: nil
           }
-        }
+        end
 
         it 'should succeed' do
           args = %w(
@@ -107,14 +107,14 @@ describe Rake::Funnel::Tasks::MSDeploy do
             -skip:objectName=filePath,skipAction=Delete,absolutePath=App_Offline\.htm$
             -useChecksum
             -allowUntrusted
-            )
+          )
 
           expect(subject).to have_received(:shell).with(args.join(' '), be_an_instance_of(Hash))
         end
       end
 
       context 'runCommand' do
-        let(:args) {
+        let(:args) do
           {
             verb: :sync,
             source: {
@@ -128,7 +128,7 @@ describe Rake::Funnel::Tasks::MSDeploy do
               auto: true
             }
           }
-        }
+        end
 
         it 'should succeed' do
           args = %w(
@@ -136,14 +136,14 @@ describe Rake::Funnel::Tasks::MSDeploy do
             -verb:sync
             -source:runCommand="cd ""C:\Program Files""",waitInterval=1
             -dest:computerName=remote.example.com,username=bob,password=secret,auto=true
-            )
+          )
 
           expect(subject).to have_received(:shell).with(args.join(' '), be_an_instance_of(Hash))
         end
       end
 
       context 'preSync runCommand' do
-        let(:args) {
+        let(:args) do
           {
             verb: :sync,
             pre_sync: {
@@ -159,7 +159,7 @@ describe Rake::Funnel::Tasks::MSDeploy do
               password: 'secret'
             }
           }
-        }
+        end
 
         it 'should succeed' do
           args = %w(
@@ -168,7 +168,7 @@ describe Rake::Funnel::Tasks::MSDeploy do
             -preSync:runCommand="cd ""C:\Program Files""",dontUseCommandExe=true
             -source:contentPath=deploy
             -dest:computerName=remote.example.com,username=bob,password=secret
-            )
+          )
 
           expect(subject).to have_received(:shell).with(args.join(' '), be_an_instance_of(Hash))
         end
@@ -176,9 +176,9 @@ describe Rake::Funnel::Tasks::MSDeploy do
     end
 
     describe "MSDeploy's idiocy" do
-      before {
+      before do
         Task[subject.name].invoke
-      }
+      end
 
       describe 'version registry value that is required to exist' do
         it 'should patch the registry' do
@@ -189,7 +189,7 @@ describe Rake::Funnel::Tasks::MSDeploy do
       describe 'command line parser that requires quotes inside but not outside parameters' do
         let(:msdeploy) { 'path to/msdeploy' }
 
-        let(:args) {
+        let(:args) do
           {
             'simple key' => 'simple value',
             hash: {
@@ -199,7 +199,7 @@ describe Rake::Funnel::Tasks::MSDeploy do
             array: ['array value 1', 'array value 2'],
             'some flag' => nil
           }
-        }
+        end
 
         it 'should quote the string' do
           args = %w(
@@ -209,7 +209,7 @@ describe Rake::Funnel::Tasks::MSDeploy do
             -array:"array value 1"
             -array:"array value 2"
             -"some flag"
-            ).join(' ')
+          ).join(' ')
 
           expect(subject).to have_received(:shell).with(args, be_an_instance_of(Hash))
         end

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

@@ -1,12 +1,14 @@
+# 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 {
+  before do
     Task.clear
-  }
+  end
 
   describe 'defaults' do
     its(:name) { should == :test }
@@ -18,10 +20,10 @@ describe Rake::Funnel::Tasks::NUnit do
   describe 'execution' do
     let(:args) { {} }
 
-    let(:mapper) { double(Mapper).as_null_object }
-    let(:finder) { double(Finder).as_null_object }
+    let(:mapper) { instance_double(Mapper).as_null_object }
+    let(:finder) { instance_double(Finder).as_null_object }
 
-    before {
+    before do
       allow(subject).to receive(:sh)
 
       allow(Mapper).to receive(:new).and_return(mapper)
@@ -31,11 +33,11 @@ describe Rake::Funnel::Tasks::NUnit do
       allow(Mono).to receive(:invocation).and_wrap_original do |_original_method, *args, &_block|
         args.compact
       end
-    }
+    end
 
-    before {
+    before do
       Task[subject.name].invoke
-    }
+    end
 
     it 'should use test assembly finder' do
       expect(finder).to have_received(:all)
@@ -62,11 +64,11 @@ describe Rake::Funnel::Tasks::NUnit do
     end
 
     context 'with custom NUnit executable' do
-      subject {
+      subject do
         described_class.new do |t|
           t.nunit = 'custom nunit.exe'
         end
-      }
+      end
 
       its(:nunit) { should == 'custom nunit.exe' }
     end

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

@@ -2,9 +2,9 @@ include Rake
 include Rake::Funnel::Support
 
 describe Rake::Funnel::Tasks::Paket do
-  before {
+  before do
     Task.clear
-  }
+  end
 
   describe 'defaults' do
     its(:name) { should == :paket }
@@ -15,31 +15,31 @@ describe Rake::Funnel::Tasks::Paket do
   end
 
   describe 'execution' do
-    before {
+    before do
       allow(subject).to receive(:sh)
       allow(Mono).to receive(:invocation).and_wrap_original do |_original_method, *args, &_block|
         args.compact
       end
-    }
+    end
 
     context 'overriding defaults' do
-      subject {
+      subject do
         described_class.new do |t|
           t.bootstrapper = 'custom bootstrapper.exe'
           t.bootstrapper_args = %w(arg1 arg2)
           t.paket = 'custom paket.exe'
           t.paket_args = %w(arg1 arg2)
         end
-      }
+      end
 
-      before {
+      before do
         allow(File).to receive(:exist?).and_return(false)
         allow(subject).to receive(:sh)
-      }
+      end
 
-      before {
+      before do
         Task[subject.name].invoke
-      }
+      end
 
       it 'should use custom bootstrapper' do
         expect(subject).to have_received(:sh).with(subject.bootstrapper, subject.bootstrapper_args)
@@ -51,9 +51,9 @@ describe Rake::Funnel::Tasks::Paket do
     end
 
     describe 'mono invocation' do
-      before {
+      before do
         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)
@@ -65,15 +65,15 @@ describe Rake::Funnel::Tasks::Paket do
     end
 
     describe 'optional download' do
-      before {
+      before do
         allow(File).to receive(:exist?).with(subject.paket).and_return(paket_exists)
         allow(subject).to receive(:sh).with(subject.bootstrapper)
-      }
+      end
 
       context 'success' do
-        before {
+        before do
           Task[subject.name].invoke
-        }
+        end
 
         context 'paket.exe exists' do
           let(:paket_exists) { true }
@@ -105,9 +105,9 @@ describe Rake::Funnel::Tasks::Paket do
           let(:paket_exists) { true }
 
           context 'paket failed' do
-            before {
+            before do
               allow(subject).to receive(:sh).with(subject.paket, anything).and_raise
-            }
+            end
 
             it 'should fail' do
               expect { Task[subject.name].invoke }.to raise_error(RuntimeError)
@@ -119,12 +119,16 @@ describe Rake::Funnel::Tasks::Paket do
           let(:paket_exists) { false }
 
           context 'bootstrapper failed' do
-            before {
+            before do
               allow(subject).to receive(:sh).with(subject.bootstrapper).and_raise
-            }
+            end
 
             it 'should not run paket' do
-              Task[subject.name].invoke rescue nil
+              begin
+                Task[subject.name].invoke
+              rescue
+                nil
+              end
 
               expect(subject).not_to have_received(:sh).with(subject.paket, subject.paket_args)
             end

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

@@ -4,9 +4,9 @@ include Rake
 include Rake::Funnel::Support
 
 describe Rake::Funnel::Tasks::QuickTemplate do
-  before {
+  before do
     Task.clear
-  }
+  end
 
   describe 'defaults' do
     its(:name) { should == :template }
@@ -17,23 +17,23 @@ describe Rake::Funnel::Tasks::QuickTemplate do
   describe 'execution' do
     let(:templates) { %w(1.template two/2.template) }
 
-    let(:finder) { double(Finder).as_null_object }
+    let(:finder) { instance_double(Finder).as_null_object }
     let(:engine) { TemplateEngine }
 
-    before {
+    before do
       allow(finder).to receive(:all_or_default).and_return(templates)
       allow(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')
       allow(File).to receive(:write)
-    }
+    end
 
     subject! { described_class.new }
 
-    before {
+    before do
       Task[subject.name].invoke
-    }
+    end
 
     it 'should report created files' do
       templates.each do |template|

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

@@ -4,9 +4,9 @@ include Rake
 include Rake::Funnel::Support
 
 describe Rake::Funnel::Tasks::SideBySideSpecs do
-  before {
+  before do
     Task.clear
-  }
+  end
 
   describe 'defaults' do
     its(:name) { should == :compile }
@@ -18,7 +18,7 @@ describe Rake::Funnel::Tasks::SideBySideSpecs do
   end
 
   describe 'execution' do
-    subject {
+    subject do
       described_class.new do |t|
         t.projects = %w(**/*.??proj)
         t.references = %w(Ref)
@@ -26,25 +26,25 @@ describe Rake::Funnel::Tasks::SideBySideSpecs do
         t.enabled = enabled
         t.packages = %w(Package)
       end
-    }
+    end
 
-    before {
+    before do
       allow(SpecsRemover).to receive(:remove)
-    }
+    end
 
-    before {
+    before do
       Task[subject.name].invoke
-    }
+    end
 
     context 'enabled' do
       let(:enabled) { true }
 
       it 'should use remover' do
         expect(SpecsRemover).to have_received(:remove)
-            .with(projects: subject.projects,
-                  references: subject.references,
-                  specs: subject.specs,
-                  packages: subject.packages)
+          .with(projects: subject.projects,
+                references: subject.references,
+                specs: subject.specs,
+                packages: subject.packages)
       end
     end
 

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

@@ -3,19 +3,19 @@ include Rake
 describe Rake::Funnel::Tasks::Timing do
   include DSL
 
-  before {
+  before do
     Rake.application = nil
     Task.clear
 
     expect(define_tasks).to be
     expect(subject).to be
-  }
+  end
 
   let(:define_tasks) { task :task }
 
-  after {
+  after do
     subject.reset!
-  }
+  end
 
   describe 'defaults' do
     its(:name) { should == :timing }
@@ -52,7 +52,7 @@ describe Rake::Funnel::Tasks::Timing do
   end
 
   describe 'execution' do
-    before {
+    before do
       allow(Rake.application).to receive(:init)
       allow(Rake.application).to receive(:load_rakefile)
       Rake.application.top_level_tasks.unshift(:task)
@@ -64,14 +64,14 @@ describe Rake::Funnel::Tasks::Timing do
       allow($stderr).to receive(:print)
 
       Rake.application.run
-    }
+    end
 
     context 'with task defined' do
-      let(:define_tasks) {
+      let(:define_tasks) do
         task :task do
           puts 'hello'
         end
-      }
+      end
 
       it 'should execute tasks' do
         expect($stdout).to have_received(:puts).with('hello')
@@ -92,10 +92,10 @@ describe Rake::Funnel::Tasks::Timing do
     end
 
     context 'with unreachable task defined' do
-      let(:define_tasks) {
+      let(:define_tasks) do
         task :task
         task :not_executed
-      }
+      end
 
       it 'should not record timing information for unexecuted tasks' do
         expect(subject.stats.map { |s| s[:task].name }).not_to include('not_executed')
@@ -114,11 +114,11 @@ describe Rake::Funnel::Tasks::Timing do
       end
 
       context 'when rake failed' do
-        let(:define_tasks) {
+        let(:define_tasks) do
           task :task do
             raise
           end
-        }
+        end
 
         it 'should print the report' do
           expect($stdout).to have_received(:puts).with(/Build time report/)