rake-funnel 0.21.0 → 0.21.1

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

@@ -1,7 +1,5 @@
 require 'erb'
 
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Support::AssemblyVersionWriter do
   describe 'version source' do
     describe 'default' do
@@ -36,7 +34,7 @@ describe Rake::Funnel::Support::AssemblyVersionWriter do
         [
           {
             source: 'from e.g. gitversion',
-            version_info: VersionInfo.new(
+            version_info: Rake::Funnel::Support::VersionInfo.new(
               assembly_version: '1',
               assembly_file_version: '1.2',
               assembly_informational_version: '1.2-abc'
@@ -60,15 +58,15 @@ describe Rake::Funnel::Support::AssemblyVersionWriter do
       [
         {
           source: 'one',
-          version_info: VersionInfo.new(assembly_version: '1',
-                                        assembly_file_version: '1.2',
-                                        assembly_informational_version: '1.2-abc')
+          version_info: Rake::Funnel::Support::VersionInfo.new(assembly_version: '1',
+                                                               assembly_file_version: '1.2',
+                                                               assembly_informational_version: '1.2-abc')
         },
         {
           source: 'two',
-          version_info: VersionInfo.new(assembly_version: '2',
-                                        assembly_file_version: '2.3',
-                                        assembly_informational_version: '2.3-def')
+          version_info: Rake::Funnel::Support::VersionInfo.new(assembly_version: '2',
+                                                               assembly_file_version: '2.3',
+                                                               assembly_informational_version: '2.3-def')
         }
       ]
     end

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

@@ -2,8 +2,6 @@
 
 require 'tmpdir'
 
-include Rake::Funnel
-
 describe Rake::Funnel::Support::Finder do
   let(:pattern) { %W(#{temp_dir}/**/*.sln #{temp_dir}/**/*.??proj) }
   let(:generate) { [] }
@@ -115,7 +113,7 @@ describe Rake::Funnel::Support::Finder do
     context 'no matching files' do
       it 'should fail' do
         Dir.chdir(temp_dir) do
-          expect { subject.single }.to raise_error(AmbiguousFileError, /error message/)
+          expect { subject.single }.to raise_error(Rake::Funnel::AmbiguousFileError, /error message/)
         end
       end
     end
@@ -125,7 +123,7 @@ describe Rake::Funnel::Support::Finder do
 
       it 'should fail' do
         Dir.chdir(temp_dir) do
-          expect { subject.single }.to raise_error(AmbiguousFileError, /error message/)
+          expect { subject.single }.to raise_error(Rake::Funnel::AmbiguousFileError, /error message/)
         end
       end
     end
@@ -174,7 +172,7 @@ describe Rake::Funnel::Support::Finder do
   describe '#all' do
     context 'no matching files' do
       it 'should fail' do
-        expect { subject.all }.to raise_error(AmbiguousFileError, /error message/)
+        expect { subject.all }.to raise_error(Rake::Funnel::AmbiguousFileError, /error message/)
       end
     end
 

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

@@ -31,7 +31,7 @@ describe Rake::Funnel::Support::InstantiateSymbol do
     class SnakeCase
     end
 
-    class Snake_Case # rubocop:disable Style/ClassAndModuleCamelCase
+    class Snake_Case # rubocop:disable Naming/ClassAndModuleCamelCase
     end
   end
 

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

@@ -1,7 +1,5 @@
 require 'tmpdir'
 
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Support::Mono do
   shared_examples 'on Windows' do
     it 'should return executable' do
@@ -53,7 +51,8 @@ describe Rake::Funnel::Support::Mono do
 
     before do
       allow(File).to receive(:readable?).with('/proc/version').and_return(false)
-      allow(Which).to receive(:which)
+
+      allow(Rake::Funnel::Support::Which).to receive(:which)
     end
 
     before do
@@ -65,7 +64,7 @@ describe Rake::Funnel::Support::Mono do
     end
 
     it 'should resolve executable through which' do
-      expect(Which).to have_received(:which).with('executable.exe')
+      expect(Rake::Funnel::Support::Which).to have_received(:which).with('executable.exe')
     end
 
     it 'should support args' do

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

@@ -40,7 +40,7 @@ describe Rake::Funnel::Support::MSDeploy::RegistryPatch do
     context 'on Windows', skip: ('Windows Registry not available' unless defined?(::Win32::Registry)) do
       let(:root) { Win32::Registry::HKEY_LOCAL_MACHINE }
 
-      let(:keys) do
+      let(:registry_keys) do
         described_class::KEYS.map do |key|
           instance_double(Win32::Registry, keyname: key)
         end
@@ -62,7 +62,7 @@ describe Rake::Funnel::Support::MSDeploy::RegistryPatch do
 
       context 'MSDeploy registry key and "Version" value does not exist' do
         before do
-          keys.each do |key|
+          registry_keys.each do |key|
             allow(key).to receive(:created?).and_return(true)
             allow(key).to receive(:[]).and_raise(key_access_error)
             allow(key).to receive(:[]=)
@@ -71,7 +71,7 @@ describe Rake::Funnel::Support::MSDeploy::RegistryPatch do
         end
 
         before do
-          keys.each do |key|
+          registry_keys.each do |key|
             allow_open_or_create(key)
             allow_open_for_deletion(key)
           end
@@ -82,17 +82,17 @@ describe Rake::Funnel::Support::MSDeploy::RegistryPatch do
         end
 
         it 'should create the key' do
-          keys.each do |key|
+          registry_keys.each do |key|
             expect(root).to have_received(:create).with(key.keyname)
           end
         end
 
         it 'should create the version' do
-          expect(keys).to all(have_received(:[]=).with('Version', described_class::FAKE_VERSION))
+          expect(registry_keys).to all(have_received(:[]=).with('Version', described_class::FAKE_VERSION))
         end
 
         it 'should delete the key' do
-          keys.each do |key| # rubocop:disable RSpec/IteratedExpectation
+          registry_keys.each do |key| # rubocop:disable RSpec/IteratedExpectation
             expect(key).to have_received(:delete_key).with(File.basename(key.keyname), true)
           end
         end
@@ -114,14 +114,14 @@ describe Rake::Funnel::Support::MSDeploy::RegistryPatch do
 
       context 'MSDeploy registry key does exist' do
         before do
-          keys.each do |key|
+          registry_keys.each do |key|
             allow_open_or_create(key)
           end
         end
 
         context '"Version" value does not exist' do
           before do
-            keys.each do |key|
+            registry_keys.each do |key|
               allow(key).to receive(:created?).and_return(false)
               allow(key).to receive(:[]).and_raise(key_access_error)
               allow(key).to receive(:[]=)
@@ -134,17 +134,17 @@ describe Rake::Funnel::Support::MSDeploy::RegistryPatch do
           end
 
           it 'should create the version' do
-            expect(keys).to all(have_received(:[]=).with('Version', described_class::FAKE_VERSION))
+            expect(registry_keys).to all(have_received(:[]=).with('Version', described_class::FAKE_VERSION))
           end
 
           it 'should delete the version' do
-            expect(keys).to all(have_received(:delete_value).with(described_class::VERSION_VALUE))
+            expect(registry_keys).to all(have_received(:delete_value).with(described_class::VERSION_VALUE))
           end
         end
 
         context '"Version" value does exist' do
           before do
-            keys.each do |key|
+            registry_keys.each do |key|
               allow(key).to receive(:created?).and_return(false)
               allow(key).to receive(:[])
             end

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

@@ -17,9 +17,9 @@ describe Rake::Funnel::Support::TemplateEngine do
 
   it 'should omit newlines for pure ruby lines' do
     # rubocop:disable Layout/IndentHeredoc
-    template = <<-EOF
+    template = <<-TEMPLATE
 <%= 42 %>
-    EOF
+    TEMPLATE
     # rubocop:enable Layout/IndentHeredoc
 
     expect(described_class.render(template)).to eq('42')
@@ -27,9 +27,9 @@ describe Rake::Funnel::Support::TemplateEngine do
 
   it 'should not omit newlines for mixed ruby lines' do
     # rubocop:disable Layout/IndentHeredoc
-    template = <<-EOF
+    template = <<-TEMPLATE
 12 <%= 34 %> 56
-    EOF
+    TEMPLATE
     # rubocop:enable Layout/IndentHeredoc
 
     expect(described_class.render(template)).to eq("12 34 56\n")

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

@@ -1,8 +1,5 @@
-include Rake
-include Rake::Funnel::Support::Timing
-
 describe Rake::Funnel::Support::Timing::Report do
-  include DSL
+  include Rake::DSL
 
   subject { described_class.new(stats, opts) }
 
@@ -10,7 +7,7 @@ describe Rake::Funnel::Support::Timing::Report do
 
   before do
     allow($stdout).to receive(:puts)
-    allow($stderr).to receive(:puts)
+    allow(Kernel).to receive(:warn)
     subject.render
   end
 
@@ -44,20 +41,20 @@ describe Rake::Funnel::Support::Timing::Report do
       let(:opts) { { failed: true } }
 
       it 'should print the failed build status' do
-        expect($stderr).to have_received(:puts).with(/Status\s+Failed/)
+        expect(Kernel).to have_received(:warn).with(/Status\s+Failed/)
       end
     end
   end
 
-  describe 'empty report' do
-    let(:stats) { Statistics.new }
+  describe 'empty report', include: Rake::Funnel::Support::Timing do
+    let(:stats) { Rake::Funnel::Support::Timing::Statistics.new }
 
     it_behaves_like :report
   end
 
   describe 'report for 2 tasks' do
     let(:stats) do
-      s = Statistics.new
+      s = Rake::Funnel::Support::Timing::Statistics.new
       s.benchmark(task(:foo)) {}
       s.benchmark(task(:bar)) {}
       s
@@ -77,7 +74,7 @@ describe Rake::Funnel::Support::Timing::Report do
 
   describe 'formatting' do
     let(:stats) do
-      s = Statistics.new
+      s = Rake::Funnel::Support::Timing::Statistics.new
       s.benchmark(task(task_name)) {}
       s
     end

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

@@ -306,10 +306,10 @@ describe Rake::Funnel::Support::VersionInfo do
     let(:file) { 'file with version info' }
     let(:contents) do
       # rubocop:disable Layout/IndentHeredoc
-      <<-EOF
+      <<-CONTENTS
   first line with expected version number
 other crap
-      EOF
+      CONTENTS
       # rubocop:enable Layout/IndentHeredoc
     end
 

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

@@ -1,5 +1,3 @@
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Support::Zipper do
   describe '#zip' do
     let(:source) { %w(bin/1 bin/2 bin/3/4) }

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

@@ -1,9 +1,6 @@
-include Rake
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Tasks::AssemblyVersion do
   before do
-    Task.clear
+    Rake::Task.clear
   end
 
   describe 'defaults' do
@@ -21,10 +18,10 @@ describe Rake::Funnel::Tasks::AssemblyVersion do
   end
 
   describe 'execution' do
-    let(:writer) { instance_double(AssemblyVersionWriter).as_null_object }
+    let(:writer) { instance_double(Rake::Funnel::Support::AssemblyVersionWriter).as_null_object }
 
     before do
-      allow(AssemblyVersionWriter).to receive(:new).and_return(writer)
+      allow(Rake::Funnel::Support::AssemblyVersionWriter).to receive(:new).and_return(writer)
     end
 
     subject do
@@ -37,11 +34,12 @@ describe Rake::Funnel::Tasks::AssemblyVersion do
     end
 
     before do
-      Task[subject.name].invoke
+      Rake::Task[subject.name].invoke
     end
 
     it 'should pass source and source_args' do
-      expect(AssemblyVersionWriter).to have_received(:new).with(subject.source, subject.source_args)
+      expect(Rake::Funnel::Support::AssemblyVersionWriter).to have_received(:new)
+        .with(subject.source, subject.source_args)
     end
 
     it 'should use writer' do

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

@@ -1,8 +1,6 @@
-include Rake
-
 describe Rake::Funnel::Tasks::BinPath do
   before do
-    Task.clear
+    Rake::Task.clear
   end
 
   describe 'defaults' do
@@ -42,7 +40,7 @@ describe Rake::Funnel::Tasks::BinPath do
       end
 
       before do
-        Task[subject.name].invoke
+        Rake::Task[subject.name].invoke
       end
 
       it 'should prepend sorted matching folders to the PATH environment variable' do
@@ -96,7 +94,7 @@ describe Rake::Funnel::Tasks::BinPath do
       end
 
       before do
-        Task[subject.name].invoke
+        Rake::Task[subject.name].invoke
       end
 
       it 'should not print message' do

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

@@ -1,9 +1,6 @@
-include Rake
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Tasks::Copy do
   before do
-    Task.clear
+    Rake::Task.clear
   end
 
   describe 'defaults' do
@@ -15,15 +12,12 @@ describe Rake::Funnel::Tasks::Copy do
   describe 'execution' do
     let(:source) { %w(one two) }
     let(:target) { 'target' }
-    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)
-    end
-
-    before do
-      allow(Copier).to receive(:copy)
+      allow(Rake::Funnel::Support::Finder).to receive(:new).and_return(finder)
+      allow(Rake::Funnel::Support::Copier).to receive(:copy)
     end
 
     subject do
@@ -34,11 +28,11 @@ describe Rake::Funnel::Tasks::Copy do
     end
 
     before do
-      Task[subject.name].invoke
+      Rake::Task[subject.name].invoke
     end
 
     it 'should delegate to Copier' do
-      expect(Copier).to have_received(:copy).with(source, subject.target)
+      expect(Rake::Funnel::Support::Copier).to have_received(:copy).with(source, subject.target)
     end
   end
 end

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

@@ -1,14 +1,10 @@
 require 'configatron'
 
-include Rake
-include Rake::Funnel::Support::Environments
-include Rake::Funnel::Tasks
-
 describe Rake::Funnel::Tasks::Environments do
   include Rake::DSL
 
   before do
-    Task.clear
+    Rake::Task.clear
   end
 
   let(:files) { [] }
@@ -90,7 +86,7 @@ describe Rake::Funnel::Tasks::Environments do
     end
 
     before do
-      allow(Loader).to receive(:load_configuration)
+      allow(Rake::Funnel::Support::Environments::Loader).to receive(:load_configuration)
     end
 
     before do
@@ -105,18 +101,19 @@ describe Rake::Funnel::Tasks::Environments do
     end
 
     before do
-      Task['dev'].invoke
+      Rake::Task['dev'].invoke
     end
 
     it 'should store configuration in configatron singleton' do
-      expect(Loader).to have_received(:load_configuration).with(anything, configatron, any_args)
+      expect(Rake::Funnel::Support::Environments::Loader).to \
+        have_received(:load_configuration).with(anything, configatron, any_args)
     end
 
     context 'default and local config files exist' do
       let(:optional) { nil }
 
       it 'should load all files' do
-        expect(Loader)
+        expect(Rake::Funnel::Support::Environments::Loader)
           .to have_received(:load_configuration)
           .with(hash_including(config_files: %w(config/default.yaml config/dev.yaml config/local.yaml)), any_args)
       end
@@ -126,7 +123,7 @@ describe Rake::Funnel::Tasks::Environments do
       let(:optional) { 'config/default.yaml' }
 
       it 'should load environment file and local file' do
-        expect(Loader)
+        expect(Rake::Funnel::Support::Environments::Loader)
           .to have_received(:load_configuration)
           .with(hash_including(config_files: %w(config/dev.yaml config/local.yaml)), any_args)
       end
@@ -136,7 +133,7 @@ describe Rake::Funnel::Tasks::Environments do
       let(:optional) { 'config/local.yaml' }
 
       it 'should load default file and environment file' do
-        expect(Loader).to \
+        expect(Rake::Funnel::Support::Environments::Loader).to \
           have_received(:load_configuration)
           .with(hash_including(config_files: %w(config/default.yaml config/dev.yaml)),
                 any_args)
@@ -157,15 +154,16 @@ describe Rake::Funnel::Tasks::Environments do
     end
 
     before do
-      allow(Loader).to receive(:load_configuration)
+      allow(Rake::Funnel::Support::Environments::Loader).to receive(:load_configuration)
     end
 
     before do
-      Task['dev'].invoke
+      Rake::Task['dev'].invoke
     end
 
     it 'should pass customizer to loader' do
-      expect(Loader).to have_received(:load_configuration).with(anything, anything, customizer)
+      expect(Rake::Funnel::Support::Environments::Loader).to \
+        have_received(:load_configuration).with(anything, anything, customizer)
     end
   end
 

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

@@ -1,25 +1,20 @@
 # 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 do
-    Task.clear
+    Rake::Task.clear
   end
 
   describe 'defaults' do
     its(:name) { should == :compile }
-    its(:project_or_solution) { should be_instance_of(Finder) }
+    its(:project_or_solution) { should be_instance_of(Rake::Funnel::Support::Finder) }
     its(:args) { should == {} }
     its(:search_pattern) { should == %w(**/*.sln) }
     its(:msbuild) { should be_nil }
 
     describe 'build tool finder' do
       before do
-        allow(BuildTool).to receive(:find).and_return('build tool')
+        allow(Rake::Funnel::Support::MSBuild::BuildTool).to receive(:find).and_return('build tool')
       end
 
       it 'should use build tool finder' do
@@ -31,19 +26,19 @@ describe Rake::Funnel::Tasks::MSBuild 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(BuildTool).to receive(:find)
+      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::Support::MSBuild::BuildTool).to receive(:find)
     end
 
     before do
-      Task[subject.name].invoke
+      Rake::Task[subject.name].invoke
     end
 
     it 'should use solution finder' do
@@ -51,11 +46,11 @@ describe Rake::Funnel::Tasks::MSBuild do
     end
 
     it 'should use MSBuild finder' do
-      expect(BuildTool).to have_received(:find)
+      expect(Rake::Funnel::Support::MSBuild::BuildTool).to have_received(:find)
     end
 
     it 'should use MSBuild mapper' do
-      expect(Mapper).to have_received(:new).with(:MSBuild)
+      expect(Rake::Funnel::Support::Mapper).to have_received(:new).with(:MSBuild)
     end
 
     it 'should map arguments' do
@@ -79,7 +74,7 @@ describe Rake::Funnel::Tasks::MSBuild do
 
       context 'when project or solution is specified' do
         before do
-          allow(Finder).to receive(:new).and_call_original
+          allow(Rake::Funnel::Support::Finder).to receive(:new).and_call_original
         end
 
         subject do
@@ -88,12 +83,13 @@ describe Rake::Funnel::Tasks::MSBuild do
           end
         end
 
-        its(:project_or_solution) { should be_instance_of(Finder) }
+        its(:project_or_solution) { should be_instance_of(Rake::Funnel::Support::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(Rake::Funnel::Support::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,13 +1,8 @@
 # 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 do
-    Task.clear
+    Rake::Task.clear
   end
 
   describe 'defaults' do
@@ -37,22 +32,22 @@ describe Rake::Funnel::Tasks::MSDeploy do
     before do
       allow(subject).to receive(:shell)
 
-      allow(RegistryPatch).to receive(:new).and_yield
+      allow(Rake::Funnel::Support::MSDeploy::RegistryPatch).to receive(:new).and_yield
     end
 
     describe 'argument mapping and invocation' do
-      let(:mapper) { instance_double(Mapper).as_null_object }
+      let(:mapper) { instance_double(Rake::Funnel::Support::Mapper).as_null_object }
 
       before do
-        allow(Mapper).to receive(:new).and_return(mapper)
+        allow(Rake::Funnel::Support::Mapper).to receive(:new).and_return(mapper)
       end
 
       before do
-        Task[subject.name].invoke
+        Rake::Task[subject.name].invoke
       end
 
       it 'should use MSDeploy mapper' do
-        expect(Mapper).to have_received(:new).with(:MSDeploy)
+        expect(Rake::Funnel::Support::Mapper).to have_received(:new).with(:MSDeploy)
       end
 
       it 'should map arguments' do
@@ -68,7 +63,7 @@ describe Rake::Funnel::Tasks::MSDeploy do
 
     describe 'arg examples' do
       before do
-        Task[subject.name].invoke
+        Rake::Task[subject.name].invoke
       end
 
       context 'skip actions' do
@@ -148,7 +143,7 @@ describe Rake::Funnel::Tasks::MSDeploy do
             verb: :sync,
             pre_sync: {
               run_command: 'cd "C:\Program Files"',
-              dont_use_command_exe: :true
+              dont_use_command_exe: true
             },
             source: {
               content_path: 'deploy'
@@ -177,12 +172,12 @@ describe Rake::Funnel::Tasks::MSDeploy do
 
     describe "MSDeploy's idiocy" do
       before do
-        Task[subject.name].invoke
+        Rake::Task[subject.name].invoke
       end
 
       describe 'version registry value that is required to exist' do
         it 'should patch the registry' do
-          expect(RegistryPatch).to have_received(:new)
+          expect(Rake::Funnel::Support::MSDeploy::RegistryPatch).to have_received(:new)
         end
       end