rake-funnel 0.11.0.pre → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8136031a5dcf41921fe9ef6e60a00a2b330b7666
-  data.tar.gz: 7e042e981473b5e97bd791892086eb23f5963a04
+  metadata.gz: 56bac75630655218368ec2766ffb96bac889e2ae
+  data.tar.gz: e073088cbdf589d3b9b5324b5a5e94ca910bd7f3
 SHA512:
-  metadata.gz: 074af6f609bab49ee4a6c98a761bf7cb1fb60574fa2b22d65e8fa550aac7c6ba47260babf4f944b2656654bc347df9e97760e75784709121860051238d5e5a52
-  data.tar.gz: 882b78b313bb24ff7b545c2790f7ed0e57944c06f4ebb25a6da33d2c58c29314e3cb46c509d9eaaeedad4aa13b06465d3757136292cb4fa07d0908557a008b3d
+  metadata.gz: 47c4be285e4c7b52db8250a4f2c4517d24cfd734affd44135966e4f7caeed992a223bc1316718fb86463701b9a0adad8beffd499f762bd2fb792bdf0721b2cf9
+  data.tar.gz: 01d64a7f8f98b43cc027f28424318621fd95a49499f547e600adc5bbc3738170a8a4317cb32e8873683620566103dce5e755e7941a4a0f681460596018bbcee5

data/lib/rake/funnel/support/assembly_version_writer.rb

@@ -11,7 +11,7 @@ module Rake
         include InstantiateSymbol
         instantiate AssemblyVersion
 
-        def initialize(type = :FromVersionFiles, args = {})
+        def initialize(type = :from_version_files, args = {})
           @type = create(type, args)
         end
 

data/lib/rake/funnel/support/internal/instantiate_symbol.rb

@@ -20,17 +20,22 @@ module Rake
         def create(sym, *args)
           return sym unless sym.is_a?(Symbol)
 
-          begin
-            type = self.class.module.const_get(sym)
-          rescue NameError
-            raise NameError, "Unknown type to instantiate: #{sym.inspect}. Available types are: #{available.inspect}"
-          end
+          found = [sym, sym.pascalize.to_sym]
+            .select { |candidate| mod.constants.include?(candidate) }
+            .first
+
+          raise NameError, "Unknown type to instantiate: #{sym.inspect}. Available types are: #{available.inspect}" if found.nil?
 
+          type = mod.const_get(found)
           type.new(*args)
         end
 
         def available
-          self.class.module.constants.sort
+          mod.constants.sort
+        end
+
+        def mod
+          self.class.module
         end
       end
     end

data/lib/rake/funnel/support/mapper.rb

@@ -10,7 +10,7 @@ module Rake
         include InstantiateSymbol
         instantiate Styles
 
-        def initialize(style = :Default)
+        def initialize(style = :default)
           raise "You cannot use the 'nil' mapper style. Available mappers are: #{available.inspect}" if style.nil?
 
           @style = create(style)

data/lib/rake/funnel/support/msbuild/build_tool.rb

@@ -9,7 +9,7 @@ module Rake
 
               require 'win32/registry'
 
-              %w(12.0 4.0 3.5 2.0).collect { |version|
+              %w(14.0 12.0 4.0 3.5 2.0).collect { |version|
                 key = "SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\#{version}"
 
                 begin

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.11.0.pre'
+    VERSION = '0.12.0.pre'
   end
 end

data/spec/rake/funnel/integration/teamcity/teamcity_spec.rb

@@ -91,7 +91,7 @@ describe Rake::Funnel::Integration::TeamCity do
 
         context 'block error' do
           it 'should reset path' do
-            expect { described_class.with_java_runtime { fail 'with some error' } }.to raise_error
+            expect { described_class.with_java_runtime { fail 'with some error' } }.to raise_error(/with some error/)
 
             expect(ENV).to have_received(:[]=).with('PATH', original_path)
           end

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

@@ -10,12 +10,12 @@ describe Rake::Funnel::Support::AssemblyVersionWriter do
       }
 
       it 'should create FromVersionFiles with empty args' do
-        expect(subject).to have_received(:create).with(:FromVersionFiles, {})
+        expect(subject).to have_received(:create).with(:from_version_files, {})
       end
     end
 
     describe 'custom type' do
-      let(:source) { :Custom }
+      let(:source) { :custom }
       let(:source_args) { { foo: 42 } }
 
       before {

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

@@ -25,6 +25,20 @@ describe Rake::Funnel::Support::InstantiateSymbol do
     end
   end
 
+  module SnakeCase
+    class SnakeCase
+    end
+
+    class Snake_Case
+    end
+  end
+
+  class SnakeCaseModuleDefinition
+    include Rake::Funnel::Support::InstantiateSymbol
+
+    instantiate SnakeCase
+  end
+
   describe 'module methods' do
     subject {
       ExplicitModuleDefinition.new
@@ -34,6 +48,7 @@ describe Rake::Funnel::Support::InstantiateSymbol do
       it 'should not be public' do
         expect(subject).not_to respond_to(:create)
         expect(subject).not_to respond_to(:available)
+        expect(subject).not_to respond_to(:mod)
       end
     end
 
@@ -107,6 +122,20 @@ describe Rake::Funnel::Support::InstantiateSymbol do
       end
     end
 
+    context 'snake cased symbol' do
+      subject {
+        SnakeCaseModuleDefinition.new
+      }
+
+      it 'should return instance' do
+        expect(subject.send(:create, :snake_case)).to be_an_instance_of(SnakeCase::SnakeCase)
+      end
+
+      it 'should prefer explicit type' do
+        expect(subject.send(:create, :Snake_Case)).to be_an_instance_of(SnakeCase::Snake_Case)
+      end
+    end
+
     context 'instantiation fails' do
       class WillFail
         include Rake::Funnel::Support::InstantiateSymbol

data/spec/rake/funnel/support/msbuild/build_tool_spec.rb

@@ -6,8 +6,33 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do
   context 'on Windows', platform: :win32 do
     let(:windows?) { true }
 
-    it 'should find msbuild.exe' do
-      expect(described_class.find).to match(/msbuild\.exe$/)
+    before {
+      allow(::Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).and_yield({ 'MSBuildToolsPath' => 'path'})
+    }
+
+    it 'should search the registry for known MSBuild versions' do
+      described_class.find
+      expect(::Win32::Registry::HKEY_LOCAL_MACHINE).to have_received(:open).at_least(:once)
+    end
+
+    context 'MSBuild exists' do
+      before {
+        allow(File).to receive(:exist?).with('path/msbuild.exe').and_return(true)
+      }
+
+      it 'should find msbuild.exe' do
+        expect(described_class.find).to eq('path/msbuild.exe')
+      end
+    end
+
+    context 'MSBuild does not exist' do
+      before {
+        allow(File).to receive(:exist?).with('path/msbuild.exe').and_return(false)
+      }
+
+      it 'should not find msbuild.exe' do
+        expect(described_class.find).to be_nil
+      end
     end
   end
 

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

@@ -41,7 +41,7 @@ describe Rake::Funnel::Support::TemplateEngine do
         var = 42
         template = '<%= var %>'
 
-        expect { described_class.render(template) }.to raise_error
+        expect { described_class.render(template) }.to raise_error(NameError)
       end
     end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.11.0.pre
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,7 +86,6 @@ files:
 - lib/rake/funnel/extensions/disable_colors.rb
 - lib/rake/funnel/extensions/rexml.rb
 - lib/rake/funnel/extensions/shell.rb
-- lib/rake/funnel/extensions/windows_path.rb
 - lib/rake/funnel/framework.rb
 - lib/rake/funnel/integration/progress_report.rb
 - lib/rake/funnel/integration/sync_output.rb
@@ -151,7 +150,6 @@ files:
 - spec/rake/funnel/extensions/disable_colors_spec.rb
 - spec/rake/funnel/extensions/rexml_spec.rb
 - spec/rake/funnel/extensions/shell_spec.rb
-- spec/rake/funnel/extensions/windows_path_spec.rb
 - spec/rake/funnel/integration/progress_report_spec.rb
 - spec/rake/funnel/integration/sync_output_spec.rb
 - spec/rake/funnel/integration/teamcity/nunit_plugin_spec.rb
@@ -228,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.15
 signing_key: 
 specification_version: 4
 summary: The build pipeline
@@ -240,7 +238,6 @@ test_files:
 - spec/rake/funnel/extensions/disable_colors_spec.rb
 - spec/rake/funnel/extensions/rexml_spec.rb
 - spec/rake/funnel/extensions/shell_spec.rb
-- spec/rake/funnel/extensions/windows_path_spec.rb
 - spec/rake/funnel/integration/progress_report_spec.rb
 - spec/rake/funnel/integration/sync_output_spec.rb
 - spec/rake/funnel/integration/teamcity/nunit_plugin_spec.rb

data/lib/rake/funnel/extensions/windows_path.rb

@@ -1,15 +0,0 @@
-module Rake
-  module Funnel
-    module Extensions
-      module WindowsPath
-        def to_windows_path
-          gsub(%r|/|, '\\')
-        end
-      end
-    end
-  end
-end
-
-class String
-  include Rake::Funnel::Extensions::WindowsPath
-end

data/spec/rake/funnel/extensions/windows_path_spec.rb

@@ -1,5 +0,0 @@
-describe Rake::Funnel::Extensions::WindowsPath do
-  it 'should convert forward slash to backslash' do
-    expect('C:\Foo/bar/baz'.to_windows_path).to eq('C:\Foo\bar\baz')
-  end
-end