rake-dotnet 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.2 / 2009
+
+* NEW: NCover: Generate the full-coverage report
+* FIX: NCover: Exclude-assemblies can be an array
+* CHANGE: NCover: Ignore ISymWrapper assembly by default; seems to be an NCover artefact
+
 === 0.1.1 / 2009-05-20
 
 * NEW: Add FxCop -> TeamCity code-inspections reporting via TeamCity's service-messages feature

data/README.markdown

@@ -29,7 +29,7 @@ Rake-dotnet is a bunch of things that aim at doing the work of creating a featur
 
 *	Relies on a whole bunch of third-party tools and libraries which are too big to distribute within the gem or host myself.  So users need to fetch these before they can get up and running.  So think of a way to make this more frictionless...
 	*	InstallPad?
-	*	Currently, the directories for each tool are created within [{github}/DemoRoot/3rdparty](http://github.com/petemounce/rake-dotnet/tree/master) and there is a readme.txt next-door with URLs to fetch from.
+	*	Currently, the directories for each tool are created within [{github}/presentation/DemoRoot/3rdparty](http://github.com/petemounce/rake-dotnet/tree/master) and there is a readme.txt next-door with URLs to fetch from.
 
 ## Conventions:
 
@@ -64,7 +64,7 @@ So our source structure looks like:
 					{files}
 			/OtherProduct.sln
 
-Example: [{github}/DemoRoot](http://github.com/petemounce/rake-dotnet/tree/master)
+Example: [{github}/presentation/DemoRoot](http://github.com/petemounce/rake-dotnet/tree/master)
 
 ## Roadmap:
 
@@ -93,9 +93,9 @@ Example: [{github}/DemoRoot](http://github.com/petemounce/rake-dotnet/tree/maste
 
 1. `gem install rake-dotnet` (prepend `sudo` if you're not on Windows - which doesn't seem likely considering the audience ;-) )
 2. Create a directory to hold 3rdparty dependencies
-	* if you mirror [{github}/DemoRoot/3rdparty/](http://github.com/petemounce/rake-dotnet/tree/master/DemoRoot/3rdparty) you'll get default paths that rake-dotnet expects
+	* if you follow the instructions in  [{github}/presentation/DemoRoot/3rdparty/readme.txt](http://github.com/petemounce/rake-dotnet/tree/master/) you'll get default paths that rake-dotnet expects
 	* if you mirror the structure as above, you won't need to pass in a value for TOOLS_DIR when calling rake
-3. Fetch the 3rdparty dependencies listed in [{github}/DemoRoot/3rdparty/readme.txt](http://github.com/petemounce/rake-dotnet/tree/master/DemoRoot/3rdparty/readme.txt)
+3. Fetch the 3rdparty dependencies listed in [{github}/presentation/DemoRoot/3rdparty/readme.txt](http://github.com/petemounce/rake-dotnet/tree/master/)
 	* rake-dotnet uses tools within the paths taken from the default unzip'd location.  For example, svn.exe is expected to live within #{TOOLS_DIR}/svn/bin because that's how svn zip files unzip
 
 ## License:

data/Rakefile

@@ -5,7 +5,7 @@ require 'hoe'
 require 'Pathname'
 require 'rake/clean'
 
-Hoe.new('rake-dotnet', '0.1.1') do |p|
+Hoe.new('rake-dotnet', '0.1.2') do |p|
   p.author = 'Peter Mounce'
   p.description = 'Making a .NET build-automation dev\'s life easier, one angle-bracket at a time'
   p.email = 'pete@neverrunwithscissors.com'

data/lib/rake_dotnet.rb

@@ -527,14 +527,15 @@ end
 
 module Rake
 	class NCoverTask < TaskLib
+		attr_accessor :profile_options, :reporting_options
 		def initialize(params={})
 			@product_name = params[:product_name] || PRODUCT_NAME
 			@bin_dir = params[:bin_dir] || File.join(OUT_DIR, 'bin')
 			@report_dir = params[:report_dir] || File.join(OUT_DIR, 'reports', 'ncover')
 			@deps = params[:deps] || []
 			tool_defaults = {:arch => ENV['PROCESSOR_ARCHITECTURE']}
-			@ncover_options = tool_defaults.merge(params[:ncover_options] || {})
-			@ncover_reporting_options = tool_defaults.merge(params[:ncover_reporting_options] || {})
+			@profile_options = tool_defaults.merge(params[:profile_options] || {})
+			@reporting_options = tool_defaults.merge(params[:reporting_options] || {})
 
 			yield self if block_given?
 			define
@@ -550,7 +551,7 @@ module Rake
 			reports_dir_regex = regexify(@report_dir)
 			rule(/#{reports_dir_regex}\/.*\.coverage\.xml/) do |r|
 				dll_to_execute = r.name.sub(/#{@report_dir}\/(.*)\.coverage\.xml/, "#{@bin_dir}/\\1.dll")
-				nc = NCover.new(@report_dir, dll_to_execute, @ncover_options)
+				nc = NCover.new(@report_dir, dll_to_execute, @profile_options)
 				nc.run
 			end
 			
@@ -573,8 +574,8 @@ module Rake
 			task :ncover_reports => [:ncover_profile] do
 				# ncover lets us use *.coverage.xml to merge together files
 				include = [File.join(@report_dir, '*.coverage.xml')]
-				@ncover_reporting_options[:name] = 'merged'
-				ncr = NCoverReporting.new(@report_dir, include, @ncover_reporting_options)
+				@reporting_options[:name] = 'merged'
+				ncr = NCoverReporting.new(@report_dir, include, @reporting_options)
 				ncr.run
 			end
 			
@@ -584,8 +585,6 @@ module Rake
 			
 			self
 		end
-		
-		self
 	end
 end
 
@@ -597,7 +596,8 @@ class NCover
 		@dll_to_execute = dll_to_execute
 		ofname = File.split(dll_to_execute)[1].sub(/(\.dll)/, '') + '.coverage.xml'
 		@output_file = File.join(report_dir, ofname)
-		@exclude_assemblies_regex = params[:exclude_assemblies_regex] || '.*Tests.*'
+		@exclude_assemblies_regex = params[:exclude_assemblies_regex] || ['.*Tests.*']
+		@exclude_assemblies_regex.push('ISymWrapper')
 		@build_id = params[:build_id] || RDNVERSION
 		@working_dir = params[:working_dir] || Pathname.new(@dll_to_execute).dirname
 	end
@@ -615,12 +615,15 @@ class NCover
 		"//w #{@working_dir}"
 	end
 	
-	def eas
-		"//eas #{@exclude_assemblies_regex}"
+	def exclude_assemblies
+		if @exclude_assemblies_regex.instance_of?(Array)
+			return '//eas ' + @exclude_assemblies_regex.join(';')
+		end
+		return '//eas ' + @exclude_assemblies_regex if @exclude_assemblies_regex.instance_of?(String)
 	end
 
 	def cmd
-		"\"#{@exe}\" #{cmdToRun} //x #{@output_file} #{eas} #{bi} #{working_dir}"
+		"\"#{@exe}\" #{cmdToRun} //x #{@output_file} #{exclude_assemblies} #{bi} #{working_dir}"
 	end
 	
 	def run
@@ -639,12 +642,13 @@ class NCoverReporting
 		@exe = params[:ncover_reporting_exe] || File.join(TOOLS_DIR, 'ncover', arch, 'ncover.reporting.exe')
 
 		# required
-		@reports = params[:reports] || ['Summary', 'UncoveredCodeSections']
+		@reports = params[:reports] || ['Summary', 'UncoveredCodeSections', 'FullCoverageReport']
 		@output_path = File.join(@report_dir)
 		
 		# optional
 		@build_id = params[:build_id] || RDNVERSION
-		@so = params[:sort] || 'CoveragePercentageAscending'
+		@sort_order = params[:sort] || 'CoveragePercentageAscending'
+		@project_name = params[:project_name] || PRODUCT_NAME
 	end
 	
 	def coverage_files
@@ -655,7 +659,7 @@ class NCoverReporting
 		list
 	end
 	
-	def bi
+	def build_id
 		"//bi #{@build_id.to_s}"
 	end
 	
@@ -667,16 +671,20 @@ class NCoverReporting
 		return cmd
 	end
 	
-	def op
+	def output_path
 		"//op \"#{@output_path}\""
 	end
 	
-	def so
-		"//so #{@so}"
+	def sort_order
+		"//so #{@sort_order}"
+	end
+	
+	def project_name
+		"//p #{@project_name}" unless @project_name.nil?
 	end
 		
 	def cmd
-		"\"#{@exe}\" #{coverage_files} #{bi} #{output_reports} #{op} #{so}"
+		"\"#{@exe}\" #{coverage_files} #{build_id} #{output_reports} #{output_path} #{sort_order} #{project_name}"
 	end
 	
 	def run
@@ -948,18 +956,18 @@ module Rake
 end
 
 class XUnit
-	attr_accessor :xunit, :testDll, :reports_dir, :options
+	attr_accessor :xunit, :test_dll, :reports_dir, :options
 	
-	def initialize(testDll, reports_dir, xunit=nil, options={})
+	def initialize(test_dll, reports_dir, xunit=nil, options={})
 		@xunit = xunit || File.join(TOOLS_DIR, 'xunit', 'xunit.console.exe')
 		@xunit = File.expand_path(@xunit)
-		@testDll = File.expand_path(testDll)
+		@test_dll = File.expand_path(test_dll)
 		@reports_dir = File.expand_path(reports_dir)
 		@options = options
 	end
 	
 	def run
-		test_dir = Pathname.new(testDll).dirname
+		test_dir = Pathname.new(test_dll).dirname
 		chdir test_dir do
 			puts cmd if VERBOSE
 			sh cmd
@@ -967,7 +975,7 @@ class XUnit
 	end
 	
 	def cmd
-		cmd = "#{exe} #{testDll} #{html} #{xml} #{nunit} #{wait} #{noshadow} #{teamcity}"
+		cmd = "#{exe} #{test_dll} #{html} #{xml} #{nunit} #{wait} #{noshadow} #{teamcity}"
 	end
 	
 	def exe
@@ -975,11 +983,11 @@ class XUnit
 	end
 	
 	def suite
-		@testDll.match(/.*\/([\w\.]+)\.dll/)[1]
+		@test_dll.match(/.*\/([\w\.]+)\.dll/)[1]
 	end
 	
-	def testDll
-		"\"#{@testDll}\""
+	def test_dll
+		"\"#{@test_dll}\""
 	end
 	
 	def html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake-dotnet
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Peter MouncePeter Mounce
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 +01:00
+date: 2009-06-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.11.0
+        version: 1.12.2
     version: 
 description: Making a .NET build-automation dev's life easier, one angle-bracket at a time
 email: pete@neverrunwithscissors.compete@neverrunwithscissors.com
@@ -52,6 +52,8 @@ files:
 - test/test_rake_dotnet.rb
 has_rdoc: true
 homepage: http://blog.neverrunwithscissors.com/tag/rake-dotnet
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -73,9 +75,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rake-dotnet
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Build automation for .NET builds
 test_files: 
 - test/test_rake_dotnet.rb