albacore 0.2.0.preview1 → 0.2.0.preview2

data/lib/albacore/config/specflowreportconfig.rb

@@ -3,10 +3,10 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module SpecFlowReport
-    @specflowreportconfig = OpenStruct.new.extend(OpenStructToHash)
+    include Albacore::Configuration
 
     def self.specflowreportconfig
-      @specflowreportconfig
+      @specflowreportconfig ||= OpenStruct.new.extend(OpenStructToHash)
     end
 
     def specflowreport
@@ -22,6 +22,3 @@ module Configuration
   end
 end
 
-class Albacore::Configuration
-  include Configuration::SpecFlowReport
-end

data/lib/albacore/config/sqlcmdconfig.rb

@@ -3,20 +3,13 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module SQLCmd
-    @sqlcmdconfig = OpenStruct.new.extend(OpenStructToHash)
-
-    def self.sqlcmdconfig
-      @sqlcmdconfig
-    end
+    include Albacore::Configuration
 
     def sqlcmd
-      config = SQLCmd.sqlcmdconfig
-      yield(config) if block_given?
-      config
+      @sqlcmdconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@sqlcmdconfig) if block_given?
+      @sqlcmdconfig
     end
   end
 end
 
-class Albacore::Configuration
-  include Configuration::SQLCmd
-end

data/lib/albacore/config/unzipconfig.rb

@@ -3,20 +3,13 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module Unzip
-    @unzipconfig = OpenStruct.new.extend(OpenStructToHash)
-
-    def self.unzipconfig
-      @unzipconfig
-    end
+    include Albacore::Configuration
 
     def unzip
-      config = Unzip.unzipconfig
-      yield(config) if block_given?
-      config
+      @unzipconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@unzipconfig) if block_given?
+      @unzipconfig
     end
   end
 end
 
-class Albacore::Configuration
-  include Configuration::Unzip
-end

data/lib/albacore/config/xbuildconfig.rb

@@ -3,20 +3,13 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module XBuild
-    @xbuildconfig = OpenStruct.new.extend(OpenStructToHash)
-
-    def self.xbuildconfig
-      @xbuildconfig
-    end
+    include Albacore::Configuration
 
     def xbuild
-      config = XBuild.xbuildconfig
-      yield(config) if block_given?
-      config
+      @xbuildconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@xbuildconfig) if block_given?
+      @xbuildconfig
     end
   end
 end
 
-class Albacore::Configuration
-  include Configuration::XBuild
-end

data/lib/albacore/config/xunittestrunnerconfig.rb

@@ -0,0 +1,15 @@
+require 'ostruct'
+require 'albacore/support/openstruct'
+
+module Configuration
+  module XUnit
+    include Albacore::Configuration
+
+    def xunit
+      @xunitconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@xunitconfig) if block_given?
+      @xunitconfig
+    end
+  end
+end
+

data/lib/albacore/config/zipdirectoryconfig.rb

@@ -0,0 +1,15 @@
+require 'ostruct'
+require 'albacore/support/openstruct'
+
+module Configuration
+  module Zip
+    include Albacore::Configuration
+
+    def zip
+      @zipconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@zipconfig) if block_given?
+      @zipconfig
+    end
+  end
+end
+

data/lib/albacore/csc.rb

@@ -1,26 +1,32 @@
-require 'albacore/albacoremodel'
+require 'albacore/albacoretask'
 require 'albacore/config/cscconfig'
 require 'albacore/support/supportlinux'
 
 class CSC
-  include AlbacoreModel
+  include AlbacoreTask
   include RunCommand
   include Configuration::CSC
   include SupportsLinuxEnvironment
 
-  attr_accessor :output, :target
-  attr_array :compile, :references
+  attr_accessor :output, :target, :optimize, :debug, :doc
+  attr_array :compile, :references, :resources, :define
 
   def initialize
+    @optimize = false
     super()
     update_attributes csc.to_hash
   end
 
   def execute
     params = []
+    params << @references.map{|r| format_reference(r)} unless @references.nil?
+    params << @resources.map{|r| format_resource(r)} unless @resources.nil?
     params << "\"/out:#{@output}\"" unless @output.nil?
     params << "/target:#{@target}" unless @target.nil?
-    params << @references.map{|r| format_reference(r)} unless @references.nil?
+    params << "/optimize+" if @optimize
+    params << get_debug_param unless @debug.nil?
+    params << "/doc:#{@doc}" unless @doc.nil?
+    params << get_define_params unless @define.nil?
     params << @compile.map{|f| format_path(f)} unless @compile.nil?
 
     result = run_command "CSC", params
@@ -28,4 +34,24 @@ class CSC
     failure_message = 'CSC Failed. See Build Log For Detail'
     fail_with_message failure_message if !result
   end
+
+  def get_define_params
+    symbols = @define.join(";")
+    "/define:#{symbols}"
+  end
+
+  def get_debug_param
+    case @debug
+      when true
+        "/debug"
+      when :full
+        "/debug:full"
+      when :pdbonly
+        "/debug:pdbonly"
+    end
+  end
+
+  def format_resource(resource)
+    "/res:#{resource}"
+  end
 end

data/lib/albacore/docu.rb

@@ -1,8 +1,7 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/docuconfig'
+require 'albacore/albacoretask'
 
 class Docu
-  include AlbacoreModel
+  include AlbacoreTask
   include RunCommand
   include Configuration::Docu
   

data/lib/albacore/exec.rb

@@ -1,14 +1,12 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/execconfig'
+require 'albacore/albacoretask'
 
 class Exec
-  include AlbacoreModel
+  include AlbacoreTask
   include RunCommand
-  include Configuration::Exec
 
   def initialize
     super()
-    update_attributes exec.to_hash
+    update_attributes Albacore.configuration.exec.to_hash
   end
     
   def execute

data/lib/albacore/msbuild.rb

@@ -1,8 +1,8 @@
-require 'albacore/albacoremodel'
+require 'albacore/albacoretask'
 require 'albacore/config/msbuildconfig.rb'
 
 class MSBuild
-  include AlbacoreModel
+  include AlbacoreTask
   include RunCommand
   include Configuration::MSBuild
   
@@ -15,7 +15,7 @@ class MSBuild
     update_attributes msbuild.to_hash
   end
   
-  def build
+  def execute
     build_solution(@solution)
   end
   

data/lib/albacore/mspectestrunner.rb

@@ -1,10 +1,9 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/mspecconfig'
+require 'albacore/albacoretask'
 
 class MSpecTestRunner
-  include AlbacoreModel
+  TaskName = :mspec
+  include AlbacoreTask
   include RunCommand
-  include Configuration::MSpec
   
   attr_accessor :html_output
   attr_array :assemblies, :options
@@ -12,7 +11,7 @@ class MSpecTestRunner
   def initialize(command=nil)
     @assemblies=[]
     super()
-    update_attributes mspec.to_hash
+    update_attributes Albacore.configuration.mspec.to_hash
     @command = command unless command.nil?
   end
   
@@ -22,7 +21,7 @@ class MSpecTestRunner
     command << get_command_parameters
     cmd = command.join(" ")
     @logger.debug "Build MSpec Test Runner Command Line: " + cmd
-        return cmd
+    return cmd
   end
   
   def get_command_parameters

data/lib/albacore/nant.rb

@@ -1,10 +1,8 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/nantconfig'
+require 'albacore/albacoretask'
 
 class NAnt 
-  include AlbacoreModel
+  include AlbacoreTask
   include RunCommand
-  include Configuration::NAnt
   
   attr_accessor :build_file
   attr_array :targets
@@ -12,10 +10,10 @@ class NAnt
   
   def initialize
     super()
-    update_attributes nant.to_hash
+    update_attributes Albacore.configuration.nant.to_hash
   end
   
-  def run
+  def execute
     command_parameters = []
     command_parameters << "-buildfile:#{@build_file}" unless @build_file.nil?
     command_parameters << "#{build_properties}" unless @properties.nil?

data/lib/albacore/ncoverconsole.rb

@@ -1,10 +1,8 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/ncoverconsoleconfig'
+require 'albacore/albacoretask'
 
 class NCoverConsole
-  include AlbacoreModel
+  include AlbacoreTask
   include RunCommand
-  include Configuration::NCoverConsole
   
   attr_accessor :testrunner
   attr_array :cover_assemblies, :exclude_assemblies, :coverage, :exclude_attributes
@@ -18,14 +16,14 @@ class NCoverConsole
     @exclude_attributes = []
     @coverage = []
     super()
-    update_attributes ncoverconsole.to_hash
+    update_attributes Albacore.configuration.ncoverconsole.to_hash
   end
   
   def no_registration
     @register_dll = false
   end
   
-  def run
+  def execute
     return unless check_for_testrunner
     
     command_parameters = []

data/lib/albacore/ncoverreport.rb

@@ -1,11 +1,9 @@
 Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'ncoverreports/*.rb')).each {|f| require f }
-require 'albacore/albacoremodel'
-require 'albacore/config/ncoverreportconfig'
+require 'albacore/albacoretask'
 
 class NCoverReport
-  include AlbacoreModel
+  include AlbacoreTask
   include RunCommand
-  include Configuration::NCoverReport
   
   attr_array :coverage_files, :reports, :required_coverage, :filters
   
@@ -15,10 +13,10 @@ class NCoverReport
     @required_coverage = []
     @filters = []
     super()
-    update_attributes ncoverreport.to_hash
+    update_attributes Albacore.configuration.ncoverreport.to_hash
   end
   
-  def run
+  def execute
     return unless check_command
     
     command_parameters = []

data/lib/albacore/ncoverreports/codecoveragebase.rb

@@ -1,8 +1,8 @@
-require 'albacore/albacoremodel'
+require 'albacore/support/updateattributes'
 
 module NCover
   class CodeCoverageBase
-    include AlbacoreModel
+    include UpdateAttributes
     
     attr_accessor :coverage_type, :minimum, :item_type 
     

data/lib/albacore/ncoverreports/cyclomaticcomplexity.rb

@@ -1,8 +1,8 @@
-require 'albacore/albacoremodel'
+require 'albacore/support/updateattributes'
 
 module NCover
   class CyclomaticComplexity
-    include AlbacoreModel
+    include UpdateAttributes
     
     attr_accessor :maximum, :item_type 
     

data/lib/albacore/ncoverreports/fullcoveragereport.rb

@@ -1,15 +1,7 @@
-require 'albacore/albacoremodel'
-
 module NCover
   class FullCoverageReport
-    include AlbacoreModel
-    
     attr_accessor :output_path
     
-    def initialize
-      super()
-    end
-    
     def report_type
       :FullCoverageReport
     end

data/lib/albacore/ncoverreports/reportfilterbase.rb

@@ -1,8 +1,8 @@
-require 'albacore/albacoremodel'
+require 'albacore/support/updateattributes'
 
 module NCover
   class ReportFilterBase
-    include AlbacoreModel
+    include UpdateAttributes
     
     attr_accessor :filter, :filter_type, :item_type, :is_regex
     

data/lib/albacore/ncoverreports/summaryreport.rb

@@ -1,9 +1,5 @@
-require 'albacore/albacoremodel'
-
 module NCover
   class SummaryReport
-    include AlbacoreModel
-    
     attr_accessor :output_path
     
     def initialize

data/lib/albacore/ndepend.rb

@@ -1,19 +1,17 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/ndependconfig'
+require 'albacore/albacoretask'
 
 class NDepend
-  include AlbacoreModel
+  include AlbacoreTask
   include RunCommand
-  include Configuration::NDepend
 
   attr_accessor :project_file
 
   def initialize()
     super()
-    update_attributes ndepend.to_hash
+    update_attributes Albacore.configuration.ndepend.to_hash
   end
   
-  def run
+  def execute
     return unless check_command
     result = run_command @command, create_parameters.join(" ")
     failure_message = 'Command Failed. See Build Log For Detail'