dev_tasks 0.0.162 → 0.0.163

data/lib/spec.json

@@ -1 +1 @@
-{"name":"dev_tasks","version":"0.0.162"}
+{"name":"dev_tasks","version":"0.0.163"}

data/lib/test.rb

@@ -7,25 +7,40 @@ class Test < CommandArray
 	if(Dir.glob("**/*spec.rb").length > 0)
 	  self.add 'rspec'
 	end
-	# nunit tests, 'nunit-console.exe "C::\\Projects\\MyProjects\\bin\\Release\\MyLib.Test.dll"'
-	if File.exist? Test.nunit_console
-	  Dir.glob("*.csproj").each{|p|
+
+    test_files=collect_nunit_files
+	if(defined?(DEV_TASKS) && DEV_TASKS.has_key?(:files) && DEV_TASKS[:files].has_key?(:test))
+      test_files=DEV_TASKS[:files][:test]
+	end
+
+    if(!test_files.nil?)
+    	test_files.each {|tf|
+    		if(tf.include?('.dll'))
+    		   nunit_dll=tf
+    		  if(outputPath.include?('x86'))
+    		  	self.add "\"#{Test.nunit_console_x86}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
+    		  else
+    		  	self.add "\"#{Test.nunit_console}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
+    		  end
+    		end
+    	}
+    end
+  end
+
+  def collect_nunit_files
+  	results=Array.new
+    Dir.glob("*.csproj").each{|p|
 	    text = File.read(p)
 		if(text.include?("nunit.framework.dll"))
 		  # extract AssemblyName of form:  <AssemblyName>MyLibrary.Test</AssemblyName>
 		  assemblyName=text[/<AssemblyName>([\w\.]+)</,1]
 		  outputPath=text[/Release[.\w\W]+<OutputPath>([\w\.\\]+)</,1]
 		  if(!assemblyName.nil? && !outputPath.nil?)
-			nunit_dll = "#{Rake.application.original_dir}\\#{outputPath}\\#{assemblyName}.dll".gsub("\\\\","\\").gsub('/','\\')
-			if(outputPath.include?('x86'))
-				self.add "\"#{Test.nunit_console_x86}\" \"#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
-			else	
-				self.add "\"#{Test.nunit_console}\" \"#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
-			end
+		  	results << "#{outputPath}\\#{assemblyName}.dll".gsub("\\\\","\\").gsub('/','\\')
 		  end
 		end
 	  }
-	end
+	 results
   end
 
   def self.nunit_console

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.162
+  version: 0.0.163
   prerelease: 
 platform: ruby
 authors: