pre_push 0.0.4 → 0.0.5

data/README.md

@@ -24,11 +24,22 @@ After installing the gem, cd to the git repository you wish to add the hook to
 (the directory containing a .git dir) and from there use one of the following:
 	
 		$ prepush
-		$ prepush mspec
-		$ prepush xunit191
+		$ prepush /r=mspec
+		$ prepush /r=xunit191
 
 the first will use nunit (2.6.2) for running your tests.
-Insert the solution or assemblies paths.
+By default, the pre-push hook will use the first .sln file it finds.
+
+The arguments accepted are:
+	
+		/r={test runner}
+		/td={testable dlls}
+
+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
+
+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."
 
 ## Contributing

data/bin/prepush

@@ -3,10 +3,15 @@
 require "pre_push"
 require "prepush_validator"
 require "sln_finder"
+require "args_parser"
 require "fileutils"
 
 
-runner = ARGV[0] || 'nunit262'
+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."
 
 if PrePush::Validator.validate(runner)
 	bin = File.dirname(__FILE__)
@@ -16,6 +21,11 @@ if PrePush::Validator.validate(runner)
 	file_text = File.read(pre_push_hook)
 	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)
+	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."
 end

data/lib/args_parser.rb

@@ -0,0 +1,21 @@
+module PrePush
+	class ArgsParser
+		class << self
+			attr_accessor :args_props
+			ArgsParser.args_props = {'r' => [:runner, :str], 'td' => [:test_dlls, :array]}
+		end
+		def self.execute args
+			result = {:runner => 'nunit262'}
+			return result if args == nil
+			args_props.each_pair do |arg, prop|
+				current_parsed_arg = args.find {|a| a.start_with?("/#{arg}=")}
+				if current_parsed_arg != nil
+					value = current_parsed_arg.sub("/#{arg}=", "")
+					value = value.split(',') if prop[1] == :array
+					result[prop[0]] = value
+				end
+			end
+			result
+		end
+	end
+end

data/lib/pre_push/version.rb

@@ -1,3 +1,3 @@
 module PrePush
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/pre_push.rb

@@ -26,6 +26,7 @@ module PrePush
 	  	set_exes_cache
 			gem_lib = File.dirname(__FILE__)
 			assemblies = assemblies || [@solution]
+			assemblies = assemblies.empty? ? [@solution] : assemblies
 			success = true
 			assemblies.each do |assembly|
 				exe = @runners_exes[@test_runner]

data/lib/template/pre-push

@@ -3,13 +3,13 @@
 require "pre_push"
 
 class Executor
+	include PrePush
 	### change only if you change your test runner
 	@test_runner = {runner}
 	###
 
 	@solution = {sln_path} # the path to the solution to build
-	# @assemblies = ['path/to/first/test.dll','path/to/second/test.dll'] #uncomment & insert dlls to test if different to the solution.
-	include PrePush
+	@assemblies = {dtt} # insert dlls to test if different to the solution.
 end
 
 Executor.run

data/spec/args_parser_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module PrePush
+	describe ArgsParser do
+		describe 'execute' do
+			describe "when no args provided" do
+				it "should return default" do
+					result = PrePush::ArgsParser.execute(nil)
+					result[:runner].should == "nunit262"
+				end
+			end
+			describe "when /r is specfied" do
+				it "should parse value as a string" do
+					result = PrePush::ArgsParser.execute(["/r=mspec,invalid,data"])
+					result[:runner].should == "mspec,invalid,data"
+				end
+				it "should return a result with a runner" do
+					result = PrePush::ArgsParser.execute(["/r=mspec"])
+					result[:runner].should == "mspec"
+				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"])
+					result[:test_dlls].should == ["./path/to/testable.dll"]
+				end
+				it "should return a result with multiple test dlls" do
+					result = PrePush::ArgsParser.execute(["/td=./path/to/testable.dll,./path/to/another.dll"])
+					result[:test_dlls].should == ["./path/to/testable.dll","./path/to/another.dll"]
+				end
+			end
+		end
+	end
+end

data/spec/pre_push_spec.rb

@@ -5,14 +5,14 @@ class Dummy
 	include PrePush
 end
 
-class DummyClr2
-	@clr = 'clr2'
-	@solution = "solution/path/whammy"
+class EmptyDllsDummy
+	@solution = "./path/to/some.sln"
+	@assemblies = []
 	include PrePush
 end
 
-class DummyClr666
-	@clr = 'clr666'
+class DummyClr2
+	@clr = 'clr2'
 	@solution = "solution/path/whammy"
 	include PrePush
 end
@@ -47,10 +47,16 @@ describe PrePush do
 		end
 	end
 	describe 'run_tests' do
-		it 'should call system to run tests in specified assemblies' do
+		it 'should call system to run tests on specified assemblies' do
 			Dummy.should_receive("system").with(/some_test_proj.csproj/)
 			Dummy.run_tests(['some_test_proj.csproj'])
 		end
+		describe 'when assemblies are left empty' do
+			it 'should call system to run tests on solution' do
+				EmptyDllsDummy.should_receive("system").with(/\.\/path\/to\/some.sln"$/)
+				EmptyDllsDummy.run_tests([])
+			end
+		end
 	end
 	describe 'run' do
 		it 'should exit with code 1 when build or tests fail' do

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'nokogiri'
 require 'pre_push'
 require 'prepush_validator'
 require 'sln_finder'
+require 'args_parser'
 
 #uncomment the following line to use spork with the debugger
 #require 'spork/ext/ruby-debug'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pre_push
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23324772 !ruby/object:Gem::Requirement
+  requirement: &21424188 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *23324772
+  version_requirements: *21424188
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23324460 !ruby/object:Gem::Requirement
+  requirement: &21423864 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23324460
+  version_requirements: *21423864
 description: adding a pre-push hook for git to compile & run tests
 email:
 - nievegoor@gmail.com
@@ -47,6 +47,7 @@ files:
 - README.md
 - Rakefile
 - bin/prepush
+- lib/args_parser.rb
 - lib/pre_push.rb
 - lib/pre_push/version.rb
 - lib/prepush_validator.rb
@@ -181,6 +182,7 @@ files:
 - spec/TestProj/packages/xunit.1.9.1/lib/net20/xunit.xml
 - spec/TestProj/packages/xunit.1.9.1/xunit.1.9.1.nupkg
 - spec/TestProj/packages/xunit.1.9.1/xunit.1.9.1.nuspec
+- spec/args_parser_spec.rb
 - spec/mspec_integration_spec.rb
 - spec/nunit_integration_spec.rb
 - spec/pre_push_spec.rb
@@ -289,6 +291,7 @@ test_files:
 - spec/TestProj/packages/xunit.1.9.1/lib/net20/xunit.xml
 - spec/TestProj/packages/xunit.1.9.1/xunit.1.9.1.nupkg
 - spec/TestProj/packages/xunit.1.9.1/xunit.1.9.1.nuspec
+- spec/args_parser_spec.rb
 - spec/mspec_integration_spec.rb
 - spec/nunit_integration_spec.rb
 - spec/pre_push_spec.rb