albacore 0.1.1 → 0.1.2

data/spec/exec_spec.rb

@@ -8,6 +8,7 @@ describe Exec, "when executing a command with parameters" do
     @cmd = Exec.new
     @cmd.log_level = :verbose
     @cmd.extend(SystemPatch)
+    @cmd.extend(FailPatch)
     @cmd.path_to_command = @@nunit
     @cmd.parameters "--help"
     @cmd.execute
@@ -18,6 +19,6 @@ describe Exec, "when executing a command with parameters" do
   end
   
   it "should not fail" do
-    @cmd.failed.should be_false
+    $task_failed.should be_false
   end
 end

data/spec/exectask_spec.rb

@@ -1,14 +1,14 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 require 'albacore/exec'
 require 'rake/exectask'
-require 'tasklib_patch'
+require 'fail_patch'
 
-describe Albacore::ExecTask, "when running" do
+describe "when running" do
   before :all do
-    task = Albacore::ExecTask.new(:exec) do |t|
+  	exec :exec do |t|
+  	  t.extend(FailPatch)
       @yielded_object = t
     end
-    task.extend(TasklibPatch)
     Rake::Task[:exec].invoke
   end
   
@@ -17,15 +17,30 @@ describe Albacore::ExecTask, "when running" do
   end
 end
 
-describe Albacore::ExecTask, "when execution fails" do
+describe "when execution fails" do
   before :all do
-    @task = Albacore::ExecTask.new(:failingtask)
-    @task.extend(TasklibPatch)
-    @task.fail
-    Rake::Task["failingtask"].invoke
+  	exec :exec_fail do |t|
+  	  t.extend(FailPatch)
+      @yielded_object = t
+    end
+    Rake::Task[:exec_fail].invoke
   end
   
   it "should fail the rake task" do
-    @task.task_failed.should be_true
+    $task_failed.should be_true
   end
 end
+
+describe "when task args are used" do
+  before :all do
+    exec :exectask_withargs, [:arg1] do |exec, args|
+      exec.extend(FailPatch)
+      @args = args
+  	end
+    Rake::Task["exectask_withargs"].invoke("test")
+  end
+  
+  it "should provide the task args" do
+    @args.arg1.should == "test"
+  end
+end

data/spec/expandtemplatestask_spec.rb

@@ -1,14 +1,14 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 require 'albacore/expandtemplates'
 require 'rake/expandtemplatestask'
-require 'tasklib_patch'
+require 'fail_patch'
 
-describe Albacore::ExpandTemplatesTask, "when running" do
+describe "when running" do
   before :each do
-    task = Albacore::ExpandTemplatesTask.new(:expandtemplates) do |t|
+    expandtemplates :expandtemplates do |t|
+      t.extend(FailPatch)
       @yielded_object = t
     end
-    task.extend(TasklibPatch)
     Rake::Task[:expandtemplates].invoke
   end
   
@@ -17,15 +17,30 @@ describe Albacore::ExpandTemplatesTask, "when running" do
   end
 end
 
-describe Albacore::ExpandTemplatesTask, "when execution fails" do
+describe "when execution fails" do
   before :each do
-    @task = Albacore::ExpandTemplatesTask.new(:failingtask)
-    @task.extend(TasklibPatch)
-    @task.fail
-    Rake::Task["failingtask"].invoke
+  	expandtemplates :expand_fail do |t|
+      t.extend(FailPatch)
+      t.fail
+    end
+    Rake::Task[:expand_fail].invoke
   end
   
   it "should fail the rake task" do
-    @task.task_failed.should be_true
+    $task_failed.should be_true
+  end
+end
+
+describe "when task args are used" do
+  before :all do
+    expandtemplates :expandtask_withargs, [:arg1] do |t, args|
+      t.extend(FailPatch)
+      @args = args
+  	end
+    Rake::Task[:expandtask_withargs].invoke("test")
+  end
+  
+  it "should provide the task args" do
+    @args.arg1.should == "test"
   end
 end

data/spec/msbuild_spec.rb

@@ -31,8 +31,8 @@ describe MSBuild, "when building with no solution specified" do
   it_should_behave_like "prepping msbuild"
 
   before :all do
+    @msbuild.extend(FailPatch)
     @msbuild.build
-    
     @log_data = @strio.string
   end
   
@@ -67,6 +67,7 @@ describe MSBuild, "when an invalid msbuild path is specified" do
   before :all do
     @testdata = MSBuildTestData.new
     msbuild = @testdata.msbuild "/an invalid path/does not exist.exe"
+    msbuild.extend(FailPatch)
     @strio = StringIO.new
     msbuild.log_device = @strio
     msbuild.log_level = :verbose

data/spec/msbuildtask_spec.rb

@@ -1,14 +1,14 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 require 'albacore/msbuild'
 require 'rake/msbuildtask'
-require 'tasklib_patch'
+require 'fail_patch'
 
-describe Albacore::MSBuildTask, "when running" do
+describe "when running" do
   before :all do
-    task = Albacore::MSBuildTask.new(:msbuild) do |t|
+    msbuild :msbuild do |t|
+      t.extend(FailPatch)
       @yielded_object = t
     end
-    task.extend(TasklibPatch)
     Rake::Task[:msbuild].invoke
   end
   
@@ -17,15 +17,30 @@ describe Albacore::MSBuildTask, "when running" do
   end
 end
 
-describe Albacore::MSBuildTask, "when execution fails" do
+describe "when execution fails" do
   before :all do
-    @task = Albacore::MSBuildTask.new(:failingtask)
-    @task.extend(TasklibPatch)
-    @task.fail
-    Rake::Task["failingtask"].invoke
+    msbuild :msbuild_fail do |t|
+      t.extend(FailPatch)
+      t.fail
+    end
+    Rake::Task[:msbuild_fail].invoke
   end
   
   it "should fail the rake task" do
-    @task.task_failed.should == true
+    $task_failed.should == true
+  end
+end
+
+describe "when task args are used" do
+  before :all do
+    msbuild :msbuildtask_withargs, [:arg1] do |t, args|
+      t.extend(FailPatch)
+      @args = args
+  	end
+    Rake::Task[:msbuildtask_withargs].invoke("test")
+  end
+  
+  it "should provide the task args" do
+    @args.arg1.should == "test"
   end
 end

data/spec/mspectask_spec.rb

@@ -1,14 +1,14 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 require 'albacore/mspectestrunner'
 require 'rake/mspectask'
-require 'tasklib_patch'
+require 'fail_patch'
 
-describe Albacore::MSpecTask, "when running" do
+describe "when running" do
   before :all do
-    task = Albacore::MSpecTask.new(:mspec) do |t|
+    mspec :mspec do |t|
+      t.extend(FailPatch)
       @yielded_object = t
     end
-    task.extend(TasklibPatch)
     Rake::Task[:mspec].invoke
   end
   
@@ -17,15 +17,30 @@ describe Albacore::MSpecTask, "when running" do
   end
 end
 
-describe Albacore::MSpecTask, "when execution fails" do
+describe "when execution fails" do
   before :all do
-    @task = Albacore::MSpecTask.new(:failingtask)
-    @task.extend(TasklibPatch)
-    @task.fail
-    Rake::Task["failingtask"].invoke
+    mspec :mspec_fail do |t|
+      t.extend(FailPatch)
+      t.fail
+    end
+    Rake::Task[:mspec_fail].invoke
   end
   
   it "should fail the rake task" do
-    @task.task_failed.should == true
+    $task_failed.should == true
+  end
+end
+
+describe "when task args are used" do
+  before :all do
+    mspec :mspectask_withargs, [:arg1] do |t, args|
+      t.extend(FailPatch)
+      @args = args
+  	end
+    Rake::Task[:mspectask_withargs].invoke("test")
+  end
+  
+  it "should provide the task args" do
+    @args.arg1.should == "test"
   end
 end

data/spec/nant_spec.rb

@@ -19,12 +19,13 @@ describe NAnt, "when a nant path is not specified" do
   it_should_behave_like "prepping nant"
   
   before :all do
+  	@nant.extend(FailPatch)
     @log_data = @strio.string
     @nant.run
   end
   
   it "should fail" do
-  	@nant.failed.should == true
+  	$task_failed.should == true
   end
   
   it "should log the missing command path" do

data/spec/nanttask_spec.rb

@@ -1,14 +1,14 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 require 'albacore/nant'
 require 'rake/nanttask'
-require 'tasklib_patch'
+require 'fail_patch'
 
-describe Albacore::NAntTask, "when running" do
+describe "when running" do
   before :all do
-    task = Albacore::NAntTask.new(:nant) do |t|
+    nant :nant do |t|
+      t.extend(FailPatch)
       @yielded_object = t
     end
-    task.extend(TasklibPatch)
     Rake::Task[:nant].invoke
   end
   
@@ -17,15 +17,30 @@ describe Albacore::NAntTask, "when running" do
   end
 end
 
-describe Albacore::NAntTask, "when execution fails" do
+describe "when execution fails" do
   before :all do
-    @task = Albacore::NAntTask.new(:nant_failingtask)
-    @task.extend(TasklibPatch)
-    @task.fail
+    nant :nant_failingtask do |t|
+      t.extend(FailPatch)
+      t.fail
+    end    
     Rake::Task[:nant_failingtask].invoke
   end
   
   it "should fail the rake task" do
-    @task.task_failed.should == true
+    $task_failed.should == true
+  end
+end
+
+describe "when task args are used" do
+  before :all do
+    nant :nanttask_withargs, [:arg1] do |t, args|
+      t.extend(FailPatch)
+      @args = args
+  	end
+    Rake::Task[:nanttask_withargs].invoke("test")
+  end
+  
+  it "should provide the task args" do
+    @args.arg1.should == "test"
   end
 end

data/spec/ncoverconsole_spec.rb

@@ -43,7 +43,7 @@ describe NCoverConsole, "when specifying assemblies with spaces in the name" do
     @ncc.path_to_command = @testdata.ncoverpath
     @ncc.output :xml => @testdata.xml_coverage_output
     @ncc.working_directory = @testdata.working_directory
-    @ncc.cover_assemblies "with spaces/TestSolution"
+    @ncc.cover_assemblies "assemblies/with spaces/TestSolution"
     
     nunit = NUnitTestRunner.new(@testdata.nunitpath)
     nunit.assemblies @testdata.test_assembly_with_spaces
@@ -54,7 +54,7 @@ describe NCoverConsole, "when specifying assemblies with spaces in the name" do
   end
 
   it "should provide coverage for the specified assemblies" do
-    @ncc.system_command.should include("//assemblies \"with spaces/TestSolution\"")
+    @ncc.system_command.should include("//assemblies \"assemblies/with spaces/TestSolution\"")
   end
   
 end
@@ -92,6 +92,8 @@ describe NCoverConsole, "when running with the defaults" do
     @ncc = NCoverConsole.new
     
     @ncc.extend(SystemPatch)
+    @ncc.extend(FailPatch)
+    
     @ncc.path_to_command = @testdata.ncoverpath
     @ncc.testrunner = NUnitTestRunner.new
     
@@ -109,6 +111,8 @@ describe NCoverConsole, "when opting out of registering the ncover dll" do
     @ncc = NCoverConsole.new
     
     @ncc.extend(SystemPatch)
+    @ncc.extend(FailPatch)
+    
     @ncc.path_to_command = @testdata.ncoverpath
     @ncc.no_registration
     @ncc.testrunner = NUnitTestRunner.new
@@ -158,6 +162,8 @@ describe NCoverConsole, "when analyzing a test suite with failing tests" do
     ncc.log_device = strio
     
     ncc.extend(SystemPatch)
+    ncc.extend(FailPatch)
+    
     ncc.log_level = :verbose
     ncc.path_to_command = @testdata.ncoverpath
     ncc.output :xml => @testdata.xml_coverage_output
@@ -170,12 +176,11 @@ describe NCoverConsole, "when analyzing a test suite with failing tests" do
     ncc.testrunner = nunit
     
     ncc.run
-    @failed = ncc.failed
     @log_data = strio.string
   end
   
   it "should return a failure code" do
-    @failed.should == true
+    $task_failed.should == true
   end
   
   it "should log a failure message" do
@@ -187,10 +192,11 @@ describe NCoverConsole, "when running without a testrunner" do
   before :all do
   	@testdata = NCoverConsoleTestData.new
     ncc = NCoverConsole.new()
+    ncc.extend(FailPatch)
     strio = StringIO.new
     ncc.log_device = strio
     
-    @result = ncc.run
+    ncc.run
     @log_data = strio.string
   end
 
@@ -198,8 +204,8 @@ describe NCoverConsole, "when running without a testrunner" do
     @log_data.should include("testrunner cannot be nil.")
   end
   
-  it "should return a failure code" do
-    @result.should == false
+  it "should fail the task" do
+    $task_failed.should be_true
   end
 end
 
@@ -287,6 +293,8 @@ describe NCoverConsole, "when producing a report with machine.specifications" do
     @ncc = NCoverConsole.new()
     
     @ncc.extend(SystemPatch)
+    @ncc.extend(FailPatch)
+    
     @ncc.log_level = :verbose
     @ncc.path_to_command = @testdata.ncoverpath
     @ncc.output :xml => @testdata.xml_coverage_output
@@ -301,7 +309,7 @@ describe NCoverConsole, "when producing a report with machine.specifications" do
   end
 
   it "should not fail" do
-    @ncc.failed.should be_false
+    $task_failed.should be_false
   end
 
   it "should produce the html report" do

data/spec/ncoverconsoletask_spec.rb

@@ -1,14 +1,14 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 require 'albacore/ncoverconsole'
 require 'rake/ncoverconsoletask'
-require 'tasklib_patch'
+require 'fail_patch'
 
-describe Albacore::NCoverConsoleTask, "when running" do
+describe "when running" do
   before :all do
-    task = Albacore::NCoverConsoleTask.new(:ncoverconsole) do |t|
+    ncoverconsole :ncoverconsole do |t|
+      t.extend(FailPatch)
       @yielded_object = t
     end
-    task.extend(TasklibPatch)
     Rake::Task[:ncoverconsole].invoke
   end
   
@@ -17,15 +17,30 @@ describe Albacore::NCoverConsoleTask, "when running" do
   end
 end
 
-describe Albacore::NCoverConsoleTask, "when execution fails" do
+describe "when execution fails" do
   before :all do
-    @task = Albacore::NCoverConsoleTask.new(:failingtask)
-    @task.extend(TasklibPatch)
-    @task.fail
-    Rake::Task["failingtask"].invoke
+    ncoverconsole :ncoverconsole_fail do |t|
+      t.extend(FailPatch)
+      t.fail
+    end
+    Rake::Task[:ncoverconsole_fail].invoke
   end
   
   it "should fail the rake task" do
-    @task.task_failed.should == true
+    $task_failed.should == true
+  end
+end
+
+describe "when task args are used" do
+  before :all do
+    ncoverconsole :ncoverconsoletask_withargs, [:arg1] do |t, args|
+      t.extend(FailPatch)
+      @args = args
+  	end
+    Rake::Task[:ncoverconsoletask_withargs].invoke("test")
+  end
+  
+  it "should provide the task args" do
+    @args.arg1.should == "test"
   end
 end