working on new task syntax and options to allow more rake like callin…

…g... Albacore::msbuild :name, [:var] => :dependency do |t,args| ... end

lib/albacore.rb

@@ -5,5 +5,6 @@
 
 require 'logging'
 
+Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'rake/support/*.rb')).each {|f| require f }
 Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'rake/*.rb')).each {|f| require f }
 Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'albacore/*.rb')).each {|f| require f }

lib/rake/msbuildtask.rb

@@ -1,22 +1,19 @@
 require 'rake/tasklib'
 
 module Albacore
-	class MSBuildTask < Rake::TaskLib
-		attr_accessor :name
-
-		def initialize(name=:msbuild, &block)
-			@name = name
-			@block = block
-			define
-		end
+
+	def self.msbuild(name=:msbuild, *args, &block)
+		MSBuildTask.new(name, *args, &block)
+	end
+
+	class MSBuildTask < AlbacoreTask
 
-		def define
-			task name do
-				@msbuild = MSBuild.new
-				@block.call(@msbuild) unless @block.nil?
-				@msbuild.build
-				fail if @msbuild.failed
-			end
+		def execute(task_args)
+			@msbuild = MSBuild.new
+			@block.call(@msbuild, task_args) unless @block.nil? 
+			@msbuild.build
+			fail if @msbuild.failed
 		end		
 	end
+
 end

lib/rake/support/albacoretask.rb

@@ -0,0 +1,17 @@
+module Albacore
+	class AlbacoreTask < Rake::TaskLib
+		attr_accessor :name
+
+		def initialize(name, *args, &block)
+			@block = block
+			@args = args.insert(0, name)
+			define
+		end
+
+		def define
+			task *@args do |task, task_args|
+				execute task_args
+			end
+		end
+	end
+end