rake-dotnet 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.1.1 / 2009-05-20
+
+* NEW: Add FxCop -> TeamCity code-inspections reporting via TeamCity's service-messages feature
+* CHANGE: MsBuild; use constants rather than hard-codings for verbosity of output and source-directory
+* FIX: If BUILD_NUMBER environment variable is not a number, use 0 (since only numbers are valid to the AssemblyFileVersion and AssemblyVersion attributes)
+
+=== 0.1.0 / 2009-05-08
+
+* NEW: Add the ability for ncover.reporting to generate more than one report at a time
+
+
+
 === 0.0.12 / 2009-05-01
 
 * FIX: Automatically create {project}/Properties directories when generating AssemblyInfo.cs files (git does not version empty directories)

data/Rakefile

@@ -5,7 +5,7 @@ require 'hoe'
 require 'Pathname'
 require 'rake/clean'
 
-Hoe.new('rake-dotnet', '0.1.0') do |p|
+Hoe.new('rake-dotnet', '0.1.1') 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

@@ -188,7 +188,7 @@ module Rake
 			@suites_dir = params[:suites_dir] || File.join(OUT_DIR, 'bin')
 			@dll_list = FileList.new
 			@deps = params[:deps] || []
-			@fxcop_options = {:apply_out_xsl=>true, :out_xsl=>'CodeAnalysisReport.xsl'}.merge(params[:fxcop_options] || {})
+			@fxcop_options = params[:fxcop_options] || {}
 			if @fxcop_options[:apply_out_xsl].nil? || @fxcop_options[:apply_out_xsl] == false
 				@name += '.xml' 
 			else
@@ -212,9 +212,15 @@ module Rake
 				runner.run
 			end
 			
-			task :fxcop,[:globs] do |t, args|
-				args.with_defaults(:globs => "#{@suites_dir}/**/*#{@product_name}*.dll")
-				@dll_list = FileList.new(args.globs)
+			task :fxcop,[:include_globs, :exclude_globs] do |t, args|
+				args.with_defaults(:include_globs => "#{@suites_dir}/**/*#{@product_name}*.dll")
+				args.include_globs.each do |g|
+					@dll_list.include g
+				end
+				args.with_defaults(:exclude_globs => "#{@suites_dir}/*Tests*.dll")
+				args.exclude_globs.each do |g|
+					@dll_list.exclude g
+				end
 				Rake::FileTask[@name].invoke
 			end
 			
@@ -283,6 +289,7 @@ class FxCop
 	def run
 		puts cmd if VERBOSE
 		sh cmd
+		puts "##teamcity[importData type='FxCop' path='#{File.expand_path(@out_file)}']" if ENV['BUILD_NUMBER']
 	end
 end
 
@@ -293,7 +300,7 @@ module Rake
 			@src_path = params[:src_path] || File.join(PRODUCT_ROOT, 'src')
 			@target_path = params[:target_path] || File.join(OUT_DIR, 'bin')
 			@deps = params[:deps] || []
-			@configuration = params[:configuration] || 'Debug'
+			@configuration = params[:configuration] || CONFIGURATION
 			@glob = params[:glob] || "#{@src_path}/*"
 			
 			yield self if block_given?
@@ -420,8 +427,8 @@ module Rake
 	
 		def initialize(params={})
 			@configuration = params[:configuration] || CONFIGURATION
-			@src_dir = params[:src_dir] || File.join(PRODUCT_ROOT, 'src')
-			@verbosity = params[:verbosity] || 'm'
+			@src_dir = params[:src_dir] || SRC_DIR
+			@verbosity = params[:verbosity] || MSBUILD_VERBOSITY || 'm'
 			@working_dir = params[:working_dir] || '.'
 			@deps = params[:deps] || []
 			
@@ -562,8 +569,8 @@ module Rake
 				
 			end
 						
-			ncover_summary_report_html = File.join(@report_dir, 'merged.MethodSourceCodeClassMethod.coverage-report.html')
-			file ncover_summary_report_html do
+			desc "Generate ncover coverage report(s), on all coverage files, merged together"
+			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'
@@ -571,10 +578,7 @@ module Rake
 				ncr.run
 			end
 			
-			desc "Generate ncover coverage summary HTML report, on all coverage files, merged together"
-			task :ncover_summary => [:ncover_profile, ncover_summary_report_html]
-			
-			task :clean_coverage do
+			task :clobber_ncover do
 				rm_rf @report_dir
 			end
 			
@@ -635,10 +639,8 @@ class NCoverReporting
 		@exe = params[:ncover_reporting_exe] || File.join(TOOLS_DIR, 'ncover', arch, 'ncover.reporting.exe')
 
 		# required
-		@name = params[:name] || 'CoverageReport'
-		@report = params[:report] || 'MethodSourceCodeClassMethod'
-		@format = params[:report_format] || 'html' # can be xml or html
-		@output_path = File.join(@report_dir, @name + '.' + @report + '.' + @format)
+		@reports = params[:reports] || ['Summary', 'UncoveredCodeSections']
+		@output_path = File.join(@report_dir)
 		
 		# optional
 		@build_id = params[:build_id] || RDNVERSION
@@ -657,8 +659,12 @@ class NCoverReporting
 		"//bi #{@build_id.to_s}"
 	end
 	
-	def output_report
-		"//or #{@report}"
+	def output_reports
+		cmd = ''
+		@reports.each do |r|
+			cmd += "//or #{r} "
+		end
+		return cmd
 	end
 	
 	def op
@@ -670,7 +676,7 @@ class NCoverReporting
 	end
 		
 	def cmd
-		"\"#{@exe}\" #{coverage_files} #{bi} #{output_report} #{op} #{so}"
+		"\"#{@exe}\" #{coverage_files} #{bi} #{output_reports} #{op} #{so}"
 	end
 	
 	def run
@@ -873,7 +879,9 @@ class Versioner
   end
 
   def build
-    ENV['BUILD_NUMBER'] || 0
+	bn = ENV['BUILD_NUMBER']
+	return 0 if bn == nil || !bn.match(/\d+/)
+	return bn
   end
 
   def revision

metadata

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