rake-funnel 0.18.0 → 0.19.0

data/spec/rake/funnel/support/assembly_version/from_version_files_spec.rb

@@ -6,12 +6,10 @@ describe Rake::Funnel::Support::AssemblyVersion::FromVersionFiles do
     its(:metadata) { should be_nil }
 
     describe 'overriding defaults' do
-      subject {
-        described_class.new({
-            search_pattern: 'search pattern',
-            metadata: {},
-          })
-      }
+      subject do
+        described_class.new(search_pattern: 'search pattern',
+                            metadata: {})
+      end
 
       its(:search_pattern) { should == 'search pattern' }
       its(:metadata) { should == {} }
@@ -28,35 +26,35 @@ describe Rake::Funnel::Support::AssemblyVersion::FromVersionFiles do
   end
 
   describe 'enumeration' do
-    let(:finder) { double(Finder).as_null_object }
+    let(:finder) { instance_double(Finder).as_null_object }
     let(:files) { %w(1 2) }
 
-    before {
+    before do
       allow(finder).to receive(:all_or_default).and_return(files)
       allow(Finder).to receive(:new).and_return(finder)
-    }
+    end
 
-    before {
+    before do
       allow(VersionInfo).to receive(:read_version_from).and_return(*files)
-    }
+    end
 
-    before {
+    before do
       allow(Rake).to receive(:rake_output_message)
-    }
+    end
 
-    subject {
+    subject do
       described_class.new(metadata: { pre: 'alpha', build: 42, sha: 'abc' })
-    }
+    end
 
     it 'should yield source and version info for each file' do
       args = files.map do |file|
         {
           source: file,
           version_info: VersionInfo.parse(version: file, metadata: {
-              pre: subject.metadata[:pre],
-              build: subject.metadata[:build],
-              sha: subject.metadata[:sha]
-            })
+                                            pre: subject.metadata[:pre],
+                                            build: subject.metadata[:build],
+                                            sha: subject.metadata[:sha]
+                                          })
         }
       end
 

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

@@ -5,9 +5,9 @@ include Rake::Funnel::Support
 describe Rake::Funnel::Support::AssemblyVersionWriter do
   describe 'version source' do
     describe 'default' do
-      before {
-        allow_any_instance_of(described_class).to receive(:create)
-      }
+      before do
+        allow_any_instance_of(described_class).to receive(:create) # rubocop:disable RSpec/AnyInstance
+      end
 
       it 'should create FromVersionFiles with empty args' do
         expect(subject).to have_received(:create).with(:from_version_files, {})
@@ -18,13 +18,13 @@ describe Rake::Funnel::Support::AssemblyVersionWriter do
       let(:source) { :custom }
       let(:source_args) { { foo: 42 } }
 
-      before {
-        allow_any_instance_of(described_class).to receive(:create)
-      }
+      before do
+        allow_any_instance_of(described_class).to receive(:create) # rubocop:disable RSpec/AnyInstance
+      end
 
-      subject {
+      subject do
         described_class.new(source, source_args)
-      }
+      end
 
       it 'should create type with args' do
         expect(subject).to have_received(:create).with(source, source_args)
@@ -32,23 +32,22 @@ describe Rake::Funnel::Support::AssemblyVersionWriter do
     end
 
     describe 'custom instance' do
-      let(:source) {
+      let(:source) do
         [
           {
             source: 'from e.g. gitversion',
             version_info: VersionInfo.new(
-              {
-                assembly_version: '1',
-                assembly_file_version: '1.2',
-                assembly_informational_version: '1.2-abc'
-              })
+              assembly_version: '1',
+              assembly_file_version: '1.2',
+              assembly_informational_version: '1.2-abc'
+            )
           }
         ]
-      }
+      end
 
-      subject {
+      subject do
         described_class.new(source)
-      }
+      end
 
       it 'should succeed' do
         expect(subject).to be
@@ -57,53 +56,47 @@ describe Rake::Funnel::Support::AssemblyVersionWriter do
   end
 
   describe '#write' do
-    let(:source) {
+    let(:source) do
       [
         {
           source: 'one',
-          version_info: VersionInfo.new(
-            {
-              assembly_version: '1',
-              assembly_file_version: '1.2',
-              assembly_informational_version: '1.2-abc'
-            })
+          version_info: 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: VersionInfo.new(assembly_version: '2',
+                                        assembly_file_version: '2.3',
+                                        assembly_informational_version: '2.3-def')
         }
       ]
-    }
+    end
 
-    let(:target_path) { double(Proc).as_null_object }
-    let(:languages) { [:vb, :cs, :fs] }
+    let(:target_path) { double(Proc).as_null_object } # rubocop:disable RSpec/VerifiedDoubles
+    let(:languages) { %i(vb cs fs) }
 
-    subject {
+    subject do
       described_class.new(source)
-    }
+    end
 
-    before {
+    before do
       allow(Rake).to receive(:rake_output_message)
-    }
+    end
 
-    before {
+    before do
       allow(ERB).to receive(:new).and_call_original
-    }
+    end
 
-    before {
+    before do
       allow(File).to receive(:read).and_call_original
       allow(File).to receive(:write)
-    }
+    end
 
     context 'supported languages' do
-      before {
+      before do
         subject.write(target_path, languages)
-      }
+      end
 
       it 'should determine target path for each language in source' do
         source.each do |src|
@@ -115,7 +108,7 @@ describe Rake::Funnel::Support::AssemblyVersionWriter do
 
       it 'should read version info template for languages' do
         languages.each do |language|
-          expect(File).to have_received(:read).with(%r|assembly_version/languages/#{language}|).at_least(:once)
+          expect(File).to have_received(:read).with(%r{assembly_version/languages/#{language}}).at_least(:once)
         end
       end
 
@@ -132,24 +125,28 @@ describe Rake::Funnel::Support::AssemblyVersionWriter do
       let(:languages) { :unsupported }
 
       it 'should fail' do
-        expect { subject.write(target_path, languages) }.to raise_error /Language is not supported: unsupported/
+        expect { subject.write(target_path, languages) }.to \
+          raise_error(/Language is not supported: unsupported/)
       end
     end
 
     describe 'version modification' do
-      let(:target_path) {
-        proc { |_language, version_info, source|
+      let(:target_path) do
+        proc do |_language, version_info, _source|
           version_info.assembly_informational_version = 'totally custom'
           'file'
-        }
-      }
+        end
+      end
 
-      before {
+      before do
         subject.write(target_path, languages)
-      }
+      end
 
       it 'should use modified version info to generate file' do
-        expect(File).to have_received(:write).with('file', /AssemblyInformationalVersion\("totally custom"\)/).at_least(:once)
+        expect(File).to \
+          have_received(:write)
+          .with('file', /AssemblyInformationalVersion\("totally custom"\)/)
+          .at_least(:once)
       end
     end
   end

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

@@ -6,9 +6,9 @@ describe Rake::Funnel::Support::BinaryVersionReader do
 
   let(:file) { 'some assembly' }
 
-  before {
+  before do
     allow(File).to receive(:binread).with(file).and_return(contents)
-  }
+  end
 
   describe 'version can be read' do
     let(:version) { %w(1 2 3 4) }

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

@@ -15,7 +15,7 @@ describe Rake::Funnel::Support::Copier do
   end
 
   describe 'recursive copy' do
-    before {
+    before do
       allow(File).to receive(:directory?).and_return(false)
       directories.each do |dir|
         allow(File).to receive(:directory?).with(dir).and_return(true)
@@ -23,14 +23,14 @@ describe Rake::Funnel::Support::Copier do
 
       allow(RakeFileUtils).to receive(:mkdir_p)
       allow(RakeFileUtils).to receive(:cp)
-    }
+    end
 
-    before {
+    before do
       described_class.copy(source, target)
-    }
+    end
 
     def no_prefix(file)
-      file.sub(%r|bin/|, '')
+      file.sub(%r{bin/}, '')
     end
 
     it 'should create target directories' do

data/spec/rake/funnel/support/environments/loader_spec.rb

@@ -1,36 +1,36 @@
 describe Rake::Funnel::Support::Environments::Loader do
-  let(:store) {
-    double(Configatron::Store).as_null_object
-  }
+  let(:store) do
+    double(Configatron::RootStore).as_null_object # rubocop:disable RSpec/VerifiedDoubles
+  end
 
   let(:customizer) { nil }
 
-  let(:config) {
+  let(:config) do
     {
       name: 'environment name',
       config_files: config_files.keys.map(&:to_s)
     }
-  }
+  end
 
-  before {
+  before do
     config_files.each do |file, content|
       allow(File).to receive(:read).with(file.to_s).and_return(content)
     end
 
     allow(Rake).to receive(:rake_output_message)
-  }
+  end
 
   describe 'loading configuration' do
-    let(:config_files) {
+    let(:config_files) do
       {
         one: 'one: 23',
         two: 'two: 42'
       }
-    }
+    end
 
-    before {
+    before do
       described_class.load_configuration(config, store, customizer)
-    }
+    end
 
     it 'should reinitialize the configatron store' do
       expect(store).to have_received(:unlock!)
@@ -48,8 +48,8 @@ describe Rake::Funnel::Support::Environments::Loader do
     end
 
     it "should add each config file's values to the store" do
-      expect(store).to have_received(:configure_from_hash).with({ 'one' => 23 })
-      expect(store).to have_received(:configure_from_hash).with({ 'two' => 42 })
+      expect(store).to have_received(:configure_from_hash).with('one' => 23)
+      expect(store).to have_received(:configure_from_hash).with('two' => 42)
     end
 
     it 'should lock the store' do
@@ -57,7 +57,7 @@ describe Rake::Funnel::Support::Environments::Loader do
     end
 
     describe 'customization' do
-      let(:customizer) { double(Proc).as_null_object }
+      let(:customizer) { instance_double(Proc).as_null_object }
 
       it 'should run the customizer' do
         expect(customizer).to have_received(:call).with(store)
@@ -65,16 +65,16 @@ describe Rake::Funnel::Support::Environments::Loader do
     end
 
     context 'config file with overriding values' do
-      let(:config_files) {
+      let(:config_files) do
         {
           one: 'foo: bar',
           two: 'foo: baz'
         }
-      }
+      end
 
-      let(:store) {
+      let(:store) do
         Configatron::RootStore.new
-      }
+      end
 
       it 'should merge config values' do
         expect(store.foo).to eq('baz')
@@ -82,15 +82,15 @@ describe Rake::Funnel::Support::Environments::Loader do
     end
 
     context 'env also defined in config file' do
-      let(:config_files) {
+      let(:config_files) do
         {
           with_env: 'env: foo'
         }
-      }
+      end
 
-      let(:store) {
+      let(:store) do
         Configatron::RootStore.new
-      }
+      end
 
       it 'should override env from config' do
         expect(store.env).to eq('foo')
@@ -98,11 +98,11 @@ describe Rake::Funnel::Support::Environments::Loader do
     end
 
     context 'empty config file' do
-      let(:config_files) {
+      let(:config_files) do
         {
           empty: ''
         }
-      }
+      end
 
       it 'should configure with empty hash' do
         expect(store).to have_received(:configure_from_hash).with({})
@@ -112,31 +112,31 @@ describe Rake::Funnel::Support::Environments::Loader do
 
   describe 'config file with ERb' do
     context 'ERb success' do
-      let(:config_files) {
+      let(:config_files) do
         {
           with_erb: 'foo: <%= 40 + 2 %>'
         }
-      }
+      end
 
-      before {
+      before do
         described_class.load_configuration(config, store)
-      }
+      end
 
       it 'should evaluate ERb' do
-        expect(store).to have_received(:configure_from_hash).with({ 'foo' => 42 })
+        expect(store).to have_received(:configure_from_hash).with('foo' => 42)
       end
     end
 
     context 'ERb failure' do
-      let(:config_files) {
+      let(:config_files) do
         {
           with_erb: 'bogus: <%= 42 + "a" %>'
         }
-      }
+      end
 
       it 'should report file name' do
         expect { described_class.load_configuration(config, store) }
-          .to raise_error { |ex| expect(ex.backtrace.join("\n")).to match(/with_erb/) }
+          .to(raise_error { |ex| expect(ex.backtrace.join("\n")).to match(/with_erb/) })
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# rubocop:disable RSpec/FilePath
+
 require 'tmpdir'
 
 include Rake::Funnel
@@ -7,22 +9,22 @@ describe Rake::Funnel::Support::Finder do
   let(:generate) { [] }
   let(:temp_dir) { Dir.mktmpdir }
 
-  before {
+  before do
     Dir.chdir(temp_dir) do
       ([] << generate).flatten.each do |file|
         FileUtils.mkdir_p(File.dirname(file))
         FileUtils.touch(file)
       end
     end
-  }
+  end
 
-  after {
+  after do
     FileUtils.rm_rf(temp_dir)
-  }
+  end
 
-  subject {
+  subject do
     described_class.new(pattern, OpenStruct.new(name: 'task name'), 'error message')
-  }
+  end
 
   def map_temp(*files)
     mapped = files.map { |f| File.join(temp_dir, f) }

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

@@ -1,3 +1,5 @@
+# rubocop:disable RSpec/FilePath
+
 describe Rake::Funnel::Support::InstantiateSymbol do
   module Creatable
     class One
@@ -29,7 +31,7 @@ describe Rake::Funnel::Support::InstantiateSymbol do
     class SnakeCase
     end
 
-    class Snake_Case
+    class Snake_Case # rubocop:disable Style/ClassAndModuleCamelCase
     end
   end
 
@@ -40,9 +42,9 @@ describe Rake::Funnel::Support::InstantiateSymbol do
   end
 
   describe 'module methods' do
-    subject {
+    subject do
       ExplicitModuleDefinition.new
-    }
+    end
 
     describe 'instance methods' do
       it 'should not be public' do
@@ -61,32 +63,32 @@ describe Rake::Funnel::Support::InstantiateSymbol do
 
   describe 'inspection' do
     context 'implicit module' do
-      subject {
+      subject do
         ImplicitModuleDefinition.new
-      }
+      end
 
       it 'should yield constants in self' do
-        expect(subject.send(:available)).to eq([:ClassMethods, :Nested])
+        expect(subject.send(:available)).to eq(%i(ClassMethods Nested))
       end
     end
 
     context 'explicit module' do
-      subject {
+      subject do
         ExplicitModuleDefinition.new
-      }
+      end
 
       it 'should yield sorted constants in module' do
-        expect(subject.send(:available)).to eq([:One, :Three, :Two])
+        expect(subject.send(:available)).to eq(%i(One Three Two))
       end
     end
 
     context 'multiple uses' do
-      subject {
+      subject do
         [
           ExplicitModuleDefinition.new,
           ImplicitModuleDefinition.new
         ]
-      }
+      end
 
       it 'should not overlap' do
         first = subject[0].send(:available)
@@ -98,9 +100,9 @@ describe Rake::Funnel::Support::InstantiateSymbol do
   end
 
   describe 'instantiation' do
-    subject {
+    subject do
       ExplicitModuleDefinition.new
-    }
+    end
 
     context 'with instance' do
       it 'should return instance' do
@@ -118,14 +120,15 @@ describe Rake::Funnel::Support::InstantiateSymbol do
 
     context 'symbol not defined' do
       it 'should fail' do
-        expect { subject.send(:create, :does_not_exist) }.to raise_error 'Unknown type to instantiate: :does_not_exist. Available types are: [:One, :Three, :Two]'
+        expect { subject.send(:create, :does_not_exist) }.to \
+          raise_error('Unknown type to instantiate: :does_not_exist. Available types are: [:One, :Three, :Two]')
       end
     end
 
     context 'snake cased symbol' do
-      subject {
+      subject do
         SnakeCaseModuleDefinition.new
-      }
+      end
 
       it 'should return instance' do
         expect(subject.send(:create, :snake_case)).to be_an_instance_of(SnakeCase::SnakeCase)
@@ -142,14 +145,14 @@ describe Rake::Funnel::Support::InstantiateSymbol do
 
         class Failure
           def initialize
-            fail 'BAM!'
+            raise 'BAM!'
           end
         end
       end
 
-      subject {
+      subject do
         WillFail.new
-      }
+      end
 
       it 'should fail' do
         expect { subject.send(:create, :Failure) }.to raise_error 'BAM!'
@@ -165,18 +168,15 @@ describe Rake::Funnel::Support::InstantiateSymbol do
     describe 'args' do
       module CreatableWithArgs
         class None
-          def initialize
-          end
+          def initialize; end
         end
 
         class Single
-          def initialize(_arg)
-          end
+          def initialize(_arg); end
         end
 
         class Multiple
-          def initialize(_arg1, _arg2)
-          end
+          def initialize(_arg1, _arg2); end
         end
       end
 
@@ -185,9 +185,9 @@ describe Rake::Funnel::Support::InstantiateSymbol do
         instantiate CreatableWithArgs
       end
 
-      subject {
+      subject do
         WithArgs.new
-      }
+      end
 
       context 'no argument' do
         it 'should not pass arg' do

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

@@ -9,8 +9,8 @@ describe Rake::Funnel::Support::Mapper do
         enum_hash: [{ one: 1 }, { two: 2 }, { unset: nil }]
       }
 
-      _ = subject.map(args)
-      expect(_).not_to be_empty
+      result = subject.map(args)
+      expect(result).not_to be_empty
 
       skip('for manual testing only')
     end
@@ -52,7 +52,8 @@ describe Rake::Funnel::Support::Mapper do
 
     context 'nil mapper' do
       it 'should fail' do
-        expect { described_class.new(nil) }.to raise_error(/You cannot use the 'nil' mapper style. Available mappers are:/)
+        expect { described_class.new(nil) }.to \
+          raise_error(/You cannot use the 'nil' mapper style. Available mappers are:/)
       end
     end