albacore 0.1.1 → 0.1.2

data/EULA.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Derick Bailey. All Rights Reserved.
+Copyright (c) 2010 Derick Bailey. All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/albacore.rb

@@ -7,12 +7,12 @@ require 'logging'
 
 runtime_is_ironruby = (!defined?(IRONRUBY_VERSION).nil?)
 
-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')).reject{ |f|
+Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'albacore/*.rb')).reject{ |f|
   f if runtime_is_ironruby && (f.include?("ssh") || f.include?("sftp"))
 }.each {|f| require f }
 
-Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'albacore/*.rb')).reject{ |f|
+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')).reject{ |f|
   f if runtime_is_ironruby && (f.include?("ssh") || f.include?("sftp"))
 }.each {|f| require f }

data/lib/albacore/ncoverconsole.rb

@@ -27,8 +27,7 @@ class NCoverConsole
   end
   
   def run
-    check_testrunner
-    return false if @failed
+    return unless check_for_testrunner
     
     command_parameters = []
     command_parameters << "//reg" if @register_dll
@@ -45,11 +44,12 @@ class NCoverConsole
     fail_with_message failure_msg if !result
   end
   
-  def check_testrunner
-    return if (!@testrunner.nil?)
+  def check_for_testrunner
+    return true if (!@testrunner.nil?)
     msg = 'testrunner cannot be nil.'
     @logger.info msg
     fail
+    return false
   end
   
   def build_output_options(output)

data/lib/albacore/ncoverreport.rb

@@ -17,8 +17,7 @@ class NCoverReport
   end
   
   def run
-    check_command
-    return if @failed
+    return unless check_command
     
     command_parameters = []
     command_parameters << build_coverage_files unless @coverage_files.empty?
@@ -33,8 +32,9 @@ class NCoverReport
   end
   
   def check_command
-    return if @path_to_command
+    return true if @path_to_command
     fail_with_message 'NCoverReport.path_to_command cannot be nil.'
+    return false
   end
   
   def build_filters

data/lib/albacore/ndepend.rb

@@ -11,8 +11,7 @@ class NDepend
   end
   
   def run
-    check_comand
-    return if @failed
+    return unless check_comand
     result = run_command @path_to_command, create_parameters.join(" ")
     failure_message = 'Command Failed. See Build Log For Detail'
     fail_with_message failure_message if !result
@@ -25,8 +24,9 @@ class NDepend
   end
 
   def check_comand
-    return if @project_file
+    return true if @project_file
     fail_with_message 'A ndepend project file is required'
+    return false
   end
 
 end

data/lib/albacore/nunittestrunner.rb

@@ -26,7 +26,7 @@ class NUnitTestRunner
   def get_command_parameters
     command_params = []
     command_params << @options.join(" ") unless @options.nil?
-    command_params << @assemblies.join(" ") unless @assemblies.nil?
+    command_params << @assemblies.map{|asm| "\"#{asm}\""}.join(' ') unless @assemblies.nil?
     command_params
   end
   

data/lib/albacore/plink.rb

@@ -18,8 +18,8 @@ class PLink
   end
 
   def run()
-    check_command
-    return if @failed
+    return unless check_command
+    
     parameters = create_parameters
     result = run_command "Plink", parameters.join(" ")
     failure_message = 'Command Failed. See Build Log For Detail'
@@ -42,7 +42,8 @@ class PLink
   end
 
   def check_command
-    return if @path_to_command
+    return true if @path_to_command
     fail_with_message 'Plink.path_to_command cannot be nil.'
+    return false
   end
 end

data/lib/albacore/renamer.rb

@@ -0,0 +1,17 @@
+require 'albacore/support/albacore_helper'
+
+class Renamer
+  include YAMLConfig
+  include Failure
+  
+  attr_accessor :actual_name, :target_name
+  
+  def rename
+    if (@actual_name.nil? || @target_name.nil?)
+      fail "actual_name and target_name cannot be nil"
+    else
+      File.rename(@actual_name, @target_name)
+    end
+  end
+  
+end

data/lib/albacore/sqlcmd.rb

@@ -17,8 +17,7 @@ class SQLCmd
   end
   
   def run
-    check_command
-    return if @failed
+    return unless check_command
     
     cmd_params=[]
     cmd_params << build_parameter("S", @server) unless @server.nil?
@@ -35,8 +34,9 @@ class SQLCmd
   end
   
   def check_command
-    return if @path_to_command
+    return true if (!@path_to_command.nil?)
     fail_with_message 'SQLCmd.path_to_command cannot be nil.'
+    return false
   end
   
   def build_script_list

data/lib/albacore/support/failure.rb

@@ -3,20 +3,13 @@ require 'albacore/support/logging'
 module Failure
   include Logging
   
-  attr_accessor :failed
-  
   def initialize
-    @failed = false
     super()
   end
   
-  def fail
-    @failed = true
-  end
-  
   def fail_with_message(msg)
     @logger.fatal msg
-    fail
+    fail msg
   end
 end
 

data/lib/rake/assemblyinfotask.rb

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

data/lib/rake/docutask.rb

@@ -1,17 +1,3 @@
-require 'rake/tasklib'
-
-def docu(name=:docu, *args, &block)
-  Albacore::DocuTask.new(name, *args, &block)
+create_task :docu, Docu.new do |doc|
+  doc.execute
 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

@@ -1,18 +1,3 @@
-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
+create_task :exec, Exec.new do |ex|
+  ex.execute
+end

data/lib/rake/expandtemplatestask.rb

@@ -1,16 +1,3 @@
-require 'rake/tasklib'
-
-def expandtemplates(name=:expandtemplates, *args, &block)
-  Albacore::ExpandTemplatesTask.new(name, *args, &block)
-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
+create_task :expandtemplates, ExpandTemplates.new do |exp|
+  exp.expand
 end

data/lib/rake/msbuildtask.rb

@@ -1,18 +1,3 @@
-require 'rake/tasklib'
-
-def msbuild(name=:msbuild, *args, &block)
-  Albacore::MSBuildTask.new(name, *args, &block)
-end
-    
-module Albacore
-  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
-  
+create_task :msbuild, MSBuild.new do |msbuild|
+  msbuild.build
 end

data/lib/rake/mspectask.rb

@@ -1,17 +1,3 @@
-require 'rake/tasklib'
-
-def mspec(name=:mspec, *args, &block)
-  Albacore::MSpecTask.new(name, *args, &block)
-end
-  
-module Albacore
-  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
+create_task :mspec, MSpecTestRunner.new do |mspec|
+  mspec.execute
 end

data/lib/rake/nanttask.rb

@@ -1,17 +1,3 @@
-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
+create_task :nant, NAnt.new do |nant|
+  nant.run
 end

data/lib/rake/ncoverconsoletask.rb

@@ -1,17 +1,3 @@
-require 'rake/tasklib'
-
-def ncoverconsole(name=:ncoverconsole, *args, &block)
-  Albacore::NCoverConsoleTask.new(name, *args, &block)
-end
-  
-module Albacore
-  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
+create_task :ncoverconsole, NCoverConsole.new do |ncover|
+  ncover.run
+end  

data/lib/rake/ncoverreporttask.rb

@@ -1,17 +1,3 @@
-require 'rake/tasklib'
-
-def ncoverreport(name=:ncoverreport, *args, &block)
-  Albacore::NCoverReportTask.new(name, *args, &block)
-end
-  
-module Albacore
-  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
+create_task :ncoverreport, NCoverReport.new do |ncoverreport|
+  ncoverreport.run
+end

data/lib/rake/ndependtask.rb

@@ -1,21 +1,3 @@
-require 'rake/tasklib'
-require 'albacore'
-
-def ndepend(name=:command, *args, &block)
-  Albacore::NDepend.new(name, *args, &block)
-end
-
-module Albacore
-  class NDependTask < Albacore::AlbacoreTask
-    def execute(name, task_args)
-      cmd = NDepend.new()
-      cmd.load_config_by_task_name(name)
-      @block.call(cmd, *task_args) unless @block.nil?
-      cmd.run
-      fail if cmd.failed
-    end
-  end
-end
-
-
-
+create_task :ndepend, NDepend.new do |cmd|
+  cmd.run
+end

data/lib/rake/nunittask.rb

@@ -1,17 +1,3 @@
-require 'rake/tasklib'
-
-def nunit(name=:nunit, *args, &block)
-  Albacore::NUnitTask.new(name, *args, &block)
-end
-  
-module Albacore
-  class NUnitTask < Albacore::AlbacoreTask
-    def execute(name, task_args)
-      @nunit = NUnitTestRunner.new
-      @nunit.load_config_by_task_name(name)
-      @block.call(@nunit, *task_args) unless @block.nil?
-      @nunit.execute
-      fail if @nunit.failed
-    end    
-  end
-end
+create_task :nunit, NUnitTestRunner.new do |n|
+  n.execute
+end    

data/lib/rake/plinktask.rb

@@ -1,23 +1,3 @@
-require 'rake/tasklib'
-require 'albacore'
-
-def plink(name=:command, *args, &block)
-  Albacore::PLinkTask.new(name, *args, &block)
-end
-
-module Albacore  
-  class PLinkTask < Albacore::AlbacoreTask
-    attr_accessor :remote_parameters, :remote_path_to_command
-
-    def execute(name, task_args)
-      cmd = PLink.new()
-      cmd.load_config_by_task_name(name)
-      @block.call(cmd, *task_args) unless @block.nil?
-      cmd.run
-      fail if cmd.failed
-    end  
-  end
-end
-
-
-
+create_task :plink, PLink.new() do |cmd|
+  cmd.run
+end