Permalink
Browse files

Move AS vendor support into bundler.

Run `rake bundle` before running tests.
  • Loading branch information...
josh committed Sep 13, 2009
1 parent 3b325d6 commit f3f2e0b00d8b422fd5921fb709ac7a9570ad2a6a
Showing with 35 additions and 36 deletions.
  1. +19 −0 activesupport/Gemfile
  2. +10 −0 activesupport/Rakefile
  3. +1 −1 activesupport/lib/active_support.rb
  4. +0 −1 activesupport/lib/active_support/test_case.rb
  5. +0 −2 activesupport/lib/active_support/testing/performance.rb
  6. +0 −27 activesupport/lib/active_support/vendor.rb
  7. 0 activesupport/lib/active_support/vendor/builder-2.1.2/{ → lib}/blankslate.rb
  8. 0 activesupport/lib/active_support/vendor/builder-2.1.2/{ → lib}/builder.rb
  9. 0 activesupport/lib/active_support/vendor/builder-2.1.2/{ → lib}/builder/blankslate.rb
  10. 0 activesupport/lib/active_support/vendor/builder-2.1.2/{ → lib}/builder/css.rb
  11. 0 activesupport/lib/active_support/vendor/builder-2.1.2/{ → lib}/builder/xchar.rb
  12. 0 activesupport/lib/active_support/vendor/builder-2.1.2/{ → lib}/builder/xmlbase.rb
  13. 0 activesupport/lib/active_support/vendor/builder-2.1.2/{ → lib}/builder/xmlevents.rb
  14. 0 activesupport/lib/active_support/vendor/builder-2.1.2/{ → lib}/builder/xmlmarkup.rb
  15. 0 activesupport/lib/active_support/vendor/memcache-client-1.6.5/{ → lib}/memcache.rb
  16. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo.rb
  17. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/data_timezone.rb
  18. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/data_timezone_info.rb
  19. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Africa/Algiers.rb
  20. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Africa/Cairo.rb
  21. 0 ...esupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Africa/Casablanca.rb
  22. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Africa/Harare.rb
  23. 0 ...upport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Africa/Johannesburg.rb
  24. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Africa/Monrovia.rb
  25. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Africa/Nairobi.rb
  26. 0 ...active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
  27. 0 ...lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Argentina/San_Juan.rb
  28. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Bogota.rb
  29. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Caracas.rb
  30. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Chicago.rb
  31. 0 ...esupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Chihuahua.rb
  32. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Denver.rb
  33. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Godthab.rb
  34. 0 ...esupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Guatemala.rb
  35. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Halifax.rb
  36. 0 ...b/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Indiana/Indianapolis.rb
  37. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Juneau.rb
  38. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/La_Paz.rb
  39. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Lima.rb
  40. 0 ...upport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Los_Angeles.rb
  41. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Mazatlan.rb
  42. 0 ...upport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Mexico_City.rb
  43. 0 ...esupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Monterrey.rb
  44. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/New_York.rb
  45. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Phoenix.rb
  46. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Regina.rb
  47. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Santiago.rb
  48. 0 ...esupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Sao_Paulo.rb
  49. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/St_Johns.rb
  50. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/America/Tijuana.rb
  51. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Almaty.rb
  52. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Baghdad.rb
  53. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Baku.rb
  54. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Bangkok.rb
  55. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Chongqing.rb
  56. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Colombo.rb
  57. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Dhaka.rb
  58. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Hong_Kong.rb
  59. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Irkutsk.rb
  60. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Jakarta.rb
  61. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Jerusalem.rb
  62. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Kabul.rb
  63. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Kamchatka.rb
  64. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Karachi.rb
  65. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Kathmandu.rb
  66. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Kolkata.rb
  67. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Krasnoyarsk.rb
  68. 0 ...esupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Kuala_Lumpur.rb
  69. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Kuwait.rb
  70. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Magadan.rb
  71. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Muscat.rb
  72. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Novosibirsk.rb
  73. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Rangoon.rb
  74. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Riyadh.rb
  75. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Seoul.rb
  76. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Shanghai.rb
  77. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Singapore.rb
  78. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Taipei.rb
  79. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Tashkent.rb
  80. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Tbilisi.rb
  81. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Tehran.rb
  82. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Tokyo.rb
  83. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Ulaanbaatar.rb
  84. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Urumqi.rb
  85. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Vladivostok.rb
  86. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Yakutsk.rb
  87. 0 ...support/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Yekaterinburg.rb
  88. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Asia/Yerevan.rb
  89. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Atlantic/Azores.rb
  90. 0 ...upport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Atlantic/Cape_Verde.rb
  91. 0 ...ort/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Atlantic/South_Georgia.rb
  92. 0 ...support/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Australia/Adelaide.rb
  93. 0 ...support/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Australia/Brisbane.rb
  94. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Australia/Darwin.rb
  95. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Australia/Hobart.rb
  96. 0 ...upport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Australia/Melbourne.rb
  97. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Australia/Perth.rb
  98. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Australia/Sydney.rb
  99. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Etc/UTC.rb
  100. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Amsterdam.rb
  101. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Athens.rb
  102. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Belgrade.rb
  103. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Berlin.rb
  104. 0 ...esupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Bratislava.rb
  105. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Brussels.rb
  106. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Bucharest.rb
  107. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Budapest.rb
  108. 0 ...esupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Copenhagen.rb
  109. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Dublin.rb
  110. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Helsinki.rb
  111. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Istanbul.rb
  112. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Kiev.rb
  113. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Lisbon.rb
  114. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Ljubljana.rb
  115. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/London.rb
  116. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Madrid.rb
  117. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Minsk.rb
  118. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Moscow.rb
  119. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Paris.rb
  120. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Prague.rb
  121. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Riga.rb
  122. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Rome.rb
  123. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Sarajevo.rb
  124. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Skopje.rb
  125. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Sofia.rb
  126. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Stockholm.rb
  127. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Tallinn.rb
  128. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Vienna.rb
  129. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Vilnius.rb
  130. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Warsaw.rb
  131. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Europe/Zagreb.rb
  132. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Pacific/Auckland.rb
  133. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Pacific/Fiji.rb
  134. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Pacific/Guam.rb
  135. 0 ...vesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Pacific/Honolulu.rb
  136. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Pacific/Majuro.rb
  137. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Pacific/Midway.rb
  138. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Pacific/Noumea.rb
  139. 0 ...esupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Pacific/Pago_Pago.rb
  140. 0 ...pport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Pacific/Port_Moresby.rb
  141. 0 ...esupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/definitions/Pacific/Tongatapu.rb
  142. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/info_timezone.rb
  143. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/linked_timezone.rb
  144. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/linked_timezone_info.rb
  145. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/offset_rationals.rb
  146. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/ruby_core_support.rb
  147. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/time_or_datetime.rb
  148. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/timezone.rb
  149. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/timezone_definition.rb
  150. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/timezone_info.rb
  151. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/timezone_offset_info.rb
  152. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/timezone_period.rb
  153. 0 activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ → lib}/tzinfo/timezone_transition_info.rb
  154. +3 −1 activesupport/test/abstract_unit.rb
  155. +2 −4 activesupport/test/xml_mini/nokogiri_engine_test.rb
View
@@ -0,0 +1,19 @@
+lib_dir = Pathname.new(File.dirname(__FILE__)).join('lib')
+vendor_dir = lib_dir.join('active_support', 'vendor')
+
+# gem 'builder', '~> 2.1.2'
+# gem 'memcache-client', '>= 1.6.5'
+# gem 'tzinfo', '~> 0.3.13'
+# gem 'i18n', '~> 0.1.3'
+
+gem 'builder', '2.1.2', :vendored_at => vendor_dir.join('builder-2.1.2')
+gem 'memcache-client', '1.6.5', :vendored_at => vendor_dir.join('memcache-client-1.6.5')
+gem 'tzinfo', '0.3.13', :vendored_at => vendor_dir.join('tzinfo-0.3.13')
+gem 'i18n', '0.1.3', :vendored_at => vendor_dir.join('i18n-0.1.3')
+
+only :test do
+ gem 'mocha', '>= 0.9.7'
+ gem 'ruby-prof', '>= 0.6.1'
+end
+
+disable_rubygems
View
@@ -28,6 +28,16 @@ task :isolated_test do
end or raise "Failures"
end
+task :bundle do
+ puts "Checking if the bundled testing requirements are up to date..."
+ result = system "gem bundle"
+ unless result
+ puts "The gem bundler is not installed. Installing."
+ system "gem install bundler"
+ system "gem bundle"
+ end
+end
+
# Create compressed packages
dist_dirs = [ "lib", "test"]
@@ -35,6 +35,6 @@ def load_all!; load_all_hooks.each { |hook| hook.call } end
end
require 'active_support/autoload'
-require 'active_support/vendor'
+require 'i18n'
I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"
@@ -7,7 +7,6 @@
require 'active_support/testing/isolation'
begin
- gem 'mocha', ">= 0.9.7"
require 'mocha'
rescue LoadError
# Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
@@ -1,5 +1,3 @@
-require 'rubygems'
-gem 'ruby-prof', '>= 0.6.1'
require 'ruby-prof'
require 'fileutils'
@@ -1,27 +0,0 @@
-# Prefer gems to the bundled libs.
-require 'rubygems'
-
-begin
- gem 'builder', '~> 2.1.2'
-rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
-end
-
-begin
- gem 'memcache-client', '>= 1.6.5'
-rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.6.5"
-end
-
-begin
- gem 'tzinfo', '~> 0.3.13'
-rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.13"
-end
-
-begin
- gem 'i18n', '~> 0.1.3'
-rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib"
- require 'i18n'
-end
@@ -1,6 +1,8 @@
ORIG_ARGV = ARGV.dup
-require 'rubygems'
+bundler = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment')
+require bundler if File.exist?("#{bundler}.rb")
+
require 'test/unit'
ENV['NO_RELOAD'] = '1'
@@ -3,13 +3,11 @@
require 'active_support/core_ext/hash/conversions'
begin
- gem 'nokogiri', '>= 1.1.1'
-rescue Gem::LoadError
+ require 'nokogiri'
+rescue LoadError
# Skip nokogiri tests
else
-require 'nokogiri'
-
class NokogiriEngineTest < Test::Unit::TestCase
include ActiveSupport

0 comments on commit f3f2e0b

Please sign in to comment.