albacore 0.1.3 → 0.1.4

data/README.markdown

@@ -86,5 +86,8 @@ Many thanks for contributions to albacore are due (in alphabetical order):
 * [James Gregory](http://github.com/jagregory): the Docu task
 * [Kevin Colyar](http://github.com/kevincolyar): Testing and updating of MSBuild to work with Cygwin
 * [Mark Wilkins](http://github.com/markwilk): VB.NET Language Generator For The AssemblyInfo Task
+* [Mike Nichols](http://github.com/mnichols): XUnit contributions, bug reports, etc
+* [Nils Jonsson](http://github.com/njonsson): AssemblyInfo corrections, rakefile corrections
 * [Sean Biefeld](http://github.com/seanbiefeld): MSpecTestRunner for NCoverConsole
 * [Steven Harman](http://github.com/stevenharman): Finding some wicked bugs, patching nunit test runner, and the nant task
+* [Panda Wood](http://github.com/pandawood): NCover Console options and wiki edits

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/albacore/assemblyinfo.rb

@@ -78,6 +78,7 @@ class AssemblyInfo
     
     @namespaces << "System.Reflection"
     @namespaces << "System.Runtime.InteropServices"
+    @namespaces.uniq!
     
     ns = ''
     @namespaces.each do |n|

data/lib/albacore/support/runcommand.rb

@@ -1,4 +1,5 @@
 require 'albacore/support/failure'
+require 'albacore/support/attrmethods.rb'
 
 module RunCommand
   extend AttrMethods
@@ -19,9 +20,10 @@ module RunCommand
       return false unless valid_command_exists
     end
 
-	@parameters = @parameters.push(command_parameters) unless command_parameters.nil?
+    combine_parameters = @parameters.collect
+    combine_parameters.push(command_parameters) unless command_parameters.nil?
     
-    command = "\"#{@path_to_command}\" #{@parameters.join(' ')}"
+    command = "\"#{@path_to_command}\" #{combine_parameters.join(' ')}"
     @logger.debug "Executing #{command_name}: #{command}"
     
     set_working_directory    
@@ -47,4 +49,4 @@ module RunCommand
     return if Dir.pwd == @original_directory
     Dir.chdir(@original_directory)
   end
-end
+end

data/lib/albacore/xunittestrunner.rb

@@ -5,8 +5,8 @@ class XUnitTestRunner
   include RunCommand
   include YAMLConfig
 
-  attr_accessor :html_output, :assembly
-  attr_array :options
+  attr_accessor :html_output
+  attr_array :options,:assembly,:assemblies
 
   def initialize(path_to_command='')
     @path_to_command = path_to_command
@@ -24,22 +24,28 @@ class XUnitTestRunner
   end
   
   def get_command_parameters
-    command_params = []
-    command_params << assembly.inspect unless @assembly.nil?
+    command_params = []	
     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
+  def execute()    		
+    @assemblies = [] unless !@assemblies.nil?
+    @assemblies << @assembly unless @assembly.nil?
+    fail_with_message 'At least one assembly is required for assemblies attr' if @assemblies.length==0	
+    failure_message = 'XUnit Failed. See Build Log For Detail'		
+    
+    @assemblies.each do |assm|
+      command_params = get_command_parameters.collect{ |p| p % File.basename(assm) }
+      command_params.insert(0,assm)	
+      result = run_command "XUnit", command_params.join(" ")
+      fail_with_message failure_message if !result
+    end       
   end
 
-  def build_html_output
-    "/html #{@html_output}"
+  def build_html_output			
+    fail_with_message 'Directory is required for html_output' if !File.directory?(File.expand_path(@html_output))
+    "/html #{File.join(File.expand_path(@html_output),"%s.html")}" 	
   end
-end
+end

data/lib/rake/assemblyinfotask.rb

@@ -1,3 +1,3 @@
-create_task :assemblyinfo, AssemblyInfo.new do |asm|
+create_task :assemblyinfo, Proc.new { AssemblyInfo.new } do |asm|
   asm.write
 end

data/lib/rake/docutask.rb

@@ -1,3 +1,3 @@
-create_task :docu, Docu.new do |doc|
+create_task :docu, Proc.new { Docu.new } do |doc|
   doc.execute
 end

data/lib/rake/exectask.rb

@@ -1,3 +1,3 @@
-create_task :exec, Exec.new do |ex|
+create_task :exec, Proc.new { Exec.new } do |ex|
   ex.execute
-end
+end

data/lib/rake/expandtemplatestask.rb

@@ -1,3 +1,3 @@
-create_task :expandtemplates, ExpandTemplates.new do |exp|
+create_task :expandtemplates, Proc.new { ExpandTemplates.new } do |exp|
   exp.expand
-end
+end

data/lib/rake/msbuildtask.rb

@@ -1,3 +1,3 @@
-create_task :msbuild, MSBuild.new do |msbuild|
+create_task :msbuild, Proc.new { MSBuild.new } do |msbuild|
   msbuild.build
 end

data/lib/rake/mspectask.rb

@@ -1,3 +1,3 @@
-create_task :mspec, MSpecTestRunner.new do |mspec|
+create_task :mspec, Proc.new { MSpecTestRunner.new } do |mspec|
   mspec.execute
-end
+end

data/lib/rake/nanttask.rb

@@ -1,3 +1,3 @@
-create_task :nant, NAnt.new do |nant|
+create_task :nant, Proc.new { NAnt.new } do |nant|
   nant.run
 end

data/lib/rake/ncoverconsoletask.rb

@@ -1,3 +1,3 @@
-create_task :ncoverconsole, NCoverConsole.new do |ncover|
+create_task :ncoverconsole, Proc.new { NCoverConsole.new } do |ncover|
   ncover.run
 end  

data/lib/rake/ncoverreporttask.rb

@@ -1,3 +1,3 @@
-create_task :ncoverreport, NCoverReport.new do |ncoverreport|
+create_task :ncoverreport, Proc.new { NCoverReport.new } do |ncoverreport|
   ncoverreport.run
-end
+end

data/lib/rake/ndependtask.rb

@@ -1,3 +1,3 @@
-create_task :ndepend, NDepend.new do |cmd|
+create_task :ndepend, Proc.new { NDepend.new } do |cmd|
   cmd.run
-end
+end

data/lib/rake/nunittask.rb

@@ -1,3 +1,3 @@
-create_task :nunit, NUnitTestRunner.new do |n|
+create_task :nunit, Proc.new { NUnitTestRunner.new } do |n|
   n.execute
 end    

data/lib/rake/plinktask.rb

@@ -1,3 +1,3 @@
-create_task :plink, PLink.new() do |cmd|
+create_task :plink, Proc.new { PLink.new() } do |cmd|
   cmd.run
 end  

data/lib/rake/renametask.rb

@@ -1,3 +1,3 @@
-create_task :rename, Renamer.new do |ren|
+create_task :rename, Proc.new { Renamer.new } do |ren|
   ren.rename
 end

data/lib/rake/sftptask.rb

@@ -1,3 +1,3 @@
-create_task :sftp, Sftp.new do |cmd|
+create_task :sftp, Proc.new { Sftp.new } do |cmd|
   cmd.upload
-end
+end

data/lib/rake/sqlcmdtask.rb

@@ -1,3 +1,3 @@
-create_task :sqlcmd, SQLCmd.new do |cmd|
+create_task :sqlcmd, Proc.new { SQLCmd.new } do |cmd|
   cmd.run
-end
+end

data/lib/rake/sshtask.rb

@@ -1,3 +1,3 @@
-create_task :ssh, Ssh.new do |cmd|
+create_task :ssh, Proc.new { Ssh.new } do |cmd|
   cmd.execute
 end

data/lib/rake/support/createtask.rb

@@ -1,4 +1,4 @@
-def create_task(taskname, task_object, &execute_body)
+def create_task(taskname, task_object_proc, &execute_body)
   taskclass = :"Albacore_TaskFor_#{taskname}"
   taskmethod = taskname.to_s.downcase.to_sym
 
@@ -11,10 +11,11 @@ def create_task(taskname, task_object, &execute_body)
   Albacore.class_eval do
     const_set(taskclass, Class.new(Albacore::AlbacoreTask) do
       define_method :execute do |name|
+        task_object = task_object_proc.call
         task_object.load_config_by_task_name(name)
         call_task_block(task_object)
       	execute_body.call(task_object) unless execute_body.nil?
       end
     end)
   end
-end
+end

data/lib/rake/unziptask.rb

@@ -1,3 +1,3 @@
-create_task :unzip, Unzip.new do |zip|
+create_task :unzip, Proc.new { Unzip.new } do |zip|
   zip.unzip
-end
+end

data/lib/rake/xbuildtask.rb

@@ -1,7 +1,7 @@
-create_task :xbuild, XBuild.new do |xb|
+create_task :xbuild, Proc.new { XBuild.new } do |xb|
   xb.build
 end
 
-create_task :mono, XBuild.new do |xb|
+create_task :mono, Proc.new { XBuild.new } do |xb|
   xb.build
 end

data/lib/rake/xunittask.rb

@@ -1,3 +1,3 @@
-create_task :xunit, XUnitTestRunner.new do |x|
+create_task :xunit, Proc.new { XUnitTestRunner.new } do |x|
   x.execute
-end
+end

data/lib/rake/ziptask.rb

@@ -1,3 +1,3 @@
-create_task :zip, ZipDirectory.new do |z|
+create_task :zip, Proc.new { ZipDirectory.new } do |z|
   z.package
-end
+end

data/rakefile.rb

@@ -4,133 +4,136 @@ task :default => ['albacore:sample']
 
 namespace :specs do
   require 'spec/rake/spectask'
+  runtime_is_ironruby = (!defined?(IRONRUBY_VERSION).nil?)
 
   @spec_opts = '--colour --format specdoc'
 
   desc "Run functional specs for Albacore"
   Spec::Rake::SpecTask.new :all do |t|
-    t.spec_files = 'spec/**/*_spec.rb'
+    t.spec_files = FileList['spec/**/*_spec.rb'].exclude{ |f| 
+      f if runtime_is_ironruby && (f.include?("ssh") || f.include?("sftp")) 
+    }
     t.spec_opts << @spec_opts
   end
   
   desc "Run rake task specs for Albacore"
   Spec::Rake::SpecTask.new :tasks do |t|
-    t.spec_files = 'spec/**/*task_spec.rb'
+    t.spec_files = FileList['spec/**/*task_spec.rb']
     t.spec_opts << @spec_opts
   end
 
   desc "Assembly info functional specs"
   Spec::Rake::SpecTask.new :assemblyinfo do |t|
-    t.spec_files = 'spec/assemblyinfo*_spec.rb'
+    t.spec_files = FileList['spec/assemblyinfo*_spec.rb']
     t.spec_opts << @spec_opts
   end
   
   desc "MSBuild functional specs"
   Spec::Rake::SpecTask.new :msbuild do |t|
-    t.spec_files = 'spec/msbuild*_spec.rb'
+    t.spec_files = FileList['spec/msbuild*_spec.rb']
     t.spec_opts << @spec_opts
   end
 
   desc "SQLServer SQLCmd functional specs" 
   Spec::Rake::SpecTask.new :sqlcmd do |t|
-    t.spec_files = 'spec/sqlcmd*_spec.rb'
+    t.spec_files = FileList['spec/sqlcmd*_spec.rb']
     t.spec_opts << @spec_opts
   end
 
   
   desc "Nant functional specs"
   Spec::Rake::SpecTask.new :nant do |t|
-    t.spec_files = 'spec/nant*_spec.rb'
+    t.spec_files = FileList['spec/nant*_spec.rb']
     t.spec_opts << @spec_opts
   end
   
   desc "NCover Console functional specs"
   Spec::Rake::SpecTask.new :ncoverconsole do |t|
-    t.spec_files = 'spec/ncoverconsole*_spec.rb'
+    t.spec_files = FileList['spec/ncoverconsole*_spec.rb']
     t.spec_opts << @spec_opts
   end
   
   desc "NCover Report functional specs"
   Spec::Rake::SpecTask.new :ncoverreport do |t|
-    t.spec_files = 'spec/ncoverreport*_spec.rb'
+    t.spec_files = FileList['spec/ncoverreport*_spec.rb']
     t.spec_opts << @spec_opts
   end
 
   desc "SSH functional specs"
   Spec::Rake::SpecTask.new :ssh do |t|
-    t.spec_files = 'spec/ssh*_spec.rb'
+    t.spec_files = FileList['spec/ssh*_spec.rb']
     t.spec_opts << @spec_opts
   end  
 
   desc "Plink functional specs"
   Spec::Rake::SpecTask.new :plink do |t|
-    t.spec_files = 'spec/plink*_spec.rb'
+    t.spec_files = FileList['spec/plink*_spec.rb']
     t.spec_opts << @spec_opts
   end
 
   desc "Ndepend functional specs"
   Spec::Rake::SpecTask.new :ndepend do |t|
-    t.spec_files = 'spec/ndepend*_spec.rb'
+    t.spec_files = FileList['spec/ndepend*_spec.rb']
     t.spec_opts << @spec_opts
   end
   
   desc "SFTP functional specs"
   Spec::Rake::SpecTask.new :sftp do |t|
-    t.spec_files = 'spec/sftp*_spec.rb'
+    t.spec_files = FileList['spec/sftp*_spec.rb']
     t.spec_opts << @spec_opts
   end
 
   desc "Expand Templates functional specs"
   Spec::Rake::SpecTask.new :templates do |t|
-    t.spec_files = 'spec/expandtemplates*_spec.rb'
+    t.spec_files = FileList['spec/expandtemplates*_spec.rb']
     t.spec_opts << @spec_opts
     end
 
   desc "Zip functional specs"
   Spec::Rake::SpecTask.new :zip do |t|
-    t.spec_files = 'spec/zip*_spec.rb'
+    t.spec_files = FileList['spec/zip*_spec.rb']
     t.spec_opts << @spec_opts
     end
 
   desc "XUnit functional specs"
   Spec::Rake::SpecTask.new :xunit do |t|
-    t.spec_files = 'spec/xunit*_spec.rb'
+    t.spec_files = FileList['spec/xunit*_spec.rb']
     t.spec_opts << @spec_opts
   end
 
   desc "NUnit functional specs"
   Spec::Rake::SpecTask.new :nunit do |t|
-    t.spec_files = 'spec/nunit*_spec.rb'
+    t.spec_files = FileList['spec/nunit*_spec.rb']
     t.spec_opts << @spec_opts
   end
 
   desc "MSpec functional specs"
   Spec::Rake::SpecTask.new :mspec do |t|
-    t.spec_files = 'spec/mspec*_spec.rb'
+    t.spec_files = FileList['spec/mspec*_spec.rb']
     t.spec_opts << @spec_opts
   end
 
   desc "Exec functional specs"
   Spec::Rake::SpecTask.new :exec do |t|
-    t.spec_files = 'spec/exec*_spec.rb'
+    t.spec_files = FileList['spec/exec*_spec.rb']
     t.spec_opts << @spec_opts
   end
   
   desc "Rename functional specs"
   Spec::Rake::SpecTask.new :rename do |t|
-    t.spec_files = 'spec/rename*_spec.rb'
+    t.spec_files = FileList['spec/rename*_spec.rb']
     t.spec_opts << @spec_opts
   end
   
   desc "Docu functional specs"
   Spec::Rake::SpecTask.new :docu do |t|
-    t.spec_files = 'spec/docu*_spec.rb'
+    t.spec_files = FileList['spec/docu*_spec.rb']
     t.spec_opts << @spec_opts
   end
 
   desc "YAML Config functional specs"
   Spec::Rake::SpecTask.new :yamlconfig do |t|
-    t.spec_files = 'spec/yaml*_spec.rb'
+    t.spec_files = FileList['spec/yaml*_spec.rb']
     t.spec_opts << @spec_opts
   end
 end
@@ -262,7 +265,7 @@ namespace :jeweler do
     gs.description = "Easily build your .NET solutions with Ruby and Rake, using this suite of Rake tasks."
     gs.email = "derickbailey@gmail.com"
     gs.homepage = "http://albacorebuild.net"
-    gs.authors = ["Derick Bailey", "Ben Hall"]
+    gs.authors = ["Derick Bailey", "Ben Hall", "etc"]
     gs.has_rdoc = false  
     gs.files.exclude("albacore.gemspec", ".gitignore", "spec/support/Tools")
 

data/spec/assemblyinfo_spec.rb

@@ -68,11 +68,13 @@ describe AssemblyInfo, "when providing a custom namespace without specifiying th
     
     asm.namespaces 'My.Name.Space'
 
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should default to c# for the generated assemby info" do
-    @filedata.should include("using My.Name.Space;")
+    @filedata.scan('using My.Name.Space;').length.should == 1
   end
 end
 
@@ -85,12 +87,14 @@ describe AssemblyInfo, "when providing custom namespaces and specifying C#" do
     
     asm.namespaces 'My.Name.Space', 'Another.Namespace.GoesHere'
 
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should write the namespaces into the using statements" do
-    @filedata.should include("using My.Name.Space;")
-    @filedata.should include("using Another.Namespace.GoesHere;")
+    @filedata.scan('using My.Name.Space;').length.should == 1
+    @filedata.scan('using Another.Namespace.GoesHere;').length.should == 1
   end
 end
 
@@ -103,12 +107,14 @@ describe AssemblyInfo, "when providing custom namespaces and specifying VB.NET"
     
     asm.namespaces 'My.Name.Space', 'Another.Namespace.GoesHere'
 
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should write the namespaces into the imports statements" do
-    @filedata.should include("Imports My.Name.Space")
-    @filedata.should include("Imports Another.Namespace.GoesHere")
+    @filedata.scan('Imports My.Name.Space').length.should == 1
+    @filedata.scan('Imports Another.Namespace.GoesHere').length.should == 1
   end
 end
 
@@ -119,12 +125,14 @@ describe AssemblyInfo, "when providing custom attributes without specifying a la
     
     asm.custom_attributes :CustomAttribute => "custom attribute data", :AnotherAttribute => "more data here"
 
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should write the custom attributes to the assembly info file" do
-    @filedata.should include("[assembly: CustomAttribute(\"custom attribute data\")]")
-    @filedata.should include("[assembly: AnotherAttribute(\"more data here\")]")
+    @filedata.scan('[assembly: CustomAttribute("custom attribute data")]').length.should == 1
+    @filedata.scan('[assembly: AnotherAttribute("more data here")]').length.should == 1
   end
 end
 
@@ -137,12 +145,14 @@ describe AssemblyInfo, "when providing custom attributes and specifying C#" do
     
     asm.custom_attributes :CustomAttribute => "custom attribute data", :AnotherAttribute => "more data here"
 
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should write the custom attributes to the assembly info file" do
-    @filedata.should include("[assembly: CustomAttribute(\"custom attribute data\")]")
-    @filedata.should include("[assembly: AnotherAttribute(\"more data here\")]")
+    @filedata.scan('[assembly: CustomAttribute("custom attribute data")]').length.should == 1
+    @filedata.scan('[assembly: AnotherAttribute("more data here")]').length.should == 1
   end
 end
 
@@ -155,12 +165,14 @@ describe AssemblyInfo, "when providing custom attributes and specifying VB.NET"
     
     asm.custom_attributes :CustomAttribute => "custom attribute data", :AnotherAttribute => "more data here"
 
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should write the custom attributes to the assembly info file" do
-    @filedata.should include("<assembly: CustomAttribute(\"custom attribute data\")>")
-    @filedata.should include("<assembly: AnotherAttribute(\"more data here\")>")
+    @filedata.scan('<assembly: CustomAttribute("custom attribute data")>').length.should == 1
+    @filedata.scan('<assembly: AnotherAttribute("more data here")>').length.should == 1
   end
 end
 
@@ -171,11 +183,13 @@ describe AssemblyInfo, "when specifying a custom attribute with no data" do
     
     asm.custom_attributes :NoArgsAttribute => nil
 
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should write the attribute with an empty argument list" do
-    @filedata.should include("[assembly: NoArgsAttribute()]")
+    @filedata.scan('[assembly: NoArgsAttribute()]').length.should == 1
   end
 end
 
@@ -186,11 +200,13 @@ describe AssemblyInfo, "when specifying an attribute with non-string data" do
     
     asm.custom_attributes :NonStringAttribute => true
 
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should write the attribute data without quotes" do
-    @filedata.should include("[assembly: NonStringAttribute(true)]")
+    @filedata.scan('[assembly: NonStringAttribute(true)]').length.should == 1
   end
 end
 
@@ -210,52 +226,54 @@ describe AssemblyInfo, "when generating an assembly info file with the built in
     asm.file_version = @tester.file_version
     asm.trademark = @tester.trademark
     
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should use the system.reflection namespace" do
-    @filedata.should include("using System.Reflection;")
+    @filedata.scan('using System.Reflection;').length.should == 1
   end
   
   it "should use the system.runtime.interopservices namespace" do
-    @filedata.should include("using System.Runtime.InteropServices;")
+    @filedata.scan('using System.Runtime.InteropServices;').length.should == 1
   end
   
   it "should contain the specified version information" do
-    @filedata.should include("[assembly: AssemblyVersion(\"#{@tester.version}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyVersion("#{@tester.version}")]|).length.should == 1
   end
   
   it "should contain the assembly title" do
-    @filedata.should include("[assembly: AssemblyTitle(\"#{@tester.title}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyTitle("#{@tester.title}")]|).length.should == 1
   end
   
   it "should contain the assembly description" do
-    @filedata.should include("[assembly: AssemblyDescription(\"#{@tester.description}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyDescription("#{@tester.description}")|).length.should == 1
   end
   
   it "should contain the copyright information" do
-    @filedata.should include("[assembly: AssemblyCopyright(\"#{@tester.copyright}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyCopyright("#{@tester.copyright}")]|).length.should == 1
   end
   
   it "should contain the com visible information" do
-    @filedata.should include("[assembly: ComVisible(#{@tester.com_visible})]")
-    @filedata.should include("[assembly: Guid(\"#{@tester.com_guid}\")]")
+    @filedata.scan(%Q|[assembly: ComVisible(#{@tester.com_visible})]|).length.should == 1
+    @filedata.scan(%Q|[assembly: Guid("#{@tester.com_guid}")]|).length.should == 1
   end
   
   it "should contain the company name information" do
-    @filedata.should include("[assembly: AssemblyCompany(\"#{@tester.company_name}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyCompany("#{@tester.company_name}")]|).length.should == 1
   end
   
   it "should contain the product information" do
-    @filedata.should include("[assembly: AssemblyProduct(\"#{@tester.product_name}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyProduct("#{@tester.product_name}")]|).length.should == 1
   end
   
   it "should contain the file version information" do
-    @filedata.should include("[assembly: AssemblyFileVersion(\"#{@tester.file_version}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyFileVersion("#{@tester.file_version}")]|).length.should == 1
   end
   
   it "should contain the trademark information" do
-    @filedata.should include("[assembly: AssemblyTrademark(\"#{@tester.trademark}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyTrademark("#{@tester.trademark}")]|).length.should == 1
   end
 end
 
@@ -277,52 +295,54 @@ describe AssemblyInfo, "when generating an assembly info file with the built in
     asm.file_version = @tester.file_version
     asm.trademark = @tester.trademark
     
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should use the system.reflection namespace" do
-    @filedata.should include("using System.Reflection;")
+    @filedata.scan('using System.Reflection;').length.should == 1
   end
   
   it "should use the system.runtime.interopservices namespace" do
-    @filedata.should include("using System.Runtime.InteropServices;")
+    @filedata.scan('using System.Runtime.InteropServices;').length.should == 1
   end
   
   it "should contain the specified version information" do
-    @filedata.should include("[assembly: AssemblyVersion(\"#{@tester.version}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyVersion("#{@tester.version}")]|).length.should == 1
   end
   
   it "should contain the assembly title" do
-    @filedata.should include("[assembly: AssemblyTitle(\"#{@tester.title}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyTitle("#{@tester.title}")]|).length.should == 1
   end
   
   it "should contain the assembly description" do
-    @filedata.should include("[assembly: AssemblyDescription(\"#{@tester.description}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyDescription("#{@tester.description}")]|).length.should == 1
   end
   
   it "should contain the copyright information" do
-    @filedata.should include("[assembly: AssemblyCopyright(\"#{@tester.copyright}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyCopyright("#{@tester.copyright}")]|).length.should == 1
   end
   
   it "should contain the com visible information" do
-    @filedata.should include("[assembly: ComVisible(#{@tester.com_visible})]")
-    @filedata.should include("[assembly: Guid(\"#{@tester.com_guid}\")]")
+    @filedata.scan(%Q|[assembly: ComVisible(#{@tester.com_visible})]|).length.should == 1
+    @filedata.scan(%Q|[assembly: Guid("#{@tester.com_guid}")]|).length.should == 1
   end
   
   it "should contain the company name information" do
-    @filedata.should include("[assembly: AssemblyCompany(\"#{@tester.company_name}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyCompany("#{@tester.company_name}")]|).length.should == 1
   end
   
   it "should contain the product information" do
-    @filedata.should include("[assembly: AssemblyProduct(\"#{@tester.product_name}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyProduct("#{@tester.product_name}")]|).length.should == 1
   end
   
   it "should contain the file version information" do
-    @filedata.should include("[assembly: AssemblyFileVersion(\"#{@tester.file_version}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyFileVersion("#{@tester.file_version}")]|).length.should == 1
   end
   
   it "should contain the trademark information" do
-    @filedata.should include("[assembly: AssemblyTrademark(\"#{@tester.trademark}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyTrademark("#{@tester.trademark}")]|).length.should == 1
   end
 end
 
@@ -344,52 +364,54 @@ describe AssemblyInfo, "when generating an assembly info file with the built in
     asm.file_version = @tester.file_version
     asm.trademark = @tester.trademark
     
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should use the system.reflection namespace" do
-    @filedata.should include("Imports System.Reflection")
+    @filedata.scan('Imports System.Reflection').length.should == 1
   end
   
   it "should use the system.runtime.interopservices namespace" do
-    @filedata.should include("Imports System.Runtime.InteropServices")
+    @filedata.scan('Imports System.Runtime.InteropServices').length.should == 1
   end
   
   it "should contain the specified version information" do
-    @filedata.should include("<assembly: AssemblyVersion(\"#{@tester.version}\")>")
+    @filedata.scan(%Q|<assembly: AssemblyVersion("#{@tester.version}")>|).length.should == 1
   end
   
   it "should contain the assembly title" do
-    @filedata.should include("<assembly: AssemblyTitle(\"#{@tester.title}\")>")
+    @filedata.scan(%Q|<assembly: AssemblyTitle("#{@tester.title}")>|).length.should == 1
   end
   
   it "should contain the assembly description" do
-    @filedata.should include("<assembly: AssemblyDescription(\"#{@tester.description}\")>")
+    @filedata.scan(%Q|<assembly: AssemblyDescription("#{@tester.description}")>|).length.should == 1
   end
   
   it "should contain the copyright information" do
-    @filedata.should include("<assembly: AssemblyCopyright(\"#{@tester.copyright}\")>")
+    @filedata.scan(%Q|<assembly: AssemblyCopyright("#{@tester.copyright}")>|).length.should == 1
   end
   
   it "should contain the com visible information" do
-    @filedata.should include("<assembly: ComVisible(#{@tester.com_visible})>")
-    @filedata.should include("<assembly: Guid(\"#{@tester.com_guid}\")>")
+    @filedata.scan(%Q|<assembly: ComVisible(#{@tester.com_visible})>|).length.should == 1
+    @filedata.scan(%Q|<assembly: Guid("#{@tester.com_guid}")>|).length.should == 1
   end
   
   it "should contain the company name information" do
-    @filedata.should include("<assembly: AssemblyCompany(\"#{@tester.company_name}\")>")
+    @filedata.scan(%Q|<assembly: AssemblyCompany("#{@tester.company_name}")>|).length.should == 1
   end
   
   it "should contain the product information" do
-    @filedata.should include("<assembly: AssemblyProduct(\"#{@tester.product_name}\")>")
+    @filedata.scan(%Q|<assembly: AssemblyProduct("#{@tester.product_name}")>|).length.should == 1
   end
   
   it "should contain the file version information" do
-    @filedata.should include("<assembly: AssemblyFileVersion(\"#{@tester.file_version}\")>")
+    @filedata.scan(%Q|<assembly: AssemblyFileVersion("#{@tester.file_version}")>|).length.should == 1
   end
   
   it "should contain the trademark information" do
-    @filedata.should include("<assembly: AssemblyTrademark(\"#{@tester.trademark}\")>")
+    @filedata.scan(%Q|<assembly: AssemblyTrademark("#{@tester.trademark}")>|).length.should == 1
   end
 end
 
@@ -398,44 +420,46 @@ describe AssemblyInfo, "when generating an assembly info file with no attributes
     @tester = AssemblyInfoTester.new
     asm = AssemblyInfo.new
     
+    # Generate the same file twice.
+    @tester.build_and_read_assemblyinfo_file asm
     @filedata = @tester.build_and_read_assemblyinfo_file asm
   end
   
   it "should not contain the specified version information" do
-    @filedata.should_not include("[assembly: AssemblyVersion(\"#{@tester.version}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyVersion("#{@tester.version}")]|).should be_empty
   end
   
   it "should not contain the assembly title" do
-    @filedata.should_not include("[assembly: AssemblyTitle(\"#{@tester.title}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyTitle("#{@tester.title}")]|).should be_empty
   end
   
   it "should not contain the assembly description" do
-    @filedata.should_not include("[assembly: AssemblyDescription(\"#{@tester.description}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyDescription("#{@tester.description}")]|).should be_empty
   end
   
   it "should not contain the copyright information" do
-    @filedata.should_not include("[assembly: AssemblyCopyright(\"#{@tester.copyright}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyCopyright("#{@tester.copyright}")]|).should be_empty
   end
   
   it "should not contain the com visible information" do
-    @filedata.should_not include("[assembly: ComVisible(#{@tester.com_visible})]")
-    @filedata.should_not include("[assembly: Guid(\"#{@tester.com_guid}\")]")
+    @filedata.scan(%Q|[assembly: ComVisible(#{@tester.com_visible})]|).should be_empty
+    @filedata.scan(%Q|[assembly: Guid("#{@tester.com_guid}")]|).should be_empty
   end
 
   it "should not contain the company name information" do
-    @filedata.should_not include("[assembly: AssemblyCompany(\"#{@tester.company_name}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyCompany("#{@tester.company_name}")]|).should be_empty
   end
 
   it "should not contain the product information" do
-    @filedata.should_not include("[assembly: AssemblyProduct(\"#{@tester.product_name}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyProduct("#{@tester.product_name}")]|).should be_empty
   end
     
   it "should not contain the file version information" do
-    @filedata.should_not include("[assembly: AssemblyFileVersion(\"#{@tester.file_version}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyFileVersion("#{@tester.file_version}")]|).should be_empty
   end
 
   it "should not contain the trademark information" do
-    @filedata.should_not include("[assembly: AssemblyTrademark(\"#{@tester.trademark}\")]")
+    @filedata.scan(%Q|[assembly: AssemblyTrademark("#{@tester.trademark}")]|).should be_empty
   end
 end
 

data/spec/createtask_spec.rb

@@ -3,8 +3,20 @@ require 'albacore/support/albacore_helper'
 require 'fail_patch'
 
 class SampleObject
+  extend AttrMethods
   include Failure
   include YAMLConfig
+
+  attr_array :array
+  attr_hash :hash
+
+  def get_array
+    @array
+  end
+
+  def get_hash
+    @hash
+  end
 end
 
 describe "when defining a task" do
@@ -13,7 +25,9 @@ describe "when defining a task" do
     @sample_object.stub_method(:load_config_by_task_name){ |name|
     	@task_name = name
     }
-    create_task :sampletask, @sample_object do |obj|
+    
+    task_object_proc = Proc.new { @sample_object }
+    create_task :sampletask, task_object_proc do |obj|
       @task_obj = obj
     end
 
@@ -39,7 +53,7 @@ end
 
 describe "when execution fails" do
   before :all do
-    create_task :failing_task, SampleObject.new
+    create_task :failing_task, Proc.new { SampleObject.new }
 
   	failing_task :sample_fail do |x|
   	  x.extend(FailPatch)
@@ -55,7 +69,7 @@ end
 
 describe "when task args are used" do
   before :all do
-    create_task :task_with_args, SampleObject.new
+    create_task :task_with_args, Proc.new { SampleObject.new }
 
     task_with_args :sampletask_withargs, [:arg1] do |t, args|
       t.extend(FailPatch)
@@ -71,7 +85,7 @@ end
 
 describe "when calling a task method without providing a task name" do
   before :all do
-    create_task :task_without_name, SampleObject.new
+    create_task :task_without_name, Proc.new { SampleObject.new }
 
     task_without_name do |t|
       @task_without_name_called = true
@@ -87,7 +101,7 @@ end
 
 describe "when calling a task method without providing a task parameter" do
   before :all do
-    create_task :task_without_param, SampleObject.new
+    create_task :task_without_param, Proc.new { SampleObject.new }
 
     task_without_param do
       @task_without_param_called = true
@@ -104,7 +118,7 @@ end
 describe "when calling a task without a task definition block" do
 	
   before :all do
-    create_task :task_without_body, SampleObject.new
+    create_task :task_without_body, Proc.new { SampleObject.new }
     
     task_without_body
     
@@ -120,3 +134,39 @@ describe "when calling a task without a task definition block" do
   	@failed.should be_false
   end
 end
+
+describe "when creating two tasks and executing them" do
+  before :all do
+    create_task :multiple_instance_task, Proc.new { SampleObject.new } do |mi|
+      @array_values = mi.get_array
+      @hash_values = mi.get_hash
+    end
+
+    multiple_instance_task :multi_instance_1 do |mi|
+      mi.array 1, 2
+      mi.hash = { :a => :b, :c => :d }
+      @instance_1 = mi
+    end
+
+    multiple_instance_task :multi_instance_2 do |mi|
+      mi.array 3, 4
+      mi.hash = { :e => :f, :g => :h }
+      @instance_2 = mi
+    end
+
+    Rake::Task[:multi_instance_1].invoke
+    Rake::Task[:multi_instance_2].invoke 
+  end
+
+  it "should specify the array values once per task" do
+    @array_values.should == [3, 4]
+  end
+
+  it "should specify the hash values once per task" do
+    @hash_values.should == { :e => :f, :g => :h }
+  end
+
+  it "should create two separate instances of the task object" do
+    @instance_1.object_id.should_not == @instance_2.object_id
+  end
+end

data/spec/runcommand_spec.rb

@@ -0,0 +1,48 @@
+require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'albacore/support/albacore_helper'
+require 'system_patch'
+
+class RunCommandObject
+  include YAMLConfig
+  include RunCommand
+
+  def execute
+    @require_valid_command = false
+    result = run_command "Run Command Test Object"
+  end
+end
+
+describe "when running two instances of a command line task" do
+  before :all do
+    create_task :run_command_task, Proc.new { RunCommandObject.new } do |ex|
+      ex.execute
+    end
+
+  	run_command_task :one do |x|
+      x.extend(SystemPatch)
+      x.path_to_command = "set"
+      x.parameters "_albacore_test = test_one"
+      @one = x
+  	end
+
+    run_command_task :two do |x|
+      x.extend(SystemPatch)
+      x.path_to_command = "set"
+      x.parameters "_another_albacore_test = test_two"
+      @two = x
+    end
+    
+    Rake::Task[:one].invoke
+    Rake::Task[:two].invoke
+  end
+  
+  it "should only pass the parameters specified to the first command" do
+    @one.system_command.should == "\"set\" _albacore_test = test_one"
+  end
+  
+  it "should only pass the parameters specified to the second command" do
+    @two.system_command.should == "\"set\" _another_albacore_test = test_two"
+  end
+end
+
+

data/spec/spec.opts

@@ -0,0 +1 @@
+--format specdoc

data/spec/xunit_spec.rb

@@ -4,6 +4,8 @@ require 'albacore/xunittestrunner'
 @@xunitpath = File.join(File.dirname(__FILE__), 'support', 'Tools', 'XUnit-v1.5', 'xunit.console.exe')
 @@test_assembly = File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'CodeCoverage', 'xunit', 'assemblies', 'TestSolution.XUnitTests.dll')
 @@output_option = "/out=xunit.results.html"
+@@working_dir =File.join(File.dirname(__FILE__), 'support','xunit')
+@@html_output = File.join(@@working_dir,'TestSolution.XUnitTests.dll.html')
 
 describe XUnitTestRunner, "the command parameters for an xunit runner" do
   before :all do
@@ -18,10 +20,6 @@ describe XUnitTestRunner, "the command parameters for an xunit runner" do
     @command_parameters.should_not include(@@xunitpath)
   end
   
-  it "should include the list of assemblies" do
-    @command_parameters.should include("\"#{@@test_assembly}\"")
-  end
-  
   it "should include the list of options" do
     @command_parameters.should include(@@output_option)
   end
@@ -46,13 +44,29 @@ describe XUnitTestRunner, "the command line string for an xunit runner" do
   end
 end
 
-
 describe XUnitTestRunner, "when configured correctly" do
   before :all do
     xunit = XUnitTestRunner.new(@@xunitpath)
     xunit.assembly = @@test_assembly
     xunit.options '/noshadow'
     xunit.extend(FailPatch)
+    xunit.log_level = :verbose
+    
+    xunit.execute
+  end
+  
+  it "should execute" do
+    $task_failed.should be_false
+  end
+end
+
+describe XUnitTestRunner, "when multiple assemblies are passed to xunit runner" do
+  before :all do
+    xunit = XUnitTestRunner.new(@@xunitpath)
+    xunit.assemblies = @@test_assembly, @@test_assembly
+    xunit.options '/noshadow'
+    xunit.extend(FailPatch)
+    xunit.log_level = :verbose
     
     xunit.execute
   end
@@ -60,4 +74,70 @@ describe XUnitTestRunner, "when configured correctly" do
   it "should execute" do
     $task_failed.should be_false
   end
-end
+end
+
+describe XUnitTestRunner, "when zero assemblies are passed to xunit runner" do
+  before :all do
+    xunit = XUnitTestRunner.new(@@xunitpath)    
+    xunit.options '/noshadow'
+    xunit.extend(FailPatch)
+    
+    xunit.execute
+  end
+  
+  it "should fail" do
+    $task_failed.should be_true
+  end
+end
+
+describe XUnitTestRunner, "when html_output is specified" do
+  before :each do
+	FileUtils.mkdir @@working_dir
+    xunit = XUnitTestRunner.new(@@xunitpath)
+    xunit.assemblies = @@test_assembly    
+	xunit.html_output = File.dirname(@@html_output)
+    xunit.extend(FailPatch)
+    
+    xunit.execute
+  end
+  
+  it "should execute" do
+    $task_failed.should be_false
+  end
+  
+  it "should write output html" do
+    File.exist?(@@html_output).should be_true
+  end
+  
+  after:each do
+	FileUtils.rm_r @@working_dir if File.exist? @@working_dir
+  end
+end
+
+describe XUnitTestRunner, "when html_output is not a directory" do
+  before :each do
+	FileUtils.mkdir @@working_dir
+	strio = StringIO.new
+    xunit = XUnitTestRunner.new(@@xunitpath)
+	xunit.log_level = :verbose
+    xunit.log_device = strio
+    xunit.assemblies = @@test_assembly    
+	xunit.html_output = @@html_output
+    xunit.extend(FailPatch)
+    
+    xunit.execute
+	@log_data = strio.string
+  end
+  
+  it "should fail" do
+    $task_failed.should be_true
+  end
+  
+  it "should log a message" do
+	@log_data.should include('Directory is required for html_output')    
+  end
+  
+  after:each do
+	FileUtils.rm_r @@working_dir if File.exist? @@working_dir
+  end
+end

metadata

@@ -5,17 +5,18 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Derick Bailey
 - Ben Hall
+- etc
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -05:00
+date: 2010-05-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -238,8 +239,10 @@ files:
 - spec/plink_spec.rb
 - spec/plinktask_spec.rb
 - spec/renametask_spec.rb
+- spec/runcommand_spec.rb
 - spec/sftp_spec.rb
 - spec/sftptask_spec.rb
+- spec/spec.opts
 - spec/sqlcmd_spec.rb
 - spec/sqlcmdtask_spec.rb
 - spec/ssh_spec.rb
@@ -371,6 +374,7 @@ test_files:
 - spec/plinktask_spec.rb
 - spec/plink_spec.rb
 - spec/renametask_spec.rb
+- spec/runcommand_spec.rb
 - spec/sftptask_spec.rb
 - spec/sftp_spec.rb
 - spec/sqlcmdtask_spec.rb