albacore 1.0.0.rc.2 → 1.0.0.rc.3

data/lib/albacore/ilmerge.rb

@@ -1,65 +1,38 @@
-require 'albacore/albacoretask'
-require 'albacore/config/ilmergeconfig'
+require "albacore/albacoretask"
+require "albacore/config/ilmergeconfig"
 
-class IlMerge 
-  TaskName = [:ilmerge, :ILMerge]
+class ILMerge
+  TaskName = :ilmerge
+  
   include Albacore::Task
   include Albacore::RunCommand
   include Configuration::ILMerge
 
-  attr_accessor :output, :resolver, :target_platform
-  
-  attr_array :parameters
+  attr_accessor :out, 
+                :target_platform
+
+  attr_array    :assemblies
 
   def initialize
+    @command = "ilmerge"
+    
     super()
-    update_attributes ilmerge.to_hash
-  end
-
-  def assemblies *assys
-    raise ArgumentError, "expected at least 2 assemblies to merge" if assys.length < 2
-    @assemblies = assys
-  end
-
-  def build_parameters
-    params = Array.new @parameters
-    params << %Q{/out:"#{output}"}
-    params << %Q{/targetPlatform:#{target_platform}} if @target_platform
-    raise ArgumentError, "you are required to call assemblies" if @assemblies == nil
-    params += @assemblies
-    params
+    update_attributes(ilmerge.to_hash)
   end
 
   def execute
-    @command ||= @resolver.resolve
-    result = run_command "ILMerge", build_parameters
-  end
-  
-end
-
-module Albacore
-  class IlMergeResolver
-    include ::Configuration::ILMerge
-
-    attr_accessor :ilmerge_path
-  
-    def initialize ilmerge_path=nil
-      @ilmerge_path = ilmerge_path || ilmerge.ilmerge_path
-    end
-
-    def path path
-      @ilmerge_path = path
-    end
+    raise "ilmerge requires #out" unless @out
+    raise "ilmerge requires #assemblies" unless @assemblies
 
-    def resolve
-      @ilmerge_path.nil? ? find_default : @ilmerge_path
-    end
-    
-    def find_default
-      m = ['', ' (x86)'].map{|x| "C:\\Program Files#{x}\\Microsoft\\ILMerge\\ilmerge.exe" }.
-        keep_if{|x| File.exists? x}.
-        first
-    end
+    result = run_command("ILMerge", build_parameters)
+    fail_with_message("ILMerge failed, see the build log for more details.") unless result
+  end
 
+  def build_parameters  
+    p = []
+    p << "/out:\"#{@out}\""
+    p << "/targetPlatform:#{@target_platform}" if @target_platform
+    p << @assemblies.map { |asm| "\"#{asm}\"" } if @assemblies
+    p
   end
 end

data/lib/albacore/msbuild.rb

@@ -1,78 +1,55 @@
-require 'albacore/albacoretask'
-require 'albacore/config/msbuildconfig.rb'
+require "albacore/albacoretask"
+require "albacore/config/msbuildconfig"
 
 class MSBuild
+  TaskName = :msbuild
+
   include Albacore::Task
   include Albacore::RunCommand
   include Configuration::MSBuild
   
-  attr_accessor :solution, :verbosity, :loggermodule, :max_cpu_count
-  attr_array :targets
-  attr_hash :properties, :other_switches
+  attr_reader   :no_logo
   
-  def initialize
-    super()
-    update_attributes msbuild.to_hash
-  end
+  attr_accessor :solution, 
+                :verbosity, 
+                # 'logger' property already exists in parent
+                :logger_module 
   
-  def execute
-    build_solution(@solution)
-  end
-
-  def nologo
-    @nologo = true     
-  end
+  attr_array    :targets
   
-  def build_solution(solution)
-    check_solution solution
-    
-    command_parameters = []
-    command_parameters << "\"#{solution}\""
-    command_parameters << "\"/verbosity:#{@verbosity}\"" if @verbosity != nil
-    command_parameters << "\"/logger:#{@loggermodule}\"" if @loggermodule != nil
-    command_parameters << "\"/maxcpucount:#{@max_cpu_count}\"" if @max_cpu_count != nil
-    command_parameters << "\"/nologo\"" if @nologo
-    command_parameters << build_properties if @properties != nil
-    command_parameters << build_switches if @other_switches != nil
-    command_parameters << "\"/target:#{build_targets}\"" if @targets != nil
-    
-    result = run_command "MSBuild", command_parameters.join(" ")
+  attr_hash     :properties, 
+                :other_switches
+  
+  def initialize
+    @command = "msbuild"
     
-    failure_message = 'MSBuild Failed. See Build Log For Detail'
-    fail_with_message failure_message if !result
-  end
-
-  def check_solution(file)
-    return if file
-    msg = 'solution cannot be nil'
-    fail_with_message msg
+    super()
+    update_attributes(msbuild.to_hash)
   end
   
-  def build_targets
-    @targets.join ";"
-  end
-
-  def build_properties
-    option_text = []
-    @properties.each do |key, value|
-      option_text << "/p:#{key}\=\"#{value}\""
+  def execute
+    unless @solution
+      fail_with_message("msbuild requires #solution")
+      return
     end
-    option_text.join(" ")
-  end
 
-  def build_switches
-    switch_text = []
-    @other_switches.each do |key, value|
-      switch_text << print_switch(key, value)
-    end
-    switch_text.join(" ")
+    result = run_command("MSBuild", build_parameters)
+    fail_with_message("MSBuild failed, see the build log for more details.") unless result
   end
-
-  def print_switch(key, value)
-    pure_switch?(value) ? "/#{key}" : "/#{key}:\"#{value}\""
+  
+  def build_parameters()
+    p = []
+    p << "\"#{@solution}\""
+    p << "/verbosity:#{@verbosity}" if @verbosity
+    p << "/logger:\"#{@logger_module}\"" if @logger_module
+    p << "/nologo" if @no_logo
+    p << @properties.map { |key, value| "/property:#{key}\=\"#{value}\"" } if @properties
+    p << @other_switches.map { |key, value| "/#{key}:\"#{value}\"" } if @other_switches
+    p << "/target:\"#{@targets.join(";")}\"" if @targets
+    p
   end
 
-  def pure_switch?(value)
-    value.is_a?(TrueClass) || value == :true
+  def no_logo
+    @no_logo = true
   end
 end

data/lib/albacore/mspec.rb

@@ -0,0 +1,39 @@
+require "albacore/albacoretask"
+require "albacore/config/mspecconfig"
+
+class MSpec
+  TaskName = :mspec
+  
+  include Albacore::Task
+  include Albacore::RunCommand
+  include Configuration::MSpec
+
+  attr_array    :assemblies
+  
+  attr_hash     :results_path
+  
+  def initialize()
+    super()
+    update_attributes(mspec.to_hash)
+  end
+  
+  def execute()
+    result = run_command("MSpec", build_parameters)
+    fail_with_message("MSpec failed, see the build log for more details.") unless result
+  end
+  
+  def build_parameters
+    p = []
+    p << @assemblies.map { |asm| "\"#{asm}\"" } if @assemblies
+    p << "--#{@results_path.first.first} \"#{@results_path.first.last}\"" if @results_path
+    p
+  end
+
+  def build_command_line
+    c = []
+    c << @command
+    c << build_parameters
+    c << @parameters
+    c
+  end
+end

data/lib/albacore/mstest.rb

@@ -0,0 +1,47 @@
+require "albacore/albacoretask"
+require "albacore/config/mstestconfig"
+
+class MSTest
+  TaskName = :mstest
+  
+  include Albacore::Task
+  include Albacore::RunCommand
+  include Configuration::MSTest
+  
+  attr_reader :no_logo
+  
+  attr_array  :assemblies, 
+              :tests
+  
+  def initialize()
+    @command = "mstest"
+
+    super()
+    update_attributes(mstest.to_hash)
+  end
+  
+  def execute()
+    result = run_command("MSTest", build_parameters)
+    fail_with_message("MSTest failed, see the build log for more details.") unless result
+  end  
+    
+  def build_parameters
+    p = []
+    p << @assemblies.map { |asm| "/testcontainer:\"#{asm}\"" } if @assemblies
+    p << @tests.map { |test| "/test:#{test}"} if @tests
+    p << "/nologo" if @no_logo
+    p
+  end
+  
+  def build_command_line
+    c = []
+    c << @command
+    c << build_parameters
+    c << @parameters
+    c
+  end
+
+  def no_logo
+    @no_logo = true
+  end
+end

data/lib/albacore/nant.rb

@@ -1,38 +1,41 @@
-require 'albacore/albacoretask'
+require "albacore/albacoretask"
+require "albacore/config/nantconfig"
 
 class NAnt 
+  TaskName = :nant
+
   include Albacore::Task
   include Albacore::RunCommand
+  include Configuration::NAnt
+
+  attr_reader   :no_logo
   
   attr_accessor :build_file
-  attr_array :targets
-  attr_hash :properties
+  
+  attr_array    :targets
+  
+  attr_hash     :properties
   
   def initialize
     super()
-    update_attributes Albacore.configuration.nant.to_hash
+    update_attributes(nant.to_hash)
   end
   
   def execute
-    command_parameters = []
-    command_parameters << "-buildfile:#{@build_file}" unless @build_file.nil?
-    command_parameters << "#{build_properties}" unless @properties.nil?
-    command_parameters << "#{build_targets}" unless @targets.nil?
-    
-    result = run_command "NAnt", command_parameters.join(" ")
-    
-    failure_msg = 'NAnt task Failed. See Build Log For Detail.'
-    fail_with_message failure_msg if !result
+    result = run_command("NAnt", build_parameters)
+    fail_with_message("NAnt failed, see the build log for more details.") unless result
   end
   
-  private 
-  
-  def build_targets
-    @targets.join " "
+  def build_parameters
+    p = []
+    p << "-buildfile:\"#{@build_file}\"" if @build_file
+    p << @properties.map { |key, value| "-D:#{key}=\"#{value}\"" } if @properties
+    p << @targets if @targets
+    p << "-nologo" if @no_logo
+    p
   end
   
-  def build_properties
-     @properties.map {|key, value| "-D:#{key}=#{value}" }.join(" ")
+  def no_logo
+    @no_logo = true
   end
-  
 end

data/lib/albacore/nchurn.rb

@@ -1,74 +1,49 @@
-require 'albacore/albacoretask'
+require "albacore/albacoretask"
+require "albacore/config/nchurnconfig"
 
 class NChurn
+  TaskName = :nchurn
+
   include Albacore::Task
   include Albacore::RunCommand
+  include Configuration::NChurn
   
-  attr_reader :from, :churn, :top, :report_as, :env_path, :adapter, :exclude, :include, :output
+  attr_accessor :from, 
+                :churn, 
+                :churn_percent,
+                :top, 
+                :report_as, 
+                :adapter, 
+                :exclude, 
+                :include, 
+                :input,
+                :output
 
-  
+  attr_array    :env_paths 
+    
   def initialize
     super()
-    update_attributes Albacore.configuration.nchurn.to_hash
+    update_attributes(nchurn.to_hash)
   end
   
-
-  
   def execute
-    command_parameters = []
-    command_parameters << ['-d',@from] if @from
-    command_parameters << ['-i',@input.to_s] if @input
-    command_parameters << ['-c',@churn.to_s] if @churn
-    command_parameters << ['-t',@top.to_s] if @top
-    command_parameters << ['-r',@report_as.to_s] if @report_as
-    command_parameters << ['-p',@env_path.to_s] if @env_path
-    command_parameters << ['-a',@adapter.to_s] if @adapter
-    command_parameters << ['-x',@exclude] if @exclude
-    command_parameters << ['-n',@include] if @include
-    command_parameters << ['>',@output] if @output
-
-    result = run_command "NChurn", command_parameters.join(" ")
-
-    failure_msg = 'Churn Analysis Failed. See Build Log For Detail.'
-    fail_with_message failure_msg if !result
+    result = run_command("NChurn", build_parameters)
+    fail_with_message("NChurn failed, see the build log for more details.") unless result
   end
   
-  def churn_precent(p)
-    @churn = p/100.0
-  end
-  def input(p)
-    @input = quotes(p)
-  end
-  def from(p)
-    @from = quotes(p.strftime('%d-%m-%Y'))
-  end
-  def churn(p)
-    @churn = p
-  end
-  def top(p)
-    @top= p
-  end
-  def report_as(p)
-    @report_as = p
-  end
-  def env_path(p)
-    @env_path = quotes(p)
-  end
-  def adapter(p)
-    @adapter = p
-  end
-  def exclude(p)
-    @exclude = quotes(p)
-  end
-  def include(p)
-    @include = quotes(p)
-  end
-  def output(p)
-    @output = quotes(p)
-  end
-
-  private
-  def quotes(s)
-   %{"#{s}"}
+  def build_parameters
+    p = []
+    p << "-d \"#{@from.strftime("%d-%m-%Y")}\"" if @from
+    p << "-i \"#{@input}\"" if @input
+    p << "-c #{@churn_percent / 100.0}" if @churn_percent
+    p << "-c #{@churn}" if @churn
+    p << "-t #{@top}" if @top
+    p << "-r #{@report_as}" if @report_as
+    p << "-p \"#{@env_paths.join(";")}\"" if @env_paths
+    p << "-a #{@adapter}" if @adapter
+    p << "-x \"#{@exclude}\"" if @exclude
+    p << "-n \"#{@include}\"" if @include
+    p << "> \"#{@output}\"" if @output
+    p
   end
 end