albacore 0.1.0 → 0.1.1

data/README.markdown

@@ -1,84 +1,84 @@
-# Welcome to the Albacore project.
-
-Albacore is intended to be a professional quality suite of Rake tasks to help automate the process of building a .NET based system. All tasks are built using a test-first approach through rspec, and all tests are included in the Albacore gem.
-
-## How To Install Albacore From Gemcutter Gems:
-
-If you would like to install the current, stable release of Albacore, you can do so easily through the Gemcutter gem server. Follow these simple instructions and you will be good to go.
-
-**Step 1:** Setup Gemcutter as a gem source
-
-> gem source -a http://gemcutter.org
-
-(note: you only need to do this once for any given computer that is going to install gems from gemcutter.)
-
-**Step 2:** Install the Albacore gem
-
-> gem install albacore
-
-(note: as of v0.0.7, the "albacore" gem is spelled with a lowercase "a".)
-
-## How To Manually Build And Install The Albacore Gem
-
-If you would like to install the latest source code for Albacore, and get all the new features and functionality (possibly in an unstable form), you can manually build and install the Albacore gem. Follow these simple instructions and you will be good to go.
-
-**Step 1:** Clone Albacore
-
-Use your Github account to fork Albacore, or clone it directly from my public clone URL.
-
-> git clone git://github.com/derickbailey/Albacore.git Albacore
-
-**Step 2:** Build the gem
-
-In your local clone of Albacore, use the jeweler rake tasks to build the latest version of the Albacore code into a gem.
-
-> rake jeweler:gemspec
->
-> rake jeweler:build
-
-this will produce an 'albacore-#.#.#.gem' file in the 'pkg' folder, where '#.#.#' is the version number. For example 'albacore-0.0.7.gem'.
-
-**Step 3:** Install the gem
-
-After building the gem, you can install it from your local file system.
-
-> gem install -l pkg/albacore-#.#.#.gem
-
-where '#.#.#' is the version number of the gem. For example 'albacore-0.0.7.gem'
-
-## How To Use Albacore
-
-After installing Albacore, you only need to
-
-    require 'albacore'
-
-in your rakefile. This will allow you to use the tasks that Albacore includes. 
-
-    desc "Run a sample build using the MSBuildTask"
-    msbuildtask do |msb|
-        msb.properties = {:configuration => :Debug}
-        msb.targets [:Clean, :Build]
-        msb.solution = "spec/support/TestSolution/TestSolution.sln"
-    end
-
-Beyond the simple example, check out the [Albacore Wiki](http://wiki.github.com/derickbailey/Albacore) for detailed instructions on how to use the built in tasks and their options.
-
-## How To Contribute, Collaborate, Communicate
-
-If you'd like to get involved with the Albacore framework, we have a discussion group over at google: **[AlbacoreDev](http://groups.google.com/group/albacoredev)**
-
-Anyone can fork the main repository and submit patches, as well. And lastly, the [wiki](http://wiki.github.com/derickbailey/Albacore) and [issues list](http://github.com/derickbailey/Albacore/issues) are also open for additions, edits, and discussion.
-
-## Contributors
-
-Many thanks for contributions to Albacore are due (in alphabetical order):
-
-* [Andreone](http://github.com/Andreone): Significant Wiki contributions, questions and contributions on the google group
-* [Ben Hall](http://github.com/benhall): Primary contributor. SSH, SFTP, ZipDirectory, Rename, YAML auto config, Wiki pages, and many other great additions
-* [Brian Donahue](http://github.com/briandonahue): Inspiration and initial code for the ExpandTemplates task
-* [Hibri Marzook](http://github.com/hibri): the PLink and NDepend tasks
-* [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
-* [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
+# Welcome to the Albacore project.
+
+Albacore is intended to be a professional quality suite of Rake tasks to help automate the process of building a .NET based system. All tasks are built using a test-first approach through rspec, and all tests are included in the Albacore gem.
+
+## How To Install Albacore From Gemcutter Gems:
+
+If you would like to install the current, stable release of Albacore, you can do so easily through the Gemcutter gem server. Follow these simple instructions and you will be good to go.
+
+**Step 1:** Setup Gemcutter as a gem source
+
+> gem source -a http://gemcutter.org
+
+(note: you only need to do this once for any given computer that is going to install gems from gemcutter.)
+
+**Step 2:** Install the Albacore gem
+
+> gem install albacore
+
+(note: as of v0.0.7, the "albacore" gem is spelled with a lowercase "a".)
+
+## How To Manually Build And Install The Albacore Gem
+
+If you would like to install the latest source code for Albacore, and get all the new features and functionality (possibly in an unstable form), you can manually build and install the Albacore gem. Follow these simple instructions and you will be good to go.
+
+**Step 1:** Clone Albacore
+
+Use your Github account to fork Albacore, or clone it directly from my public clone URL.
+
+> git clone git://github.com/derickbailey/Albacore.git Albacore
+
+**Step 2:** Build the gem
+
+In your local clone of Albacore, use the jeweler rake tasks to build the latest version of the Albacore code into a gem.
+
+> rake jeweler:gemspec
+>
+> rake jeweler:build
+
+this will produce an 'albacore-#.#.#.gem' file in the 'pkg' folder, where '#.#.#' is the version number. For example 'albacore-0.0.7.gem'.
+
+**Step 3:** Install the gem
+
+After building the gem, you can install it from your local file system.
+
+> gem install -l pkg/albacore-#.#.#.gem
+
+where '#.#.#' is the version number of the gem. For example 'albacore-0.0.7.gem'
+
+## How To Use Albacore
+
+After installing Albacore, you only need to
+
+    require 'albacore'
+
+in your rakefile. This will allow you to use the tasks that Albacore includes. 
+
+    desc "Run a sample build using the MSBuildTask"
+    msbuildtask do |msb|
+        msb.properties = {:configuration => :Debug}
+        msb.targets [:Clean, :Build]
+        msb.solution = "spec/support/TestSolution/TestSolution.sln"
+    end
+
+Beyond the simple example, check out the [Albacore Wiki](http://wiki.github.com/derickbailey/Albacore) for detailed instructions on how to use the built in tasks and their options.
+
+## How To Contribute, Collaborate, Communicate
+
+If you'd like to get involved with the Albacore framework, we have a discussion group over at google: **[AlbacoreDev](http://groups.google.com/group/albacoredev)**
+
+Anyone can fork the main repository and submit patches, as well. And lastly, the [wiki](http://wiki.github.com/derickbailey/Albacore) and [issues list](http://github.com/derickbailey/Albacore/issues) are also open for additions, edits, and discussion.
+
+## Contributors
+
+Many thanks for contributions to Albacore are due (in alphabetical order):
+
+* [Andreone](http://github.com/Andreone): Significant Wiki contributions, questions and contributions on the google group
+* [Ben Hall](http://github.com/benhall): Primary contributor. SSH, SFTP, ZipDirectory, Rename, YAML auto config, Wiki pages, and many other great additions
+* [Brian Donahue](http://github.com/briandonahue): Inspiration and initial code for the ExpandTemplates task
+* [Hibri Marzook](http://github.com/hibri): the PLink and NDepend tasks
+* [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
+* [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

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/albacore/exec.rb

@@ -1,13 +1,10 @@
 require 'albacore/support/albacore_helper'
 
 class Exec
-  extend AttrMethods
   include RunCommand
   include YAMLConfig
   include Logging
   
-  attr_array :parameters
-  
   def initialize
     @path_to_command=''
     @parameters = []

data/lib/albacore/msbuild.rb

@@ -1,61 +1,61 @@
-require 'albacore/support/albacore_helper'
-
-class MSBuild
-  extend AttrMethods
-  include RunCommand
-  include YAMLConfig
-  include Logging
-  
-  attr_accessor :solution, :verbosity
-  attr_array :targets
-  attr_hash :properties
-  
-  def initialize
-    @path_to_command = build_path_to_command
-    super()
-  end
-  
-  def build_path_to_command
-    win_dir = ENV['windir'] || ENV['WINDIR']
-    win_dir = 'C:/Windows' if win_dir.nil?
-    
-    File.join(win_dir.dup, 'Microsoft.NET', 'Framework', 'v3.5', 'MSBuild.exe')
-  end
-  
-  def build
-    build_solution(@solution)
-  end
-  
-  def build_solution(solution)
-    check_solution solution
-    
-    command_parameters = []
-    command_parameters << "\"#{solution}\""
-    command_parameters << "\"/verbosity:#{@verbosity}\"" if @verbosity != nil
-    command_parameters << build_properties if @properties != nil
-    command_parameters << "\"/target:#{build_targets}\"" if @targets != nil
-    
-    result = run_command "MSBuild", command_parameters.join(" ")
-    
-    failure_message = 'MSBuild Failed. See Build Log For Detail'
-    fail_with_message failure_message if !result
-  end
-  
-  def check_solution(file)
-    return if file
-    msg = 'solution cannot be nil'
-    fail_with_message msg
-  end
-  
-  def build_targets
-    @targets.join ";"
-  end
-
-  def build_properties
-    option_text = []
-    @properties.each do |key, value|
-      option_text << "/p:#{key}\=\"#{value}\""
-    end
-    option_text.join(" ")
-  end
-end
+require 'albacore/support/albacore_helper'
+
+class MSBuild
+  extend AttrMethods
+  include RunCommand
+  include YAMLConfig
+  include Logging
+  
+  attr_accessor :solution, :verbosity
+  attr_array :targets
+  attr_hash :properties
+  
+  def initialize
+    @path_to_command = build_path_to_command
+    super()
+  end
+  
+  def build_path_to_command
+    win_dir = ENV['windir'] || ENV['WINDIR']
+    win_dir = 'C:/Windows' if win_dir.nil?
+    
+    File.join(win_dir.dup, 'Microsoft.NET', 'Framework', 'v3.5', 'MSBuild.exe')
+  end
+  
+  def build
+    build_solution(@solution)
+  end
+  
+  def build_solution(solution)
+    check_solution solution
+    
+    command_parameters = []
+    command_parameters << "\"#{solution}\""
+    command_parameters << "\"/verbosity:#{@verbosity}\"" if @verbosity != nil
+    command_parameters << build_properties if @properties != nil
+    command_parameters << "\"/target:#{build_targets}\"" if @targets != nil
+    
+    result = run_command "MSBuild", command_parameters.join(" ")
+    
+    failure_message = 'MSBuild Failed. See Build Log For Detail'
+    fail_with_message failure_message if !result
+  end
+  
+  def check_solution(file)
+    return if file
+    msg = 'solution cannot be nil'
+    fail_with_message msg
+  end
+  
+  def build_targets
+    @targets.join ";"
+  end
+
+  def build_properties
+    option_text = []
+    @properties.each do |key, value|
+      option_text << "/p:#{key}\=\"#{value}\""
+    end
+    option_text.join(" ")
+  end
+end

data/lib/albacore/ndepend.rb

@@ -1,29 +1,26 @@
 require "albacore/support/albacore_helper"
 class NDepend
+  extend AttrMethods
   include RunCommand
   include Logging
   include YAMLConfig
 
-  attr_accessor :path_to_command, :project_file , :parameters
+  attr_accessor :path_to_command, :project_file
   def initialize()
     super()
-    @parameters =[]
-    @require_valid_command = true
   end
   
   def run
     check_comand
     return if @failed
-    result = run_command @path_to_command, create_parameters
+    result = run_command @path_to_command, create_parameters.join(" ")
     failure_message = 'Command Failed. See Build Log For Detail'
     fail_with_message failure_message if !result
   end
 
   def create_parameters
     params = []
-    params << File.expand_path( @project_file)
-    params << @parameters.join(" ")
-    @logger.debug "NDependConsole Parameters" + @parameters.join(" ")
+    params << File.expand_path(@project_file)
     return params
   end
 

data/lib/albacore/nunittestrunner.rb

@@ -25,8 +25,8 @@ class NUnitTestRunner
   
   def get_command_parameters
     command_params = []
-    command_params << @assemblies.join(" ") unless @assemblies.nil?
     command_params << @options.join(" ") unless @options.nil?
+    command_params << @assemblies.join(" ") unless @assemblies.nil?
     command_params
   end
   

data/lib/albacore/support/runcommand.rb

@@ -1,13 +1,16 @@
 require 'albacore/support/failure'
 
 module RunCommand
+  extend AttrMethods
   include Failure
   
   attr_accessor :path_to_command, :require_valid_command, :command_directory
+  attr_array :parameters
   
   def initialize
     @require_valid_command = true
     @command_directory = Dir.pwd
+    @parameters = []
     super()
   end
   
@@ -15,6 +18,8 @@ module RunCommand
     if @require_valid_command
       return false unless valid_command_exists
     end
+
+    command_parameters = command_parameters + " #{@parameters.join(' ')}"
     
     command = "\"#{@path_to_command}\" #{command_parameters}"
     @logger.debug "Executing #{command_name}: #{command}"

data/lib/rake/assemblyinfotask.rb

@@ -8,7 +8,7 @@ module Albacore
   class AssemblyInfoTask < Albacore::AlbacoreTask
     def execute(name, task_args)
       @asm = AssemblyInfo.new
-      @asm.load_config_by_task_name(self.class.to_s.downcase)
+      @asm.load_config_by_task_name(name)
       @block.call(@asm, *task_args) unless @block.nil?
       @asm.write
       fail if @asm.failed

data/lib/rake/ndependtask.rb

@@ -7,8 +7,6 @@ end
 
 module Albacore
   class NDependTask < Albacore::AlbacoreTask
-    attr_accessor  :project_file , :parameters
-
     def execute(name, task_args)
       cmd = NDepend.new()
       cmd.load_config_by_task_name(name)

data/spec/ncoverconsole_spec.rb

@@ -31,6 +31,34 @@ describe NCoverConsole, "when specifying assemblies to cover" do
   end
 end
 
+describe NCoverConsole, "when specifying assemblies with spaces in the name" do
+  before :all do
+  	@testdata = NCoverConsoleTestData.new
+    File.delete(@testdata.xml_coverage_output) if File.exist?(@testdata.xml_coverage_output)
+    
+    @ncc = NCoverConsole.new()
+    
+    @ncc.extend(SystemPatch)
+    @ncc.log_level = :verbose
+    @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"
+    
+    nunit = NUnitTestRunner.new(@testdata.nunitpath)
+    nunit.assemblies @testdata.test_assembly_with_spaces
+    nunit.options '/noshadow'
+    
+    @ncc.testrunner = nunit
+    @ncc.run
+  end
+
+  it "should provide coverage for the specified assemblies" do
+    @ncc.system_command.should include("//assemblies \"with spaces/TestSolution\"")
+  end
+  
+end
+
 describe NCoverConsole, "when specifying assemblies to ignore" do
   before :all do
   	@testdata = NCoverConsoleTestData.new
@@ -208,8 +236,12 @@ describe NCoverConsole, "when producing an xml coverage report with nunit" do
     @ncc.system_command.should include(@testdata.nunitpath)
   end
   
-  it "should pass the specified arguments to the test runner" do
-    @ncc.system_command.should include("TestSolution.Tests.dll /noshadow")
+  it "should pass the specified assembly to the test runner" do
+    @ncc.system_command.should include("TestSolution.Tests.dll")
+  end
+  
+  it "should tell nunit to use the noshadow option" do
+  	@ncc.system_command.should include("/noshadow")
   end
     
   it "should write the coverage data to the specified file" do

data/spec/ndepend_spec.rb

@@ -13,7 +13,7 @@ describe "when executing Ndepend console" do
   before :each do
     @ndepend = NDepend.new
     @ndepend.log_device = StringIO.new
-    @ndepend.project_file = "spec/support/TestSolution/Ndependproject.xml"
+    @ndepend.project_file = "spec/support/TestSolution/NDependProject.xml"
     @ndepend.path_to_command = "spec/support/tools/Ndepend-v2.12/NDepend.Console.exe"
 
     @logger = StringIO.new
@@ -42,7 +42,7 @@ describe "when executing Ndepend console" do
 
   it "should accept other parameters" do
     expected_params = "/ViewReport /Silent /Help"
-    @ndepend.parameters << expected_params
+    @ndepend.parameters expected_params
     @ndepend.run
     @log_data.should include(expected_params)
   end

data/spec/support/ncoverconsoletestdata.rb

@@ -1,6 +1,7 @@
 class NCoverConsoleTestData
   attr_accessor :ncoverpath, :nunitpath, :xml_coverage_output, :html_coverage_output, :working_directory
   attr_accessor :test_assembly, :failing_test_assembly, :mspecpath, :mspec_html_output, :mspec_test_assembly
+  attr_accessor :test_assembly_with_spaces
     
   def initialize
     @ncoverpath = File.join(File.dirname(__FILE__), '..', 'support', 'Tools', 'NCover-v3.3', 'NCover.Console.exe')
@@ -9,6 +10,7 @@ class NCoverConsoleTestData
     @html_coverage_output = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'support', 'CodeCoverage', 'nunit', 'html', 'test-coverage.html')
     @working_directory = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'support', 'CodeCoverage', 'nunit')
     @test_assembly = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'support', 'CodeCoverage', 'nunit', 'assemblies', 'TestSolution.Tests.dll')
+    @test_assembly_with_spaces = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'support', 'CodeCoverage', 'nunit', 'assemblies/with spaces/', 'TestSolution.Tests.dll')
     @failing_test_assembly = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'support', 'CodeCoverage', 'nunit', 'failing_assemblies', 'TestSolution.FailingTests.dll')
   
     @mspecpath = File.join(File.dirname(__FILE__), '..', 'support', 'Tools', 'Machine.Specification-v0.2', 'Machine.Specifications.ConsoleRunner.exe')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: albacore
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Derick Bailey
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 -06:00
+date: 2010-02-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -213,6 +213,9 @@ files:
 - spec/support/CodeCoverage/nunit/assemblies/TestSolution.Tests.dll
 - spec/support/CodeCoverage/nunit/assemblies/TestSolution.dll
 - spec/support/CodeCoverage/nunit/assemblies/nunit.framework.dll
+- spec/support/CodeCoverage/nunit/assemblies/with spaces/TestSolution.Tests.dll
+- spec/support/CodeCoverage/nunit/assemblies/with spaces/TestSolution.dll
+- spec/support/CodeCoverage/nunit/assemblies/with spaces/nunit.framework.dll
 - spec/support/CodeCoverage/nunit/failing_assemblies/TestSolution.FailingTests.dll
 - spec/support/CodeCoverage/nunit/failing_assemblies/nunit.framework.dll
 - spec/support/CodeCoverage/report/coverage.xml