pre_push 0.0.1.3 → 0.0.2

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pre_push.gemspec
 gemspec
+gem 'rspec'
+gem 'spork'

data/lib/pre_push/version.rb

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

data/lib/pre_push.rb

@@ -3,7 +3,7 @@ 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'}
+		MSBuildPaths = {:clr4 => 'C:/Windows/Microsoft.NET/Framework/v4.0.30319'}
 		def run
 			success = build
 			if (!success)
@@ -18,12 +18,7 @@ module PrePush
 		end
 		def build
 			set_exes_cache
-			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"
+			msbuild = "#{MSBuildPaths[:clr4]}/MSBuild.exe"
 			system "#{msbuild} #{@solution}"
 			$?.success?
 		end
@@ -67,11 +62,11 @@ class Container
 	end
 end
 
-module Config
+module PrepushConfig
 	private
-	def use(runner)
+	def use_runner(runner)
 		Container.runner = runner
 	end
 end
 
-self.extend Config
+self.extend PrepushConfig

data/lib/runners_config/mspec.rb

@@ -1 +1 @@
-use	'mspec-clr4.exe'
+use_runner 'mspec-clr4.exe'

data/lib/runners_config/nunit262.rb

@@ -1 +1 @@
-use	'nunit-console.exe'
+use_runner 'nunit-console.exe'

data/lib/runners_config/xunit191.rb

@@ -1 +1 @@
-use	'xunit.console.exe'
+use_runner 'xunit.console.exe'

data/spec/TestProj/TestProj/AllTests.cs

@@ -33,6 +33,6 @@ namespace TestProj
 
     public class MspecTests
     {
-        Machine.Specifications.It should_equal_one = () => 1.ShouldEqual(1);
+        It should_equal_one = () => 1.ShouldEqual(1);
     }
 }

data/spec/TestProj/TestProj/TestProj.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -62,4 +62,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

data/spec/TestProj/TestProj/app.config

@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

data/spec/TestProj/TestProj2/AllTests.cs

@@ -0,0 +1,31 @@
+using NUnit.Framework;
+using Xunit;
+
+namespace TestProj
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+        }
+    }
+
+    [TestFixture]
+    public class NunitTests
+    {
+        [Test]
+        public void OneEqualsOne()
+        {
+            NUnit.Framework.Assert.AreEqual(1, 1);
+        }
+    }
+
+    public class XUnitTests
+    {
+        [Fact]
+        public void OneEqualsOne()
+        {
+            Xunit.Assert.Equal(1, 1);
+        }
+    }
+}

data/spec/TestProj/TestProj2/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("TestProj")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("TestProj")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("14678652-2efc-449c-b565-d3908cd12c11")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

data/spec/TestProj/TestProj2/TestProj.csproj

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D29E34F2-D326-48EB-9354-D6882867A7A3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TestProj</RootNamespace>
+    <AssemblyName>TestProj</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="xunit">
+      <HintPath>..\packages\xunit.1.9.1\lib\net20\xunit.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AllTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

data/spec/TestProj/TestProj2/TestProj.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProj", "TestProj.csproj", "{D29E34F2-D326-48EB-9354-D6882867A7A3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D29E34F2-D326-48EB-9354-D6882867A7A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D29E34F2-D326-48EB-9354-D6882867A7A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D29E34F2-D326-48EB-9354-D6882867A7A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D29E34F2-D326-48EB-9354-D6882867A7A3}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

data/spec/TestProj/TestProj2/app.config

@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

data/spec/TestProj/TestProj2/packages/repositories.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="..\packages.config" />
+</repositories>

data/spec/TestProj/TestProj2/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.2" targetFramework="net40" />
+  <package id="xunit" version="1.9.1" targetFramework="net40" />
+</packages>

data/spec/mspec_integration_spec.rb

@@ -1,15 +1,29 @@
 require 'spec_helper'
 
-class MspecRunnerTester
+class MspecRunnerTesterClr4
 	@solution = "spec/TestProj/TestProj/TestProj.csproj"
 	@assemblies = ["C:/Code/Ruby Projects/prepush/spec/TestProj/TestProj/bin/Debug/TestProj.exe"]
 	@test_runner = 'mspec'
-	@runner_exe = 'mspec-clr4.exe' # will be selected by default
+	#@runner_exe = 'mspec-clr4.exe' # will be selected by default
+	include PrePush
+end
+
+class MspecRunnerTesterClr2
+	@solution = "spec/TestProj/TestProj/TestProj.csproj"
+	@assemblies = ["C:/Code/Ruby Projects/prepush/spec/TestProj/TestProj/bin/Debug/TestProj.exe"]
+	@test_runner = 'mspec'
+	@clr = :clr2
+	#@runner_exe = 'mspec-clr4.exe' # will be selected by default
 	include PrePush
 end
 
 describe "MspecRunner" do
-	it "should compile and run tests" do
-		MspecRunnerTester.run
+	describe "on clr 4" do
+		before do
+			ReplaceClr.between('v2.0', 'v3.5')
+		end
+		it "should compile and run tests" do
+			MspecRunnerTesterClr4.run
+		end
 	end
 end

data/spec/nunit_integration_spec.rb

@@ -4,11 +4,23 @@ class NunitRunnerTester
 	@solution = "spec/TestProj/TestProj.sln"
 	@assemblies = ["spec/TestProj/TestProj/TestProj.csproj"]
 	@test_runner = 'nunit262'
-	@runner_exe = 'nunit-console.exe' # will be selected by default
+	#@runner_exe = 'nunit-console.exe' # will be selected by default
 	include PrePush
 end
 
 describe "NunitRunnerTester" do
+	before do
+		ReplaceClr.between('v2.0', 'v3.5')
+	end
+	it "should compile and run tests" do
+		NunitRunnerTester.run
+	end
+end
+
+describe "on clr 2" do
+	before do
+		ReplaceClr.between('v3.5', 'v2.0', 'TestProj2')
+	end
 	it "should compile and run tests" do
 		NunitRunnerTester.run
 	end

data/spec/pre_push_spec.rb

@@ -45,15 +45,6 @@ describe PrePush 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

data/spec/spec_helper.rb

@@ -0,0 +1,74 @@
+require 'rubygems'
+require 'spork'
+require 'rspec'
+require 'rspec/expectations'
+require 'nokogiri'
+require 'pre_push'
+require 'prepush_validator'
+
+#uncomment the following line to use spork with the debugger
+#require 'spork/ext/ruby-debug'
+
+Spork.prefork do
+  # Loading more in this block will cause your tests to run faster. However,
+  # if you change any configuration or code from libraries loaded here, you'll
+  # need to restart spork for it take effect.
+
+end
+
+Spork.each_run do
+  # This code will be run each time you run your specs.
+
+end
+
+# --- Instructions ---
+# Sort the contents of this file into a Spork.prefork and a Spork.each_run
+# block.
+#
+# The Spork.prefork block is run only once when the spork server is started.
+# You typically want to place most of your (slow) initializer code in here, in
+# particular, require'ing any 3rd-party gems that you don't normally modify
+# during development.
+#
+# The Spork.each_run block is run each time you run your specs.  In case you
+# need to load files that tend to change during development, require them here.
+# With Rails, your application modules are loaded automatically, so sometimes
+# this block can remain empty.
+#
+# Note: You can modify files loaded *from* the Spork.each_run block without
+# restarting the spork server.  However, this file itself will not be reloaded,
+# so if you change any of the code inside the each_run block, you still need to
+# restart the server.  In general, if you have non-trivial code in this file,
+# it's advisable to move it into a separate file so you can easily edit it
+# without restarting spork.  (For example, with RSpec, you could move
+# non-trivial code into a file spec/support/my_helper.rb, making sure that the
+# spec/support/* files are require'd from inside the each_run block.)
+#
+# Any code that is left outside the two blocks will be run during preforking
+# *and* during each_run -- that's probably not what you want.
+#
+# These instructions should self-destruct in 10 seconds.  If they don't, feel
+# free to delete them.
+
+
+
+
+
+class ReplaceClr
+	def self.between(old_version, new_version, proj = nil)
+		lines = []
+		lib = File.dirname(__FILE__)
+
+		proj = proj || 'TestProj'
+		tfv = "TargetFrameworkVersion"
+		target = "<#{tfv}>#{old_version}</#{tfv}>"
+		replace = "<#{tfv}>#{new_version}</#{tfv}>"
+		csproj = "#{lib}/../spec/TestProj/#{proj}/TestProj.csproj"
+		File.open(csproj) do |f|
+			f.each_line {|line| lines << line.sub(old_version, new_version)}
+		end
+		File.open(csproj, "w") do |file|
+			lines.each { |l| file.puts l }
+		end
+	end
+end

data/spec/xunit_integration_spec.rb

@@ -4,7 +4,15 @@ class XunitRunnerTester
 	@solution = "spec/TestProj/TestProj.sln"
 	@assemblies = ["spec/TestProj/TestProj/bin/Debug/TestProj.exe"]
 	@test_runner = 'xunit191'
-	@runner_exe = 'xunit.console.exe' # will be selected by default
+	#@runner_exe = 'xunit.console.exe' # will be selected by default
+	include PrePush
+end
+
+class XunitRunnerTesterClr2
+	@solution = "spec/TestProj/TestProj2/TestProj.sln"
+	# XUnit on clr2 takes the dll path only, won't work with csproj.
+	@assemblies = ["spec/TestProj/TestProj2/bin/Debug/TestProj.dll"]
+	@test_runner = 'xunit191'
 	include PrePush
 end
 
@@ -12,4 +20,13 @@ describe "XunitRunner" do
 	it "should compile and run tests" do
 		XunitRunnerTester.run
 	end
+end
+
+describe "on clr 2" do
+	before do
+		ReplaceClr.between('v3.5', 'v2.0', 'TestProj2')
+	end
+	it "should compile and run tests" do
+		XunitRunnerTesterClr2.run
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pre_push
 version: !ruby/object:Gem::Version
-  version: 0.0.1.3
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19942908 !ruby/object:Gem::Requirement
+  requirement: &17823108 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *19942908
+  version_requirements: *17823108
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19958232 !ruby/object:Gem::Requirement
+  requirement: &17822580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19958232
+  version_requirements: *17822580
 description: adding a pre-push hook for git to compile & run tests
 email:
 - nievegoor@gmail.com
@@ -106,13 +106,20 @@ files:
 - 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/AllTests.cs
 - spec/TestProj/TestProj/Properties/AssemblyInfo.cs
 - spec/TestProj/TestProj/TestProj.csproj
+- spec/TestProj/TestProj/app.config
 - spec/TestProj/TestProj/packages.config
+- spec/TestProj/TestProj2/AllTests.cs
+- spec/TestProj/TestProj2/Properties/AssemblyInfo.cs
+- spec/TestProj/TestProj2/TestProj.csproj
+- spec/TestProj/TestProj2/TestProj.sln
+- spec/TestProj/TestProj2/app.config
+- spec/TestProj/TestProj2/packages.config
+- spec/TestProj/TestProj2/packages/repositories.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
 - spec/TestProj/packages/Machine.Specifications.0.5.12/lib/net20/Machine.Specifications.TDNetRunner.dll
@@ -178,6 +185,7 @@ files:
 - spec/nunit_integration_spec.rb
 - spec/pre_push_spec.rb
 - spec/prepush_validator_spec.rb
+- spec/spec_helper.rb
 - spec/xunit_integration_spec.rb
 homepage: https://github.com/nieve/prepush
 licenses:
@@ -210,7 +218,15 @@ test_files:
 - spec/TestProj/TestProj/AllTests.cs
 - spec/TestProj/TestProj/Properties/AssemblyInfo.cs
 - spec/TestProj/TestProj/TestProj.csproj
+- spec/TestProj/TestProj/app.config
 - spec/TestProj/TestProj/packages.config
+- spec/TestProj/TestProj2/AllTests.cs
+- spec/TestProj/TestProj2/Properties/AssemblyInfo.cs
+- spec/TestProj/TestProj2/TestProj.csproj
+- spec/TestProj/TestProj2/TestProj.sln
+- spec/TestProj/TestProj2/app.config
+- spec/TestProj/TestProj2/packages.config
+- spec/TestProj/TestProj2/packages/repositories.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
 - spec/TestProj/packages/Machine.Specifications.0.5.12/lib/net20/Machine.Specifications.TDNetRunner.dll
@@ -276,4 +292,5 @@ test_files:
 - spec/nunit_integration_spec.rb
 - spec/pre_push_spec.rb
 - spec/prepush_validator_spec.rb
+- spec/spec_helper.rb
 - spec/xunit_integration_spec.rb

data/lib/spec_helper.rb

@@ -1,5 +0,0 @@
-require 'rubygems'
-require 'rspec'
-require 'rspec/expectations'
-require 'pre_push'
-require 'prepush_validator'