rake-dotnet 0.1.17 → 0.1.18

data/doc/examples.html

@@ -474,7 +474,7 @@ a {
     <dd class="spec not_implemented"><span class="not_implemented_spec_name">should require a test_dll (PENDING: Not Yet Implemented)</span></dd>
   </dl>
 </div>
-<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0.09 seconds</strong>";</script>
+<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0.066 seconds</strong>";</script>
 <script type="text/javascript">document.getElementById('totals').innerHTML = "75 examples, 0 failures, 45 pending";</script>
 </div>
 </div>

data/lib/rake_dotnet.rb

@@ -770,6 +770,8 @@ class NCoverTask < Rake::TaskLib
 		@report_dir = params[:report_dir] || File.join(OUT_DIR, 'reports', 'ncover')
 		@deps = params[:deps] || []
 		tool_defaults = {:arch => ENV['PROCESSOR_ARCHITECTURE']}
+		puts ENV['PROCESSOR_ARCHITECTURE']
+		puts 'NCOVER TD: ' + tool_defaults.to_s
 		@profile_options = tool_defaults.merge(params[:profile_options] || {})
 		@reporting_options = tool_defaults.merge(params[:reporting_options] || {})
 
@@ -787,10 +789,22 @@ class NCoverTask < Rake::TaskLib
 		reports_dir_regex = RakeDotNet::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")
+			if (shouldProfileIis(dll_to_execute))
+				@profile_options[:profile_iis] = true
+			end
 			nc = NCoverConsoleCmd.new(@report_dir, dll_to_execute, @profile_options)
 			nc.run
 		end
 
+		def shouldProfileIis(dll)
+			dll = dll.downcase
+			return true if dll.include? 'functional'
+			return true if dll.include? 'browser'
+			return true if dll.include? 'selenium'
+			return true if dll.include? 'watin'
+			return false
+		end
+
 		desc "Generate ncover coverage XML, one file per test-suite that exercises your product"
 		task :ncover_profile, [:dlls_to_run] => [@report_dir] do |t, args|
 			dlls_to_run_list = FileList.new
@@ -803,16 +817,24 @@ class NCoverTask < Rake::TaskLib
 				coverage_file = File.join(@report_dir, cf_name)
 				Rake::FileTask[coverage_file].invoke
 			end
+		end
 
+		rule(/#{reports_dir_regex}\/.*\//) do |report_set|
+			set_name = report_set.name.match(/#{reports_dir_regex}\/(.*)\//)[1]
+			profile_xml = File.join(@report_dir, "#{set_name}.coverage.xml")
+			mkdir_p report_set.name
+			@reporting_options[:project_name] = set_name
+			ncr = NCoverReportingCmd.new(report_set.name, profile_xml, @reporting_options)
+			ncr.run
 		end
 
-		desc "Generate ncover coverage report(s), on all coverage files, merged together"
+		desc "Generate ncover coverage report(s), on all coverage files"
 		task :ncover_reports => [:ncover_profile] do
-			# ncover lets us use *.coverage.xml to merge together files
-			include = [File.join(@report_dir, '*.coverage.xml')]
-			@reporting_options[:name] = 'merged'
-			ncr = NCoverReportingCmd.new(@report_dir, include, @reporting_options)
-			ncr.run
+			report_sets = FileList.new("#{@report_dir}/**/*.coverage.xml")
+			report_sets.each do |set|
+				cov_report = set.sub('.coverage.xml', '/')
+				Rake::FileTask[cov_report].invoke
+			end
 		end
 
 		task :clobber_ncover do
@@ -831,9 +853,14 @@ class NCoverConsoleCmd
 		@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.push('ISymWrapper')
+		
+		@profile_iis = params[:profile_iis] || false
 		@working_dir = params[:working_dir] || Pathname.new(@dll_to_execute).dirname
+
+		@is_complete_version = `#{@exe}`.include?('NCover Complete v')
 	end
 
 	def cmdToRun
@@ -842,22 +869,29 @@ class NCoverConsoleCmd
 	end
 
 	def bi
-		"//bi #{Versioner.new.get.to_s}"
+		return "//bi #{Versioner.new.get.to_s}"
 	end
 
 	def working_dir
-		"//w #{@working_dir}"
+		return "//w #{@working_dir}"
+	end
+
+	def iis
+		return '' unless @is_complete_version
+		return "//iis" if @profile_iis
 	end
 
 	def exclude_assemblies
-		if @exclude_assemblies_regex.instance_of?(Array)
+		return '' unless @is_complete_version
+		if @exclude_assemblies_regex.instance_of?(Array) && @exclude_assemblies_regex.length > 0
 			return '//eas ' + @exclude_assemblies_regex.join(';')
 		end
 		return '//eas ' + @exclude_assemblies_regex if @exclude_assemblies_regex.instance_of?(String)
+		return ''
 	end
 
 	def cmd
-		"\"#{@exe}\" #{cmdToRun} //x #{@output_file} #{exclude_assemblies} #{bi} #{working_dir}"
+		"\"#{@exe}\" #{cmdToRun} //x #{@output_file} #{exclude_assemblies} #{bi} #{working_dir} #{iis}"
 	end
 
 	def run
@@ -874,7 +908,9 @@ class NCoverReportingCmd
 		params ||= {}
 		arch = params[:arch] || ENV['PROCESSOR_ARCHITECTURE']
 		@exe = params[:ncover_reporting_exe] || File.join(TOOLS_DIR, 'ncover', arch, 'ncover.reporting.exe')
+		puts 'NR: ' + params[:arch].to_s + ' ' + arch
 
+		@is_complete_version = `#{@exe}`.include?('NCover Reporting Complete v')
 		# required
 		@reports = params[:reports] || ['Summary', 'UncoveredCodeSections', 'FullCoverageReport']
 		@output_path = File.join(@report_dir)
@@ -889,38 +925,46 @@ class NCoverReportingCmd
 		@coverage_files.each do |cf|
 			list += "\"#{cf}\" "
 		end
-		list
+		return list
 	end
 
 	def build_id
-		"//bi #{Versioner.new.get.to_s}"
+		return "//bi #{Versioner.new.get.to_s}"
 	end
 
 	def output_reports
 		cmd = ''
-		@reports.each do |r|
-			cmd += "//or #{r} "
+		if @is_complete_version
+			@reports.each do |r|
+				cmd += "//or #{r}"
+			end
+		else
+			classic_version_reports_allowed = ['Summary', 'SymbolModule', 'SymbolModuleNamespace', 'SymbolModuleNamespaceClass', 'SymbolModuleNamespaceClassMethod']
+			@reports.each do |r|
+				cmd += "//or #{r} " if classic_version_reports_allowed.include?(r)
+			end
 		end
 		return cmd
 	end
 
 	def output_path
-		"//op \"#{@output_path}\""
+		return "//op \"#{@output_path}\""
 	end
 
 	def sort_order
-		"//so #{@sort_order}"
+		return "//so #{@sort_order}"
 	end
 
 	def project_name
-		"//p #{@project_name}" unless @project_name.nil?
+		return "//p #{@project_name}" unless @project_name.nil?
 	end
 
 	def cmd
-		"\"#{@exe}\" #{coverage_files} #{build_id} #{output_reports} #{output_path} #{sort_order} #{project_name}"
+		return "\"#{@exe}\" #{coverage_files} #{build_id} #{output_reports} #{output_path} #{sort_order} #{project_name}"
 	end
 
 	def run
+		puts cmd if VERBOSE
 		sh cmd
 	end
 end
@@ -1177,7 +1221,7 @@ class XUnitTask < Rake::TaskLib
 
 	def initialize(params={}) # :yield: self
 		@suites_dir = params[:suites_dir] || File.join(OUT_DIR, 'bin')
-		@reports_dir = params[:reports_dir] || File.join(OUT_DIR, 'reports')
+		@reports_dir = params[:reports_dir] || File.join(OUT_DIR, 'reports', 'tests')
 		@options = params[:options] || {}
 		@deps = params[:deps] || []
 
@@ -1193,15 +1237,23 @@ class XUnitTask < Rake::TaskLib
 
 		rule(/#{@reports_dir}\/.*Tests.*\//) do |r|
 			suite = r.name.match(/.*\/(.*Tests)\//)[1]
-			testsDll = File.join(@suites_dir, suite + '.dll')
+			run(suite)
+		end
+
+		rule(/xt-.*Tests.*/) do |r|
+			suite = r.name.match(/xunit-(.*Tests)/)[1]
+			run(suite)
+		end
+
+		def run(suite)
+			tests_dll = File.join(@suites_dir, suite + '.dll')
 			out_dir = File.join(@reports_dir, suite)
-			unless File.exist?(out_dir) && uptodate?(testsDll, out_dir)
+			unless File.exist?(out_dir) && uptodate?(tests_dll, out_dir)
 				mkdir_p(out_dir) unless File.exist?(out_dir)
-				x = XUnitConsoleCmd.new(testsDll, out_dir, nil, options=@options)
+				x = XUnitConsoleCmd.new(tests_dll, out_dir, nil, options=@options)
 				x.run
 			end
 		end
-
 		directory @reports_dir
 
 		desc "Generate test reports (which ones, depends on the content of XUNIT_OPTS) inside of each directory specified, where each directory matches a test-suite name (give relative paths) (otherwise, all matching #{@suites_dir}/*Tests.*.dll) and write reports to #{@reports_dir}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake-dotnet
 version: !ruby/object:Gem::Version 
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors: 
 - Peter MouncePeter Mounce
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 +00:00
+date: 2009-11-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,36 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.3
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.2
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development