rake-funnel 0.18.0 → 0.19.0

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

@@ -2,18 +2,17 @@ include Rake
 include Rake::Funnel::Support::Timing
 
 describe Rake::Funnel::Support::Timing::Report do
-
   include DSL
 
   subject { described_class.new(stats, opts) }
 
   let(:opts) { {} }
 
-  before {
+  before do
     allow($stdout).to receive(:puts)
     allow($stderr).to receive(:puts)
     subject.render
-  }
+  end
 
   shared_examples_for :report do
     it 'should separator lines' do
@@ -53,18 +52,18 @@ describe Rake::Funnel::Support::Timing::Report do
   describe 'empty report' do
     let(:stats) { Statistics.new }
 
-    it_should_behave_like :report
+    it_behaves_like :report
   end
 
   describe 'report for 2 tasks' do
-    let(:stats) {
+    let(:stats) do
       s = Statistics.new
-      s.benchmark(task :foo) { }
-      s.benchmark(task :bar) { }
+      s.benchmark(task(:foo)) {}
+      s.benchmark(task(:bar)) {}
       s
-    }
+    end
 
-    it_should_behave_like :report
+    it_behaves_like :report
 
     it 'should print each task' do
       expect($stdout).to have_received(:puts).with(/^foo/)
@@ -77,27 +76,27 @@ describe Rake::Funnel::Support::Timing::Report do
   end
 
   describe 'formatting' do
-    let(:stats) {
+    let(:stats) do
       s = Statistics.new
-      s.benchmark(task task_name) { }
+      s.benchmark(task(task_name)) {}
       s
-    }
+    end
 
-    let(:header_space) {
+    let(:header_space) do
       diff = task_name.to_s.length - subject.columns[0].header.length
       diff = 0 if diff < 0
       diff + described_class::SPACE
-    }
+    end
 
-    let(:header_underline) {
+    let(:header_underline) do
       [subject.columns[0].header.length, task_name.to_s.length].max
-    }
+    end
 
-    let(:value_space) {
+    let(:value_space) do
       diff = subject.columns.first.header.length - task_name.to_s.length
       diff = 0 if diff < 0
       diff + described_class::SPACE
-    }
+    end
 
     shared_examples_for :padding do
       it 'should pad headers' do
@@ -117,13 +116,13 @@ describe Rake::Funnel::Support::Timing::Report do
     context 'task names are shorter than headers' do
       let(:task_name) { :a }
 
-      it_should_behave_like :padding
+      it_behaves_like :padding
     end
 
     context 'task names are longer than headers' do
       let(:task_name) { :aaaaaaaaaaaa }
 
-      it_should_behave_like :padding
+      it_behaves_like :padding
     end
   end
 end

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

@@ -1,12 +1,12 @@
 describe Rake::Funnel::Support::Trace do
-  before {
+  before do
     allow(Rake).to receive(:rake_output_message)
-  }
+  end
 
   context 'Rake run with --trace' do
-    before {
+    before do
       allow(Rake.application.options).to receive(:trace).and_return(true)
-    }
+    end
 
     it 'should write messages' do
       described_class.message('foo')
@@ -16,9 +16,9 @@ describe Rake::Funnel::Support::Trace do
   end
 
   context 'Rake run without --trace' do
-    before {
+    before do
       allow(Rake.application.options).to receive(:trace).and_return(false)
-    }
+    end
 
     it 'should not write messages' do
       described_class.message('foo')

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

@@ -175,7 +175,7 @@ describe Rake::Funnel::Support::VersionInfo do
       {
         context: {
           version: '1.2',
-          metadata: { }
+          metadata: {}
         },
         expected: {
           assembly_version: '1.2.0.0',
@@ -259,7 +259,7 @@ describe Rake::Funnel::Support::VersionInfo do
         }
       }
     ].each do |spec|
-      context "version #{spec[:context][:version] || 'none'}, build number #{spec[:context].fetch(:metadata, {})[:build] || 'none'}, SHA #{spec[:context].fetch(:metadata, {})[:sha] || 'none'}" do
+      context "version #{spec[:context][:version] || 'none'}, build number #{spec[:context].fetch(:metadata, {})[:build] || 'none'}, SHA #{spec[:context].fetch(:metadata, {})[:sha] || 'none'}" do # rubocop:disable Metrics/LineLength
         let(:parsed) { described_class.parse(spec[:context]) }
 
         it "should generate assembly version #{spec[:expected][:assembly_version]}" do
@@ -304,16 +304,18 @@ describe Rake::Funnel::Support::VersionInfo do
 
   describe '#read_version_from' do
     let(:file) { 'file with version info' }
-    let(:contents) { <<-EOF
+    let(:contents) do
+      # rubocop:disable Style/IndentHeredoc
+      <<-EOF
   first line with expected version number
 other crap
-    EOF
-    }
+      EOF
+      # rubocop:enable Style/IndentHeredoc
+    end
 
     it 'should read the first line with leading and trailing whitespace removed' do
       Dir.mktmpdir do |tmp|
         Dir.chdir(tmp) do
-
           File.write(file, contents)
           expect(described_class.read_version_from(file)).to eq('first line with expected version number')
         end

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

@@ -3,17 +3,17 @@ require 'tmpdir'
 describe Rake::Funnel::Support::Which do
   let(:temp_dir) { Dir.mktmpdir }
   let(:executable_path) { File.join(temp_dir, 'executable.exe') }
-  let(:create_entry) { lambda { |p| FileUtils.touch(p) }}
+  let(:create_entry) { ->(p) { FileUtils.touch(p) } }
 
-  before {
+  before do
     create_entry.call(executable_path)
 
     allow(ENV).to receive(:[]).with('PATH').and_return(temp_dir)
-  }
+  end
 
-  after {
+  after do
     FileUtils.rm_rf(temp_dir)
-  }
+  end
 
   describe 'executable in PATH' do
     context 'found' do
@@ -29,7 +29,7 @@ describe Rake::Funnel::Support::Which do
     end
 
     context 'found as directory' do
-      let(:create_entry) { lambda { |p| FileUtils.mkdir_p(p) } }
+      let(:create_entry) { ->(p) { FileUtils.mkdir_p(p) } }
 
       it 'should yield nil' do
         expect(described_class.which('executable.exe')).to be_nil
@@ -55,7 +55,7 @@ describe Rake::Funnel::Support::Which do
     end
 
     context 'found as directory' do
-      let(:create_entry) { lambda { |p| FileUtils.mkdir_p(p) } }
+      let(:create_entry) { ->(p) { FileUtils.mkdir_p(p) } }
 
       it 'should yield nil' do
         expect(described_class.which('executable.exe')).to be_nil

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

@@ -19,21 +19,21 @@ describe Rake::Funnel::Support::Zipper do
       let(:zip_root) { nil }
       let(:zip) { instance_double(::Zip::File).as_null_object }
       let(:mtime) { Time.new(2015, 3, 9) }
-      let(:zip_entry) { double(::Zip::Entry).as_null_object }
+      let(:zip_entry) { double(::Zip::Entry).as_null_object } # rubocop:disable RSpec/VerifiedDoubles
 
-      before {
+      before do
         allow(RakeFileUtils).to receive(:mkdir_p)
-      }
+      end
 
-      before {
+      before do
         allow(::Zip::File).to receive(:open).with(target, ::Zip::File::CREATE).and_yield(zip)
         allow(zip).to receive(:add).and_return(zip_entry)
         allow(File).to receive(:mtime).and_return(mtime)
-      }
+      end
 
-      before {
+      before do
         described_class.zip(source, target, zip_root)
-      }
+      end
 
       it 'should create the target directory' do
         expect(RakeFileUtils).to have_received(:mkdir_p).with(File.dirname(target))
@@ -66,7 +66,7 @@ describe Rake::Funnel::Support::Zipper do
           context "with '#{root || 'nil'}'" do
             let(:zip_root) { root }
 
-            it "should put files below #{(root.nil? || root.empty?) ? 'the root' : "'#{root}'"}" do
+            it "should put files below #{root.nil? || root.empty? ? 'the root' : "'#{root}'"}" do
               expect(zip).to have_received(:add).with(/^#{root}/, anything).exactly(source.length).times
             end
           end

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

@@ -2,9 +2,9 @@ include Rake
 include Rake::Funnel::Support
 
 describe Rake::Funnel::Tasks::AssemblyVersion do
-  before {
+  before do
     Task.clear
-  }
+  end
 
   describe 'defaults' do
     its(:name) { should == :version }
@@ -23,22 +23,22 @@ describe Rake::Funnel::Tasks::AssemblyVersion do
   describe 'execution' do
     let(:writer) { instance_double(AssemblyVersionWriter).as_null_object }
 
-    before {
+    before do
       allow(AssemblyVersionWriter).to receive(:new).and_return(writer)
-    }
+    end
 
-    subject {
+    subject do
       described_class.new(:name) do |t|
-        t.language = [:cs, :vb]
+        t.language = %i(cs vb)
         t.source = %w(one two)
         t.source_args = { foo: 42 }
         t.target_path = 'will not work'
       end
-    }
+    end
 
-    before {
+    before do
       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)

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

@@ -1,9 +1,9 @@
 include Rake
 
 describe Rake::Funnel::Tasks::BinPath do
-  before {
+  before do
     Task.clear
-  }
+  end
 
   describe 'defaults' do
     its(:name) { should == :bin_path }
@@ -13,35 +13,37 @@ describe Rake::Funnel::Tasks::BinPath do
   describe 'execution' do
     let(:default_path) { 'default PATH contents' }
     let(:search_pattern) { %w(foo bar not-a-directory) }
-    let(:directories) { search_pattern.first(2)
-                                      .map { |path| File.expand_path(path) }
-                                      .sort
-                                      .join(File::PATH_SEPARATOR) }
+    let(:directories) do
+      search_pattern.first(2)
+                    .map { |path| File.expand_path(path) }
+                    .sort
+                    .join(File::PATH_SEPARATOR)
+    end
     let(:path_modifier) { nil }
 
-    before {
+    before do
       allow(ENV).to receive(:[]).with('PATH').and_return(default_path)
       allow(ENV).to receive(:[]=)
       allow(Rake).to receive(:rake_output_message)
-    }
+    end
 
-    subject {
+    subject do
       described_class.new do |t|
         t.search_pattern = search_pattern
         t.path_modifier = path_modifier unless path_modifier.nil?
       end
-    }
+    end
 
     context 'paths to add' do
-      before {
+      before do
         allow(Dir).to receive(:[]).with(*search_pattern).and_return(search_pattern)
         allow(File).to receive(:directory?).and_return(true)
         allow(File).to receive(:directory?).with(search_pattern.last).and_return(false)
-      }
+      end
 
-      before {
+      before do
         Task[subject.name].invoke
-      }
+      end
 
       it 'should prepend sorted matching folders to the PATH environment variable' do
         expect(ENV).to have_received(:[]=).with('PATH', /^#{directories}/)
@@ -56,8 +58,8 @@ describe Rake::Funnel::Tasks::BinPath do
       end
 
       it 'should report added paths' do
-        expect(Rake).to have_received(:rake_output_message).with(%r|/foo$|)
-        expect(Rake).to have_received(:rake_output_message).with(%r|/bar$|)
+        expect(Rake).to have_received(:rake_output_message).with(%r{/foo$})
+        expect(Rake).to have_received(:rake_output_message).with(%r{/bar$})
       end
 
       describe 'path modifier' do
@@ -65,7 +67,7 @@ describe Rake::Funnel::Tasks::BinPath do
           let(:path_modifier) { proc { |paths| paths.push('added path') } }
 
           it 'adds extra paths' do
-            expect(ENV).to have_received(:[]=).with('PATH',/added path/)
+            expect(ENV).to have_received(:[]=).with('PATH', /added path/)
           end
 
           it 'retains other paths' do
@@ -89,13 +91,13 @@ describe Rake::Funnel::Tasks::BinPath do
     end
 
     context 'no paths to add' do
-      before {
+      before do
         allow(Dir).to receive(:[]).with(*search_pattern).and_return([])
-      }
+      end
 
-      before {
+      before do
         Task[subject.name].invoke
-      }
+      end
 
       it 'should not print message' do
         expect(Rake).not_to have_received(:rake_output_message)

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

@@ -2,9 +2,9 @@ include Rake
 include Rake::Funnel::Support
 
 describe Rake::Funnel::Tasks::Copy do
-  before {
+  before do
     Task.clear
-  }
+  end
 
   describe 'defaults' do
     its(:name) { should == :copy }
@@ -17,25 +17,25 @@ describe Rake::Funnel::Tasks::Copy do
     let(:target) { 'target' }
     let(:finder) { instance_double(Finder).as_null_object }
 
-    before {
+    before do
       allow(finder).to receive(:all_or_default).and_return(source)
       allow(Finder).to receive(:new).and_return(finder)
-    }
+    end
 
-    before {
+    before do
       allow(Copier).to receive(:copy)
-    }
+    end
 
-    subject {
+    subject do
       described_class.new do |t|
         t.source = source
         t.target = target
       end
-    }
+    end
 
-    before {
+    before do
       Task[subject.name].invoke
-    }
+    end
 
     it 'should delegate to Copier' do
       expect(Copier).to have_received(:copy).with(source, subject.target)

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

@@ -7,24 +7,24 @@ include Rake::Funnel::Tasks
 describe Rake::Funnel::Tasks::Environments do
   include Rake::DSL
 
-  before {
+  before do
     Task.clear
-  }
+  end
 
   let(:files) { [] }
 
-  before {
+  before do
     allow(Dir).to receive(:[]).and_return(files)
-  }
+  end
 
   def disable_default_env_setup
-    allow_any_instance_of(described_class).to receive(:default_environment_setup)
+    allow_any_instance_of(described_class).to receive(:default_environment_setup) # rubocop:disable RSpec/AnyInstance
   end
 
   describe 'defaults' do
-    before {
+    before do
       disable_default_env_setup
-    }
+    end
 
     its(:store) { should == configatron }
     its(:base_dir) { should == 'config' }
@@ -36,7 +36,7 @@ describe Rake::Funnel::Tasks::Environments do
     describe 'overriding defaults' do
       let(:store) { OpenStruct.new }
 
-      subject {
+      subject do
         described_class.new do |t|
           t.store = store
           t.base_dir = 'custom base_dir'
@@ -45,7 +45,7 @@ describe Rake::Funnel::Tasks::Environments do
           t.local_config = 'custom local_config'
           t.customizer = proc {}
         end
-      }
+      end
 
       its(:store) { should == store }
       its(:base_dir) { should == subject.base_dir }
@@ -57,17 +57,17 @@ describe Rake::Funnel::Tasks::Environments do
   end
 
   describe 'definition' do
-    before {
+    before do
       disable_default_env_setup
-    }
+    end
 
-    before {
-      allow_any_instance_of(described_class).to receive(:task)
-    }
+    before do
+      allow_any_instance_of(described_class).to receive(:task) # rubocop:disable RSpec/AnyInstance
+    end
 
-    let(:files) {
+    let(:files) do
       %w(config/default.yaml config/local.yaml config/dev.yaml config/production.yaml)
-    }
+    end
 
     it 'should define a task for each config file' do
       expect(subject).to have_received(:task).with('dev')
@@ -85,28 +85,28 @@ describe Rake::Funnel::Tasks::Environments do
 
   describe 'config files to load' do
     let(:optional) { nil }
-    let(:files) {
+    let(:files) do
       %w(config/dev.yaml)
-    }
+    end
 
-    before {
+    before do
       allow(Loader).to receive(:load_configuration)
-    }
+    end
 
-    before {
+    before do
       allow(File).to receive(:exist?).and_return(true)
       allow(File).to receive(:exist?).with(optional).and_return(false)
-    }
+    end
 
-    subject! {
+    subject! do
       described_class.new do |t|
         t.default_env = 'dev'
       end
-    }
+    end
 
-    before {
+    before do
       Task['dev'].invoke
-    }
+    end
 
     it 'should store configuration in configatron singleton' do
       expect(Loader).to have_received(:load_configuration).with(anything, configatron, any_args)
@@ -118,7 +118,7 @@ describe Rake::Funnel::Tasks::Environments do
       it 'should load all files' do
         expect(Loader)
           .to have_received(:load_configuration)
-              .with(hash_including({ config_files: %w(config/default.yaml config/dev.yaml config/local.yaml) }), any_args)
+          .with(hash_including(config_files: %w(config/default.yaml config/dev.yaml config/local.yaml)), any_args)
       end
     end
 
@@ -128,7 +128,7 @@ describe Rake::Funnel::Tasks::Environments do
       it 'should load environment file and local file' do
         expect(Loader)
           .to have_received(:load_configuration)
-              .with(hash_including({ config_files: %w(config/dev.yaml config/local.yaml) }), any_args)
+          .with(hash_including(config_files: %w(config/dev.yaml config/local.yaml)), any_args)
       end
     end
 
@@ -136,31 +136,33 @@ describe Rake::Funnel::Tasks::Environments do
       let(:optional) { 'config/local.yaml' }
 
       it 'should load default file and environment file' do
-        expect(Loader)
-          .to have_received(:load_configuration).with(hash_including({ config_files: %w(config/default.yaml config/dev.yaml) }), any_args)
+        expect(Loader).to \
+          have_received(:load_configuration)
+          .with(hash_including(config_files: %w(config/default.yaml config/dev.yaml)),
+                any_args)
       end
     end
   end
 
   describe 'customization' do
     let(:customizer) { proc {} }
-    let(:files) {
+    let(:files) do
       %w(config/dev.yaml)
-    }
+    end
 
-    subject! {
+    subject! do
       described_class.new do |t|
         t.customizer = customizer
       end
-    }
+    end
 
-    before {
+    before do
       allow(Loader).to receive(:load_configuration)
-    }
+    end
 
-    before {
+    before do
       Task['dev'].invoke
-    }
+    end
 
     it 'should pass customizer to loader' do
       expect(Loader).to have_received(:load_configuration).with(anything, anything, customizer)
@@ -168,21 +170,21 @@ describe Rake::Funnel::Tasks::Environments do
   end
 
   describe 'automatic environment setup' do
-    let(:files) {
+    let(:files) do
       %w(config/dev.yaml config/production.yaml)
-    }
+    end
 
-    before {
+    before do
       Rake.application.top_level_tasks.clear
       Rake.application.top_level_tasks.push(*top_level_tasks)
-    }
+    end
 
     context 'environment task defined in top-level Rake namespace' do
-      subject! {
+      subject! do
         described_class.new do |t|
           t.default_env = default_env
         end
-      }
+      end
 
       context 'no default environment configured' do
         let(:default_env) { nil }
@@ -215,7 +217,7 @@ describe Rake::Funnel::Tasks::Environments do
     end
 
     context 'environment task defined in Rake namespace' do
-      subject! {
+      subject! do
         namespace :foo do
           namespace :bar do
             described_class.new do |t|
@@ -223,7 +225,7 @@ describe Rake::Funnel::Tasks::Environments do
             end
           end
         end
-      }
+      end
 
       context 'default environment configured' do
         let(:default_env) { 'dev' }