albacore 0.0.9 → 0.1.0

data/lib/albacore/xunittestrunner.rb

@@ -1,48 +1,45 @@
 require 'albacore/support/albacore_helper'
 
 class XUnitTestRunner
+  extend AttrMethods
   include RunCommand
-	include YAMLConfig
-
-	attr_accessor :assemblies, :path_to_command, :html_output, :options
-
-	def initialize(path_to_command='')
-		@path_to_command = path_to_command
-		@assemblies=[]
-		super()
-	end
-
-	def get_command_line
-		command = []
-		command << @path_to_command
-		command << get_command_parameters
-
-		cmd = command.join(" ")
-		@logger.debug "Build XUnit Test Runner Command Line: " + cmd
-        return cmd
-	end
-	
-	def get_command_parameters
-		command_params = []
-		command_params << build_assembly_list unless @assemblies.empty?
-    	command_params << @options.join(" ") unless @options.nil?
-		command_params << build_html_output unless @html_output.nil?
-		command_params
-	end
-
-	def execute()
-		command_params = get_command_parameters
-		result = run_command "XUnit", command_params.join(" ")
-
-		failure_message = 'XUnit Failed. See Build Log For Detail'
-		fail_with_message failure_message if !result
-	end
-
-	def build_assembly_list
-		@assemblies.map{|asm| "\"#{asm}\""}.join(" ")
-	end
-
-	def build_html_output
-		"/html #{@html_output}"
-	end
+  include YAMLConfig
+
+  attr_accessor :html_output, :assembly
+  attr_array :options
+
+  def initialize(path_to_command='')
+    @path_to_command = path_to_command
+    @options=[]
+    super()
+  end
+
+  def get_command_line
+    command_params = []
+    command_params << @path_to_command
+    command_params << get_command_parameters
+    commandline = command_params.join(" ")
+    @logger.debug "Build XUnit Test Runner Command Line: " + commandline
+    commandline
+  end
+  
+  def get_command_parameters
+    command_params = []
+    command_params << assembly.inspect unless @assembly.nil?
+    command_params << @options.join(" ") unless @options.nil?
+    command_params << build_html_output unless @html_output.nil?
+    command_params
+  end
+
+  def execute()
+    command_params = get_command_parameters
+    result = run_command "XUnit", command_params.join(" ")
+
+    failure_message = 'XUnit Failed. See Build Log For Detail'
+    fail_with_message failure_message if !result
+  end
+
+  def build_html_output
+    "/html #{@html_output}"
+  end
 end

data/lib/albacore/zipdirectory.rb

@@ -4,73 +4,82 @@ require 'zip/zipfilesystem'
 include Zip
 
 class ZipDirectory
-	include YAMLConfig
-	include Failure
+  extend AttrMethods
+  include YAMLConfig
+  include Failure
   
-	attr_accessor :directories_to_zip, :additional_files
-	attr_accessor :output_path, :output_file
-	attr_accessor :flatten_zip
+  attr_accessor :output_path, :output_file
+  attr_accessor :flatten_zip
+  attr_array :directories_to_zip, :additional_files, :exclusions
 
-	def initialize
-		@flatten_zip = true
-		super()
-	end
-		
-	def package()
-		fail_with_message 'Output File cannot be empty' if @output_file.nil?
-		return if @output_file.nil?
+  def initialize
+    @flatten_zip = true
+    @exclusions = []
+    super()
+  end
+    
+  def package()
+    fail_with_message 'Output File cannot be empty' if @output_file.nil?
+    return if @output_file.nil?
         
-		clean_directories_names
-		remove zip_name
+    clean_directories_names
+    remove zip_name
 
-		ZipFile.open(zip_name, 'w')	do |zipfile|
-			zip_directory(zipfile)
-			zip_additional(zipfile)
-		end
-	end
-	
-	def clean_directories_names
-    	return if @directories_to_zip.nil?
-		@directories_to_zip.each { |d| d.sub!(%r[/$],'')}
-	end
-	
-	def remove(filename)
-		FileUtils.rm filename, :force=>true
-	end
-	
-	def reject_file(f)
-		f == zip_name
-	end
-	
-	def zip_name()
-		@output_path = set_output_path
-		File.join(@output_path, @output_file)
-	end
+    ZipFile.open(zip_name, 'w')  do |zipfile|
+      zip_directory(zipfile)
+      zip_additional(zipfile)
+    end
+  end
+  
+  def clean_directories_names
+    return if @directories_to_zip.nil?
+    @directories_to_zip.each { |d| d.sub!(%r[/$],'')}
+  end
+  
+  def remove(filename)
+    FileUtils.rm filename, :force=>true
+  end
+  
+  def reject_file(f)
+    f == zip_name || is_excluded(f)
+  end
   
-	def set_output_path()
-		path = ''
-		path = @directories_to_zip.first unless @directories_to_zip.nil?
-		path = @output_path unless @output_path.nil?
-		return path
-	end
+  def is_excluded(f)
+    @exclusions.any? do |e|
+      return true if e.respond_to? '~' and f =~ e
+      e == f
+    end
+  end
+  
+  def zip_name()
+    @output_path = set_output_path
+    File.join(@output_path, @output_file)
+  end
+  
+  def set_output_path()
+    path = ''
+    path = @directories_to_zip.first unless @directories_to_zip.nil?
+    path = @output_path unless @output_path.nil?
+    return path
+  end
     
-	
-	def zip_directory(zipfile)
-		return if @directories_to_zip.nil?
-		@directories_to_zip.each do |d|
-			Dir["#{d}/**/**"].reject{|f| reject_file(f)}.each do |file_path|
-				file_name = file_path
-				file_name = file_path.sub(d + '/','') if @flatten_zip
-				zipfile.add(file_name, file_path)
-			end
-		end
-	end
-	
-	def zip_additional(zipfile)
-		return if @additional_files.nil?
-		@additional_files.reject{|f| reject_file(f)}.each do |file_path|
-			file_name = file_path.split('/').last if @flatten_zip
-			zipfile.add(file_name, file_path)
-		end
-	end
+  
+  def zip_directory(zipfile)
+    return if @directories_to_zip.nil?
+    @directories_to_zip.each do |d|
+      Dir["#{d}/**/**"].reject{|f| reject_file(f)}.each do |file_path|
+        file_name = file_path
+        file_name = file_path.sub(d + '/','') if @flatten_zip
+        zipfile.add(file_name, file_path)
+      end
+    end
+  end
+  
+  def zip_additional(zipfile)
+    return if @additional_files.nil?
+    @additional_files.reject{|f| reject_file(f)}.each do |file_path|
+      file_name = file_path.split('/').last if @flatten_zip
+      zipfile.add(file_name, file_path)
+    end
+  end
 end

data/lib/rake/assemblyinfotask.rb

@@ -1,16 +1,17 @@
 require 'rake/tasklib'
 
-def assemblyinfotask(name=:assemblyinfo, *args, &block)
-	Albacore::AssemblyInfoTask.new(name, *args, &block)
+def assemblyinfo(name=:assemblyinfo, *args, &block)
+  Albacore::AssemblyInfoTask.new(name, *args, &block)
 end
-	
+  
 module Albacore
-	class AssemblyInfoTask < Albacore::AlbacoreTask
-		def execute(task_args)
-			@asm = AssemblyInfo.new
-			@block.call(@asm, *task_args) unless @block.nil?
-			@asm.write
-			fail if @asm.failed
-		end
-	end
+  class AssemblyInfoTask < Albacore::AlbacoreTask
+    def execute(name, task_args)
+      @asm = AssemblyInfo.new
+      @asm.load_config_by_task_name(self.class.to_s.downcase)
+      @block.call(@asm, *task_args) unless @block.nil?
+      @asm.write
+      fail if @asm.failed
+    end
+  end
 end

data/lib/rake/docutask.rb

@@ -0,0 +1,17 @@
+require 'rake/tasklib'
+
+def docu(name=:docu, *args, &block)
+  Albacore::DocuTask.new(name, *args, &block)
+end
+
+module Albacore
+  class DocuTask < Albacore::AlbacoreTask
+    def execute(name, task_args)
+      @docu = Docu.new
+      @docu.load_config_by_task_name(name)
+      @block.call(@docu, *task_args) unless @block.nil?
+      @docu.execute
+      fail if @docu.failed
+    end
+  end
+end

data/lib/rake/exectask.rb

@@ -0,0 +1,18 @@
+require 'rake/tasklib'
+
+def exec(name=:exec, *args, &block)
+  Albacore::ExecTask.new(name, *args, &block)
+end
+  
+module Albacore
+  class ExecTask < Albacore::AlbacoreTask    
+    def execute(name, task_args)
+      @exec = Exec.new
+      @exec.load_config_by_task_name(name)
+      @block.call(@exec, *task_args) unless @block.nil? 
+      @exec.execute
+      fail if @exec.failed
+    end    
+  end
+  
+end

data/lib/rake/expandtemplatestask.rb

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

data/lib/rake/msbuildtask.rb

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

data/lib/rake/mspectask.rb

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

data/lib/rake/nanttask.rb

@@ -0,0 +1,17 @@
+require 'rake/tasklib'
+
+def nant(name=:nant, *args, &block)
+  Albacore::NAntTask.new(name, *args, &block)
+end
+
+module Albacore
+  class NAntTask < Albacore::AlbacoreTask
+    def execute(name, task_args)
+      nant = NAnt.new
+      nant.load_config_by_task_name(name)
+      @block.call(nant, *task_args) unless @block.nil? 
+      nant.run
+      fail if nant.failed
+    end
+  end
+end

data/lib/rake/ncoverconsoletask.rb

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

data/lib/rake/ncoverreporttask.rb

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