pre_push 0.0.1.2 → 0.0.1.3

data/.gitignore

@@ -19,4 +19,7 @@ tmp
 bin/
 obj/
 _ReSharper*
-*ReSharper*
+*ReSharper*
+*.suo
+*.user
+todo

data/lib/pre_push/version.rb

@@ -1,3 +1,3 @@
 module PrePush
-  VERSION = "0.0.1.2"
+  VERSION = "0.0.1.3"
 end

data/lib/pre_push.rb

@@ -2,6 +2,8 @@ require "pre_push/version"
 
 module PrePush
 	module ClassMethods
+		attr :runner
+		MSBuildPaths = {:clr4 => 'C:/Windows/Microsoft.NET/Framework/v4.0.30319', :clr2 => 'C:/Windows/Microsoft.NET/Framework/v2.0.50727'}
 		def run
 			success = build
 			if (!success)
@@ -16,7 +18,12 @@ module PrePush
 		end
 		def build
 			set_exes_cache
-			msbuild = 'C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe'
+			clr = @clr == nil ? :clr4 : @clr.to_sym
+			if MSBuildPaths[clr] == nil
+				puts 'please assign clr2 or clr4 to @clr'
+				exit(1)
+			end
+			msbuild = "#{MSBuildPaths[clr]}/MSBuild.exe"
 			system "#{msbuild} #{@solution}"
 			$?.success?
 		end
@@ -37,12 +44,13 @@ module PrePush
 	  def set_exes_cache
 	  	if (@runners_exes == nil || @runners_exes.empty?) then
 				@runners_exes = {}
-		  		bin = File.dirname(__FILE__)
-				runners_dir = "#{bin}/../lib/runners"
-				Dir.entries(runners_dir).each {|file| @runners_exes[file] = @runner_exe || Dir.entries("#{runners_dir}/#{file}").detect{|f| f.end_with?('.exe')}}	
-				@runners_exes['nunit262'] = @runner_exe || 'nunit-console.exe'
-				@runners_exes['mspec'] = @runner_exe || 'mspec-clr4.exe'
-				@runners_exes['xunit191'] = @runner_exe || 'xunit.console.exe'
+		  	bin = File.dirname(__FILE__)
+				config_dir = "#{bin}/../lib/runners_config"
+				Dir.entries(config_dir).select{|f| !File.directory? f}.each do |file|
+					load "#{bin}/../lib/runners_config/#{file}"
+					name = file.gsub('.rb','')
+					@runners_exes[name] = Container.runner
+				end
 			end
 	  end
 	end
@@ -51,4 +59,19 @@ module PrePush
 		receiver.extend         ClassMethods
 		#receiver.send :include, InstanceMethods
 	end
-end
+end
+
+class Container
+	class << self
+		attr_accessor :runner
+	end
+end
+
+module Config
+	private
+	def use(runner)
+		Container.runner = runner
+	end
+end
+
+self.extend Config

data/lib/prepush_validator.rb

@@ -11,10 +11,10 @@ module PrePush
 			end
 			bin = File.dirname(__FILE__)
 			runners_dir = "#{bin}/../lib/runners"
-			found = false
-			Dir.entries(runners_dir).each {|file| found = true if file == runner}
+			found = Dir.entries(runners_dir).any?{|file| file == "#{runner}.rb"}
 			unless found
-				puts "Couldn't find test runner #{runner}"
+				all = Dir.entries(runners_dir).select{|f| !File.directory? f}.join(', ')
+				puts "Couldn't find test runner #{runner} in #{all}"
 				return false
 			end
 			return true

data/lib/runners_config/mspec.rb

@@ -0,0 +1 @@
+use	'mspec-clr4.exe'

data/lib/runners_config/nunit262.rb

@@ -0,0 +1 @@
+use	'nunit-console.exe'

data/lib/runners_config/xunit191.rb

@@ -0,0 +1 @@
+use	'xunit.console.exe'

data/spec/pre_push_spec.rb

@@ -5,12 +5,24 @@ class Dummy
 	include PrePush
 end
 
+class DummyClr2
+	@clr = 'clr2'
+	@solution = "solution/path/whammy"
+	include PrePush
+end
+
+class DummyClr666
+	@clr = 'clr666'
+	@solution = "solution/path/whammy"
+	include PrePush
+end
+
 class SetExeDummy
 	@solution = 'meh'
 	@runner_exe = 'bar.exe'
 	@test_runner = 'nunit262'
-	def self.get_runner_exe(key)
-		@runners_exes[key]
+	def self.get_runners_exes
+		@runners_exes
 	end
 	def self.set_exes
 		self.build
@@ -29,6 +41,19 @@ describe PrePush do
 			Dummy.should_receive("system").with(/solution\/path\/whammy$/)
 			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.build
+		end
+		it "should use clr2 msbuild when clr2 specified" do
+			DummyClr2.should_receive("system").with(/^C:\/Windows\/Microsoft.NET\/Framework\/v2.0.50727/)
+			DummyClr2.build
+		end
+		it "should exit when inexistent clr specified" do
+			DummyClr666.should_receive("puts").with('please assign clr2 or clr4 to @clr')
+			DummyClr666.should_receive("exit").with(1)
+			DummyClr666.build
+		end
 	end
 	describe 'run_tests' do
 		it 'should call system to run tests in specified assemblies' do
@@ -47,10 +72,13 @@ describe PrePush do
 		end
 	end
 	describe 'set_exes_cache' do
-		it 'should add predefined runner exe' do
+		it 'should set runners individually and uniquely' do
 			SetExeDummy.should_receive("system").with(/meh$/)
 			SetExeDummy.set_exes
-			SetExeDummy.get_runner_exe('nunit262').should == 'bar.exe'
+			subject = SetExeDummy.get_runners_exes
+			subject[subject.keys[0]].should_not == subject[subject.keys[1]]
+			subject[subject.keys[0]].should_not == subject[subject.keys[2]]
+			subject[subject.keys[1]].should_not == subject[subject.keys[2]]
 		end
 	end
 end

data/spec/prepush_validator_spec.rb

@@ -17,13 +17,13 @@ module PrePush
 			it "should fail when runner not found" do
 				Dir.stub('exists?').with('.git').and_return(true)
 				Dir.stub('exists?').with('.git/hooks').and_return(true)
-				PrePush::Validator.should_receive('puts').with("Couldn't find test runner non-existant-runner")
+				PrePush::Validator.should_receive('puts').with(/^Couldn't find test runner non-existant-runner/)
 				PrePush::Validator.validate('non-existant-runner').should be false
 			end
 			it "should validate when runner found" do
 				Dir.stub('exists?').with('.git').and_return(true)
 				Dir.stub('exists?').with('.git/hooks').and_return(true)
-				Dir.stub('entries').with(/lib\/runners$/).and_return(['existant-runner'])
+				Dir.stub('entries').with(/lib\/runners$/).and_return(['existant-runner.rb'])
 				PrePush::Validator.validate('existant-runner').should be true
 			end
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pre_push
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2
+  version: 0.0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20015844 !ruby/object:Gem::Requirement
+  requirement: &19942908 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *20015844
+  version_requirements: *19942908
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &20014932 !ruby/object:Gem::Requirement
+  requirement: &19958232 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20014932
+  version_requirements: *19958232
 description: adding a pre-push hook for git to compile & run tests
 email:
 - nievegoor@gmail.com
@@ -103,15 +103,15 @@ files:
 - lib/runners/xunit191/xunit.runner.utility.dll
 - lib/runners/xunit191/xunit.runner.utility.xml
 - lib/runners/xunit191/xunit.xml
+- lib/runners_config/mspec.rb
+- lib/runners_config/nunit262.rb
+- lib/runners_config/xunit191.rb
 - lib/spec_helper.rb
 - pre_push.gemspec
 - spec/TestProj/TestProj.sln
-- spec/TestProj/TestProj.suo
 - spec/TestProj/TestProj/AllTests.cs
 - spec/TestProj/TestProj/Properties/AssemblyInfo.cs
 - spec/TestProj/TestProj/TestProj.csproj
-- spec/TestProj/TestProj/TestProj.csproj.user
-- spec/TestProj/TestProj/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
 - spec/TestProj/TestProj/packages.config
 - spec/TestProj/packages/Machine.Specifications.0.5.12/Machine.Specifications.0.5.12.nupkg
 - spec/TestProj/packages/Machine.Specifications.0.5.12/Machine.Specifications.0.5.12.nuspec
@@ -207,12 +207,9 @@ summary: Add a pre-push git hook on any of your repos to build & run tests of yo
   .net project.
 test_files:
 - spec/TestProj/TestProj.sln
-- spec/TestProj/TestProj.suo
 - spec/TestProj/TestProj/AllTests.cs
 - spec/TestProj/TestProj/Properties/AssemblyInfo.cs
 - spec/TestProj/TestProj/TestProj.csproj
-- spec/TestProj/TestProj/TestProj.csproj.user
-- spec/TestProj/TestProj/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
 - spec/TestProj/TestProj/packages.config
 - spec/TestProj/packages/Machine.Specifications.0.5.12/Machine.Specifications.0.5.12.nupkg
 - spec/TestProj/packages/Machine.Specifications.0.5.12/Machine.Specifications.0.5.12.nuspec

data/spec/TestProj/TestProj/TestProj.csproj.user

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
-  </PropertyGroup>
-</Project>