@@ -1,6 +1,17 @@ $:.unshift(File.dirname(__FILE__)) require 'rubygems' -require 'trollop' + +# Load the vendor gems +$:.unshift(File.dirname(__FILE__) + "/../vendor/gems") +%w(trollop).each do |library| + begin + require "#{library}/lib/#{library}" + rescue + puts "There was an error loading #{library}. Try running git submodule init && git submodule update to correct the problem" + require 'trollop' + end +end + require 'ext/core' require 'ext/colorize' require 'git-style-binary/autorunner' lib/git-style-binary.rb @@ -84,7 +84,7 @@ class RunningBinariesTest < Test::Unit::TestCase %w(before after).each do |time| should "run the callback #{time}_run}" do - assert @stdout.match /#{time}_run command/ + assert @stdout.match(/#{time}_run command/) end end end @@ -94,7 +94,7 @@ class RunningBinariesTest < Test::Unit::TestCase %w(before after).each do |time| should "not run the callback #{time}_run" do - assert_nil @stdout.match /#{time}_run command/ + assert_nil @stdout.match(/#{time}_run command/) end end end test/running_binaries_test.rb 44f2323527c33cffa0322166d7127f290311ed01 Ari Lerner arilerner@mac.com http://github.com/jashmenn/git-style-binaries/commit/8d4fd08a56540c9f525a9a60d6699f863946d3c8 8d4fd08a56540c9f525a9a60d6699f863946d3c8 2009-06-02T13:06:43-07:00 2009-06-02T13:06:43-07:00 Added trollop to vendor gems... failing tests aa51103287b8f2967a6341b9b59c4b5e5cabe18f Ari Lerner arilerner@mac.com