pre_push 0.0.6 → 0.0.7

data/README.md

@@ -34,11 +34,17 @@ The arguments accepted are:
 	
 		/r={test runner}
 		/td={testable dlls}
+		/msb={path/to/custom/MSBuild.exe}
 
 If you wish to specify the dlls that your test runner should run/test use:
 	
 		$ prepush /td=./path/to/some.dll,./path/to/another.dll
 
+The default msbuild path used is C:/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe.
+If you wish to override it use:
+		
+		$ prepush /msb=c:/my/path/to/MSBuild.exe
+
 You can also modify the solution, dlls & even runner on the dropped pre-push file itself.
 If you're using mspec, you may need to specify the dlls you wish to test in the @assemblies array variable. Failing to do so may result in the error "Could not load file or assembly 'path/to/your.sln' or one of its dependencies. The module was expected to contain an assembly manifest."
 

data/bin/prepush

@@ -10,8 +10,7 @@ require "fileutils"
 parsed_args = PrePush::ArgsParser.execute(ARGV)
 runner = parsed_args[:runner]
 test_dlls = parsed_args[:test_dlls]
-assemblies_line = "@assemblies = {dtt} # insert dlls to test if different to the solution."
-commented_assemblies_line = "# @assemblies = ['path/to/first/test.dll','path/to/second/test.dll'] # insert dlls to test if different to the solution."
+msbuild = parsed_args[:msbuild]
 
 if PrePush::Validator.validate(runner)
 	bin = File.dirname(__FILE__)
@@ -22,9 +21,10 @@ if PrePush::Validator.validate(runner)
 	sln_path = PrePush::SlnFinder.find || "path/to/your.sln"
 	content = file_text.gsub(/\{runner\}/, "\"#{runner}\"").gsub(/\{sln_path\}/, "\"#{sln_path}\"")
 	if test_dlls != nil
-		content = content.gsub(/\{dtt\}/, "#{test_dlls}")
-	else 
-		content = content.sub(assemblies_line, commented_assemblies_line)
+		content = content.sub("# @assemblies = {test_dlls}", "@assemblies = #{test_dlls}")
+	end
+	if msbuild != nil
+		content = content.sub("# override_msbuild 'path/to/custom/msbuild.exe'","override_msbuild '#{msbuild}'")
 	end
 	File.open(pre_push_hook, "w") {|file| file.puts content}
 	puts "the pre-push hook has been dropped into your hooks dir; please modify it to build your assembly & run your tests."

data/lib/args_parser.rb

@@ -2,7 +2,11 @@ module PrePush
 	class ArgsParser
 		class << self
 			attr_accessor :args_props
-			ArgsParser.args_props = {'r' => [:runner, :str], 'td' => [:test_dlls, :array]}
+			ArgsParser.args_props = {
+				'r' => [:runner, :str], 
+				'td' => [:test_dlls, :array], 
+				'msb' => [:msbuild, :str]
+			}
 		end
 		def self.execute args
 			result = {:runner => 'nunit262'}

data/lib/pre_push/version.rb

@@ -1,3 +1,3 @@
 module PrePush
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/pre_push.rb

@@ -2,7 +2,6 @@ require "pre_push/version"
 
 module PrePush
 	module ClassMethods
-		MSBuildPaths = {:clr4 => 'C:/Windows/Microsoft.NET/Framework/v4.0.30319'}
 		def run
 			success = build
 			if (!success)
@@ -36,12 +35,17 @@ module PrePush
 	  def msbuild
 	  	'C:/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe'
 	  end
+	  def override_msbuild custom_msbuild
+	  	define_singleton_method :msbuild do
+	  		custom_msbuild
+	  	end
+	  end
 	  def runners_exes
 	  	{
 				'mspec' => 'mspec-clr4.exe',
 				'nunit262' => 'nunit-console.exe',
 				'xunit191' => 'xunit.console.exe'
-			}	  	
+			}
 	  end
 	end
 

data/lib/template/pre-push

@@ -9,7 +9,8 @@ class Executor
 	###
 
 	@solution = {sln_path} # the path to the solution to build
-	@assemblies = {dtt} # insert dlls to test if different to the solution.
+	# @assemblies = {test_dlls} # insert dlls to test if different to the solution.
+	# override_msbuild 'path/to/custom/msbuild.exe'
 end
 
 Executor.run

data/spec/args_parser_spec.rb

@@ -19,6 +19,12 @@ module PrePush
 					result[:runner].should == "mspec"
 				end
 			end
+			describe "when /msb is specfied" do
+				it "should return a result with a string msbuild" do
+					result = PrePush::ArgsParser.execute(["/msb=path/to/custom/msbuild.exe"])
+					result[:msbuild].should == "path/to/custom/msbuild.exe"
+				end
+			end
 			describe "when /td is specified" do
 				it "should parse value as an array" do
 					result = PrePush::ArgsParser.execute(["/td=./path/to/testable.dll"])

data/spec/pre_push_spec.rb

@@ -11,23 +11,8 @@ class EmptyDllsDummy
 	include PrePush
 end
 
-class DummyClr2
-	@clr = 'clr2'
-	@solution = "solution/path/whammy"
-	include PrePush
-end
-
-class SetExeDummy
-	@solution = 'meh'
-	@runner_exe = 'bar.exe'
-	@test_runner = 'nunit262'
-	def self.get_runners_exes
-		@runners_exes
-	end
-	def self.set_exes
-		self.build
-	end
-	include PrePush
+class DummyCustomMSBuild < Dummy
+	override_msbuild 'path/to/custom/msbuild.exe'
 end
 
 class NilClass
@@ -42,9 +27,13 @@ describe PrePush do
 			Dummy.build
 		end
 		it "should use clr4 msbuild when no clr specified" do
-			Dummy.should_receive("system").with(/^C:\/Windows\/Microsoft.NET\/Framework\/v4.0.30319/)
+			Dummy.should_receive("system").with(/^C:\/Windows\/Microsoft.NET\/Framework\/v4.0.30319\/MSBuild.exe/)
 			Dummy.build
 		end
+		it "should use custom msbuild when specified" do
+			DummyCustomMSBuild.should_receive("system").with(/^path\/to\/custom\/msbuild.exe/)
+			DummyCustomMSBuild.build
+		end
 	end
 	describe 'run_tests' do
 		it 'should call system to run tests on specified assemblies' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pre_push
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21391524 !ruby/object:Gem::Requirement
+  requirement: &23167296 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *21391524
+  version_requirements: *23167296
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21391188 !ruby/object:Gem::Requirement
+  requirement: &23166732 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21391188
+  version_requirements: *23166732
 description: adding a pre-push hook for git to compile & run tests
 email:
 - nievegoor@gmail.com