msdeploy.rb in rake-funnel-0.1.0.pre

- old
+ new

@@ -1,14 +1,13 @@
 require 'rake/clean'
 require 'rake/tasklib'
 
-Dir["#{File.dirname(__FILE__)}/msdeploy_support/*.rb"].each do |path|
-  require path
-end
-
 module Rake::Funnel::Tasks
   class MSDeploy < Rake::TaskLib
+    include Rake::Funnel::Support
+    include Rake::Funnel::Support::MSDeploy
+
     attr_accessor :name, :msdeploy, :log_file, :args
 
     def initialize(name = :msdeploy)
       @name = name
       @msdeploy = 'msdeploy'
@@ -26,15 +25,15 @@
     def define
       CLEAN.include(log_file)
 
       desc "Deploy #{deploy_source(args)}"
       task @name do
-        mapper = Rake::Funnel::Support::Mapper.new(:MSDeploy)
+        mapper = Mapper.new(:MSDeploy)
         cmd = [quote(msdeploy), mapper.map(args)]
           .flatten
           .join(' ')
 
-        MSDeploySupport::RegistryPatch.new do
+        RegistryPatch.new do
           shell(cmd, log_file: log_file, error_lines: /^(error|[\w\.]*exception)/i)
         end
       end
 
       self