albacore 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/albacore/support/attrmethods.rb

@@ -14,14 +14,14 @@ module AttrMethods
       end
     end
   end
-  
+
   def attr_hash(*names)
   	names.each do |n|
-      self.send :define_method, n do |value|
+      self.send :define_method, n do |*value|
         if value.nil? || value.empty?
           instance_variable_get "@#{n}"
         else
-          instance_variable_set "@#{n}", value
+          instance_variable_set "@#{n}", value[0]
         end
       end
       self.send :define_method, "#{n}=" do |value|

data/lib/albacore/support/runcommand.rb

@@ -20,8 +20,8 @@ module RunCommand
       return false unless valid_command_exists
     end
 
-    combine_parameters = @parameters.collect
-    combine_parameters.push(command_parameters) unless command_parameters.nil?
+    combine_parameters = Array.new(@parameters)
+    combine_parameters << command_parameters unless command_parameters.nil?
     
     command = "\"#{@path_to_command}\" #{combine_parameters.join(' ')}"
     @logger.debug "Executing #{command_name}: #{command}"

data/lib/albacore/xunittestrunner.rb

@@ -31,7 +31,7 @@ class XUnitTestRunner
   end
 
   def execute()    		
-    @assemblies = [] unless !@assemblies.nil?
+    @assemblies = [] if @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'		

data/spec/exec_spec.rb

@@ -1,21 +1,21 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 require 'albacore/exec'
 
-@@nunit = File.join(File.dirname(__FILE__), 'support', 'Tools', 'NUnit-v2.5', 'nunit-console-x86.exe')
-
 describe Exec, "when executing a command with parameters" do
   before :all do
+    @nunit = File.join(File.dirname(__FILE__), 'support', 'Tools', 'NUnit-v2.5', 'nunit-console-x86.exe')
+
     @cmd = Exec.new
     @cmd.log_level = :verbose
     @cmd.extend(SystemPatch)
     @cmd.extend(FailPatch)
-    @cmd.path_to_command = @@nunit
+    @cmd.path_to_command = @nunit
     @cmd.parameters "--help"
     @cmd.execute
   end
   
   it "should run the command with the parameters" do
-    @cmd.system_command.should include("\"#{@@nunit}\" --help")
+    @cmd.system_command.should include("\"#{@nunit}\" --help")
   end
   
   it "should specify the parameters only once" do

data/spec/ncoverreport_spec.rb

@@ -433,8 +433,8 @@ describe NCoverReport, "when filtering on Assembly coverage data" do
     @ncover.required_coverage NCover::SymbolCoverage.new(:minimum => 0)
     
     @ncover.filters(
-    	NCover::AssemblyFilter.new(:filter_type => :exclude, :filter => ["nunit.*"]),
-    	NCover::AssemblyFilter.new(:filter_type => :include, :filter => ["TestSolution.*"])
+    	NCover::AssemblyFilter.new(:filter_type => :exclude, :filter => "nunit.*"),
+    	NCover::AssemblyFilter.new(:filter_type => :include, :filter => "TestSolution.*")
     )
     
     @ncover.run
@@ -471,8 +471,8 @@ describe NCoverReport, "when filtering on Namespace coverage data" do
     @ncover.required_coverage NCover::SymbolCoverage.new(:minimum => 0)
     
     @ncover.filters(
-    	NCover::NamespaceFilter.new(:filter_type => :exclude, :filter => ["nunit.*"]),
-    	NCover::NamespaceFilter.new(:filter_type => :include, :filter => ["TestSolution.*"])
+    	NCover::NamespaceFilter.new(:filter_type => :exclude, :filter => "nunit.*"),
+    	NCover::NamespaceFilter.new(:filter_type => :include, :filter => "TestSolution.*")
     )
     
     @ncover.run
@@ -509,8 +509,8 @@ describe NCoverReport, "when filtering on Class coverage data" do
     @ncover.required_coverage NCover::SymbolCoverage.new(:minimum => 0)
     
     @ncover.filters(
-    	NCover::ClassFilter.new(:filter_type => :exclude, :filter => ["Foo"]),
-    	NCover::ClassFilter.new(:filter_type => :include, :filter => ["Bar"])
+    	NCover::ClassFilter.new(:filter_type => :exclude, :filter => "Foo"),
+    	NCover::ClassFilter.new(:filter_type => :include, :filter => "Bar")
     )
     
     @ncover.run
@@ -547,8 +547,8 @@ describe NCoverReport, "when filtering on Method coverage data" do
     @ncover.required_coverage NCover::SymbolCoverage.new(:minimum => 0)
     
     @ncover.filters(
-    	NCover::MethodFilter.new(:filter_type => :exclude, :filter => ["Foo"]),
-    	NCover::MethodFilter.new(:filter_type => :include, :filter => ["Bar"])
+    	NCover::MethodFilter.new(:filter_type => :exclude, :filter => "Foo"),
+    	NCover::MethodFilter.new(:filter_type => :include, :filter => "Bar")
     )
     
     @ncover.run
@@ -585,8 +585,8 @@ describe NCoverReport, "when filtering on Document coverage data" do
     @ncover.required_coverage NCover::SymbolCoverage.new(:minimum => 0)
     
     @ncover.filters(
-    	NCover::DocumentFilter.new(:filter_type => :exclude, :filter => ["Foo"]),
-    	NCover::DocumentFilter.new(:filter_type => :include, :filter => ["Bar"])
+    	NCover::DocumentFilter.new(:filter_type => :exclude, :filter => "Foo"),
+    	NCover::DocumentFilter.new(:filter_type => :include, :filter => "Bar")
     )
     
     @ncover.run

data/spec/nunittestrunner_spec.rb

@@ -1,45 +1,53 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 require 'albacore/nunittestrunner'
 
-@@nunitpath = File.join(File.dirname(__FILE__), 'support', 'Tools', 'NUnit-v2.5', 'nunit-console-x86.exe')
-@@test_assembly = File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'CodeCoverage', 'nunit', 'assemblies', 'TestSolution.Tests.dll')
-@@failing_test_assembly = File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'CodeCoverage', 'nunit', 'failing_assemblies', 'TestSolution.FailingTests.dll')
-@@output_option = "/out=nunit.results.html"
+shared_examples_for "nunit paths" do
+  before :all do
+    @nunitpath = File.join(File.dirname(__FILE__), 'support', 'Tools', 'NUnit-v2.5', 'nunit-console-x86.exe')
+    @test_assembly = File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'CodeCoverage', 'nunit', 'assemblies', 'TestSolution.Tests.dll')
+    @failing_test_assembly = File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'CodeCoverage', 'nunit', 'failing_assemblies', 'TestSolution.FailingTests.dll')
+    @output_option = "/out=nunit.results.html"
+  end
+end
 
 describe NUnitTestRunner, "the command parameters for an nunit runner" do
+  it_should_behave_like "nunit paths"
+
   before :all do
-    nunit = NUnitTestRunner.new(@@nunitpath)
-    nunit.assemblies @@test_assembly, @@failing_test_assembly
-    nunit.options @@output_option
+    nunit = NUnitTestRunner.new(@nunitpath)
+    nunit.assemblies @test_assembly, @failing_test_assembly
+    nunit.options @output_option
     
     @command_parameters = nunit.get_command_parameters
   end
     
   it "should not include the path to the command" do
-    @command_parameters.should_not include(@@nunitpath)
+    @command_parameters.should_not include(@nunitpath)
   end
   
   it "should include the list of assemblies" do
-    @command_parameters.should include("\"#{@@test_assembly}\" \"#{@@failing_test_assembly}\"")
+    @command_parameters.should include("\"#{@test_assembly}\" \"#{@failing_test_assembly}\"")
   end
   
   it "should include the list of options" do
-    @command_parameters.should include(@@output_option)
+    @command_parameters.should include(@output_option)
   end
 end
 
 describe NUnitTestRunner, "the command line string for an nunit runner" do
+  it_should_behave_like "nunit paths"
+
   before :all do
-    nunit = NUnitTestRunner.new(@@nunitpath)
-    nunit.assemblies @@test_assembly
-    nunit.options @@output_option
+    nunit = NUnitTestRunner.new(@nunitpath)
+    nunit.assemblies @test_assembly
+    nunit.options @output_option
     
     @command_line = nunit.get_command_line
     @command_parameters = nunit.get_command_parameters.join(" ")
   end
     
   it "should start with the path to the command" do
-    @command_line.split(" ").first.should == @@nunitpath
+    @command_line.split(" ").first.should == @nunitpath
   end
   
   it "should include the command parameters" do
@@ -49,10 +57,12 @@ end
 
 
 describe NUnitTestRunner, "when configured correctly" do
+  it_should_behave_like "nunit paths"
+
   before :all do
-    nunit = NUnitTestRunner.new(@@nunitpath)
+    nunit = NUnitTestRunner.new(@nunitpath)
     nunit.extend(FailPatch)
-    nunit.assemblies @@test_assembly
+    nunit.assemblies @test_assembly
     nunit.options '/noshadow'
     
     nunit.execute
@@ -61,4 +71,4 @@ describe NUnitTestRunner, "when configured correctly" do
   it "should execute" do
     $task_failed.should be_false
   end
-end
+end

data/spec/xunit_spec.rb

@@ -1,42 +1,48 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 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')
+shared_examples_for "xunit paths" do
+  before :all do
+    @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')
+  end
+end
 
 describe XUnitTestRunner, "the command parameters for an xunit runner" do
+  it_should_behave_like "xunit paths"
   before :all do
-    xunit = XUnitTestRunner.new(@@xunitpath)
-    xunit.assembly = @@test_assembly
-    xunit.options @@output_option
+    xunit = XUnitTestRunner.new(@xunitpath)
+    xunit.assembly = @test_assembly
+    xunit.options @output_option
     
     @command_parameters = xunit.get_command_parameters
   end
     
   it "should not include the path to the command" do
-    @command_parameters.should_not include(@@xunitpath)
+    @command_parameters.should_not include(@xunitpath)
   end
   
   it "should include the list of options" do
-    @command_parameters.should include(@@output_option)
+    @command_parameters.should include(@output_option)
   end
 end
 
 describe XUnitTestRunner, "the command line string for an xunit runner" do
+  it_should_behave_like "xunit paths"
   before :all do
-    xunit = XUnitTestRunner.new(@@xunitpath)
-    xunit.assembly = @@test_assembly
-    xunit.options @@output_option
+    xunit = XUnitTestRunner.new(@xunitpath)
+    xunit.assembly = @test_assembly
+    xunit.options @output_option
     
     @command_line = xunit.get_command_line
     @command_parameters = xunit.get_command_parameters.join(" ")
   end
     
   it "should start with the path to the command" do
-    @command_line.split(" ").first.should == @@xunitpath
+    @command_line.split(" ").first.should == @xunitpath
   end
   
   it "should include the command parameters" do
@@ -45,9 +51,10 @@ describe XUnitTestRunner, "the command line string for an xunit runner" do
 end
 
 describe XUnitTestRunner, "when configured correctly" do
+  it_should_behave_like "xunit paths"
   before :all do
-    xunit = XUnitTestRunner.new(@@xunitpath)
-    xunit.assembly = @@test_assembly
+    xunit = XUnitTestRunner.new(@xunitpath)
+    xunit.assembly = @test_assembly
     xunit.options '/noshadow'
     xunit.extend(FailPatch)
     xunit.log_level = :verbose
@@ -61,9 +68,10 @@ describe XUnitTestRunner, "when configured correctly" do
 end
 
 describe XUnitTestRunner, "when multiple assemblies are passed to xunit runner" do
+  it_should_behave_like "xunit paths"
   before :all do
-    xunit = XUnitTestRunner.new(@@xunitpath)
-    xunit.assemblies = @@test_assembly, @@test_assembly
+    xunit = XUnitTestRunner.new(@xunitpath)
+    xunit.assemblies = @test_assembly, @test_assembly
     xunit.options '/noshadow'
     xunit.extend(FailPatch)
     xunit.log_level = :verbose
@@ -77,8 +85,9 @@ describe XUnitTestRunner, "when multiple assemblies are passed to xunit runner"
 end
 
 describe XUnitTestRunner, "when zero assemblies are passed to xunit runner" do
+  it_should_behave_like "xunit paths"
   before :all do
-    xunit = XUnitTestRunner.new(@@xunitpath)    
+    xunit = XUnitTestRunner.new(@xunitpath)    
     xunit.options '/noshadow'
     xunit.extend(FailPatch)
     
@@ -91,11 +100,12 @@ describe XUnitTestRunner, "when zero assemblies are passed to xunit runner" do
 end
 
 describe XUnitTestRunner, "when html_output is specified" do
+  it_should_behave_like "xunit paths"
   before :each do
-	FileUtils.mkdir @@working_dir
-    xunit = XUnitTestRunner.new(@@xunitpath)
-    xunit.assemblies = @@test_assembly    
-	xunit.html_output = File.dirname(@@html_output)
+	FileUtils.mkdir @working_dir
+    xunit = XUnitTestRunner.new(@xunitpath)
+    xunit.assembly = @test_assembly    
+    xunit.html_output = File.dirname(@html_output)
     xunit.extend(FailPatch)
     
     xunit.execute
@@ -106,27 +116,28 @@ describe XUnitTestRunner, "when html_output is specified" do
   end
   
   it "should write output html" do
-    File.exist?(@@html_output).should be_true
+    File.exist?(@html_output).should be_true
   end
   
   after:each do
-	FileUtils.rm_r @@working_dir if File.exist? @@working_dir
+	FileUtils.rm_r @working_dir if File.exist? @working_dir
   end
 end
 
 describe XUnitTestRunner, "when html_output is not a directory" do
+  it_should_behave_like "xunit paths"
   before :each do
-	FileUtils.mkdir @@working_dir
-	strio = StringIO.new
-    xunit = XUnitTestRunner.new(@@xunitpath)
-	xunit.log_level = :verbose
+    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.assembly = @test_assembly    
+    xunit.html_output = @html_output
     xunit.extend(FailPatch)
     
     xunit.execute
-	@log_data = strio.string
+    @log_data = strio.string
   end
   
   it "should fail" do
@@ -134,10 +145,10 @@ describe XUnitTestRunner, "when html_output is not a directory" do
   end
   
   it "should log a message" do
-	@log_data.should include('Directory is required for html_output')    
+    @log_data.should include('Directory is required for html_output')    
   end
   
   after:each do
-	FileUtils.rm_r @@working_dir if File.exist? @@working_dir
+    FileUtils.rm_r @working_dir if File.exist? @working_dir
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Derick Bailey
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -05:00
+date: 2010-05-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency