rake-funnel 0.0.6.pre → 0.1.0.pre

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

@@ -46,13 +46,13 @@ describe Rake::Funnel::Support::Mapper do
 
     context 'unknown mapper' do
       it 'should fail' do
-        expect { described_class.new(:unknown) }.to raise_error(/^Something went wrong while creating the 'unknown' mapper/)
+        expect { described_class.new(:unknown) }.to raise_error(NameError)
       end
     end
 
     context 'nil mapper' do
       it 'should fail' do
-        expect { described_class.new(nil) }.to raise_error(/You cannot use a 'nil' mapper. Available mappers are: \w+/)
+        expect { described_class.new(nil) }.to raise_error(/You cannot use the 'nil' mapper style. Available mappers are:/)
       end
     end
 

data/spec/rake/funnel/{tasks/msbuild_support → support/msbuild}/build_tool_spec.rb

@@ -1,4 +1,4 @@
-describe Rake::Funnel::Tasks::MSBuildSupport::BuildTool do
+describe Rake::Funnel::Support::MSBuild::BuildTool do
   before {
     allow(Rake::Win32).to receive(:windows?).and_return(windows?)
   }

data/spec/rake/funnel/{tasks/msdeploy_support → support/msdeploy}/registry_patch_spec.rb

@@ -1,4 +1,4 @@
-describe Rake::Funnel::Tasks::MSDeploySupport::RegistryPatch do
+describe Rake::Funnel::Support::MSDeploy::RegistryPatch do
   describe 'execution' do
     it 'should yield block' do
       result = 0
@@ -11,7 +11,7 @@ describe Rake::Funnel::Tasks::MSDeploySupport::RegistryPatch do
     end
 
     it 'should work without block' do
-      expect(lambda { described_class.new }).not_to raise_error
+      expect { described_class.new }.not_to raise_error
     end
   end
 
@@ -22,7 +22,7 @@ describe Rake::Funnel::Tasks::MSDeploySupport::RegistryPatch do
       }
 
       it 'should succeed' do
-        expect(lambda { described_class.new }).not_to raise_error
+        expect { described_class.new }.not_to raise_error
       end
     end
 

data/spec/rake/funnel/{tasks/side_by_side_specs_support → support/side_by_side_specs}/remover_spec.rb

@@ -1,4 +1,4 @@
-describe Rake::Funnel::Tasks::SideBySideSpecsSupport::Remover do
+describe Rake::Funnel::Support::SideBySideSpecs::Remover do
   describe 'removal' do
     let(:projects) { [] }
     let(:references) { [] }

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

@@ -41,7 +41,7 @@ describe Rake::Funnel::Support::TemplateEngine do
         var = 42
         template = '<%= var %>'
 
-        expect(lambda { described_class.render(template) }).to raise_error
+        expect { described_class.render(template) }.to raise_error
       end
     end
 
@@ -59,7 +59,7 @@ describe Rake::Funnel::Support::TemplateEngine do
   end
 
   it 'should report errors with file name' do
-    expect(lambda { described_class.render('<%= undefined %>', 'file.template') })
+    expect { described_class.render('<%= undefined %>', 'file.template') }
       .to raise_error { |ex| expect(ex.backtrace.join("\n")).to match(/file\.template/) }
   end
 end

data/spec/rake/funnel/{tasks/timing_support → support/timing}/report_spec.rb

@@ -1,7 +1,7 @@
 include Rake
-include Rake::Funnel::Tasks::TimingSupport
+include Rake::Funnel::Support::Timing
 
-describe Rake::Funnel::Tasks::TimingSupport::Report do
+describe Rake::Funnel::Support::Timing::Report do
 
   include DSL
 

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

@@ -0,0 +1,228 @@
+require 'ostruct'
+require 'tmpdir'
+
+describe Rake::Funnel::Support::VersionInfo do
+  describe '#parse' do
+    [
+      {
+        context: {
+          version: '1.2',
+          build_number: '42',
+          sha: 'sha'
+        },
+        expected: {
+          assembly_version: '1.2',
+          assembly_file_version: '1.2.42',
+          assembly_informational_version: '1.2.42-sha'
+        }
+      },
+      {
+        context: {
+          version: '1.2-pre1',
+          build_number: '42',
+          sha: 'sha'
+        },
+        expected: {
+          assembly_version: '1.2',
+          assembly_file_version: '1.2.42',
+          assembly_informational_version: '1.2-pre1.42-sha'
+        }
+      },
+      {
+        context: {
+          version: '1.2.3',
+          build_number: '42',
+          sha: 'sha' },
+        expected: {
+          assembly_version: '1.2.3',
+          assembly_file_version: '1.2.3.42',
+          assembly_informational_version: '1.2.3.42-sha'
+        }
+      },
+      {
+        context: {
+          version: '1.2.3-pre1',
+          build_number: '42',
+          sha: 'sha'
+        },
+        expected: {
+          assembly_version: '1.2.3',
+          assembly_file_version: '1.2.3.42',
+          assembly_informational_version: '1.2.3-pre1.42-sha'
+        }
+      },
+      {
+        context: {
+          version: '1.2',
+          build_number: '-pre',
+          sha: 'sha'
+        },
+        expected: {
+          assembly_version: '1.2',
+          assembly_file_version: '1.2',
+          assembly_informational_version: '1.2-pre-sha'
+        }
+      },
+      {
+        context: {
+          version: '1.2',
+          build_number: '-pre42',
+          sha: 'sha'
+        },
+        expected: {
+          assembly_version: '1.2',
+          assembly_file_version: '1.2.42',
+          assembly_informational_version: '1.2-pre42-sha'
+        }
+      },
+      {
+        context: {
+          version: '1.2',
+          build_number: nil,
+          sha: nil
+        },
+        expected: {
+          assembly_version: '1.2',
+          assembly_file_version: '1.2',
+          assembly_informational_version: '1.2'
+        }
+      },
+      {
+        context: {
+          version: '1.2',
+          build_number: '42',
+          sha: nil
+        },
+        expected: {
+          assembly_version: '1.2',
+          assembly_file_version: '1.2.42',
+          assembly_informational_version: '1.2.42'
+        }
+      },
+      {
+        context: {
+          version: 1,
+          build_number: '42',
+          sha: 'sha'
+        },
+        expected: {
+          assembly_version: '1',
+          assembly_file_version: '1.42',
+          assembly_informational_version: '1.42-sha'
+        }
+      },
+      {
+        context: {
+          version: '1.2',
+          build_number: 42,
+          sha: 'sha'
+        },
+        expected: {
+          assembly_version: '1.2',
+          assembly_file_version: '1.2.42',
+          assembly_informational_version: '1.2.42-sha'
+        }
+      },
+      {
+        context: {
+          version: '1.2'
+        },
+        expected: {
+          assembly_version: '1.2',
+          assembly_file_version: '1.2',
+          assembly_informational_version: '1.2'
+        }
+      },
+      {
+        context: {
+          version: nil,
+          build_number: nil,
+          sha: nil
+        },
+        expected: {
+          assembly_version: '0',
+          assembly_file_version: '0',
+          assembly_informational_version: '0'
+        }
+      },
+      {
+        context: {},
+        expected: {
+          assembly_version: '0',
+          assembly_file_version: '0',
+          assembly_informational_version: '0'
+        }
+      }
+    ].each do |spec|
+      context "version #{spec[:context][:version] || 'none'}, build number #{spec[:context][:build_number] || 'none'}, SHA #{spec[:context][:sha] || 'none'}" do
+        let(:parsed) { described_class.parse(spec[:context]) }
+
+        it "should generate assembly version #{spec[:expected][:assembly_version]}" do
+          expect(parsed.assembly_version).to eq(spec[:expected][:assembly_version])
+        end
+
+        it "should generate assembly file version #{spec[:expected][:assembly_file_version]}" do
+          expect(parsed.assembly_file_version).to eq(spec[:expected][:assembly_file_version])
+        end
+
+        it "should generate assembly informational version #{spec[:expected][:assembly_informational_version]}" do
+          expect(parsed.assembly_informational_version).to eq(spec[:expected][:assembly_informational_version])
+        end
+      end
+    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
+
+    context 'enumerating' do
+      let(:args) { { a: 42, b: 23 } }
+
+      subject { described_class.new(args) }
+
+      it 'should yield all hash pairs' do
+        expect { |b| subject.each(&b) }.to yield_successive_args([:a, 42], [:b, 23])
+      end
+    end
+  end
+
+  describe 'automatic methods' do
+    it 'should be an OpenStruct' do
+      expect(described_class < OpenStruct).to eq(true)
+    end
+
+    describe 'immutability' do
+      let(:args) { { a: 42 } }
+
+      subject { described_class.new(args) }
+
+      it 'should be immutable' do
+        expect { subject.a = 23 }.to raise_error
+      end
+    end
+  end
+
+  describe '#read_version_from' do
+    let(:file) { 'file with version info' }
+    let(:contents) { <<-EOF
+  first line with expected version number
+other crap
+    EOF
+    }
+
+    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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+include Rake
+include Rake::Funnel::Support
+
+describe Rake::Funnel::Tasks::AssemblyVersion do
+  before {
+    CLEAN.clear
+    Task.clear
+  }
+
+  describe 'defaults' do
+    its(:name) { should == :version }
+    its(:language) { should == :cs }
+    its(:source) { should == :FromVersionFiles }
+    its(:source_args) { should == {} }
+    its(:target_path) { should be_an_instance_of(Proc) }
+
+    describe 'overriding defaults' do
+      subject {
+        described_class.new(:name) do |t|
+          t.language = [:cs, :vb]
+          t.source = []
+          t.source_args = { foo: 42 }
+          t.target_path = 'will not work'
+        end
+      }
+
+      its(:name) { should == :name }
+      its(:language) { should == [:cs, :vb] }
+      its(:source) { should == [] }
+      its(:source_args) { should == { foo: 42 } }
+      its(:target_path) { should == 'will not work' }
+    end
+  end
+
+  describe 'execution' do
+    let(:writer) { double(AssemblyVersionWriter).as_null_object }
+
+    before {
+      allow(AssemblyVersionWriter).to receive(:new).and_return(writer)
+    }
+
+    before {
+      Task[subject.name].invoke
+    }
+
+    it 'should pass source and source_args' do
+      expect(AssemblyVersionWriter).to have_received(:new).with(subject.source, subject.source_args)
+    end
+
+    it 'should use writer' do
+      expect(writer).to have_received(:write).with(subject.target_path, subject.language)
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ describe Rake::Funnel::Tasks::BinPath do
 
   describe 'defaults' do
     its(:name) { should == :bin_path }
-    its(:pattern) { is_expected.to match_array(%w(tools/* tools/*/bin packages/**/tools)) }
+    its(:search_pattern) { should eq(%w(tools/* tools/*/bin packages/**/tools)) }
   end
 
   describe 'execution' do
@@ -19,15 +19,15 @@ describe Rake::Funnel::Tasks::BinPath do
     }
 
     before {
-      subject.pattern = %w(foo bar)
+      subject.search_pattern = %w(foo bar)
 
-      allow(Dir).to receive(:[]).with(*subject.pattern).and_return(subject.pattern)
+      allow(Dir).to receive(:[]).with(*subject.search_pattern).and_return(subject.search_pattern)
 
       Task[:bin_path].invoke
     }
 
     it 'should prepend sorted matching folders to the PATH environment variable' do
-      paths = subject.pattern.sort.map { |path| File.expand_path(path) } << ENV['PATH']
+      paths = subject.search_pattern.sort.map { |path| File.expand_path(path) } << ENV['PATH']
 
       expect(ENV).to have_received(:[]=).with('PATH', paths.join(File::PATH_SEPARATOR))
     end

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

@@ -45,7 +45,7 @@ describe Rake::Funnel::Tasks::Copy do
         let(:target) { nil }
 
         it 'should fail' do
-          expect(lambda { Task[subject.name].invoke }).to raise_error(/Target not defined/)
+          expect { Task[subject.name].invoke }.to raise_error(/Target not defined/)
         end
       end
     end

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

@@ -1,5 +1,5 @@
 include Rake
-include Rake::Funnel::Support
+include Rake::Funnel::Support::Environments
 include Rake::Funnel::Tasks
 
 describe Rake::Funnel::Tasks::Environments do
@@ -9,6 +9,14 @@ describe Rake::Funnel::Tasks::Environments do
     Task.clear
   }
 
+  before {
+    module Kernel
+      def configatron
+        OpenStruct.new(name: 'fake configatron singleton')
+      end
+    end
+  }
+
   let(:files) { [] }
 
   before {
@@ -28,6 +36,7 @@ describe Rake::Funnel::Tasks::Environments do
     its(:default_env) { should be_nil }
     its(:default_config) { should == 'default' }
     its(:local_config) { should == 'local' }
+    its(:customizer) { should be_nil }
 
     describe 'overriding defaults' do
       subject {
@@ -36,6 +45,7 @@ describe Rake::Funnel::Tasks::Environments do
           t.default_env = 'custom default_env'
           t.default_config = 'custom default_config'
           t.local_config = 'custom local_config'
+          t.customizer = Proc.new {}
         end
       }
 
@@ -43,6 +53,7 @@ describe Rake::Funnel::Tasks::Environments do
       its(:default_env) { should == subject.default_env }
       its(:default_config) { should == subject.default_config }
       its(:local_config) { should == subject.local_config }
+      its(:customizer) { should be_instance_of(Proc) }
     end
   end
 
@@ -79,7 +90,7 @@ describe Rake::Funnel::Tasks::Environments do
     }
 
     before {
-      allow(EnvironmentsSupport::Loader).to receive(:load_configuration)
+      allow(Loader).to receive(:load_configuration)
     }
 
     before {
@@ -101,8 +112,8 @@ describe Rake::Funnel::Tasks::Environments do
       let(:optional) { nil }
 
       it 'should load all files' do
-        expect(EnvironmentsSupport::Loader)
-          .to have_received(:load_configuration).with(hash_including({ config_files: %w(config/default.yaml config/dev.yaml config/local.yaml) }))
+        expect(Loader)
+          .to have_received(:load_configuration).with(hash_including({ config_files: %w(config/default.yaml config/dev.yaml config/local.yaml) }), any_args)
       end
     end
 
@@ -110,8 +121,8 @@ describe Rake::Funnel::Tasks::Environments do
       let(:optional) { 'config/default.yaml' }
 
       it 'should load environment file and local file' do
-        expect(EnvironmentsSupport::Loader)
-          .to have_received(:load_configuration).with(hash_including({ config_files: %w(config/dev.yaml config/local.yaml) }))
+        expect(Loader)
+          .to have_received(:load_configuration).with(hash_including({ config_files: %w(config/dev.yaml config/local.yaml) }), any_args)
       end
     end
 
@@ -119,9 +130,54 @@ describe Rake::Funnel::Tasks::Environments do
       let(:optional) { 'config/local.yaml' }
 
       it 'should load default file and environment file' do
-        expect(EnvironmentsSupport::Loader)
-          .to have_received(:load_configuration).with(hash_including({ config_files: %w(config/default.yaml config/dev.yaml) }))
+        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 'store' do
+    let(:files) {
+      %w(config/dev.yaml)
+    }
+
+    before {
+      allow(Loader).to receive(:load_configuration)
+    }
+
+    before {
+      expect(subject).to be
+      Task['dev'].invoke
+    }
+
+    it 'should store configuration in configatron singleton' do
+      expect(Loader).to have_received(:load_configuration).with(anything, configatron, any_args)
+    end
+  end
+
+  describe 'customization' do
+    let(:customizer) { Proc.new {} }
+    let(:files) {
+      %w(config/dev.yaml)
+    }
+
+    subject {
+      described_class.new do |t|
+        t.customizer = customizer
       end
+    }
+
+    before {
+      allow(Loader).to receive(:load_configuration)
+    }
+
+    before {
+      expect(subject).to be
+      Task['dev'].invoke
+    }
+
+    it 'should pass customizer to loader' do
+      expect(Loader).to have_received(:load_configuration).with(anything, anything, customizer)
     end
   end
 
@@ -131,7 +187,7 @@ describe Rake::Funnel::Tasks::Environments do
     }
 
     before {
-      allow(EnvironmentsSupport::Loader).to receive(:load_configuration)
+      allow(Loader).to receive(:load_configuration)
     }
 
     context 'no default environment configured' do
@@ -140,7 +196,7 @@ describe Rake::Funnel::Tasks::Environments do
       }
 
       it 'should not invoke environment tasks' do
-        expect(EnvironmentsSupport::Loader).not_to have_received(:load_configuration)
+        expect(Loader).not_to have_received(:load_configuration)
       end
     end
 
@@ -163,13 +219,13 @@ describe Rake::Funnel::Tasks::Environments do
         let(:user_defined_task) { %w(foo) }
 
         it 'should invoke default environment task' do
-          expect(EnvironmentsSupport::Loader)
-            .to have_received(:load_configuration).with(hash_including({ name: 'dev' }))
+          expect(Loader)
+            .to have_received(:load_configuration).with(hash_including({ name: 'dev' }), any_args)
         end
 
         it 'should not invoke other environment tasks' do
-          expect(EnvironmentsSupport::Loader)
-            .not_to have_received(:load_configuration).with(hash_including({ name: 'production' }))
+          expect(Loader)
+            .not_to have_received(:load_configuration).with(hash_including({ name: 'production' }), any_args)
         end
       end
 
@@ -177,13 +233,13 @@ describe Rake::Funnel::Tasks::Environments do
         let(:user_defined_task) { %w(foo production) }
 
         it 'should invoke user-defined environment task' do
-          expect(EnvironmentsSupport::Loader)
-            .to have_received(:load_configuration).with(hash_including({ name: 'production' }))
+          expect(Loader)
+            .to have_received(:load_configuration).with(hash_including({ name: 'production' }), any_args)
         end
 
         it 'should not invoke other environment tasks' do
-          expect(EnvironmentsSupport::Loader)
-            .not_to have_received(:load_configuration).with(hash_including({ name: 'dev' }))
+          expect(Loader)
+            .not_to have_received(:load_configuration).with(hash_including({ name: 'dev' }), any_args)
         end
       end
 
@@ -207,13 +263,13 @@ describe Rake::Funnel::Tasks::Environments do
             let(:user_defined_task) { %w(foo) }
 
             it 'should invoke default environment task' do
-              expect(EnvironmentsSupport::Loader)
-                .to have_received(:load_configuration).with(hash_including({ name: 'dev' }))
+              expect(Loader)
+                .to have_received(:load_configuration).with(hash_including({ name: 'dev' }), any_args)
             end
 
             it 'should not invoke other environment tasks' do
-              expect(EnvironmentsSupport::Loader)
-                .not_to have_received(:load_configuration).with(hash_including({ name: 'production' }))
+              expect(Loader)
+                .not_to have_received(:load_configuration).with(hash_including({ name: 'production' }), any_args)
             end
           end
 
@@ -221,13 +277,13 @@ describe Rake::Funnel::Tasks::Environments do
             let(:user_defined_task) { %w(foo foo:bar:production) }
 
             it 'should invoke user-defined environment task' do
-              expect(EnvironmentsSupport::Loader)
-                .to have_received(:load_configuration).with(hash_including({ name: 'production' }))
+              expect(Loader)
+                .to have_received(:load_configuration).with(hash_including({ name: 'production' }), any_args)
             end
 
             it 'should not invoke other environment tasks' do
-              expect(EnvironmentsSupport::Loader)
-                .not_to have_received(:load_configuration).with(hash_including({ name: 'dev' }))
+              expect(Loader)
+                .not_to have_received(:load_configuration).with(hash_including({ name: 'dev' }), any_args)
             end
           end
         end

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

@@ -1,7 +1,7 @@
 include Rake
 include Rake::Funnel
 include Rake::Funnel::Support
-include Rake::Funnel::Tasks::MSBuildSupport
+include Rake::Funnel::Support::MSBuild
 
 describe Rake::Funnel::Tasks::MSBuild do
   before {

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

@@ -1,7 +1,7 @@
 include Rake
 include Rake::Funnel
 include Rake::Funnel::Support
-include Rake::Funnel::Tasks::MSDeploySupport
+include Rake::Funnel::Support::MSDeploy
 
 describe Rake::Funnel::Tasks::MSDeploy do
   before {

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

@@ -154,7 +154,7 @@ describe Rake::Funnel::Tasks::Paket do
             }
 
             it 'should fail' do
-              expect(lambda { Task[subject.name].invoke }).to raise_error
+              expect { Task[subject.name].invoke }.to raise_error
             end
           end
         end
@@ -174,7 +174,7 @@ describe Rake::Funnel::Tasks::Paket do
             end
 
             it 'should fail' do
-              expect(lambda { Task[subject.name].invoke }).to raise_error
+              expect { Task[subject.name].invoke }.to raise_error
             end
           end
         end