rake-funnel 0.0.6.pre → 0.1.0.pre

data/lib/rake/funnel/tasks/nunit.rb

@@ -2,6 +2,8 @@ require 'rake/tasklib'
 
 module Rake::Funnel::Tasks
   class NUnit < Rake::TaskLib
+    include Rake::Funnel::Support
+
     attr_accessor :name, :files, :args
 
     def initialize(name = :test)
@@ -28,9 +30,9 @@ module Rake::Funnel::Tasks
         Rake::Funnel::Integration::TeamCity::NUnitPlugin.setup(nunit)
 
         cmd = [
-          *Rake::Funnel::Support::Mono.invocation(nunit),
+          *Mono.invocation(nunit),
           *test_assemblies.all,
-          *Rake::Funnel::Support::Mapper.new(:NUnit).map(args)
+          *Mapper.new(:NUnit).map(args)
         ]
 
         sh(*cmd)
@@ -40,7 +42,7 @@ module Rake::Funnel::Tasks
     end
 
     def test_assemblies
-      Rake::Funnel::Support::Finder.new(files, self, 'No test assemblies found.')
+      Finder.new(files, self, 'No test assemblies found.')
     end
   end
 end

data/lib/rake/funnel/tasks/paket.rb

@@ -2,6 +2,8 @@ require 'rake/tasklib'
 
 module Rake::Funnel::Tasks
   class Paket < Rake::TaskLib
+    include Rake::Funnel::Support
+
     attr_accessor :name, :paket, :paket_args, :bootstrapper, :bootstrapper_args
 
     def initialize(name = :paket)
@@ -29,11 +31,11 @@ module Rake::Funnel::Tasks
     end
 
     def bootstrapper_cmd
-      Rake::Funnel::Support::Mono.invocation(bootstrapper, bootstrapper_args)
+      Mono.invocation(bootstrapper, bootstrapper_args)
     end
 
     def paket_cmd
-      Rake::Funnel::Support::Mono.invocation(paket, paket_args)
+      Mono.invocation(paket, paket_args)
     end
   end
 end

data/lib/rake/funnel/tasks/quick_template.rb

@@ -3,6 +3,8 @@ require 'rake/tasklib'
 
 module Rake::Funnel::Tasks
   class QuickTemplate < Rake::TaskLib
+    include Rake::Funnel::Support
+
     attr_accessor :name, :search_pattern, :context
 
     def initialize(name = :template)
@@ -35,7 +37,7 @@ module Rake::Funnel::Tasks
     end
 
     def templates
-      Rake::Funnel::Support::Finder.new(search_pattern, self, 'No templates found.')
+      Finder.new(search_pattern, self, 'No templates found.')
     end
 
     def result_filename(template)

data/lib/rake/funnel/tasks/side_by_side_specs.rb

@@ -1,11 +1,9 @@
 require 'rake/tasklib'
 
-Dir["#{File.dirname(__FILE__)}/side_by_side_specs_support/*.rb"].each do |path|
-  require path
-end
-
 module Rake::Funnel::Tasks
   class SideBySideSpecs < Rake::TaskLib
+    include Rake::Funnel::Support::SideBySideSpecs
+
     attr_accessor :name, :projects, :references, :specs, :enabled
 
     def initialize(name = :compile)
@@ -24,7 +22,7 @@ module Rake::Funnel::Tasks
     def define
       task name do
         next unless enabled
-        SideBySideSpecsSupport::Remover.remove({ projects: projects, references: references, specs: specs })
+        Remover.remove({ projects: projects, references: references, specs: specs })
       end
 
       self

data/lib/rake/funnel/tasks/timing.rb

@@ -1,18 +1,15 @@
-require 'rake'
 require 'rake/tasklib'
 
-Dir["#{File.dirname(__FILE__)}/timing_support/*.rb"].each do |path|
-  require path
-end
-
 module Rake::Funnel::Tasks
   class Timing < Rake::TaskLib
+    include Rake::Funnel::Support::Timing
+
     attr_accessor :name
     attr_reader :stats
 
     def initialize(name = :timing)
       @name = name
-      @stats = TimingSupport::Statistics.new
+      @stats = Statistics.new
 
       yield self if block_given?
 
@@ -28,7 +25,7 @@ module Rake::Funnel::Tasks
       patches.each { |p| p.apply! }
 
       task @name, :failed do |task, args|
-        TimingSupport::Report.new(@stats, args).render
+        Report.new(@stats, args).render
       end
 
       timing_task = Rake.application.current_scope.path_with_task_name(@name)
@@ -43,7 +40,7 @@ module Rake::Funnel::Tasks
 
     def report
       Rake::Funnel::Support::Patch.new do |p|
-        report_invoker = -> (opts) { TimingSupport::Report.new(@stats, opts).render }
+        report_invoker = -> (opts) { Report.new(@stats, opts).render }
 
         p.setup do
           Rake::Application.class_eval do

data/lib/rake/funnel/tasks/zip.rb

@@ -4,6 +4,8 @@ require 'zip'
 
 module Rake::Funnel::Tasks
   class Zip < Rake::TaskLib
+    include Rake::Funnel::Support
+
     attr_accessor :name, :source, :target, :zip_root
 
     def initialize(name = :package)
@@ -38,7 +40,7 @@ module Rake::Funnel::Tasks
     end
 
     def files
-      Rake::Funnel::Support::Finder.new(source, self, 'No files to zip.').all_or_default
+      Finder.new(source, self, 'No files to zip.').all_or_default
     end
 
     def configure_zip

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.0.6.pre'
+    VERSION = '0.1.0.pre'
   end
 end

data/spec/rake/funnel/extensions/case/pascal_case_spec.rb

@@ -0,0 +1,17 @@
+describe Rake::Funnel::Extensions::PascalCase do
+  it 'should convert strings' do
+    expect('foo'.pascalize).to eq('Foo')
+  end
+
+  it 'should convert strings with underscores' do
+    expect('foo_bar'.pascalize).to eq('FooBar')
+  end
+
+  it 'should convert symbols to string' do
+    expect(:foo.pascalize).to eq('Foo')
+  end
+
+  it 'should convert symbols with underscores' do
+    expect(:foo_bar.pascalize).to eq('FooBar')
+  end
+end

data/spec/rake/funnel/support/{mapper_styles → argument_mapper/styles}/msdeploy_spec.rb

@@ -1,6 +1,6 @@
 include Rake::Funnel::Support
 
-describe Rake::Funnel::Support::MapperStyles::MSDeploy do
+describe Rake::Funnel::Support::Mapper::Styles::MSDeploy do
   subject { Mapper.new(:MSDeploy) }
 
   describe 'no arguments' do

data/spec/rake/funnel/support/{mapper_styles → argument_mapper/styles}/nunit_spec.rb

@@ -1,4 +1,4 @@
-describe Rake::Funnel::Support::MapperStyles::NUnit do
+describe Rake::Funnel::Support::Mapper::Styles::NUnit do
   subject { Mapper.new(:NUnit) }
 
   describe 'prefix' do

data/spec/rake/funnel/support/{mapper_styles → argument_mapper/styles}/styles_spec.rb

@@ -1,14 +1,14 @@
-include Rake::Funnel::Support
+include Rake::Funnel::Support::ArgumentMapper
 
-MapperStyles.constants.reject { |x| x == :MSDeploy }.each do |style|
-  style_path = MapperStyles.const_get(style)
+Styles.constants.reject { |x| x == :MSDeploy }.each do |style|
+  style_path = Styles.const_get(style)
   describe style_path do
     subject {
       Mapper.new(style)
     }
 
     let (:style) {
-      MapperStyles.const_get(style).new
+      Styles.const_get(style).new
     }
 
     def styled(switch, key = nil, value = nil)

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

@@ -0,0 +1,61 @@
+include Rake::Funnel::Support
+
+describe Rake::Funnel::Support::AssemblyVersion::FromVersionFiles do
+  describe 'defaults' do
+    its(:search_pattern) { should == %w(**/VERSION) }
+    its(:build_number) { should be_nil }
+    its(:sha) { should be_nil }
+
+    describe 'overriding defaults' do
+      subject {
+        described_class.new({
+            search_pattern: 'search pattern',
+            build_number: 42,
+            sha: 'abc'
+          })
+      }
+
+      its(:search_pattern) { should == 'search pattern' }
+      its(:build_number) { should == 42 }
+      its(:sha) { should == 'abc' }
+    end
+  end
+
+  describe 'enumerable' do
+    it { is_expected.to be_kind_of(Enumerable) }
+    it { is_expected.to respond_to(:each) }
+
+    it 'should yield enumerator' do
+      expect(subject.each).to be_kind_of(Enumerator)
+    end
+  end
+
+  describe 'enumeration' do
+    let(:finder) { double(Finder).as_null_object }
+    let(:files) { %w(1 2) }
+
+    before {
+      allow(finder).to receive(:all_or_default).and_return(files)
+      allow(Finder).to receive(:new).and_return(finder)
+    }
+
+    before {
+      allow(VersionInfo).to receive(:read_version_from).and_return(*files)
+    }
+
+    before {
+      allow(Rake).to receive(:rake_output_message)
+    }
+
+    subject {
+      described_class.new({ build_number: 42, sha: 'abc' })
+    }
+
+    it 'should yield source and version info for each file' do
+      expect { |b| subject.each(&b) }.to yield_successive_args(
+          { source: '1', version_info: VersionInfo.new({ assembly_version: '1', assembly_file_version: '1.42', assembly_informational_version: '1.42-abc' }) },
+          { source: '2', version_info: VersionInfo.new({ assembly_version: '2', assembly_file_version: '2.42', assembly_informational_version: '2.42-abc' }) }
+        )
+    end
+  end
+end

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

@@ -0,0 +1,140 @@
+require 'erb'
+
+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)
+      }
+
+      it 'should create FromVersionFiles with empty args' do
+        expect(subject).to have_received(:create).with(:FromVersionFiles, {})
+      end
+    end
+
+    describe 'custom type' do
+      let(:source) { :Custom }
+      let(:source_args) { { foo: 42 } }
+
+      before {
+        allow_any_instance_of(described_class).to receive(:create)
+      }
+
+      subject {
+        described_class.new(source, source_args)
+      }
+
+      it 'should create type with args' do
+        expect(subject).to have_received(:create).with(source, source_args)
+      end
+    end
+
+    describe 'custom instance' do
+      let(:source) {
+        [
+          {
+            source: 'from e.g. gitversion',
+            version_info: VersionInfo.new(
+              {
+                assembly_version: '1',
+                assembly_file_version: '1.2',
+                assembly_informational_version: '1.2-abc'
+              })
+          }
+        ]
+      }
+
+      subject {
+        described_class.new(source)
+      }
+
+      it 'should succeed' do
+        expect(true).to eq(true)
+      end
+    end
+  end
+
+  describe 'generator' do
+    let(:source) {
+      [
+        {
+          source: 'one',
+          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'
+            })
+        }
+      ]
+    }
+
+    let(:target_path) { double(Proc).as_null_object }
+    let(:languages) { [:vb, :cs, :fs] }
+    let(:erb) { double(ERB).as_null_object }
+
+    subject {
+      described_class.new(source)
+    }
+
+    before {
+      allow(Rake).to receive(:rake_output_message)
+    }
+
+    before {
+      allow(ERB).to receive(:new).and_return(erb)
+    }
+
+    before {
+      allow(File).to receive(:read).and_return('template')
+      allow(File).to receive(:write)
+    }
+
+    context 'supported languages' do
+      before {
+        subject.write(target_path, languages)
+      }
+
+      it 'should determine target path for each language in source' do
+        source.each do |src|
+          languages.each do |language|
+            expect(target_path).to have_received(:call).with(language, src[:version_info], src[:source])
+          end
+        end
+      end
+
+      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)
+        end
+      end
+
+      it 'should run templates through ERb' do
+        expect(erb).to have_received(:result).exactly(languages.length * source.length).times
+      end
+
+      it 'should write version info file for each language in source' do
+        expect(File).to have_received(:write).exactly(languages.length * source.length).times
+      end
+    end
+
+    context 'unsupported language' do
+      let(:languages) { :unsupported }
+
+      it 'should fail' do
+        expect { subject.write(target_path, languages) }.to raise_error /Language is not supported: unsupported/
+      end
+    end
+  end
+end

data/spec/rake/funnel/{tasks/environments_support → support/environments}/loader_spec.rb

@@ -1,8 +1,10 @@
-describe Rake::Funnel::Tasks::EnvironmentsSupport::Loader do
+describe Rake::Funnel::Support::Environments::Loader do
   let(:store) {
     double(Configatron::Store).as_null_object
   }
 
+  let(:customizer) { nil }
+
   let(:config) {
     {
       name: 'environment name',
@@ -27,7 +29,7 @@ describe Rake::Funnel::Tasks::EnvironmentsSupport::Loader do
     }
 
     before {
-      described_class.load_configuration(config, store)
+      described_class.load_configuration(config, store, customizer)
     }
 
     it 'should reinitialize the configatron store' do
@@ -54,6 +56,14 @@ describe Rake::Funnel::Tasks::EnvironmentsSupport::Loader do
       expect(store).to have_received(:lock!)
     end
 
+    describe 'customization' do
+      let(:customizer) { double(Proc).as_null_object }
+
+      it 'should run the customizer' do
+        expect(customizer).to have_received(:call).with(store)
+      end
+    end
+
     context 'config file with overriding values' do
       let(:config_files) {
         {
@@ -125,7 +135,7 @@ describe Rake::Funnel::Tasks::EnvironmentsSupport::Loader do
       }
 
       it 'should report file name' do
-        expect(lambda { described_class.load_configuration(config, store) })
+        expect { described_class.load_configuration(config, store) }
           .to raise_error { |ex| expect(ex.backtrace.join("\n")).to match(/with_erb/) }
       end
     end

data/spec/rake/funnel/support/{finder_spec.rb → internal/finder_spec.rb}

@@ -34,9 +34,10 @@ describe Rake::Funnel::Support::Finder do
     let(:generate) { %w(1 2 3 4) }
     let(:pattern) { '**/*' }
 
-    it 'should be enumerable' do
-      expect(described_class < Enumerable).to eq(true)
-      expect(subject.respond_to?(:each)).to eq(true)
+    it { is_expected.to be_kind_of(Enumerable) }
+    it { is_expected.to respond_to(:each) }
+
+    it 'should yield enumerator' do
       expect(subject.each).to be_kind_of(Enumerator)
     end
 
@@ -112,7 +113,7 @@ describe Rake::Funnel::Support::Finder do
     context 'no matching files' do
       it 'should fail' do
         Dir.chdir(temp_dir) do
-          expect(lambda { subject.single }).to raise_error(AmbiguousFileError, /error message/)
+          expect { subject.single }.to raise_error(AmbiguousFileError, /error message/)
         end
       end
     end
@@ -122,7 +123,7 @@ describe Rake::Funnel::Support::Finder do
 
       it 'should fail' do
         Dir.chdir(temp_dir) do
-          expect(lambda { subject.single }).to raise_error(AmbiguousFileError, /error message/)
+          expect { subject.single }.to raise_error(AmbiguousFileError, /error message/)
         end
       end
     end
@@ -171,7 +172,7 @@ describe Rake::Funnel::Support::Finder do
   describe '#all' do
     context 'no matching files' do
       it 'should fail' do
-        expect(lambda { subject.all }).to raise_error(AmbiguousFileError, /error message/)
+        expect { subject.all }.to raise_error(AmbiguousFileError, /error message/)
       end
     end
 

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

@@ -0,0 +1,183 @@
+describe Rake::Funnel::Support::InstantiateSymbol do
+  module Creatable
+    class One
+    end
+
+    class Two
+    end
+
+    class Three
+    end
+  end
+
+  class ExplicitModuleDefinition
+    include Rake::Funnel::Support::InstantiateSymbol
+    instantiate Creatable
+
+    class Nested
+    end
+  end
+
+  class ImplicitModuleDefinition
+    include Rake::Funnel::Support::InstantiateSymbol
+
+    class Nested
+    end
+  end
+
+  describe 'module methods' do
+    subject {
+      ExplicitModuleDefinition.new
+    }
+
+    describe 'instance methods' do
+      it 'should not be public' do
+        expect(subject).not_to respond_to(:create)
+        expect(subject).not_to respond_to(:available)
+      end
+    end
+
+    describe 'class methods' do
+      it 'should not be public' do
+        expect(subject.class).not_to respond_to(:instantiate)
+      end
+    end
+  end
+
+  describe 'inspection' do
+    context 'implicit module' do
+      subject {
+        ImplicitModuleDefinition.new
+      }
+
+      it 'should yield constants in self' do
+        expect(subject.send(:available)).to eq([:ClassMethods, :Nested])
+      end
+    end
+
+    context 'explicit module' do
+      subject {
+        ExplicitModuleDefinition.new
+      }
+
+      it 'should yield sorted constants in module' do
+        expect(subject.send(:available)).to eq([:One, :Three, :Two])
+      end
+    end
+
+    context 'multiple uses' do
+      subject {
+        [
+          ExplicitModuleDefinition.new,
+          ImplicitModuleDefinition.new
+        ]
+      }
+
+      it 'should not overlap' do
+        first = subject[0].send(:available)
+        second = subject[1].send(:available)
+
+        expect(first).not_to include(second)
+      end
+    end
+  end
+
+  describe 'instantiation' do
+    subject {
+      ExplicitModuleDefinition.new
+    }
+
+    context 'with instance' do
+      it 'should return instance' do
+        instance = Object.new
+
+        expect(subject.send(:create, instance)).to eq(instance)
+      end
+    end
+
+
+    context 'with nil' do
+      it 'should return nil' do
+        expect(subject.send(:create, nil)).to eq(nil)
+      end
+    end
+
+    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]'
+      end
+    end
+
+    context 'instantiation fails' do
+      class WillFail
+        include Rake::Funnel::Support::InstantiateSymbol
+
+        class Failure
+          def initialize
+            raise "BAM!"
+          end
+        end
+      end
+
+      subject {
+        WillFail.new
+      }
+
+      it 'should fail' do
+        expect { subject.send(:create, :Failure) }.to raise_error "BAM!"
+      end
+    end
+
+    context 'instantiation succeeds' do
+      it 'should return instance' do
+        expect(subject.send(:create, :One)).to be_an_instance_of(Creatable::One)
+      end
+    end
+
+    describe 'args' do
+      module CreatableWithArgs
+        class None
+          def initialize
+          end
+        end
+
+        class Single
+          def initialize(arg)
+          end
+        end
+
+        class Multiple
+          def initialize(arg1, arg2)
+          end
+        end
+      end
+
+      class WithArgs
+        include Rake::Funnel::Support::InstantiateSymbol
+        instantiate CreatableWithArgs
+      end
+
+      subject {
+        WithArgs.new
+      }
+
+      context 'no argument' do
+        it 'should not pass arg' do
+          expect(subject.send(:create, :None)).to be_an_instance_of(CreatableWithArgs::None)
+        end
+      end
+
+      context 'single argument' do
+        it 'should pass arg' do
+          expect(subject.send(:create, :Single, 1)).to be_an_instance_of(CreatableWithArgs::Single)
+        end
+      end
+
+      context 'multiple argument' do
+        it 'should pass args' do
+          expect(subject.send(:create, :Multiple, 1, 2)).to be_an_instance_of(CreatableWithArgs::Multiple)
+        end
+      end
+    end
+  end
+end