albacore 0.0.7 → 0.0.8

data/lib/rake/assemblyinfotask.rb

@@ -1,22 +1,16 @@
 require 'rake/tasklib'
 
+def assemblyinfotask(name=:assemblyinfo, *args, &block)
+	Albacore::AssemblyInfoTask.new(name, *args, &block)
+end
+	
 module Albacore
-	class AssemblyInfoTask < Rake::TaskLib
-		attr_accessor :name
-		
-		def initialize(name=:assemblyinfo, &block)
-			@name = name
+	class AssemblyInfoTask < Albacore::AlbacoreTask
+		def execute(task_args)
 			@asm = AssemblyInfo.new
-			@block = block
-			define
-		end
-		
-		def define
-			task name do
-				@block.call(@asm) unless @block.nil?
-				@asm.write
-				fail if @asm.failed
-			end
+			@block.call(@asm, *task_args) unless @block.nil?
+			@asm.write
+			fail if @asm.failed
 		end
 	end
 end

data/lib/rake/commandtask.rb

@@ -0,0 +1,16 @@
+require 'rake/tasklib'
+
+def commandtask(name=:command, *args, &block)
+	Albacore::CommandTask.new(name, *args, &block)
+end
+	
+module Albacore	
+	class CommandTask < Albacore::AlbacoreTask
+		def execute(task_args)
+			cmd = Command.new
+			@block.call(cmd, *task_args) unless @block.nil?
+			cmd.execute
+			fail if cmd.failed
+		end	
+	end
+end

data/lib/rake/expandtemplatestask.rb

@@ -1,21 +1,15 @@
 require 'rake/tasklib'
 
+def expandtemplatestask(name=:expandtemplates, *args, &block)
+	Albacore::ExpandTemplatesTask.new(name, *args, &block)
+end
+	
 module Albacore	
-	class ExpandTemplatesTask < Rake::TaskLib
-		attr_accessor :name
-		
-		def initialize(name=:expandtemplates, &block)
-			@name = name
+	class ExpandTemplatesTask < Albacore::AlbacoreTask
+		def execute(task_args)
 			@exp = ExpandTemplates.new
-			@block = block
-			define
-		end
-		
-		def define
-			task @name do
-				@block.call(@exp) unless @block.nil?
-				@exp.expand
-			end
+			@block.call(@exp, *task_args) unless @block.nil?
+			@exp.expand
 		end	
 	end
 end

data/lib/rake/msbuildtask.rb

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

data/lib/rake/mspectask.rb

@@ -0,0 +1,16 @@
+require 'rake/tasklib'
+
+def mspectask(name=:mspec, *args, &block)
+	Albacore::MSpecTask.new(name, *args, &block)
+end
+	
+module Albacore
+	class MSpecTask < Albacore::AlbacoreTask
+		def execute(task_args)
+			@mspec = MSpecTestRunner.new
+		  	@block.call(@mspec, *task_args) unless @block.nil?
+			@mspec.execute
+			fail if @mspec.failed
+		end		
+	end
+end

data/lib/rake/ncoverconsoletask.rb

@@ -1,22 +1,16 @@
 require 'rake/tasklib'
 
+def ncoverconsoletask(name=:ncoverconsole, *args, &block)
+	Albacore::NCoverConsoleTask.new(name, *args, &block)
+end
+	
 module Albacore
-	class NCoverConsoleTask < Rake::TaskLib
-		attr_accessor :name
-		
-		def initialize(name=:ncoverconsole, &block)
-			@name = name
+	class NCoverConsoleTask < Albacore::AlbacoreTask
+		def execute(task_args)
 			@ncover = NCoverConsole.new
-			@block = block
-			define
-		end
-		
-		def define
-			task name do
-				@block.call(@ncover) unless @block.nil?
-				@ncover.run
-				fail if @ncover.failed
-			end
+			@block.call(@ncover, *task_args) unless @block.nil?
+			@ncover.run
+			fail if @ncover.failed
 		end	
 	end
 end

data/lib/rake/ncoverreporttask.rb

@@ -1,22 +1,16 @@
 require 'rake/tasklib'
 
+def ncoverreporttask(name=:ncoverreport, *args, &block)
+	Albacore::NCoverReportTask.new(name, *args, &block)
+end
+	
 module Albacore
-	class NCoverReportTask < Rake::TaskLib
-		attr_accessor :name
-		
-		def initialize(name=:ncoverreport, &block)
-			@name = name
+	class NCoverReportTask < Albacore::AlbacoreTask
+		def execute(task_args)
 			@ncoverreport = NCoverReport.new
-			@block = block
-			define
-		end
-		
-		def define
-			task name do
-				@block.call(@ncoverreport) unless @block.nil?
-				@ncoverreport.run
-				fail if @ncoverreport.failed
-			end
+			@block.call(@ncoverreport, *task_args) unless @block.nil?
+			@ncoverreport.run
+			fail if @ncoverreport.failed
 		end		
 	end
 end

data/lib/rake/nunittask.rb

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

data/lib/rake/renametask.rb

@@ -1,24 +1,19 @@
 require 'rake/tasklib'
 
+def renametask(name=:rename, *args, &block)
+	Albacore::RenameTask.new(name, *args, &block)
+end
+	
 module Albacore
-	class RenameTask < Rake::TaskLib
-		attr_accessor :name
+	class RenameTask < Albacore::AlbacoreTask
 		attr_accessor :actual_name, :target_name
 		
-		def initialize(name=:rename, &block)
-			@name = name
-			@block = block
-			define
-		end
-		
-		def define
-			task name do
-				@block.call(self) unless @block.nil?
-				if (@actual_name.nil? || @target_name.nil?)
-					fail
-				else
-					File.rename(@actual_name, @target_name)
-				end
+		def execute(task_args)
+			@block.call(self, *task_args) unless @block.nil?
+			if (@actual_name.nil? || @target_name.nil?)
+				fail
+			else
+				File.rename(@actual_name, @target_name)
 			end
 		end
 	end

data/lib/rake/sftptask.rb

@@ -1,21 +1,15 @@
 require 'rake/tasklib'
 
+def sftptask(name=:sftp, *args, &block)
+	Albacore::SftpTask.new(name, *args, &block)
+end
+	
 module Albacore
-	class SftpTask < Rake::TaskLib
-		attr_accessor :name
-		
-		def initialize(name=:sftp, &block)
-			@name = name
+	class SftpTask < Albacore::AlbacoreTask
+		def execute(task_args)
 			@sftp = Sftp.new
-			@block = block
-			define
-		end
-		
-		def define
-			task name do
-				@block.call(@sftp) unless @block.nil?
-				@sftp.upload
-			end
+			@block.call(@sftp, *task_args) unless @block.nil?
+			@sftp.upload
 		end
 	end
 end

data/lib/rake/sqlcmdtask.rb

@@ -1,22 +1,16 @@
 require 'rake/tasklib'
 
+def sqlcmdtask(name=:sqlcmd, *args, &block)
+	Albacore::SQLCmdTask.new(name, *args, &block)
+end
+	
 module Albacore	
-	class SQLCmdTask < Rake::TaskLib
-		attr_accessor :name
-		
-		def initialize(name=:sqlcmd, &block)
-			@name = name
+	class SQLCmdTask < Albacore::AlbacoreTask
+		def execute(task_args)
 			@sqlcmd = SQLCmd.new
-			@block = block
-			define
-		end
-		
-		def define
-			task name do
-				@block.call(@sqlcmd) unless @block.nil?
-				@sqlcmd.run
-				fail if @sqlcmd.failed
-			end
+			@block.call(@sqlcmd, *task_args) unless @block.nil?
+			@sqlcmd.run
+			fail if @sqlcmd.failed
 		end	
 	end
 end

data/lib/rake/sshtask.rb

@@ -1,21 +1,15 @@
 require 'rake/tasklib'
 
+def sshtask(name=:ssh, *args, &block)
+	Albacore::SshTask.new(name, *args, &block)
+end
+	
 module Albacore
-	class SshTask < Rake::TaskLib
-		attr_accessor :name
-		
-		def initialize(name=:ssh, &block)
-			@name = name
+	class SshTask < Albacore::AlbacoreTask
+		def execute(task_args)
 			@ssh = Ssh.new
-			@block = block
-			define
-		end
-		
-		def define
-			task name do
-				@block.call(@ssh) unless @block.nil?
-				@ssh.execute
-			end
+			@block.call(@ssh, *task_args) unless @block.nil?
+			@ssh.execute
 		end
 	end
 end

data/lib/rake/support/albacoretask.rb

@@ -0,0 +1,19 @@
+require 'rake/tasklib'
+
+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

data/lib/rake/xunittask.rb

@@ -0,0 +1,16 @@
+require 'rake/tasklib'
+
+def xunittask(name=:xunit, *args, &block)
+	Albacore::XUnitTask.new(name, *args, &block)
+end
+	
+module Albacore
+	class XUnitTask < Albacore::AlbacoreTask
+		def execute(task_args)
+			@xunit = XUnitTestRunner.new
+		  	@block.call(@xunit, *task_args) unless @block.nil?
+			@xunit.execute
+			fail if @xunit.failed
+		end
+	end
+end

data/lib/rake/ziptask.rb

@@ -1,21 +1,16 @@
 require 'rake/tasklib'
 
+def ziptask(name=:zip, *args, &block)
+	Albacore::ZipTask.new(name, *args, &block)
+end
+	
 module Albacore
-	class ZipTask < Rake::TaskLib
-		attr_accessor :name
-		
-		def initialize(name=:zip, &block)
-			@name = name
+	class ZipTask < Albacore::AlbacoreTask
+		def execute(task_args)
 			@zip = ZipDirectory.new
-			@block = block
-			define
-		end
-		
-		def define
-			task name do
-				@block.call(@zip) unless @block.nil?
-				@zip.package
-			end
+			@block.call(@zip, *task_args) unless @block.nil?
+			@zip.package
+			fail if @zip.failed
 		end		
 	end
 end

data/rakefile.rb

@@ -52,29 +52,78 @@ namespace :specs do
 		t.spec_files = 'spec/ssh*_spec.rb'
 		t.spec_opts << @spec_opts
 	end	
+	
+	desc "SFTP functional specs"
+	Spec::Rake::SpecTask.new :sftp do |t|
+		t.spec_files = 'spec/sftp*_spec.rb'
+		t.spec_opts << @spec_opts
+	end
 
 	desc "Expand Templates functional specs"
-	Spec::Rake::SpecTask.new :ssh do |t|
+	Spec::Rake::SpecTask.new :templates do |t|
 		t.spec_files = 'spec/expandtemplates*_spec.rb'
 		t.spec_opts << @spec_opts
-	end	
+    end
+
+	desc "Zip functional specs"
+	Spec::Rake::SpecTask.new :zip do |t|
+		t.spec_files = 'spec/zip*_spec.rb'
+		t.spec_opts << @spec_opts
+    end
+
+	desc "XUnit functional specs"
+	Spec::Rake::SpecTask.new :xunit do |t|
+		t.spec_files = 'spec/xunit*_spec.rb'
+		t.spec_opts << @spec_opts
+	end
+
+    desc "NUnit functional specs"
+	Spec::Rake::SpecTask.new :nunit do |t|
+		t.spec_files = 'spec/nunit*_spec.rb'
+		t.spec_opts << @spec_opts
+	end
+
+    desc "MSpec functional specs"
+	Spec::Rake::SpecTask.new :mspec do |t|
+		t.spec_files = 'spec/mspec*_spec.rb'
+		t.spec_opts << @spec_opts
+	end
+
+    desc "Command functional specs"
+	Spec::Rake::SpecTask.new :command do |t|
+		t.spec_files = 'spec/command*_spec.rb'
+		t.spec_opts << @spec_opts
+	end
+	
+	desc "Rename functional specs"
+	Spec::Rake::SpecTask.new :rename do |t|
+		t.spec_files = 'spec/rename*_spec.rb'
+		t.spec_opts << @spec_opts
+	end
 end
 
 namespace :albacore do	
 	require 'lib/albacore'
 
 	desc "Run a complete Albacore build sample"
-	task :sample => ['albacore:assemblyinfo', 'albacore:msbuild', 'albacore:ncoverconsole', 'albacore:ncoverreport']
+	task :sample => ['albacore:assemblyinfo',
+                     'albacore:msbuild',
+                     'albacore:ncoverconsole',
+                     'albacore:ncoverreport',
+                     'albacore:rename',  
+                     'albacore:mspec',
+                     'albacore:nunit',
+                     'albacore:xunit']
 	
 	desc "Run a sample build using the MSBuildTask"
-	Albacore::MSBuildTask.new(:msbuild) do |msb|
+	msbuildtask do |msb|
 		msb.properties = {:configuration => :Debug}
 		msb.targets [:Clean, :Build]
 		msb.solution = "spec/support/TestSolution/TestSolution.sln"
 	end
 	
 	desc "Run a sample assembly info generator"
-	Albacore::AssemblyInfoTask.new(:assemblyinfo) do |asm|
+	assemblyinfotask do |asm|
 		asm.version = "0.1.2.3"
 		asm.company_name = "a test company"
 		asm.product_name = "a product name goes here"
@@ -87,7 +136,7 @@ namespace :albacore do
 	end
 	
 	desc "Run a sample NCover Console code coverage"
-	Albacore::NCoverConsoleTask.new(:ncoverconsole) do |ncc|
+	ncoverconsoletask do |ncc|
 		@xml_coverage = "spec/support/CodeCoverage/test-coverage.xml"
 		File.delete(@xml_coverage) if File.exist?(@xml_coverage)
 		
@@ -96,7 +145,7 @@ namespace :albacore do
 		ncc.output = {:xml => @xml_coverage}
 		ncc.working_directory = "spec/support/CodeCoverage/nunit"
 		
-		nunit = NUnitTestRunner.new("spec/support/Tools/NUnit-v2.5/nunit-console.exe")
+		nunit = NUnitTestRunner.new("spec/support/Tools/NUnit-v2.5/nunit-console-x86.exe")
 		nunit.log_level = :verbose
 		nunit.assemblies << "assemblies/TestSolution.Tests.dll"
 		nunit.options << '/noshadow'
@@ -105,7 +154,7 @@ namespace :albacore do
 	end	
 	
 	desc "Run a sample NCover Report to check code coverage"
-	Albacore::NCoverReportTask.new(:ncoverreport => :ncoverconsole) do |ncr|
+	ncoverreporttask :ncoverreport => :ncoverconsole do |ncr|
 		@xml_coverage = "spec/support/CodeCoverage/test-coverage.xml"
 		
 		ncr.path_to_command = "spec/support/Tools/NCover-v3.3/NCover.Reporting.exe"
@@ -118,6 +167,40 @@ namespace :albacore do
 		ncr.required_coverage << NCover::BranchCoverage.new(:minimum => 10)
 		ncr.required_coverage << NCover::CyclomaticComplexity.new(:maximum => 1)
 	end
+
+	desc "Run the sample for renaming a File"
+	renametask do |rename|
+		FileUtils.touch 'web.uat.config.example'
+     
+		rename.actual_name = 'web.uat.config.example'
+		rename.target_name = 'web.config.example'
+	end
+   
+	desc "Run ZipDirectory example"
+	ziptask do |zip|
+		zip.output_path = File.dirname(__FILE__)
+		zip.directories_to_zip = ["lib", "spec"]
+		zip.additional_files = "README.markdown"
+		zip.file = 'albacore_example.zip'
+	end
+   
+	desc "MSpec Test Runner Example"
+	mspectask do |mspec|
+		mspec.path_to_command = "spec/support/Tools/Machine.Specification-v0.2/Machine.Specifications.ConsoleRunner.exe"
+		mspec.assemblies << "spec/support/CodeCoverage/mspec/assemblies/TestSolution.MSpecTests.dll"
+	end
+
+	desc "NUnit Test Runner Example"
+	nunittask do |nunit|
+		nunit.path_to_command = "spec/support/Tools/NUnit-v2.5/nunit-console.exe"
+		nunit.assemblies << "spec/support/CodeCoverage/nunit/assemblies/TestSolution.Tests.dll"
+	end
+
+	desc "XUnit Test Runner Example"
+	xunittask do |xunit|
+		xunit.path_to_command = "spec/support/Tools/XUnit-v1.5/xunit.console.exe"
+		xunit.assemblies << "spec/support/CodeCoverage/xunit/assemblies/TestSolution.XUnitTests.dll"
+	end   
 end
 
 namespace :jeweler do
@@ -125,10 +208,10 @@ namespace :jeweler do
 	Jeweler::Tasks.new do |gs|
 		gs.name = "albacore"
 		gs.summary = "A Suite of Rake Build Tasks For .Net Solutions"
-		gs.description = "Easily build your .NET solutions with rake, using this suite of custom tasks."
+		gs.description = "Easily build your .NET solutions with rake, using this suite of rake tasks."
 		gs.email = "derickbailey@gmail.com"
-		gs.homepage = "http://github.com/derickbailey/Albacore"
-		gs.authors = ["Derick Bailey", "Ben Hall"]
+		gs.homepage = "http://albacorebuild.net"
+		gs.authors = ["Derick Bailey", "Ben Hall", "Steven Harman"]
 		gs.has_rdoc = false	
 		gs.files.exclude("albacore.gemspec", ".gitignore", "spec/support/Tools")
 
@@ -140,5 +223,6 @@ namespace :jeweler do
 		gs.add_development_dependency('rspec', '>= 1.2.8')
 		gs.add_development_dependency('jeweler', '>= 1.2.1')
 		gs.add_development_dependency('derickbailey-notamock', '>= 0.0.1')
+		gs.add_development_dependency('jekyll', '>= 0.5.4')
 	end
 end