albacore 0.2.0.preview1 → 0.2.0.preview2

data/lib/albacore/nunittestrunner.rb

@@ -1,10 +1,9 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/nunitconfig'
+require 'albacore/albacoretask'
 
 class NUnitTestRunner
-  include AlbacoreModel
+  TaskName = :nunit
+  include AlbacoreTask
   include RunCommand
-  include Configuration::NUnit
   
   attr_array :assemblies, :options
   
@@ -12,7 +11,7 @@ class NUnitTestRunner
     @options=[]
     @assemblies=[]
     super()
-    update_attributes nunit.to_hash
+    update_attributes Albacore.configuration.nunit.to_hash
     @command = command unless command.nil?
   end
   

data/lib/albacore/specflowreport.rb

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

data/lib/albacore/sqlcmd.rb

@@ -1,12 +1,10 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/sqlcmdconfig'
+require 'albacore/albacoretask'
 
 class SQLCmd
-  include AlbacoreModel
+  include AlbacoreTask
   include RunCommand
-  include Configuration::SQLCmd
   
-  attr_accessor :server, :database, :username, :password
+  attr_accessor :server, :database, :username, :password, :trusted_connection, :batch_abort
   attr_array :scripts
   attr_hash :variables
   
@@ -14,19 +12,22 @@ class SQLCmd
     @require_valid_command = false
     @scripts=[]
     @variables={}
+    @trusted_connection = true
+    @batch_abort = true
     super()
-    update_attributes sqlcmd.to_hash
+    update_attributes Albacore.configuration.sqlcmd.to_hash
   end
   
-  def run
+  def execute
     return unless check_command
     
     cmd_params=[]
-    cmd_params << build_parameter("S", @server) unless @server.nil?
+    serverParam = @server.nil? ? build_parameter("S", ".") : build_parameter("S", @server)
+    cmd_params << serverParam
     cmd_params << build_parameter("d", @database) unless @database.nil?
-    cmd_params << build_parameter("U", @username) unless @username.nil?
-    cmd_params << build_parameter("P", @password) unless @password.nil?
+    cmd_params << get_authentication_params
     cmd_params << build_variable_list if @variables.length > 0
+    cmd_params << get_batch_abort_param
     cmd_params << build_script_list if @scripts.length > 0
     
     result = run_command "SQLCmd", cmd_params.join(" ")
@@ -34,15 +35,36 @@ class SQLCmd
     failure_msg = 'SQLCmd Failed. See Build Log For Detail.'
     fail_with_message failure_msg if !result
   end
+
+  def get_batch_abort_param
+    "-b" if (@scripts.length > 1 && @batch_abort)
+  end
+
+  def get_authentication_params
+    integratedParam = "-E" if @trusted_connection
+    if ((!(@username.nil?)) and (!(@password.nil?)))
+      integratedParam = build_parameter("U", @username) + " " + build_parameter("P", @password)
+    end
+    integratedParam
+  end
   
   def check_command
+    sql2008cmdPath = File.join(ENV['SystemDrive'],'program files','microsoft sql server','100','tools','binn', 'sqlcmd.exe')
+    @command = sql2008cmdPath if File.exists?(sql2008cmdPath)
+    return true
+    
+    sql2005cmdPath = File.join(ENV['SystemDrive'],'program files','microsoft sql server','90','tools','binn', 'sqlcmd.exe')
+    @command = sql2005cmdPath if File.exists?(sql2005cmdPath)
+    return true
+    
     return true if (!@command.nil?)
+    
     fail_with_message 'SQLCmd.command cannot be nil.'
     return false
   end
   
   def build_script_list
-    @scripts.map{|s| "-i \"#{s}\""}.join(" ")
+    @scripts.map{|s| "-i \"#{s.strip}\""}.join(" ")
   end
   
   def build_parameter(param_name, param_value)

data/lib/albacore/support/createtask.rb

@@ -0,0 +1,30 @@
+module Albacore
+  def self.create_task(taskname, taskclass)
+    # this style of creating tasks is not really what i
+    # want to do. but it's necessary for ruby 1.8.6
+    # because that version doesn't support the foo do |*args, &block|
+    # block signature. it supports *args, but not &block.
+    # so that limitation is worked around with string eval
+    Object.class_eval(<<-EOF, __FILE__, __LINE__)
+      def #{taskname}(name=:#{taskname}, *args, &configblock)
+        task name, *args do |t, task_args|
+          obj = #{taskclass}.new
+          obj.load_config_by_task_name(name) if obj.respond_to?(:load_config_by_task_name)
+
+          if !configblock.nil?
+            case configblock.arity
+              when 0
+                configblock.call
+              when 1
+                configblock.call(obj)
+              when 2
+                configblock.call(obj, task_args)
+            end
+          end
+
+          obj.execute if obj.respond_to?(:execute)
+        end
+      end
+    EOF
+  end
+end

data/lib/albacore/support/runcommand.rb

@@ -13,40 +13,31 @@ module RunCommand
   end
   
   def run_command(name="Command Line", parameters=nil)
-    params = Array.new
-    params << parameters unless parameters.nil?
-    params << @parameters unless (@parameters.nil? || @parameters.length==0)
-    
-    cmd = get_command(params)
-    @logger.debug "Executing #{name}: #{cmd}"
-    
-    set_working_directory
-    result = system cmd
-    reset_working_directory
-    
-    result
+    begin
+      params = Array.new
+      params << parameters unless parameters.nil?
+      params << @parameters unless (@parameters.nil? || @parameters.length==0)
+      
+      cmd = get_command(params)
+      @logger.debug "Executing #{name}: #{cmd}"
+      
+      Dir.chdir(@working_directory) do
+        return system(cmd)
+      end
+
+    rescue Exception => e
+      puts "Error While Running Command Line Tool: #{e}"
+      raise
+    end
   end
 
   def get_command(params)
-    cmd = "\"#{@command}\""
+    executable = @command
+    unless command.nil?
+      executable = File.expand_path(@command) if File.exists?(@command)
+    end
+    cmd = "\"#{executable}\""
     cmd +=" #{params.join(' ')}" if params.length > 0
     cmd
   end
-
-  def combine_parameters(params1, params2)
-    combined = params1.collect
-    combined = combined.push(params2) unless params2.nil?
-    combined
-  end
-  
-  def set_working_directory
-    @original_directory = Dir.pwd
-    return if @working_directory == @original_directory
-    Dir.chdir(@working_directory)
-  end
-  
-  def reset_working_directory
-    return if Dir.pwd == @original_directory
-    Dir.chdir(@original_directory)
-  end
 end

data/lib/albacore/support/updateattributes.rb

@@ -0,0 +1,13 @@
+module UpdateAttributes
+  def update_attributes(attrs)
+    attrs.each do |key, value|
+      setter = "#{key}="
+      send(setter, value) if respond_to?(setter)
+      @logger.warn "#{key} is not a settable attribute on #{self.class}" unless respond_to?(setter)
+    end
+  end
+
+  def <<(attrs)
+    update_attributes attrs
+  end
+end

data/lib/albacore/unzip.rb

@@ -1,18 +1,16 @@
-require 'albacore/albacoremodel'
+require 'albacore/albacoretask'
 require 'zip/zip'
 require 'zip/zipfilesystem'
-require 'albacore/config/unzipconfig'
 include Zip
 
 class Unzip
-  include AlbacoreModel
-  include Configuration::Unzip
+  include AlbacoreTask
   
   attr_accessor :destination, :file
 
   def initialize
     super()
-    update_attributes unzip.to_hash
+    update_attributes Albacore.configuration.unzip.to_hash
   end
     
   def execute()

data/lib/albacore/xbuild.rb

@@ -1,10 +1,9 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/xbuildconfig'
+require 'albacore/albacoretask'
 
 class XBuild
-  include AlbacoreModel
+  TaskName = [:xbuild, :mono]
+  include AlbacoreTask
   include RunCommand
-  include Configuration::XBuild
   
   attr_accessor :solution, :verbosity
   attr_array :targets
@@ -13,10 +12,10 @@ class XBuild
   def initialize
     @command = 'xbuild'
     super()
-    update_attributes xbuild.to_hash
+    update_attributes Albacore.configuration.xbuild.to_hash
   end
   
-  def build
+  def execute
     build_solution(@solution)
   end
   

data/lib/albacore/xunittestrunner.rb

@@ -1,10 +1,9 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/xunitconfig'
+require 'albacore/albacoretask'
 
 class XUnitTestRunner
-  include AlbacoreModel
+  TaskName = :xunit
+  include AlbacoreTask
   include RunCommand
-  include Configuration::XUnit
 
   attr_accessor :html_output
   attr_array :options,:assembly,:assemblies
@@ -12,7 +11,7 @@ class XUnitTestRunner
   def initialize(command=nil)
     @options=[]
     super()
-    update_attributes xunit.to_hash
+    update_attributes Albacore.configuration.xunit.to_hash
     @command = command unless command.nil?
   end
 

data/lib/albacore/zipdirectory.rb

@@ -1,12 +1,11 @@
-require 'albacore/albacoremodel'
-require 'albacore/config/zipconfig'
+require 'albacore/albacoretask'
 require 'zip/zip'
 require 'zip/zipfilesystem'
 include Zip
 
 class ZipDirectory
-  include AlbacoreModel
-  include Configuration::Zip
+  TaskName = :zip
+  include AlbacoreTask
   
   attr_accessor :output_path, :output_file
   attr_accessor :flatten_zip
@@ -16,10 +15,10 @@ class ZipDirectory
     @flatten_zip = true
     @exclusions = []
     super()
-    update_attributes zip.to_hash
+    update_attributes Albacore.configuration.zip.to_hash
   end
     
-  def package()
+  def execute()
     fail_with_message 'Output File cannot be empty' if @output_file.nil?
     return if @output_file.nil?
         

data/rakefile.rb

@@ -8,7 +8,7 @@ namespace :specs do
 
   @spec_opts = '--colour --format specdoc'
 
-  desc "Run functional specs for Albacore"
+  desc "Run all specs for albacore"
   Spec::Rake::SpecTask.new :all do |t|
     t.spec_files = FileList['spec/**/*_spec.rb'].exclude{ |f| 
       f if runtime_is_ironruby && (f.include?("ssh") || f.include?("sftp")) 
@@ -16,12 +16,6 @@ namespace :specs do
     t.spec_opts << @spec_opts
   end
   
-  desc "Run rake task specs for Albacore"
-  Spec::Rake::SpecTask.new :tasks do |t|
-    t.spec_files = FileList['spec/**/*task_spec.rb']
-    t.spec_opts << @spec_opts
-  end
-
   desc "CSharp compiler (csc.exe) specs" 
   Spec::Rake::SpecTask.new :csc do |t|
     t.spec_files = FileList['spec/csc*_spec.rb']
@@ -235,7 +229,12 @@ namespace :jeweler do
     gs.homepage = "http://albacorebuild.net"
     gs.authors = ["Derick Bailey", "Ben Hall", "Steve Harman", "etc"]
     gs.has_rdoc = false  
-    gs.files.exclude("albacore.gemspec", ".gitignore", "spec/support/Tools")
+    gs.files.exclude(
+      "albacore.gemspec", 
+      ".gitignore", 
+      "spec/",
+      "pkg/"
+    )
 
     gs.add_dependency('rake', '>= 0.8.7')
     gs.add_dependency('rubyzip', '>= 0.9.4')

data/spec/albacoremodel_spec.rb

@@ -1,13 +1,18 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
-require 'albacore/albacoremodel'
+require 'albacore/albacoretask'
 
 class ModelTest
-  include AlbacoreModel
+  include AlbacoreTask
   attr_accessor :foo, :bar
   attr_hash :a_hash
   attr_array :a_array
 end
 
+class NamedTaskExample
+  TaskName = [:namedtask, :anothername]
+  include AlbacoreTask
+end
+
 describe "when updating object attributes with a valid set of hash keys" do
   before :each do
     @model = ModelTest.new
@@ -33,3 +38,16 @@ describe "when updating an object attributes with an invalid hash key" do
     @log.should include("something is not a settable attribute on ModelTest")
   end
 end
+
+describe "when an class includes albacoretask" do
+  it "should create a rake task for that class" do
+    respond_to?(:modeltest).should be_true
+  end
+end
+
+describe "when an albacoretask class specifies task names" do
+  it "should create a task with the specified names" do
+    respond_to?(:namedtask).should be_true
+    respond_to?(:anothername).should be_true
+  end
+end

data/spec/assemblyinfo_spec.rb

@@ -36,10 +36,6 @@ describe AssemblyInfo, "when generating an assembly info file in verbose mode" d
   it "should log the name of the output file" do
     @log_data.should include(@tester.assemblyinfo_file)
   end
-  
-  it "should log the supplied attribute information" do
-    @log_data.should include("[assembly: AssemblyVersion(\"#{@tester.version}\")]")
-  end
 end
 
 describe AssemblyInfo, "when generating an assembly info file without an output file specified" do
@@ -51,7 +47,7 @@ describe AssemblyInfo, "when generating an assembly info file without an output
     strio = StringIO.new
     asm.log_device = strio
     
-    asm.write
+    asm.execute
 
     @log_data = strio.string
   end
@@ -92,7 +88,7 @@ describe AssemblyInfo, "when providing custom namespaces and specifying C#" do
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
-  it "should write the namespaces into the using statements" do
+  it "should.execute the namespaces into the using statements" do
     @filedata.scan('using My.Name.Space;').length.should == 1
     @filedata.scan('using Another.Namespace.GoesHere;').length.should == 1
   end
@@ -112,7 +108,7 @@ describe AssemblyInfo, "when providing custom namespaces and specifying VB.NET"
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
-  it "should write the namespaces into the imports statements" do
+  it "should.execute the namespaces into the imports statements" do
     @filedata.scan('Imports My.Name.Space').length.should == 1
     @filedata.scan('Imports Another.Namespace.GoesHere').length.should == 1
   end
@@ -130,7 +126,7 @@ describe AssemblyInfo, "when providing custom attributes without specifying a la
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
-  it "should write the custom attributes to the assembly info file" do
+  it "should.execute the custom attributes to the assembly info file" do
     @filedata.scan('[assembly: CustomAttribute("custom attribute data")]').length.should == 1
     @filedata.scan('[assembly: AnotherAttribute("more data here")]').length.should == 1
   end
@@ -150,7 +146,7 @@ describe AssemblyInfo, "when providing custom attributes and specifying C#" do
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
-  it "should write the custom attributes to the assembly info file" do
+  it "should.execute the custom attributes to the assembly info file" do
     @filedata.scan('[assembly: CustomAttribute("custom attribute data")]').length.should == 1
     @filedata.scan('[assembly: AnotherAttribute("more data here")]').length.should == 1
   end
@@ -170,7 +166,7 @@ describe AssemblyInfo, "when providing custom attributes and specifying VB.NET"
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
-  it "should write the custom attributes to the assembly info file" do
+  it "should.execute the custom attributes to the assembly info file" do
     @filedata.scan('<assembly: CustomAttribute("custom attribute data")>').length.should == 1
     @filedata.scan('<assembly: AnotherAttribute("more data here")>').length.should == 1
   end
@@ -188,7 +184,7 @@ describe AssemblyInfo, "when specifying a custom attribute with no data" do
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
-  it "should write the attribute with an empty argument list" do
+  it "should.execute the attribute with an empty argument list" do
     @filedata.scan('[assembly: NoArgsAttribute()]').length.should == 1
   end
 end
@@ -205,7 +201,7 @@ describe AssemblyInfo, "when specifying an attribute with non-string data" do
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
-  it "should write the attribute data without quotes" do
+  it "should.execute the attribute data without quotes" do
     @filedata.scan('[assembly: NonStringAttribute(true)]').length.should == 1
   end
 end
@@ -484,11 +480,28 @@ describe AssemblyInfo, "when assembly info configuration is provided" do
         asm.version = "bar"
       end
     end
-    asm = AssemblyInfo.new
-    asm
+    AssemblyInfo.new
   end
   it "should use the supplied info" do
     asm.company_name.should == "foo"
     asm.version.should == "bar"
   end
 end
+
+describe AssemblyInfo, "when specifying custom data" do
+  before :all do
+    @tester = AssemblyInfoTester.new
+    asm = AssemblyInfo.new
+    
+    asm.custom_data "// foo", "// bar"
+
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
+    @filedata = @tester.build_and_read_assemblyinfo_file asm
+  end
+  
+  it "should write data unmodified to the output" do
+    @filedata.scan('// foo').length.should == 1
+    @filedata.scan('// bar').length.should == 1
+  end
+end