From f3f2e0b00d8b422fd5921fb709ac7a9570ad2a6a Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 13 Sep 2009 12:24:50 -0500 Subject: [PATCH] Move AS vendor support into bundler. Run `rake bundle` before running tests. --- activesupport/Gemfile | 19 +++++++++++++ activesupport/Rakefile | 10 +++++++ activesupport/lib/active_support.rb | 2 +- activesupport/lib/active_support/test_case.rb | 1 - .../lib/active_support/testing/performance.rb | 2 -- activesupport/lib/active_support/vendor.rb | 27 ------------------- .../builder-2.1.2/{ => lib}/blankslate.rb | 0 .../vendor/builder-2.1.2/{ => lib}/builder.rb | 0 .../{ => lib}/builder/blankslate.rb | 0 .../builder-2.1.2/{ => lib}/builder/css.rb | 0 .../builder-2.1.2/{ => lib}/builder/xchar.rb | 0 .../{ => lib}/builder/xmlbase.rb | 0 .../{ => lib}/builder/xmlevents.rb | 0 .../{ => lib}/builder/xmlmarkup.rb | 0 .../{ => lib}/memcache.rb | 0 .../vendor/tzinfo-0.3.13/{ => lib}/tzinfo.rb | 0 .../{ => lib}/tzinfo/data_timezone.rb | 0 .../{ => lib}/tzinfo/data_timezone_info.rb | 0 .../tzinfo/definitions/Africa/Algiers.rb | 0 .../tzinfo/definitions/Africa/Cairo.rb | 0 .../tzinfo/definitions/Africa/Casablanca.rb | 0 .../tzinfo/definitions/Africa/Harare.rb | 0 .../tzinfo/definitions/Africa/Johannesburg.rb | 0 .../tzinfo/definitions/Africa/Monrovia.rb | 0 .../tzinfo/definitions/Africa/Nairobi.rb | 0 .../America/Argentina/Buenos_Aires.rb | 0 .../definitions/America/Argentina/San_Juan.rb | 0 .../tzinfo/definitions/America/Bogota.rb | 0 .../tzinfo/definitions/America/Caracas.rb | 0 .../tzinfo/definitions/America/Chicago.rb | 0 .../tzinfo/definitions/America/Chihuahua.rb | 0 .../tzinfo/definitions/America/Denver.rb | 0 .../tzinfo/definitions/America/Godthab.rb | 0 .../tzinfo/definitions/America/Guatemala.rb | 0 .../tzinfo/definitions/America/Halifax.rb | 0 .../America/Indiana/Indianapolis.rb | 0 .../tzinfo/definitions/America/Juneau.rb | 0 .../tzinfo/definitions/America/La_Paz.rb | 0 .../tzinfo/definitions/America/Lima.rb | 0 .../tzinfo/definitions/America/Los_Angeles.rb | 0 .../tzinfo/definitions/America/Mazatlan.rb | 0 .../tzinfo/definitions/America/Mexico_City.rb | 0 .../tzinfo/definitions/America/Monterrey.rb | 0 .../tzinfo/definitions/America/New_York.rb | 0 .../tzinfo/definitions/America/Phoenix.rb | 0 .../tzinfo/definitions/America/Regina.rb | 0 .../tzinfo/definitions/America/Santiago.rb | 0 .../tzinfo/definitions/America/Sao_Paulo.rb | 0 .../tzinfo/definitions/America/St_Johns.rb | 0 .../tzinfo/definitions/America/Tijuana.rb | 0 .../tzinfo/definitions/Asia/Almaty.rb | 0 .../tzinfo/definitions/Asia/Baghdad.rb | 0 .../{ => lib}/tzinfo/definitions/Asia/Baku.rb | 0 .../tzinfo/definitions/Asia/Bangkok.rb | 0 .../tzinfo/definitions/Asia/Chongqing.rb | 0 .../tzinfo/definitions/Asia/Colombo.rb | 0 .../tzinfo/definitions/Asia/Dhaka.rb | 0 .../tzinfo/definitions/Asia/Hong_Kong.rb | 0 .../tzinfo/definitions/Asia/Irkutsk.rb | 0 .../tzinfo/definitions/Asia/Jakarta.rb | 0 .../tzinfo/definitions/Asia/Jerusalem.rb | 0 .../tzinfo/definitions/Asia/Kabul.rb | 0 .../tzinfo/definitions/Asia/Kamchatka.rb | 0 .../tzinfo/definitions/Asia/Karachi.rb | 0 .../tzinfo/definitions/Asia/Kathmandu.rb | 0 .../tzinfo/definitions/Asia/Kolkata.rb | 0 .../tzinfo/definitions/Asia/Krasnoyarsk.rb | 0 .../tzinfo/definitions/Asia/Kuala_Lumpur.rb | 0 .../tzinfo/definitions/Asia/Kuwait.rb | 0 .../tzinfo/definitions/Asia/Magadan.rb | 0 .../tzinfo/definitions/Asia/Muscat.rb | 0 .../tzinfo/definitions/Asia/Novosibirsk.rb | 0 .../tzinfo/definitions/Asia/Rangoon.rb | 0 .../tzinfo/definitions/Asia/Riyadh.rb | 0 .../tzinfo/definitions/Asia/Seoul.rb | 0 .../tzinfo/definitions/Asia/Shanghai.rb | 0 .../tzinfo/definitions/Asia/Singapore.rb | 0 .../tzinfo/definitions/Asia/Taipei.rb | 0 .../tzinfo/definitions/Asia/Tashkent.rb | 0 .../tzinfo/definitions/Asia/Tbilisi.rb | 0 .../tzinfo/definitions/Asia/Tehran.rb | 0 .../tzinfo/definitions/Asia/Tokyo.rb | 0 .../tzinfo/definitions/Asia/Ulaanbaatar.rb | 0 .../tzinfo/definitions/Asia/Urumqi.rb | 0 .../tzinfo/definitions/Asia/Vladivostok.rb | 0 .../tzinfo/definitions/Asia/Yakutsk.rb | 0 .../tzinfo/definitions/Asia/Yekaterinburg.rb | 0 .../tzinfo/definitions/Asia/Yerevan.rb | 0 .../tzinfo/definitions/Atlantic/Azores.rb | 0 .../tzinfo/definitions/Atlantic/Cape_Verde.rb | 0 .../definitions/Atlantic/South_Georgia.rb | 0 .../tzinfo/definitions/Australia/Adelaide.rb | 0 .../tzinfo/definitions/Australia/Brisbane.rb | 0 .../tzinfo/definitions/Australia/Darwin.rb | 0 .../tzinfo/definitions/Australia/Hobart.rb | 0 .../tzinfo/definitions/Australia/Melbourne.rb | 0 .../tzinfo/definitions/Australia/Perth.rb | 0 .../tzinfo/definitions/Australia/Sydney.rb | 0 .../{ => lib}/tzinfo/definitions/Etc/UTC.rb | 0 .../tzinfo/definitions/Europe/Amsterdam.rb | 0 .../tzinfo/definitions/Europe/Athens.rb | 0 .../tzinfo/definitions/Europe/Belgrade.rb | 0 .../tzinfo/definitions/Europe/Berlin.rb | 0 .../tzinfo/definitions/Europe/Bratislava.rb | 0 .../tzinfo/definitions/Europe/Brussels.rb | 0 .../tzinfo/definitions/Europe/Bucharest.rb | 0 .../tzinfo/definitions/Europe/Budapest.rb | 0 .../tzinfo/definitions/Europe/Copenhagen.rb | 0 .../tzinfo/definitions/Europe/Dublin.rb | 0 .../tzinfo/definitions/Europe/Helsinki.rb | 0 .../tzinfo/definitions/Europe/Istanbul.rb | 0 .../tzinfo/definitions/Europe/Kiev.rb | 0 .../tzinfo/definitions/Europe/Lisbon.rb | 0 .../tzinfo/definitions/Europe/Ljubljana.rb | 0 .../tzinfo/definitions/Europe/London.rb | 0 .../tzinfo/definitions/Europe/Madrid.rb | 0 .../tzinfo/definitions/Europe/Minsk.rb | 0 .../tzinfo/definitions/Europe/Moscow.rb | 0 .../tzinfo/definitions/Europe/Paris.rb | 0 .../tzinfo/definitions/Europe/Prague.rb | 0 .../tzinfo/definitions/Europe/Riga.rb | 0 .../tzinfo/definitions/Europe/Rome.rb | 0 .../tzinfo/definitions/Europe/Sarajevo.rb | 0 .../tzinfo/definitions/Europe/Skopje.rb | 0 .../tzinfo/definitions/Europe/Sofia.rb | 0 .../tzinfo/definitions/Europe/Stockholm.rb | 0 .../tzinfo/definitions/Europe/Tallinn.rb | 0 .../tzinfo/definitions/Europe/Vienna.rb | 0 .../tzinfo/definitions/Europe/Vilnius.rb | 0 .../tzinfo/definitions/Europe/Warsaw.rb | 0 .../tzinfo/definitions/Europe/Zagreb.rb | 0 .../tzinfo/definitions/Pacific/Auckland.rb | 0 .../tzinfo/definitions/Pacific/Fiji.rb | 0 .../tzinfo/definitions/Pacific/Guam.rb | 0 .../tzinfo/definitions/Pacific/Honolulu.rb | 0 .../tzinfo/definitions/Pacific/Majuro.rb | 0 .../tzinfo/definitions/Pacific/Midway.rb | 0 .../tzinfo/definitions/Pacific/Noumea.rb | 0 .../tzinfo/definitions/Pacific/Pago_Pago.rb | 0 .../definitions/Pacific/Port_Moresby.rb | 0 .../tzinfo/definitions/Pacific/Tongatapu.rb | 0 .../{ => lib}/tzinfo/info_timezone.rb | 0 .../{ => lib}/tzinfo/linked_timezone.rb | 0 .../{ => lib}/tzinfo/linked_timezone_info.rb | 0 .../{ => lib}/tzinfo/offset_rationals.rb | 0 .../{ => lib}/tzinfo/ruby_core_support.rb | 0 .../{ => lib}/tzinfo/time_or_datetime.rb | 0 .../{ => lib}/tzinfo/timezone.rb | 0 .../{ => lib}/tzinfo/timezone_definition.rb | 0 .../{ => lib}/tzinfo/timezone_info.rb | 0 .../{ => lib}/tzinfo/timezone_offset_info.rb | 0 .../{ => lib}/tzinfo/timezone_period.rb | 0 .../tzinfo/timezone_transition_info.rb | 0 activesupport/test/abstract_unit.rb | 4 ++- .../test/xml_mini/nokogiri_engine_test.rb | 6 ++--- 155 files changed, 35 insertions(+), 36 deletions(-) create mode 100644 activesupport/Gemfile delete mode 100644 activesupport/lib/active_support/vendor.rb rename activesupport/lib/active_support/vendor/builder-2.1.2/{ => lib}/blankslate.rb (100%) rename activesupport/lib/active_support/vendor/builder-2.1.2/{ => lib}/builder.rb (100%) rename activesupport/lib/active_support/vendor/builder-2.1.2/{ => lib}/builder/blankslate.rb (100%) rename activesupport/lib/active_support/vendor/builder-2.1.2/{ => lib}/builder/css.rb (100%) rename activesupport/lib/active_support/vendor/builder-2.1.2/{ => lib}/builder/xchar.rb (100%) rename activesupport/lib/active_support/vendor/builder-2.1.2/{ => lib}/builder/xmlbase.rb (100%) rename activesupport/lib/active_support/vendor/builder-2.1.2/{ => lib}/builder/xmlevents.rb (100%) rename activesupport/lib/active_support/vendor/builder-2.1.2/{ => lib}/builder/xmlmarkup.rb (100%) rename activesupport/lib/active_support/vendor/memcache-client-1.6.5/{ => lib}/memcache.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/data_timezone.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/data_timezone_info.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Africa/Algiers.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Africa/Cairo.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Africa/Casablanca.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Africa/Harare.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Africa/Johannesburg.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Africa/Monrovia.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Africa/Nairobi.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Argentina/Buenos_Aires.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Argentina/San_Juan.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Bogota.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Caracas.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Chicago.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Chihuahua.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Denver.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Godthab.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Guatemala.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Halifax.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Indiana/Indianapolis.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Juneau.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/La_Paz.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Lima.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Los_Angeles.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Mazatlan.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Mexico_City.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Monterrey.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/New_York.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Phoenix.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Regina.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Santiago.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Sao_Paulo.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/St_Johns.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/America/Tijuana.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Almaty.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Baghdad.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Baku.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Bangkok.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Chongqing.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Colombo.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Dhaka.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Hong_Kong.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Irkutsk.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Jakarta.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Jerusalem.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Kabul.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Kamchatka.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Karachi.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Kathmandu.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Kolkata.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Krasnoyarsk.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Kuala_Lumpur.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Kuwait.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Magadan.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Muscat.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Novosibirsk.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Rangoon.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Riyadh.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Seoul.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Shanghai.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Singapore.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Taipei.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Tashkent.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Tbilisi.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Tehran.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Tokyo.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Ulaanbaatar.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Urumqi.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Vladivostok.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Yakutsk.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Yekaterinburg.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Asia/Yerevan.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Atlantic/Azores.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Atlantic/Cape_Verde.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Atlantic/South_Georgia.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Australia/Adelaide.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Australia/Brisbane.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Australia/Darwin.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Australia/Hobart.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Australia/Melbourne.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Australia/Perth.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Australia/Sydney.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Etc/UTC.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Amsterdam.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Athens.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Belgrade.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Berlin.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Bratislava.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Brussels.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Bucharest.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Budapest.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Copenhagen.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Dublin.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Helsinki.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Istanbul.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Kiev.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Lisbon.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Ljubljana.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/London.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Madrid.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Minsk.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Moscow.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Paris.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Prague.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Riga.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Rome.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Sarajevo.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Skopje.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Sofia.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Stockholm.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Tallinn.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Vienna.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Vilnius.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Warsaw.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Europe/Zagreb.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Pacific/Auckland.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Pacific/Fiji.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Pacific/Guam.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Pacific/Honolulu.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Pacific/Majuro.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Pacific/Midway.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Pacific/Noumea.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Pacific/Pago_Pago.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Pacific/Port_Moresby.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/definitions/Pacific/Tongatapu.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/info_timezone.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/linked_timezone.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/linked_timezone_info.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/offset_rationals.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/ruby_core_support.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/time_or_datetime.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/timezone.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/timezone_definition.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/timezone_info.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/timezone_offset_info.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/timezone_period.rb (100%) rename activesupport/lib/active_support/vendor/tzinfo-0.3.13/{ => lib}/tzinfo/timezone_transition_info.rb (100%) diff --git a/activesupport/Gemfile b/activesupport/Gemfile new file mode 100644 index 0000000000..c41e742058 --- /dev/null +++ b/activesupport/Gemfile @@ -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 diff --git a/activesupport/Rakefile b/activesupport/Rakefile index 91c874d729..ecf8b52fc5 100644 --- a/activesupport/Rakefile +++ b/activesupport/Rakefile @@ -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"] diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index a20635ba62..0f2c7706fe 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -35,6 +35,6 @@ module ActiveSupport end require 'active_support/autoload' -require 'active_support/vendor' +require 'i18n' I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml" diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index c915bf799d..1646891e00 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -7,7 +7,6 @@ require 'active_support/testing/pending' 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. diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb index f8d12e82b3..ab34f975f6 100644 --- a/activesupport/lib/active_support/testing/performance.rb +++ b/activesupport/lib/active_support/testing/performance.rb @@ -1,5 +1,3 @@ -require 'rubygems' -gem 'ruby-prof', '>= 0.6.1' require 'ruby-prof' require 'fileutils' diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb deleted file mode 100644 index ca64c5ebe3..0000000000 --- a/activesupport/lib/active_support/vendor.rb +++ /dev/null @@ -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 diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/blankslate.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/blankslate.rb similarity index 100% rename from activesupport/lib/active_support/vendor/builder-2.1.2/blankslate.rb rename to activesupport/lib/active_support/vendor/builder-2.1.2/lib/blankslate.rb diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/builder.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder.rb similarity index 100% rename from activesupport/lib/active_support/vendor/builder-2.1.2/builder.rb rename to activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder.rb diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/blankslate.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/blankslate.rb similarity index 100% rename from activesupport/lib/active_support/vendor/builder-2.1.2/builder/blankslate.rb rename to activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/blankslate.rb diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/css.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/css.rb similarity index 100% rename from activesupport/lib/active_support/vendor/builder-2.1.2/builder/css.rb rename to activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/css.rb diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xchar.rb similarity index 100% rename from activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb rename to activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xchar.rb diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlbase.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlbase.rb similarity index 100% rename from activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlbase.rb rename to activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlbase.rb diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlevents.rb similarity index 100% rename from activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb rename to activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlevents.rb diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlmarkup.rb similarity index 100% rename from activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb rename to activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlmarkup.rb diff --git a/activesupport/lib/active_support/vendor/memcache-client-1.6.5/memcache.rb b/activesupport/lib/active_support/vendor/memcache-client-1.6.5/lib/memcache.rb similarity index 100% rename from activesupport/lib/active_support/vendor/memcache-client-1.6.5/memcache.rb rename to activesupport/lib/active_support/vendor/memcache-client-1.6.5/lib/memcache.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/data_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/data_timezone.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/data_timezone.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/data_timezone.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/data_timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/data_timezone_info.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/data_timezone_info.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/data_timezone_info.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Algiers.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Algiers.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Algiers.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Algiers.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Cairo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Cairo.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Cairo.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Cairo.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Casablanca.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Casablanca.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Casablanca.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Casablanca.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Harare.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Harare.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Harare.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Harare.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Johannesburg.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Johannesburg.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Johannesburg.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Johannesburg.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Monrovia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Monrovia.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Monrovia.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Monrovia.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Nairobi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Nairobi.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Africa/Nairobi.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Nairobi.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Argentina/Buenos_Aires.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Argentina/Buenos_Aires.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Argentina/San_Juan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Argentina/San_Juan.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Argentina/San_Juan.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Argentina/San_Juan.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Bogota.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Bogota.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Bogota.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Bogota.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Caracas.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Caracas.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Caracas.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Caracas.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Chicago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Chicago.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Chicago.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Chicago.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Chihuahua.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Chihuahua.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Chihuahua.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Chihuahua.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Denver.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Denver.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Denver.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Denver.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Godthab.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Godthab.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Godthab.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Godthab.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Guatemala.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Guatemala.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Guatemala.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Guatemala.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Halifax.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Halifax.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Halifax.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Halifax.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Indiana/Indianapolis.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Indiana/Indianapolis.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Juneau.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Juneau.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Juneau.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Juneau.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/La_Paz.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/La_Paz.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/La_Paz.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/La_Paz.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Lima.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Lima.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Lima.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Lima.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Los_Angeles.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Los_Angeles.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Los_Angeles.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Los_Angeles.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Mazatlan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Mazatlan.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Mazatlan.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Mazatlan.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Mexico_City.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Mexico_City.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Mexico_City.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Mexico_City.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Monterrey.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Monterrey.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Monterrey.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Monterrey.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/New_York.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/New_York.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/New_York.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/New_York.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Phoenix.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Phoenix.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Phoenix.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Phoenix.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Regina.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Regina.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Regina.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Regina.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Santiago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Santiago.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Santiago.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Santiago.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Sao_Paulo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Sao_Paulo.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Sao_Paulo.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Sao_Paulo.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/St_Johns.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/St_Johns.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/St_Johns.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/St_Johns.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Tijuana.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Tijuana.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/America/Tijuana.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Tijuana.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Almaty.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Almaty.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Almaty.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Almaty.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Baghdad.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Baghdad.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Baghdad.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Baghdad.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Baku.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Baku.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Baku.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Baku.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Bangkok.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Bangkok.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Bangkok.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Bangkok.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Chongqing.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Chongqing.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Chongqing.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Chongqing.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Colombo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Colombo.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Colombo.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Colombo.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Dhaka.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Dhaka.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Dhaka.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Dhaka.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Hong_Kong.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Hong_Kong.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Hong_Kong.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Hong_Kong.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Irkutsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Irkutsk.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Irkutsk.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Irkutsk.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Jakarta.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Jakarta.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Jakarta.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Jakarta.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Jerusalem.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Jerusalem.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Jerusalem.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Jerusalem.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kabul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kabul.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kabul.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kabul.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kamchatka.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kamchatka.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kamchatka.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kamchatka.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Karachi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Karachi.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Karachi.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Karachi.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kathmandu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kathmandu.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kathmandu.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kathmandu.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kolkata.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kolkata.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kolkata.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kolkata.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Krasnoyarsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Krasnoyarsk.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kuala_Lumpur.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kuala_Lumpur.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kuwait.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kuwait.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kuwait.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kuwait.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Magadan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Magadan.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Magadan.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Magadan.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Muscat.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Muscat.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Muscat.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Muscat.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Novosibirsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Novosibirsk.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Novosibirsk.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Novosibirsk.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Rangoon.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Rangoon.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Rangoon.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Rangoon.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Riyadh.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Riyadh.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Riyadh.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Riyadh.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Seoul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Seoul.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Seoul.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Seoul.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Shanghai.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Shanghai.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Shanghai.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Shanghai.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Singapore.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Singapore.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Singapore.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Singapore.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Taipei.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Taipei.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Taipei.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Taipei.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Tashkent.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tashkent.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Tashkent.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tashkent.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Tbilisi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tbilisi.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Tbilisi.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tbilisi.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Tehran.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tehran.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Tehran.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tehran.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Tokyo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tokyo.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Tokyo.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tokyo.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Ulaanbaatar.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Ulaanbaatar.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Urumqi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Urumqi.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Urumqi.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Urumqi.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Vladivostok.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Vladivostok.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Vladivostok.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Vladivostok.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Yakutsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yakutsk.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Yakutsk.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yakutsk.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Yekaterinburg.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yekaterinburg.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Yekaterinburg.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yekaterinburg.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Yerevan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yerevan.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Yerevan.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yerevan.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Atlantic/Azores.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/Azores.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Atlantic/Azores.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/Azores.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Atlantic/Cape_Verde.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Atlantic/Cape_Verde.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Atlantic/South_Georgia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/South_Georgia.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Atlantic/South_Georgia.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/South_Georgia.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Adelaide.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Adelaide.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Adelaide.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Adelaide.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Brisbane.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Brisbane.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Brisbane.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Brisbane.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Darwin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Darwin.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Darwin.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Darwin.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Hobart.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Hobart.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Hobart.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Hobart.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Melbourne.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Melbourne.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Melbourne.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Melbourne.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Perth.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Perth.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Perth.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Perth.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Sydney.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Sydney.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Australia/Sydney.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Sydney.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Etc/UTC.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Etc/UTC.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Etc/UTC.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Etc/UTC.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Amsterdam.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Amsterdam.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Amsterdam.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Amsterdam.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Athens.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Athens.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Athens.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Athens.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Belgrade.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Belgrade.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Belgrade.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Belgrade.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Berlin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Berlin.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Berlin.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Berlin.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Bratislava.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Bratislava.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Bratislava.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Bratislava.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Brussels.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Brussels.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Brussels.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Brussels.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Bucharest.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Bucharest.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Bucharest.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Bucharest.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Budapest.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Budapest.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Budapest.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Budapest.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Copenhagen.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Copenhagen.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Copenhagen.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Copenhagen.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Dublin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Dublin.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Dublin.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Dublin.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Helsinki.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Helsinki.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Helsinki.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Helsinki.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Istanbul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Istanbul.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Istanbul.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Istanbul.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Kiev.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Kiev.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Kiev.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Kiev.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Lisbon.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Lisbon.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Lisbon.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Lisbon.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Ljubljana.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Ljubljana.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Ljubljana.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Ljubljana.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/London.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/London.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/London.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/London.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Madrid.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Madrid.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Madrid.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Madrid.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Minsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Minsk.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Minsk.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Minsk.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Moscow.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Moscow.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Moscow.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Moscow.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Paris.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Paris.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Paris.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Paris.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Prague.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Prague.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Prague.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Prague.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Riga.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Riga.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Riga.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Riga.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Rome.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Rome.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Rome.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Rome.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Sarajevo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Sarajevo.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Sarajevo.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Sarajevo.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Skopje.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Skopje.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Skopje.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Skopje.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Sofia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Sofia.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Sofia.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Sofia.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Stockholm.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Stockholm.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Stockholm.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Stockholm.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Tallinn.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Tallinn.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Tallinn.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Tallinn.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Vienna.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Vienna.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Vienna.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Vienna.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Vilnius.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Vilnius.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Vilnius.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Vilnius.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Warsaw.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Warsaw.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Warsaw.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Warsaw.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Zagreb.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Zagreb.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Europe/Zagreb.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Zagreb.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Auckland.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Auckland.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Auckland.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Auckland.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Fiji.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Fiji.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Fiji.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Fiji.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Guam.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Guam.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Guam.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Guam.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Honolulu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Honolulu.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Honolulu.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Honolulu.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Majuro.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Majuro.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Majuro.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Majuro.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Midway.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Midway.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Midway.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Midway.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Noumea.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Noumea.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Noumea.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Noumea.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Pago_Pago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Pago_Pago.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Pago_Pago.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Pago_Pago.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Port_Moresby.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Port_Moresby.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Port_Moresby.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Port_Moresby.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Tongatapu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Tongatapu.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Pacific/Tongatapu.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Tongatapu.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/info_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/info_timezone.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/info_timezone.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/info_timezone.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/linked_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/linked_timezone.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/linked_timezone.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/linked_timezone.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/linked_timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/linked_timezone_info.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/linked_timezone_info.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/linked_timezone_info.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/offset_rationals.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/offset_rationals.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/offset_rationals.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/offset_rationals.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/ruby_core_support.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/ruby_core_support.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/ruby_core_support.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/ruby_core_support.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/time_or_datetime.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/time_or_datetime.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/time_or_datetime.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/time_or_datetime.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone_definition.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_definition.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone_definition.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_definition.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_info.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone_info.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_info.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone_offset_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_offset_info.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone_offset_info.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_offset_info.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone_period.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_period.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone_period.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_period.rb diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone_transition_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_transition_info.rb similarity index 100% rename from activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/timezone_transition_info.rb rename to activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_transition_info.rb diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index c2def8fe88..e06faadacb 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -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' diff --git a/activesupport/test/xml_mini/nokogiri_engine_test.rb b/activesupport/test/xml_mini/nokogiri_engine_test.rb index 7c3a591e63..1eeff73d32 100644 --- a/activesupport/test/xml_mini/nokogiri_engine_test.rb +++ b/activesupport/test/xml_mini/nokogiri_engine_test.rb @@ -3,13 +3,11 @@ require 'active_support/xml_mini' 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