msbuild.rb in rake-funnel-0.1.0.pre

- old
+ new

@@ -1,13 +1,12 @@
 require 'rake/tasklib'
 
-Dir["#{File.dirname(__FILE__)}/msbuild_support/*.rb"].each do |path|
-  require path
-end
-
 module Rake::Funnel::Tasks
   class MSBuild < Rake::TaskLib
+    include Rake::Funnel::Support
+    include Rake::Funnel::Support::MSBuild
+
     attr_accessor :name, :project_or_solution, :args, :search_pattern
 
     def initialize(name = :compile)
       @name = name
       @args = {}
@@ -16,19 +15,19 @@
       yield self if block_given?
       define
     end
 
     def msbuild
-      @_msbuild || MSBuildSupport::BuildTool.find
+      @_msbuild || BuildTool.find
     end
 
     def msbuild=(value)
       @_msbuild = value
     end
 
     def project_or_solution
-      Rake::Funnel::Support::Finder.new(@_project_or_solution || search_pattern, self, 'No projects or more than one project found.')
+      Finder.new(@_project_or_solution || search_pattern, self, 'No projects or more than one project found.')
     end
 
     def project_or_solution=(value)
       @_project_or_solution = value
     end
@@ -38,10 +37,10 @@
       desc "Compile #{project_or_solution.single_or_default}"
       task @name do
         cmd = [
           msbuild,
           project_or_solution.single,
-          *Rake::Funnel::Support::Mapper.new(:MSBuild).map(args)
+          *Mapper.new(:MSBuild).map(args)
         ]
 
         sh(*cmd)
       end
 