pre_push 0.0.3 → 0.0.4

data/.gitignore

@@ -16,7 +16,8 @@ test/tmp
 test/version_tmp
 tmp
 *TestResult.xml
-bin/
+spec/TestProj/TestProj/bin/
+spec/TestProj/TestProj2/bin/
 obj/
 _ReSharper*
 *ReSharper*

data/bin/prepush

@@ -2,6 +2,7 @@
 
 require "pre_push"
 require "prepush_validator"
+require "sln_finder"
 require "fileutils"
 
 
@@ -9,11 +10,12 @@ runner = ARGV[0] || 'nunit262'
 
 if PrePush::Validator.validate(runner)
 	bin = File.dirname(__FILE__)
-	FileUtils.cp("#{bin}/pre-push", ".git/hooks")
+	FileUtils.cp("#{bin}/../lib/template/pre-push", ".git/hooks")
 
 	pre_push_hook = ".git/hooks/pre-push"
 	file_text = File.read(pre_push_hook)
-	content = file_text.gsub(/\{runner\}/, "\"#{runner}\"")
+	sln_path = PrePush::SlnFinder.find || "path/to/your.sln"
+	content = file_text.gsub(/\{runner\}/, "\"#{runner}\"").gsub(/\{sln_path\}/, "\"#{sln_path}\"")
 	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/pre_push/version.rb

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

data/lib/sln_finder.rb

@@ -0,0 +1,20 @@
+module PrePush
+	class SlnFinder
+		def self.find
+			try_find_sln('.')
+		end
+
+		private
+		def self.try_find_sln location
+			sln = Dir.entries(location).find {|f| File.file?("#{location}/#{f}") && f.end_with?('.sln')}
+			return "#{location}/#{sln}" if sln != nil
+
+			dirs = Dir.entries(location).select {|e| !File.file?("#{location}/#{e}") && File.directory?("#{location}/#{e}") && !(/^\.{1,2}$/ =~ e)}
+			dirs.each do |dir|
+				sln = try_find_sln("#{location}/#{dir}")
+				return sln if sln != nil
+			end
+			sln
+		end
+	end
+end

data/{bin → lib/template}/pre-push

@@ -7,7 +7,7 @@ class Executor
 	@test_runner = {runner}
 	###
 
-	@solution = "path/to/your.sln" # the path to the solution to build
+	@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
 end

data/spec/TestProj/TestProj2/TestProj.csproj

@@ -59,4 +59,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

data/spec/sln_finder_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+module PrePush
+	describe SlnFinder do
+		describe 'find' do
+			it "should return first sln file found" do
+				Dir.stub('entries').and_return(['second.sln','first.sln'])
+				File.stub('file?').with(anything()).and_return(true)
+				PrePush::SlnFinder.find().should == './second.sln'
+			end
+			it "should return nested sln when none found at top level" do
+				Dir.stub('entries').with('.').and_return(['second.sn','first.sl', 'nested'])
+				Dir.stub('entries').with('./nested').and_return(['third.sn', 'first.sln', 'second.sln','fourth.sl', 'inner'])
+				File.stub('file?').with('./nested').and_return(false)
+				File.stub('file?').with('./nested/third.sn').and_return(false)
+				File.stub('file?').with('./nested/first.sln').and_return(true)
+				File.stub('file?').with('./second.sn').and_return(true)
+				File.stub('file?').with('./first.sl').and_return(true)
+				File.stub('file?').with('./first.sln').and_return(true)
+				File.stub('file?').with('./second.sln').and_return(true)
+				File.stub('directory?').with('./nested').and_return(true)
+				PrePush::SlnFinder.find().should == './nested/first.sln'
+			end
+			it "should disregard . and .. directories" do
+				Dir.stub('entries').with('.').and_return(['second.sn','.', '..'])
+				File.stub('file?').with('./second.sn').and_return(true)
+				File.stub('file?').with('./.').and_return(false)
+				File.stub('file?').with('./..').and_return(false)
+				File.stub('directory?').with('./.').and_return(true)
+				File.stub('directory?').with('./..').and_return(true)
+				Dir.should_not_receive(:entries).with('./.')
+				Dir.should_not_receive(:entries).with('./..')
+				PrePush::SlnFinder.find().should be_nil
+			end
+		end
+	end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'rspec/expectations'
 require 'nokogiri'
 require 'pre_push'
 require 'prepush_validator'
+require 'sln_finder'
 
 #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.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21522876 !ruby/object:Gem::Requirement
+  requirement: &23324772 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *21522876
+  version_requirements: *23324772
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21522276 !ruby/object:Gem::Requirement
+  requirement: &23324460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,12 +32,11 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21522276
+  version_requirements: *23324460
 description: adding a pre-push hook for git to compile & run tests
 email:
 - nievegoor@gmail.com
 executables:
-- pre-push
 - prepush
 extensions: []
 extra_rdoc_files: []
@@ -47,7 +46,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/pre-push
 - bin/prepush
 - lib/pre_push.rb
 - lib/pre_push/version.rb
@@ -106,6 +104,8 @@ files:
 - lib/runners_config/mspec.rb
 - lib/runners_config/nunit262.rb
 - lib/runners_config/xunit191.rb
+- lib/sln_finder.rb
+- lib/template/pre-push
 - pre_push.gemspec
 - spec/TestProj/TestProj.sln
 - spec/TestProj/TestProj/AllTests.cs
@@ -185,6 +185,7 @@ files:
 - spec/nunit_integration_spec.rb
 - spec/pre_push_spec.rb
 - spec/prepush_validator_spec.rb
+- spec/sln_finder_spec.rb
 - spec/spec_helper.rb
 - spec/xunit_integration_spec.rb
 homepage: https://github.com/nieve/prepush
@@ -292,5 +293,6 @@ test_files:
 - spec/nunit_integration_spec.rb
 - spec/pre_push_spec.rb
 - spec/prepush_validator_spec.rb
+- spec/sln_finder_spec.rb
 - spec/spec_helper.rb
 - spec/xunit_integration_spec.rb