[macruby-changes] [3872] MacRuby/trunk/spec/frozen/library

[source_changes at macosforge.org]

Revision: 3872
          http://trac.macosforge.org/projects/ruby/changeset/3872
Author:   eloy.de.enige at gmail.com
Date:     2010-03-28 12:53:23 -0700 (Sun, 28 Mar 2010)
Log Message:
-----------
Update RubySpec to 1d137b699c813be4d9f1f2728d68b44ab52ec36a (part 2)

Modified Paths:
--------------
    MacRuby/trunk/spec/frozen/library/abbrev/abbrev_spec.rb
    MacRuby/trunk/spec/frozen/library/base64/b64encode_spec.rb
    MacRuby/trunk/spec/frozen/library/base64/decode64_spec.rb
    MacRuby/trunk/spec/frozen/library/base64/decode_b_spec.rb
    MacRuby/trunk/spec/frozen/library/base64/encode64_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/abs_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/add_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/case_compare_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/ceil_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/coerce_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/comparison_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/div_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/divide_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/divmod_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/double_fig_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/eql_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/equal_value_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/exponent_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/finite_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/fix_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/floor_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/frac_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/gt_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/gte_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/induced_from_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/infinite_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/limit_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/lt_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/lte_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/minus_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/mode_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/modulo_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/mult_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/multiply_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/nan_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/new_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/nonzero_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/plus_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/power_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/precs_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/quo_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/remainder_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/shared/modulo.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/shared/power.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/shared/quo.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/shared/to_int.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/sign_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/split_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/sqrt_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/sub_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/to_f_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/to_i_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/to_int_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/truncate_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/uminus_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/uplus_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/ver_spec.rb
    MacRuby/trunk/spec/frozen/library/bigdecimal/zero_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/cookie/domain_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/cookie/expires_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/cookie/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/cookie/name_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/cookie/parse_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/cookie/path_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/cookie/secure_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/cookie/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/cookie/value_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/escapeElement_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/escapeHTML_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/escape_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/header_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/a_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/base_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/blockquote_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/caption_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/checkbox_group_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/checkbox_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/file_field_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/fixtures/common.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/form_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/hidden_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/html_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/image_button_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/img_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/multipart_form_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/password_field_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/popup_menu_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/radio_button_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/radio_group_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/reset_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/scrolling_list_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/shared/popup_menu.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/submit_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/text_field_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/textarea_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/out_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/parse_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/pretty_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/print_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_charset_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_encoding_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_language_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/auth_type_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/cache_control_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/content_length_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/content_type_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/cookies_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/element_reference_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/from_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/gateway_interface_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/has_key_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/host_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/include_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/key_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/keys_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/multipart_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/negotiate_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/params_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/path_info_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/path_translated_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/pragma_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/query_string_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/raw_cookie2_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/raw_cookie_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/referer_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_addr_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_host_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_ident_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_user_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/request_method_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/script_name_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_name_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_port_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_protocol_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_software_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/queryextension/user_agent_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/rfc1123_date_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/unescapeElement_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/unescapeHTML_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/unescape_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/Complex_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/abs2_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/abs_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/angle_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/arg_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/coerce_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/comparison_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/conj_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/conjugate_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/denominator_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/divide_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/equal_value_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/exponent_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/generic_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/hash_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/imag_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/image_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/acos_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/acosh_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/asin_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/asinh_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/atan2_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/atan_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/atanh_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/cos_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/cosh_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/exp_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/log10_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/log_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/acos.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/acosh.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/asin.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/asinh.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/atan.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/atan2.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/atanh.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/cos.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/cosh.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/exp.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/log.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/log10.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/sin.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/sinh.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/sqrt.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/tan.rb
    MacRuby/trunk/spec/frozen/library/complex/math/shared/tanh.rb
    MacRuby/trunk/spec/frozen/library/complex/math/sin_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/sinh_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/sqrt_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/tan_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/math/tanh_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/minus_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/modulo_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/multiply_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/new_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/numerator_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/numeric/angle_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/numeric/arg_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/numeric/conj_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/numeric/conjugate_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/numeric/im_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/numeric/imag_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/numeric/image_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/numeric/polar_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/numeric/real_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/plus_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/polar_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/real_spec.rb
    MacRuby/trunk/spec/frozen/library/complex/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/conditionvariable/broadcast_spec.rb
    MacRuby/trunk/spec/frozen/library/conditionvariable/signal_spec.rb
    MacRuby/trunk/spec/frozen/library/conditionvariable/wait_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/basicwriter/close_on_terminate_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/basicwriter/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/basicwriter/terminate_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/cell/data_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/cell/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/foreach_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/generate_line_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/generate_row_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/generate_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/iobuf/close_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/iobuf/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/iobuf/read_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/iobuf/terminate_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/ioreader/close_on_terminate_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/ioreader/get_row_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/ioreader/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/ioreader/terminate_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/open_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/parse_row_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/parse_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/read_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/reader/close_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/reader/create_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/reader/each_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/reader/get_row_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/reader/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/reader/parse_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/reader/shift_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/reader/terminate_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/readlines_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/add_buf_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/buf_size_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/drop_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/element_reference_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/get_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/idx_is_eos_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/is_eos_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/read_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/rel_buf_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/streambuf/terminate_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/stringreader/get_row_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/stringreader/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/writer/add_row_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/writer/append_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/writer/close_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/writer/create_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/writer/generate_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/writer/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/csv/writer/terminate_spec.rb
    MacRuby/trunk/spec/frozen/library/date/accessor_spec.rb
    MacRuby/trunk/spec/frozen/library/date/add_month_spec.rb
    MacRuby/trunk/spec/frozen/library/date/add_spec.rb
    MacRuby/trunk/spec/frozen/library/date/boat_spec.rb
    MacRuby/trunk/spec/frozen/library/date/civil_spec.rb
    MacRuby/trunk/spec/frozen/library/date/commercial_spec.rb
    MacRuby/trunk/spec/frozen/library/date/constants_spec.rb
    MacRuby/trunk/spec/frozen/library/date/conversions_spec.rb
    MacRuby/trunk/spec/frozen/library/date/downto_spec.rb
    MacRuby/trunk/spec/frozen/library/date/eql_spec.rb
    MacRuby/trunk/spec/frozen/library/date/gregorian_spec.rb
    MacRuby/trunk/spec/frozen/library/date/hash_spec.rb
    MacRuby/trunk/spec/frozen/library/date/infinity_spec.rb
    MacRuby/trunk/spec/frozen/library/date/julian_spec.rb
    MacRuby/trunk/spec/frozen/library/date/minus_month_spec.rb
    MacRuby/trunk/spec/frozen/library/date/minus_spec.rb
    MacRuby/trunk/spec/frozen/library/date/new_spec.rb
    MacRuby/trunk/spec/frozen/library/date/ordinal_spec.rb
    MacRuby/trunk/spec/frozen/library/date/parse_spec.rb
    MacRuby/trunk/spec/frozen/library/date/relationship_spec.rb
    MacRuby/trunk/spec/frozen/library/date/shared/commercial.rb
    MacRuby/trunk/spec/frozen/library/date/shared/parse_eu.rb
    MacRuby/trunk/spec/frozen/library/date/shared/parse_us.rb
    MacRuby/trunk/spec/frozen/library/date/step_spec.rb
    MacRuby/trunk/spec/frozen/library/date/strftime_spec.rb
    MacRuby/trunk/spec/frozen/library/date/strptime_spec.rb
    MacRuby/trunk/spec/frozen/library/date/upto_spec.rb
    MacRuby/trunk/spec/frozen/library/delegate/frozen_spec.rb
    MacRuby/trunk/spec/frozen/library/delegate/marshal_spec.rb
    MacRuby/trunk/spec/frozen/library/delegate/method_spec.rb
    MacRuby/trunk/spec/frozen/library/delegate/send_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/append_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/block_length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/digest_bang_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/digest_length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/digest_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/equal_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/hexdigest_bang_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/hexdigest_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/reset_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/size_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/md5/update_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha1/digest_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/append_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/block_length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/digest_bang_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/digest_length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/digest_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/equal_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/hexdigest_bang_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/hexdigest_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/reset_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/size_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha256/update_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/append_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/block_length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/digest_bang_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/digest_length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/digest_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/equal_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/hexdigest_bang_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/hexdigest_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/reset_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/size_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha384/update_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/append_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/block_length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/digest_bang_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/digest_length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/digest_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/equal_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/hexdigest_bang_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/hexdigest_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/length_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/reset_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/size_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/digest/sha512/update_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/config_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/current_server_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/__drbref_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/__drburi_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/_dump_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/_load_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/eql_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/equal_value_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/hash_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/method_missing_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/new_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/new_with_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/new_with_uri_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/prepare_backtrace_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/pretty_print_cycle_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/pretty_print_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/respond_to_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/drbobject/with_friend_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/fetch_server_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/front_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/here_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/install_acl_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/install_id_conv_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/primary_server_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/regist_server_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/remove_server_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/start_service_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/stop_service_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/thread_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/to_id_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/to_obj_spec.rb
    MacRuby/trunk/spec/frozen/library/drb/uri_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/each_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/each_with_index_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/enum_cons_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/enum_for_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/enum_slice_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/enum_with_index_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/new_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/next_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/rewind_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/to_enum_spec.rb
    MacRuby/trunk/spec/frozen/library/enumerator/with_index_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/def_class_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/def_method_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/def_module_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/defmethod/def_erb_method_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/filename_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/new_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/result_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/run_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/src_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/util/h_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/util/html_escape_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/util/u_spec.rb
    MacRuby/trunk/spec/frozen/library/erb/util/url_encode_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/endgrent_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/endpwent_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/getgrent_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/getgrgid_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/getgrnam_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/getlogin_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/getpwent_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/getpwnam_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/getpwuid_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/group_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/passwd_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/setgrent_spec.rb
    MacRuby/trunk/spec/frozen/library/etc/setpwent_spec.rb
    MacRuby/trunk/spec/frozen/library/ftools/catname_spec.rb
    MacRuby/trunk/spec/frozen/library/ftools/chmod_spec.rb
    MacRuby/trunk/spec/frozen/library/ftools/compare_spec.rb
    MacRuby/trunk/spec/frozen/library/ftools/copy_spec.rb
    MacRuby/trunk/spec/frozen/library/ftools/install_spec.rb
    MacRuby/trunk/spec/frozen/library/ftools/makedirs_spec.rb
    MacRuby/trunk/spec/frozen/library/ftools/move_spec.rb
    MacRuby/trunk/spec/frozen/library/ftools/safe_unlink_spec.rb
    MacRuby/trunk/spec/frozen/library/ftools/syscopy_spec.rb
    MacRuby/trunk/spec/frozen/library/generator/each_spec.rb
    MacRuby/trunk/spec/frozen/library/generator/new_spec.rb
    MacRuby/trunk/spec/frozen/library/generator/next_spec.rb
    MacRuby/trunk/spec/frozen/library/generator/rewind_spec.rb
    MacRuby/trunk/spec/frozen/library/getoptlong/each_option_spec.rb
    MacRuby/trunk/spec/frozen/library/getoptlong/each_spec.rb
    MacRuby/trunk/spec/frozen/library/getoptlong/error_message_spec.rb
    MacRuby/trunk/spec/frozen/library/getoptlong/get_option_spec.rb
    MacRuby/trunk/spec/frozen/library/getoptlong/get_spec.rb
    MacRuby/trunk/spec/frozen/library/getoptlong/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/getoptlong/ordering_spec.rb
    MacRuby/trunk/spec/frozen/library/getoptlong/set_options_spec.rb
    MacRuby/trunk/spec/frozen/library/getoptlong/terminate_spec.rb
    MacRuby/trunk/spec/frozen/library/getoptlong/terminated_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/charset_map_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/close_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/conv_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/failure/failed_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/failure/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/failure/success_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/failure_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/iconv_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/new_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/open_spec.rb
    MacRuby/trunk/spec/frozen/library/iconv/shared/new.rb
    MacRuby/trunk/spec/frozen/library/ipaddr/hton_spec.rb
    MacRuby/trunk/spec/frozen/library/ipaddr/ipv4_conversion_spec.rb
    MacRuby/trunk/spec/frozen/library/ipaddr/new_spec.rb
    MacRuby/trunk/spec/frozen/library/ipaddr/operator_spec.rb
    MacRuby/trunk/spec/frozen/library/ipaddr/reverse_spec.rb
    MacRuby/trunk/spec/frozen/library/ipaddr/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/application/level_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/application/log_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/application/new_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/application/set_log_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/application/start_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/device/close_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/device/new_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/device/write_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/logger/add_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/logger/close_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/logger/datetime_format_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/logger/debug_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/logger/error_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/logger/fatal_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/logger/info_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/logger/new_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/logger/unknown_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/logger/warn_spec.rb
    MacRuby/trunk/spec/frozen/library/logger/severity_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/bignum/exponent_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/complex/Complex_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/fixnum/exponent_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/float/exponent_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/integer/from_prime_division_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/integer/gcd2_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/integer/prime_division_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/math/rsqrt_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/math/shared/rsqrt.rb
    MacRuby/trunk/spec/frozen/library/mathn/math/shared/sqrt.rb
    MacRuby/trunk/spec/frozen/library/mathn/math/sqrt_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/prime/each_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/prime/new_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/prime/next_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/rational/Rational_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/rational/exponent_spec.rb
    MacRuby/trunk/spec/frozen/library/mathn/rational/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/I_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/clone_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/coerce_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/collect_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/column_size_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/column_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/column_vector_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/column_vectors_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/columns_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/constructor_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/det_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/determinant_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/diagonal_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/divide_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/element_reference_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/eql_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/equal_value_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/exponent_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/hash_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/identity_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/inv_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/inverse_from_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/inverse_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/map_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/minor_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/minus_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/multiply_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/new_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/plus_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/rank_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/regular_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/row_size_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/row_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/row_vector_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/row_vectors_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/rows_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/scalar/Fail_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/scalar/Raise_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/scalar/divide_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/scalar/exponent_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/scalar/included_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/scalar/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/scalar/minus_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/scalar/multiply_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/scalar/plus_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/scalar_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/shared/collect.rb
    MacRuby/trunk/spec/frozen/library/matrix/singular_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/square_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/t_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/to_a_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/tr_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/trace_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/transpose_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/unit_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/vector/each2_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/vector/eql_spec.rb
    MacRuby/trunk/spec/frozen/library/matrix/zero_spec.rb
    MacRuby/trunk/spec/frozen/library/mutex/lock_spec.rb
    MacRuby/trunk/spec/frozen/library/mutex/locked_spec.rb
    MacRuby/trunk/spec/frozen/library/mutex/synchronize_spec.rb
    MacRuby/trunk/spec/frozen/library/mutex/try_lock_spec.rb
    MacRuby/trunk/spec/frozen/library/mutex/unlock_spec.rb
    MacRuby/trunk/spec/frozen/library/net/FTPError_spec.rb
    MacRuby/trunk/spec/frozen/library/net/FTPPermError_spec.rb
    MacRuby/trunk/spec/frozen/library/net/FTPProtoError_spec.rb
    MacRuby/trunk/spec/frozen/library/net/FTPReplyError_spec.rb
    MacRuby/trunk/spec/frozen/library/net/FTPTempError_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/abort_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/acct_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/binary_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/chdir_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/close_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/closed_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/connect_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/debug_mode_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/delete_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/dir_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/fixtures/server.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/get_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/getbinaryfile_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/getdir_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/gettextfile_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/help_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/last_response_code_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/last_response_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/lastresp_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/list_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/login_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/ls_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/mdtm_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/mkdir_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/mtime_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/nlst_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/noop_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/open_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/passive_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/put_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/putbinaryfile_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/puttextfile_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/pwd_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/quit_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/rename_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/resume_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/retrbinary_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/retrlines_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/return_code_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/rmdir_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/sendcmd_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/set_socket_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/shared/getbinaryfile.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/shared/gettextfile.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/shared/list.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/shared/putbinaryfile.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/shared/puttextfile.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/site_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/size_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/status_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/storbinary_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/storlines_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/system_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/voidcmd_spec.rb
    MacRuby/trunk/spec/frozen/library/net/ftp/welcome_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/HTTPBadResponse_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/HTTPError_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/HTTPFatalError_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/HTTPHeaderSyntaxError_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/HTTPRetriableError_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/HTTPServerException_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/Proxy_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/active_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/address_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/close_on_empty_response_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/copy_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/default_port_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/delete_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/finish_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/fixtures/http_server.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/get2_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/get_print_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/get_response_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/get_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/head2_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/head_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/http_default_port_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/https_default_port_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/is_version_1_1_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/is_version_1_2_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/lock_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/mkcol_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/move_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/new_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/newobj_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/open_timeout_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/options_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/port_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/post2_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/post_form_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/post_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/propfind_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/proppatch_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/proxy_address_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/proxy_class_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/proxy_pass_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/proxy_port_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/proxy_user_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/put2_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/put_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/read_timeout_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/request_get_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/request_head_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/request_post_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/request_put_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/request_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/request_types_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/send_request_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/set_debug_output_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/socket_type_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/start_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/started_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/trace_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/unlock_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/use_ssl_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/version_1_1_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/http/version_1_2_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpexceptions/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpexceptions/response_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_exist_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_stream_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/exec_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/method_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/path_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/request_body_permitted_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/response_body_permitted_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/set_body_internal_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/add_field_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/basic_auth_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/canonical_each_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/chunked_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_length_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_range_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_type_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/delete_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_capitalized_name_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_capitalized_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_header_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_key_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_name_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_value_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/element_reference_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/element_set_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/fetch_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/form_data_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/get_fields_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/initialize_http_header_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/key_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/length_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/main_type_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/proxy_basic_auth_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/range_length_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/range_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_content_type_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_form_data_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_range_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_capitalized.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_header.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_name.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/set_form_data.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/size_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/sub_type_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/to_hash_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpheader/type_params_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httprequest/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/body_permitted_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/body_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/code_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/code_type_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/entity_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/error_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/error_type_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/exception_type_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/header_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/http_version_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/message_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/msg_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_body_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_header_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_new_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/reading_body_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/response_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/to_ary_spec.rb
    MacRuby/trunk/spec/frozen/library/net/http/httpresponse/value_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/binmode_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/cmd_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/login_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/preprocess_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/print_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/puts_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/sock_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/telnetmode_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/waitfor_spec.rb
    MacRuby/trunk/spec/frozen/library/net/telnet/write_spec.rb
    MacRuby/trunk/spec/frozen/library/observer/add_observer_spec.rb
    MacRuby/trunk/spec/frozen/library/observer/count_observers_spec.rb
    MacRuby/trunk/spec/frozen/library/observer/delete_observer_spec.rb
    MacRuby/trunk/spec/frozen/library/observer/delete_observers_spec.rb
    MacRuby/trunk/spec/frozen/library/observer/notify_observers_spec.rb
    MacRuby/trunk/spec/frozen/library/openssl/cipher_spec.rb
    MacRuby/trunk/spec/frozen/library/openssl/config/freeze_spec.rb
    MacRuby/trunk/spec/frozen/library/openssl/hmac/digest_spec.rb
    MacRuby/trunk/spec/frozen/library/openssl/hmac/hexdigest_spec.rb
    MacRuby/trunk/spec/frozen/library/openssl/random/pseudo_bytes_spec.rb
    MacRuby/trunk/spec/frozen/library/openssl/random/random_bytes_spec.rb
    MacRuby/trunk/spec/frozen/library/openssl/random/shared/random_bytes.rb
    MacRuby/trunk/spec/frozen/library/openstruct/delete_field_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/equal_value_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/frozen_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/initialize_copy_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/marshal_dump_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/marshal_load_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/method_missing_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/new_ostruct_member_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/new_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/table_spec.rb
    MacRuby/trunk/spec/frozen/library/openstruct/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/parsedate/parsedate_spec.rb
    MacRuby/trunk/spec/frozen/library/pathname/absolute_spec.rb
    MacRuby/trunk/spec/frozen/library/pathname/equal_value_spec.rb
    MacRuby/trunk/spec/frozen/library/pathname/hash_spec.rb
    MacRuby/trunk/spec/frozen/library/pathname/new_spec.rb
    MacRuby/trunk/spec/frozen/library/pathname/parent_spec.rb
    MacRuby/trunk/spec/frozen/library/pathname/relative_spec.rb
    MacRuby/trunk/spec/frozen/library/pathname/root_spec.rb
    MacRuby/trunk/spec/frozen/library/pathname/sub_spec.rb
    MacRuby/trunk/spec/frozen/library/ping/pingecho_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/each_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/instance_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/int_from_prime_division_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/integer/each_prime_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/integer/from_prime_division_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/integer/prime_division_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/integer/prime_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/new_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/next_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/prime_division_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/prime_spec.rb
    MacRuby/trunk/spec/frozen/library/prime/succ_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/append_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/clear_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/deq_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/empty_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/enq_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/length_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/num_waiting_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/pop_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/push_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/shift_spec.rb
    MacRuby/trunk/spec/frozen/library/queue/size_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/Rational_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/abs_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/ceil_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/coerce_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/comparison_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/denominator_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/div_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/divide_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/divmod_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/equal_value_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/exponent_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/fdiv_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/floor_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/hash_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/minus_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/modulo_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/multiply_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/new_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/numerator_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/plus_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/quo_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/reduce_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/remainder_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/round_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/to_f_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/to_i_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/to_r_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/rational/truncate_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/basic_quote_characters_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/basic_word_break_characters_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/completer_quote_characters_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/completer_word_break_characters_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/completion_append_character_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/completion_case_fold_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/completion_proc_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/constants_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/emacs_editing_mode_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/filename_quote_characters_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/append_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/delete_at_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/each_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/element_reference_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/element_set_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/empty_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/history_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/length_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/pop_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/push_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/shift_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/size_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/history/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/readline/readline_spec_disabled.rb
    MacRuby/trunk/spec/frozen/library/readline/vi_editing_mode_spec.rb
    MacRuby/trunk/spec/frozen/library/resolv/get_address_spec.rb
    MacRuby/trunk/spec/frozen/library/resolv/get_addresses_spec.rb
    MacRuby/trunk/spec/frozen/library/resolv/get_name_spec.rb
    MacRuby/trunk/spec/frozen/library/resolv/get_names_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/clone_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/element_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/equal_value_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/hash_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/namespace_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/node_type_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/prefix_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/remove_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/to_string_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/value_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/write_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attribute/xpath_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/add_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/append_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/delete_all_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/delete_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/each_attribute_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/each_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/element_reference_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/element_set_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/get_attribute_ns_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/get_attribute_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/length_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/namespaces_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/prefixes_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/shared/length.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/size_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/attributes/to_a_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/cdata/clone_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/cdata/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/cdata/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/cdata/value_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/add_element_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/add_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/clone_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/doctype_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/encoding_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/expanded_name_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/new_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/node_type_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/root_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/stand_alone_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/version_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/write_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/document/xml_decl_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/add_attribute_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/add_attributes_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/add_element_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/add_namespace_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/add_text_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/attribute_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/attributes_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/cdatas_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/clone_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/comments_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/delete_attribute_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/delete_element_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/delete_namespace_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/document_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/each_element_with_attribute_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/each_element_with_text_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/get_text_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/has_attributes_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/has_elements_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/has_text_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/instructions_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/namespace_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/namespaces_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/new_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/next_element_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/node_type_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/prefixes_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/previous_element_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/raw_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/root_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/text_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/texts_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/element/whitespace_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/node/each_recursive_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/node/find_first_recursive_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/node/index_in_parent_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/node/next_sibling_node_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/node/parent_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/node/previous_sibling_node_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/shared/each_element.rb
    MacRuby/trunk/spec/frozen/library/rexml/shared/elements_to_a.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/append_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/clone_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/comparison_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/empty_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/indent_text_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/new_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/node_type_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/normalize_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/read_with_substitution_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/unnormalize_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/value_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/wrap_spec.rb
    MacRuby/trunk/spec/frozen/library/rexml/text/write_with_substitution_spec.rb
    MacRuby/trunk/spec/frozen/library/scanf/io/block_scanf_spec.rb
    MacRuby/trunk/spec/frozen/library/scanf/io/scanf_spec.rb
    MacRuby/trunk/spec/frozen/library/scanf/string/block_scanf_spec.rb
    MacRuby/trunk/spec/frozen/library/scanf/string/scanf_spec.rb
    MacRuby/trunk/spec/frozen/library/securerandom/base64_spec.rb
    MacRuby/trunk/spec/frozen/library/securerandom/hex_spec.rb
    MacRuby/trunk/spec/frozen/library/securerandom/random_bytes_spec.rb
    MacRuby/trunk/spec/frozen/library/securerandom/random_number_spec.rb
    MacRuby/trunk/spec/frozen/library/set/add_spec.rb
    MacRuby/trunk/spec/frozen/library/set/append_spec.rb
    MacRuby/trunk/spec/frozen/library/set/classify_spec.rb
    MacRuby/trunk/spec/frozen/library/set/clear_spec.rb
    MacRuby/trunk/spec/frozen/library/set/collect_spec.rb
    MacRuby/trunk/spec/frozen/library/set/constructor_spec.rb
    MacRuby/trunk/spec/frozen/library/set/delete_if_spec.rb
    MacRuby/trunk/spec/frozen/library/set/delete_spec.rb
    MacRuby/trunk/spec/frozen/library/set/difference_spec.rb
    MacRuby/trunk/spec/frozen/library/set/divide_spec.rb
    MacRuby/trunk/spec/frozen/library/set/each_spec.rb
    MacRuby/trunk/spec/frozen/library/set/empty_spec.rb
    MacRuby/trunk/spec/frozen/library/set/enumerable/to_set_spec.rb
    MacRuby/trunk/spec/frozen/library/set/eql_spec.rb
    MacRuby/trunk/spec/frozen/library/set/equal_value_spec.rb
    MacRuby/trunk/spec/frozen/library/set/exclusion_spec.rb
    MacRuby/trunk/spec/frozen/library/set/flatten_merge_spec.rb
    MacRuby/trunk/spec/frozen/library/set/flatten_spec.rb
    MacRuby/trunk/spec/frozen/library/set/hash_spec.rb
    MacRuby/trunk/spec/frozen/library/set/include_spec.rb
    MacRuby/trunk/spec/frozen/library/set/initialize_copy_spec.rb
    MacRuby/trunk/spec/frozen/library/set/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/set/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/set/intersection_spec.rb
    MacRuby/trunk/spec/frozen/library/set/length_spec.rb
    MacRuby/trunk/spec/frozen/library/set/map_spec.rb
    MacRuby/trunk/spec/frozen/library/set/member_spec.rb
    MacRuby/trunk/spec/frozen/library/set/merge_spec.rb
    MacRuby/trunk/spec/frozen/library/set/minus_spec.rb
    MacRuby/trunk/spec/frozen/library/set/plus_spec.rb
    MacRuby/trunk/spec/frozen/library/set/pretty_print_cycle_spec.rb
    MacRuby/trunk/spec/frozen/library/set/pretty_print_spec.rb
    MacRuby/trunk/spec/frozen/library/set/proper_subset_spec.rb
    MacRuby/trunk/spec/frozen/library/set/proper_superset_spec.rb
    MacRuby/trunk/spec/frozen/library/set/reject_spec.rb
    MacRuby/trunk/spec/frozen/library/set/replace_spec.rb
    MacRuby/trunk/spec/frozen/library/set/size_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/add_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/append_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/classify_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/clear_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/collect_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/constructor_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/delete_if_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/delete_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/difference_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/divide_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/each_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/empty_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/eql_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/equal_value_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/exclusion_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/flatten_merge_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/flatten_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/hash_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/include_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/initialize_copy_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/intersection_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/length_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/map_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/member_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/merge_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/minus_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/plus_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/pretty_print_cycle_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/pretty_print_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/proper_subset_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/proper_superset_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/reject_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/replace_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/size_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/subset_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/subtract_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/superset_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/to_a_spec.rb
    MacRuby/trunk/spec/frozen/library/set/sortedset/union_spec.rb
    MacRuby/trunk/spec/frozen/library/set/subset_spec.rb
    MacRuby/trunk/spec/frozen/library/set/subtract_spec.rb
    MacRuby/trunk/spec/frozen/library/set/superset_spec.rb
    MacRuby/trunk/spec/frozen/library/set/to_a_spec.rb
    MacRuby/trunk/spec/frozen/library/set/union_spec.rb
    MacRuby/trunk/spec/frozen/library/shellwords/shellwords_spec.rb
    MacRuby/trunk/spec/frozen/library/singleton/allocate_spec.rb
    MacRuby/trunk/spec/frozen/library/singleton/clone_spec.rb
    MacRuby/trunk/spec/frozen/library/singleton/dump_spec.rb
    MacRuby/trunk/spec/frozen/library/singleton/dup_spec.rb
    MacRuby/trunk/spec/frozen/library/singleton/instance_spec.rb
    MacRuby/trunk/spec/frozen/library/singleton/instantiate_spec.rb
    MacRuby/trunk/spec/frozen/library/singleton/load_spec.rb
    MacRuby/trunk/spec/frozen/library/singleton/new_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/close_read_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/close_write_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/do_not_reverse_lookup_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/for_fd_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/getpeername_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/getsockname_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/getsockopt_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/recv_nonblock_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/recv_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/send_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/setsockopt_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/basicsocket/shutdown_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/constants/constants_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/ipsocket/addr_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/ipsocket/getaddress_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/ipsocket/peeraddr_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/ipsocket/recvfrom_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/accept_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/bind_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/connect_nonblock_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/connect_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/for_fd_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/getaddrinfo_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/gethostbyaddr_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/gethostbyname_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/gethostname_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/getnameinfo_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/getservbyname_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/listen_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/new_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/pack_sockaddr_in_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/pack_sockaddr_un_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/pair_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/recvfrom_nonblock_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/recvfrom_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/sockaddr_in_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/sockaddr_un_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/socket_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/socketpair_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/sysaccept_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/unpack_sockaddr_in_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/socket/unpack_sockaddr_un_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpserver/accept_nonblock_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpserver/accept_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpserver/listen_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpserver/new_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpserver/output_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpserver/readpartial_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpserver/sysaccept_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpsocket/gethostbyname_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpsocket/new_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpsocket/open_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpsocket/partially_closable_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpsocket/shared/new.rb
    MacRuby/trunk/spec/frozen/library/socket/udpsocket/bind_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/udpsocket/connect_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/udpsocket/new_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/udpsocket/open_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/udpsocket/recvfrom_nonblock_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/udpsocket/send_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixserver/accept_nonblock_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixserver/accept_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixserver/new_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixserver/open_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixserver/shared/new.rb
    MacRuby/trunk/spec/frozen/library/socket/unixsocket/addr_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixsocket/new_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixsocket/open_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixsocket/pair_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixsocket/partially_closable_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixsocket/path_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixsocket/peeraddr_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixsocket/recvfrom_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/unixsocket/shared/new.rb
    MacRuby/trunk/spec/frozen/library/stringio/append_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/binmode_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/bytes_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/chars_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/close_read_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/close_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/close_write_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/closed_read_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/closed_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/closed_write_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/codepoints.rb
    MacRuby/trunk/spec/frozen/library/stringio/each_byte_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/each_char_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/each_codepoint.rb
    MacRuby/trunk/spec/frozen/library/stringio/each_line_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/each_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/eof_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/fcntl_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/fileno_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/flush_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/fsync_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/getbyte_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/getc_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/gets_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/initialize_copy_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/isatty_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/length_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/lineno_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/lines_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/open_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/path_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/pid_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/pos_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/print_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/printf_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/putc_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/puts_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/read_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/readbyte_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/readchar_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/readline_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/readlines_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/readpartial_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/reopen_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/rewind_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/seek_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/shared/each.rb
    MacRuby/trunk/spec/frozen/library/stringio/shared/getc.rb
    MacRuby/trunk/spec/frozen/library/stringio/shared/read.rb
    MacRuby/trunk/spec/frozen/library/stringio/shared/readchar.rb
    MacRuby/trunk/spec/frozen/library/stringio/size_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/string_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/stringio_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/sync_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/sysread_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/syswrite_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/tell_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/truncate_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/tty_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/ungetc_spec.rb
    MacRuby/trunk/spec/frozen/library/stringio/write_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/append_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/beginning_of_line_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/bol_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/check_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/check_until_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/clear_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/concat_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/dup_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/element_reference_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/empty_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/eos_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/exist_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/get_byte_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/getbyte_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/getch_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/initialize_copy_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/match_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/matched_size_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/matched_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/matchedsize_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/must_C_version_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/peek_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/peep_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/pointer_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/pos_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/post_match_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/pre_match_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/reset_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/rest_size_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/rest_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/restsize_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/scan_full_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/scan_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/scan_until_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/search_full_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/skip_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/skip_until_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/string_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/terminate_spec.rb
    MacRuby/trunk/spec/frozen/library/stringscanner/unscan_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/alert_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/close_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/constants_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/crit_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/debug_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/emerg_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/err_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/facility_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/ident_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/info_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/inspect_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/instance_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/log_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/mask_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/notice_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/open_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/opened_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/options_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/reopen_spec.rb
    MacRuby/trunk/spec/frozen/library/syslog/warning_spec.rb
    MacRuby/trunk/spec/frozen/library/tempfile/_close_spec.rb
    MacRuby/trunk/spec/frozen/library/tempfile/callback_spec.rb
    MacRuby/trunk/spec/frozen/library/tempfile/close_spec.rb
    MacRuby/trunk/spec/frozen/library/tempfile/delete_spec.rb
    MacRuby/trunk/spec/frozen/library/tempfile/initialize_spec.rb
    MacRuby/trunk/spec/frozen/library/tempfile/length_spec.rb
    MacRuby/trunk/spec/frozen/library/tempfile/open_spec.rb
    MacRuby/trunk/spec/frozen/library/tempfile/path_spec.rb
    MacRuby/trunk/spec/frozen/library/tempfile/size_spec.rb
    MacRuby/trunk/spec/frozen/library/tempfile/unlink_spec.rb
    MacRuby/trunk/spec/frozen/library/time/httpdate_spec.rb
    MacRuby/trunk/spec/frozen/library/time/iso8601_spec.rb
    MacRuby/trunk/spec/frozen/library/time/rfc2822_spec.rb
    MacRuby/trunk/spec/frozen/library/time/rfc822_spec.rb
    MacRuby/trunk/spec/frozen/library/time/xmlschema_spec.rb
    MacRuby/trunk/spec/frozen/library/timeout/timeout_spec.rb
    MacRuby/trunk/spec/frozen/library/tmpdir/dir/mktmpdir_spec.rb
    MacRuby/trunk/spec/frozen/library/tmpdir/dir/tmpdir_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/eql_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/equality_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/extract_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/http/request_uri_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/join_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/mailto/build_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/normalize_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/parse_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/plus_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/regexp_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/route_to.rb
    MacRuby/trunk/spec/frozen/library/uri/select_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/set_component_spec.rb
    MacRuby/trunk/spec/frozen/library/uri/uri_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/add_builtin_type_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/add_domain_type_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/add_private_type_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/add_ruby_type_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/detect_implicit_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/dump_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/dump_stream_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/each_document_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/each_node_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/emitter_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/generic_parser_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/load_documents_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/load_file_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/load_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/load_stream_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/object_maker_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/parse_documents_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/parse_file_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/parse_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/parser_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/quick_emit_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/read_type_class_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/tag_class_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/tagged_classes_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/tagurize_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/to_yaml_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/transfer_spec.rb
    MacRuby/trunk/spec/frozen/library/yaml/try_implicit_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/adler32_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/crc32_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/crc_table_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/deflate/append_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/deflate/deflate_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/deflate/flush_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/deflate/initialize_copy_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/deflate/new_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/deflate/params_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/deflate/set_dictionary_spec_disabled.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/close_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/closed_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/comment_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/crc_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/finish_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/level_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/mtime_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/orig_name_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/os_code_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/sync_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/to_io_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipfile/wrap_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_byte_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_line_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/eof_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/getc_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/gets_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/lineno_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/new_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/open_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/pos_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/read_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readchar_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readline_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readlines_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/rewind_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/tell_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/ungetc_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipreader/unused_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/append_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/comment_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/flush_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/mtime_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/new_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/open_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/orig_name_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/pos_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/print_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/printf_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/putc_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/puts_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/tell_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/write_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/inflate/append_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/inflate/inflate_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/inflate/new_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/inflate/set_dictionary_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/inflate/sync_point_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/inflate/sync_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zlib_version_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/adler_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/avail_in_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/avail_out_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/close_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/closed_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/data_type_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/end_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/ended_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/finish_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/finished_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/flush_next_in_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/flush_next_out_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/reset_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/stream_end_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/total_in_spec.rb
    MacRuby/trunk/spec/frozen/library/zlib/zstream/total_out_spec.rb

Added Paths:
-----------
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/br_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/doctype_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/frame_spec.rb
    MacRuby/trunk/spec/frozen/library/cgi/htmlextension/frameset_spec.rb
    MacRuby/trunk/spec/frozen/library/continuation/
    MacRuby/trunk/spec/frozen/library/continuation/call_spec.rb
    MacRuby/trunk/spec/frozen/library/continuation/element_reference_spec.rb
    MacRuby/trunk/spec/frozen/library/continuation/kernel/
    MacRuby/trunk/spec/frozen/library/continuation/kernel/callcc_spec.rb
    MacRuby/trunk/spec/frozen/library/continuation/new_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/
    MacRuby/trunk/spec/frozen/library/datetime/_strptime_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/civil_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/commercial_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/hour_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/httpdate_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/iso8601_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/jd_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/jisx0301_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/min_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/minute_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/new_offset_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/new_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/now_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/offset_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/ordinal_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/parse_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/rfc2822_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/rfc3339_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/rfc822_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/sec_fraction_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/sec_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/second_fraction_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/second_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/strftime_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/strptime_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/to_date_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/to_datetime_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/to_s_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/to_time_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/xmlschema_spec.rb
    MacRuby/trunk/spec/frozen/library/datetime/zone_spec.rb
    MacRuby/trunk/spec/frozen/library/fiber/
    MacRuby/trunk/spec/frozen/library/fiber/alive_spec.rb
    MacRuby/trunk/spec/frozen/library/fiber/current_spec.rb
    MacRuby/trunk/spec/frozen/library/fiber/resume_spec.rb
    MacRuby/trunk/spec/frozen/library/fiber/transfer_spec.rb
    MacRuby/trunk/spec/frozen/library/socket/tcpserver/gets_spec.rb

Modified: MacRuby/trunk/spec/frozen/library/abbrev/abbrev_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/abbrev/abbrev_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/abbrev/abbrev_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'abbrev'
 
 #test both Abbrev::abbrev and Array#abbrev in

Modified: MacRuby/trunk/spec/frozen/library/base64/b64encode_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/base64/b64encode_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/base64/b64encode_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 require 'base64'
 
-ruby_version_is ""..."1.9" do 
+ruby_version_is "" ... "1.9" do
   describe "Base64#b64encode" do
     it "returns the Base64-encoded version of the given string with a newline at 60 characters" do
       b64encoded_version = "Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMgdG8gbGVhcm4g\nUnVieQ==\n"
@@ -10,7 +10,7 @@
         Base64.b64encode("Now is the time for all good coders to learn Ruby").should == b64encoded_version
       }.should output
     end
-    
+  
     it "prints the Base64-encoded version of the given string with a newline after 60 characters" do
       b64encoded_version ="Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMgdG8gbGVhcm4g\nUnVieQ==\n"
       lambda {
@@ -26,7 +26,7 @@
         Base64.b64encode("Now is the time for all good coders to learn Ruby", 2).should == b64encoded_version
       }.should output
     end
-  
+
     it "prints the Base64-encoded version of the given stringwith a newline after length characters" do
       lambda {
         Base64.b64encode("hello", 2).should == "aGVsbG8=\n" 

Modified: MacRuby/trunk/spec/frozen/library/base64/decode64_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/base64/decode64_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/base64/decode64_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 require 'base64'
 

Modified: MacRuby/trunk/spec/frozen/library/base64/decode_b_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/base64/decode_b_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/base64/decode_b_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,17 +1,17 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 require 'base64'
 
-ruby_version_is ""..."1.9" do
+ruby_version_is "" ... "1.9" do
   describe "Base64#decode_b" do
     it "supports an encoding type of base64 and the charachter set SHIFT_JIS" do
       Base64.decode_b("=?SHIFT_JIS?B?Zm9v?=").should == 'foo'
     end
-    
+  
     it "supports an encoding type of base64 and the character set ISO-2022-JP" do
       Base64.decode_b("=?ISO-2022-JP?B?Zm9v?=").should == 'foo'
     end
-    
+  
     # mSpec doesn't have pending specs yet
     # Waiting on Kconv implementation
     # it "decodes MIME encoded string and convert halfwidth katakana to fullwidth katakana."

Modified: MacRuby/trunk/spec/frozen/library/base64/encode64_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/base64/encode64_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/base64/encode64_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 require 'base64'
 

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/abs_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/abs_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/abs_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#abs" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/add_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/add_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/add_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 require 'bigdecimal'
 

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/case_compare_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/case_compare_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/case_compare_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/eql.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/eql.rb', __FILE__)
 
 
 describe "BigDecimal#===" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/ceil_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/ceil_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/ceil_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#ceil" do
@@ -21,19 +21,28 @@
     @zero_neg = BigDecimal("-0")
   end
   
-  it "returns a BigDecimal" do
-    @mixed.ceil.kind_of?(BigDecimal).should == true
-    @pos_int.ceil(2).kind_of?(BigDecimal).should == true
+  ruby_version_is "" ... "1.9" do
+    it "returns a BigDecimal" do
+      @mixed.ceil.kind_of?(BigDecimal).should == true
+      @pos_int.ceil(2).kind_of?(BigDecimal).should == true
+    end
   end
+  
+  ruby_version_is "1.9" do
+    it "returns an Integer, if n is unspecified" do
+      @mixed.ceil.kind_of?(Integer).should == true
+    end
 
+    it "returns a BigDecimal, if n is specified" do
+      @pos_int.ceil(2).kind_of?(BigDecimal).should == true
+    end
+  end
+
   it "returns the smallest integer greater or equal to self, if n is unspecified" do
     @pos_int.ceil.should == @pos_int
     @neg_int.ceil.should == @neg_int
     @pos_frac.ceil.should == BigDecimal("1")
     @neg_frac.ceil.should == @zero
-    @infinity.ceil.should == @infinity
-    @infinity_neg.ceil.should == @infinity_neg
-    @nan.ceil.nan?.should == true
     @zero.ceil.should == 0
     @zero_pos.ceil.should == @zero_pos
     @zero_neg.ceil.should == @zero_neg
@@ -47,6 +56,22 @@
     BigDecimal('-2.9999').ceil.should == -2
   end
 
+  ruby_version_is "" ... "1.9" do
+    it "returns the same value, if self is special value" do
+      @infinity.ceil.should == @infinity
+      @infinity_neg.ceil.should == @infinity_neg
+      @nan.ceil.nan?.should == true
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "raise exception, if self is special value" do
+      lambda { @infinity.ceil }.should raise_error(FloatDomainError)
+      lambda { @infinity_neg.ceil }.should raise_error(FloatDomainError)
+      lambda { @nan.ceil }.should raise_error(FloatDomainError)
+    end
+  end
+
   it "returns n digits right of the decimal point if given n > 0" do
     @mixed.ceil(1).should == BigDecimal("1.3")
     @mixed.ceil(5).should == BigDecimal("1.23457")

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/coerce_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/coerce_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/coerce_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#coerce" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/comparison_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/comparison_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/comparison_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#<=>" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/div_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/div_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/div_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/quo'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/quo', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#div with precision set to 0" do
@@ -42,14 +42,28 @@
     }
   end
 
-  it "returns NaN if NaN is involved" do
-    @one.div(@nan).nan?.should == true
-    @nan.div(@one).nan?.should == true
+  ruby_version_is "" ... "1.9" do
+    it "returns NaN if NaN is involved" do
+      @one.div(@nan).nan?.should == true
+      @nan.div(@one).nan?.should == true
+    end
+
+    it "returns NaN if divided by Infinity and no precision given" do
+      @zero.div(@infinity).nan?.should == true
+      @frac_2.div(@infinity).nan?.should == true
+    end
   end
 
-  it "returns NaN if divided by Infinity and no precision given" do
-    @zero.div(@infinity).nan?.should == true
-    @frac_2.div(@infinity).nan?.should == true
+  ruby_version_is "1.9" do
+    it "raises FloatDomainError if NaN is involved" do
+      lambda { @one.div(@nan) }.should raise_error(FloatDomainError)
+      lambda { @nan.div(@one) }.should raise_error(FloatDomainError)
+    end
+
+    it "returns 0 if divided by Infinity and no precision given" do
+      @zero.div(@infinity).should == 0
+      @frac_2.div(@infinity).should == 0
+    end
   end
 
   it "returns 0 if divided by Infinity with given precision" do
@@ -59,30 +73,60 @@
     @frac_2.div(@infinity, 100000).should == 0
   end
   
-  it "returns NaN if divided by zero and no precision given" do
-    @one.div(@zero).nan?.should == true
-    @one.div(@zero_plus).nan?.should == true
-    @one.div(@zero_minus).nan?.should == true
-  end
+  ruby_version_is "" ... "1.9" do
+    it "returns NaN if divided by zero and no precision given" do
+      @one.div(@zero).nan?.should == true
+      @one.div(@zero_plus).nan?.should == true
+      @one.div(@zero_minus).nan?.should == true
+    end
 
-  it "returns NaN if zero is divided by zero" do
-    @zero.div(@zero).nan?.should == true
-    @zero_minus.div(@zero_plus).nan?.should == true
-    @zero_plus.div(@zero_minus).nan?.should == true
+    it "returns NaN if zero is divided by zero" do
+      @zero.div(@zero).nan?.should == true
+      @zero_minus.div(@zero_plus).nan?.should == true
+      @zero_plus.div(@zero_minus).nan?.should == true
 
-    @zero.div(@zero, 0).nan?.should == true
-    @zero_minus.div(@zero_plus, 0).nan?.should == true
-    @zero_plus.div(@zero_minus, 0).nan?.should == true
+      @zero.div(@zero, 0).nan?.should == true
+      @zero_minus.div(@zero_plus, 0).nan?.should == true
+      @zero_plus.div(@zero_minus, 0).nan?.should == true
 
-    @zero.div(@zero, 10).nan?.should == true
-    @zero_minus.div(@zero_plus, 10).nan?.should == true
-    @zero_plus.div(@zero_minus, 10).nan?.should == true
+      @zero.div(@zero, 10).nan?.should == true
+      @zero_minus.div(@zero_plus, 10).nan?.should == true
+      @zero_plus.div(@zero_minus, 10).nan?.should == true
+    end
+
+    it "returns NaN if (+|-) Infinity divided by 1 and no precision given" do
+      @infinity_minus.div(@one).nan?.should == true
+      @infinity.div(@one).nan?.should == true
+      @infinity_minus.div(@one_minus).nan?.should == true
+    end
   end
+  
+  ruby_version_is "1.9" do
+    it "raises ZeroDivisionError if divided by zero and no precision given" do
+      lambda { @one.div(@zero) }.should raise_error(ZeroDivisionError)
+      lambda { @one.div(@zero_plus) }.should raise_error(ZeroDivisionError)
+      lambda { @one.div(@zero_minus) }.should raise_error(ZeroDivisionError)
 
-  it "returns NaN if (+|-) Infinity divided by 1 and no precision given" do
-    @infinity_minus.div(@one).nan?.should == true
-    @infinity.div(@one).nan?.should == true
-    @infinity_minus.div(@one_minus).nan?.should == true
+      lambda { @zero.div(@zero) }.should raise_error(ZeroDivisionError)
+      lambda { @zero_minus.div(@zero_plus) }.should raise_error(ZeroDivisionError)
+      lambda { @zero_plus.div(@zero_minus) }.should raise_error(ZeroDivisionError)
+    end
+
+    it "returns NaN if zero is divided by zero" do
+      @zero.div(@zero, 0).nan?.should == true
+      @zero_minus.div(@zero_plus, 0).nan?.should == true
+      @zero_plus.div(@zero_minus, 0).nan?.should == true
+
+      @zero.div(@zero, 10).nan?.should == true
+      @zero_minus.div(@zero_plus, 10).nan?.should == true
+      @zero_plus.div(@zero_minus, 10).nan?.should == true
+    end
+
+    it "raises FloatDomainError if (+|-) Infinity divided by 1 and no precision given" do
+      lambda { @infinity_minus.div(@one) }.should raise_error(FloatDomainError)
+      lambda { @infinity.div(@one) }.should raise_error(FloatDomainError)
+      lambda { @infinity_minus.div(@one_minus) }.should raise_error(FloatDomainError)
+    end
   end
 
   it "returns (+|-)Infinity if (+|-)Infinity by 1 and precision given" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/divide_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/divide_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/divide_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/quo'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/quo', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#/" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/divmod_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/divmod_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/divmod_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/modulo'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/modulo', __FILE__)
 require 'bigdecimal'
 
 module DivmodSpecs
@@ -35,16 +35,31 @@
 
   it_behaves_like :bigdecimal_modulo, :mod_part_of_divmod
 
-  it "does NOT raise ZeroDivisionError if other is zero" do
-    bd6543 = BigDecimal.new("6543.21")
-    bd5667 = BigDecimal.new("5667.19")
-    a = BigDecimal("1.0000000000000000000000000000000000000000005")
-    b = BigDecimal("1.00000000000000000000000000000000000000000005")
+  ruby_version_is "" ... "1.9" do
+    it "does NOT raise ZeroDivisionError if other is zero" do
+      bd6543 = BigDecimal.new("6543.21")
+      bd5667 = BigDecimal.new("5667.19")
+      a = BigDecimal("1.0000000000000000000000000000000000000000005")
+      b = BigDecimal("1.00000000000000000000000000000000000000000005")
 
-    bd5667.send(@method, 0).nan?.should == true
-    bd5667.send(@method, BigDecimal("0")).nan?.should == true
-    @zero.send(@method, @zero).nan?.should == true
+      bd5667.send(@method, 0).nan?.should == true
+      bd5667.send(@method, BigDecimal("0")).nan?.should == true
+      @zero.send(@method, @zero).nan?.should == true
+    end
   end
+
+  ruby_version_is "1.9" do
+    it "raises ZeroDivisionError if other is zero" do
+      bd6543 = BigDecimal.new("6543.21")
+      bd5667 = BigDecimal.new("5667.19")
+      a = BigDecimal("1.0000000000000000000000000000000000000000005")
+      b = BigDecimal("1.00000000000000000000000000000000000000000005")
+
+      lambda { bd5667.send(@method, 0) }.should raise_error(ZeroDivisionError)
+      lambda { bd5667.send(@method, BigDecimal("0")) }.should raise_error(ZeroDivisionError)
+      lambda { @zero.send(@method, @zero) }.should raise_error(ZeroDivisionError)
+    end
+  end
 end
 
 describe "BigDecimal#divmod" do
@@ -135,34 +150,79 @@
     end
   end
 
-  it "properly handles special values" do
-    values = @special_vals + @zeroes
-    values.each do |val1|
-      values.each do |val2|
-        DivmodSpecs::check_both_nan(val1.divmod(val2))
+  ruby_version_is "" ... "1.9" do
+    it "properly handles special values" do
+      values = @special_vals + @zeroes
+      values.each do |val1|
+        values.each do |val2|
+          DivmodSpecs::check_both_nan(val1.divmod(val2))
+        end
       end
-    end
 
-    @special_vals.each do |val1|
-      @regular_vals.each do |val2|
-        DivmodSpecs::check_both_nan(val1.divmod(val2))
+      @special_vals.each do |val1|
+        @regular_vals.each do |val2|
+          DivmodSpecs::check_both_nan(val1.divmod(val2))
+        end
       end
+
+      @regular_vals.each do |val1|
+        @special_vals.each do |val2|
+          DivmodSpecs::check_both_nan(val1.divmod(val2))
+        end
+      end
     end
 
-    @regular_vals.each do |val1|
-      @special_vals.each do |val2|
-        DivmodSpecs::check_both_nan(val1.divmod(val2))
+    it "returns an array of two NaNs if the argument is zero" do
+      values = @regular_vals + @special_vals
+      values.each do |val1|
+        @zeroes.each do |val2|
+          DivmodSpecs::check_both_nan(val1.divmod(val2))
+        end
       end
     end
   end
 
-  it "returns an array of two NaNs if the argument is zero" do
-    values = @regular_vals + @special_vals
-    values.each do |val1|
-      @zeroes.each do |val2|
-        DivmodSpecs::check_both_nan(val1.divmod(val2))
+  ruby_version_is "1.9" do
+    it "returns an array of two NaNs if NaN is involved" do
+      (@special_vals + @regular_vals + @zeroes).each do |val|
+        DivmodSpecs::check_both_nan(val.divmod(@nan))
+        DivmodSpecs::check_both_nan(@nan.divmod(val))
       end
     end
+
+    it "raises ZeroDivisionError if the divisor is zero" do
+      (@special_vals + @regular_vals + @zeroes - [@nan]).each do |val|
+        @zeroes.each do |zero|
+          lambda { val.divmod(zero) }.should raise_error(ZeroDivisionError)
+        end
+      end
+    end
+
+    it "returns an array of Infinity and NaN if the dividend is Infinity" do
+      @regular_vals.each do |val|
+        array = @infinity.divmod(val)
+        array.length.should == 2
+        array[0].infinite?.should == (val > 0 ? 1 : -1)
+        array[1].nan?.should == true
+      end
+    end
+
+    it "returns an array of zero and the dividend if the divisor is Infinity" do
+      @regular_vals.each do |val|
+        array = val.divmod(@infinity)
+        array.length.should == 2
+        array[0].should == @zero
+        array[1].should == val
+      end
+    end
+
+    it "returns an array of two zero if the diviend is zero" do
+      @zeroes.each do |zero|
+        @regular_vals.each do |val|
+          zero.divmod(val).should == [@zero, @zero]
+        end
+      end
+    end
   end
 
   it "raises TypeError if the argument cannot be coerced to BigDecimal" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/double_fig_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/double_fig_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/double_fig_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal.double_fig" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/eql_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/eql_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/eql_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/eql.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/eql.rb', __FILE__)
 
 describe "BigDecimal#eql?" do
   it_behaves_like(:bigdecimal_eql, :eql?)

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/equal_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/equal_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/equal_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/eql.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/eql.rb', __FILE__)
 
 
 describe "BigDecimal#==" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/exponent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/exponent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/exponent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/power'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/power', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#**" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/finite_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/finite_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/finite_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#finite?" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/fix_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/fix_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/fix_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#fix" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/floor_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/floor_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/floor_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#floor" do
@@ -26,9 +26,6 @@
     @neg_int.floor.should == @neg_int
     @pos_frac.floor.should == @zero
     @neg_frac.floor.should == BigDecimal("-1")
-    @infinity.floor.should == @infinity
-    @infinity_neg.floor.should == @infinity_neg
-    @nan.floor.nan?.should == true
     @zero.floor.should == 0
     @zero_pos.floor.should == @zero_pos
     @zero_neg.floor.should == @zero_neg
@@ -43,6 +40,22 @@
     BigDecimal('-0.8').floor.should == -1
   end
 
+  ruby_version_is "" ... "1.9" do
+    it "returns the same value, if self is special value" do
+      @infinity.floor.should == @infinity
+      @infinity_neg.floor.should == @infinity_neg
+      @nan.floor.nan?.should == true
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "raise exception, if self is special value" do
+      lambda { @infinity.floor }.should raise_error(FloatDomainError)
+      lambda { @infinity_neg.floor }.should raise_error(FloatDomainError)
+      lambda { @nan.floor }.should raise_error(FloatDomainError)
+    end
+  end
+
   it "returns n digits right of the decimal point if given n > 0" do
     @mixed.floor(1).should == BigDecimal("1.2")
     @mixed.floor(5).should == BigDecimal("1.23456")

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/frac_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/frac_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/frac_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#frac" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/gt_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/gt_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/gt_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#>" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/gte_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/gte_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/gte_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#>=" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/induced_from_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/induced_from_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/induced_from_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,35 +1,37 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
-describe "BigDecimal.induced_from" do
-  it "returns the passed argument when passed a BigDecimal" do
-    BigDecimal.induced_from(BigDecimal("5")).should == BigDecimal("5")
-    BigDecimal.induced_from(BigDecimal("-5")).should == BigDecimal("-5")
-    BigDecimal.induced_from(BigDecimal("Infinity")).should == BigDecimal("Infinity")
-  end
+ruby_version_is "" ... "1.9" do
+  describe "BigDecimal.induced_from" do
+    it "returns the passed argument when passed a BigDecimal" do
+      BigDecimal.induced_from(BigDecimal("5")).should == BigDecimal("5")
+      BigDecimal.induced_from(BigDecimal("-5")).should == BigDecimal("-5")
+      BigDecimal.induced_from(BigDecimal("Infinity")).should == BigDecimal("Infinity")
+    end
 
-  it "converts passed Fixnums to BigDecimal" do
-    BigDecimal.induced_from(5).should == BigDecimal("5")
-    BigDecimal.induced_from(-5).should == BigDecimal("-5")
-    BigDecimal.induced_from(0).should == BigDecimal("0")
-  end
+    it "converts passed Fixnums to BigDecimal" do
+      BigDecimal.induced_from(5).should == BigDecimal("5")
+      BigDecimal.induced_from(-5).should == BigDecimal("-5")
+      BigDecimal.induced_from(0).should == BigDecimal("0")
+    end
   
-  it "converts passed Bignums to BigDecimal" do
-    BigDecimal.induced_from(bignum_value).should == BigDecimal(bignum_value.to_s)
-    BigDecimal.induced_from(-bignum_value).should == BigDecimal((-bignum_value).to_s)
-  end
+    it "converts passed Bignums to BigDecimal" do
+      BigDecimal.induced_from(bignum_value).should == BigDecimal(bignum_value.to_s)
+      BigDecimal.induced_from(-bignum_value).should == BigDecimal((-bignum_value).to_s)
+    end
 
-  it "does not try to convert non-Integers to Integer using #to_i" do
-    obj = mock("Not converted to Integer")
-    obj.should_not_receive(:to_i)
-    lambda { BigDecimal.induced_from(obj) }.should raise_error(TypeError)
-  end
+    it "does not try to convert non-Integers to Integer using #to_i" do
+      obj = mock("Not converted to Integer")
+      obj.should_not_receive(:to_i)
+      lambda { BigDecimal.induced_from(obj) }.should raise_error(TypeError)
+    end
 
-  it "raises a TypeError when passed a non-Integer" do
-    lambda { BigDecimal.induced_from(2.0) }.should raise_error(TypeError)
-    lambda { BigDecimal.induced_from("2") }.should raise_error(TypeError)
-    lambda { BigDecimal.induced_from(:symbol) }.should raise_error(TypeError)
-    lambda { BigDecimal.induced_from(nil) }.should raise_error(TypeError)
-    lambda { BigDecimal.induced_from(Object.new) }.should raise_error(TypeError)
+    it "raises a TypeError when passed a non-Integer" do
+      lambda { BigDecimal.induced_from(2.0) }.should raise_error(TypeError)
+      lambda { BigDecimal.induced_from("2") }.should raise_error(TypeError)
+      lambda { BigDecimal.induced_from(:symbol) }.should raise_error(TypeError)
+      lambda { BigDecimal.induced_from(nil) }.should raise_error(TypeError)
+      lambda { BigDecimal.induced_from(Object.new) }.should raise_error(TypeError)
+    end
   end
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/infinite_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/infinite_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/infinite_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#infinite?" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#inspect" do
@@ -11,18 +11,10 @@
     @bigdec.inspect.kind_of?(String).should == true
   end
 
-  ruby_version_is "" ... "1.9" do
-    it "returns String starting with #" do
-      @bigdec.inspect[0].should == 35
-    end
+  it "returns String starting with #" do
+    @bigdec.inspect[0].should == ?#
   end
 
-  ruby_version_is "1.9" do
-    it "returns String starting with #" do
-      @bigdec.inspect[0].should == '#'
-    end
-  end
-
   it "encloses information in angle brackets" do
     @bigdec.inspect.should =~ /^.<.*>$/
   end

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/limit_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/limit_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/limit_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal.limit" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/lt_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/lt_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/lt_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#<" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/lte_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/lte_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/lte_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#<=" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/minus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/minus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/minus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#-" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/mode_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/mode_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/mode_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal.mode" do
@@ -15,10 +15,23 @@
     BigDecimal("NaN").add(BigDecimal("1"),0).nan?.should == true
     BigDecimal("0").add(BigDecimal("Infinity"),0).should == BigDecimal("Infinity")
     BigDecimal("1").quo(BigDecimal("0")).should == BigDecimal("Infinity")
-    BigDecimal("1E11111111111111111111").zero?.should == true
-    (BigDecimal("1E11111111111")*BigDecimal("1E11111111111")).zero?.should == true
   end
 
+  ruby_version_is "" ... "1.9" do
+    it "returns zero when too big" do
+      BigDecimal("1E11111111111111111111").zero?.should == true
+      (BigDecimal("1E11111111111")*BigDecimal("1E11111111111")).zero?.should == true
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "returns Infinity when too big" do
+      BigDecimal("1E11111111111111111111").should == BigDecimal("Infinity")
+      (BigDecimal("1E11111111111")*BigDecimal("1E11111111111")).should ==
+        BigDecimal("Infinity")
+    end
+  end
+
   it "raise an exception if the flag is true" do
     BigDecimal::mode(BigDecimal::EXCEPTION_NaN, true)
     lambda { BigDecimal("NaN").add(BigDecimal("1"),0) }.should raise_error(FloatDomainError)

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/modulo_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/modulo_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/modulo_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/modulo'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/modulo', __FILE__)
 
 describe "BigDecimal#%" do
   it_behaves_like(:bigdecimal_modulo, :%)

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/mult_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/mult_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/mult_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/mult'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/mult', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#mult" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/multiply_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/multiply_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/multiply_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/mult'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/mult', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#*" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/nan_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/nan_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/nan_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#nan?" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal.new" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/nonzero_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/nonzero_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/nonzero_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#nonzero?" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/plus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/plus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/plus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#+" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/power_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/power_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/power_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/power'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/power', __FILE__)
 
 describe "BigDecimal#power" do
   it_behaves_like(:bigdecimal_power, :power)

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/precs_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/precs_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/precs_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#precs" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/quo_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/quo_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/quo_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,13 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/quo'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/quo', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#quo" do
   it_behaves_like :bigdecimal_quo, :quo, []
+
+  it "returns NaN if NaN is involved" do
+    BigDecimal("1").quo(BigDecimal("NaN")).nan?.should == true
+    BigDecimal("NaN").quo(BigDecimal("1")).nan?.should == true
+  end
 end
 

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/remainder_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/remainder_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/remainder_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#remainder" do
@@ -29,13 +29,11 @@
     @neg_int.remainder(@neg_frac).should == @neg_int % @neg_frac
   end
 
-  ruby_bug "Bug #585", "1.8" do
-    it "it is the modulus minus the value divided by, if values have opposite sign" do
-      @mixed.remainder(@neg_frac).should == (@mixed % @neg_frac) - @neg_frac
-      @pos_int.remainder(@neg_frac).should == (@pos_int % @neg_frac) - @neg_frac
-      @neg_frac.remainder(@pos_int).should == (@neg_frac % @pos_int) - @pos_int
-      @neg_int.remainder(@pos_frac).should == (@neg_int % @pos_frac) - @pos_frac
-    end
+  it "means self-arg*(self/arg).truncate" do
+    @mixed.remainder(@neg_frac).should == @mixed - @neg_frac * (@mixed / @neg_frac).truncate
+    @pos_int.remainder(@neg_frac).should == @pos_int - @neg_frac * (@pos_int / @neg_frac).truncate
+    @neg_frac.remainder(@pos_int).should == @neg_frac - @pos_int * (@neg_frac / @pos_int).truncate
+    @neg_int.remainder(@pos_frac).should == @neg_int - @pos_frac * (@neg_int / @pos_frac).truncate
   end
 
   it "returns NaN used with zero" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/shared/modulo.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/shared/modulo.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/shared/modulo.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -78,22 +78,35 @@
     @nan.send(@method, @infinity).nan?.should == true
   end
 
-  it "returns NaN if Infinity is involved" do
+  it "returns NaN if the dividend is Infinity" do
     @infinity.send(@method, @infinity).nan?.should == true
     @infinity.send(@method, @one).nan?.should == true
     @infinity.send(@method, @mixed).nan?.should == true
     @infinity.send(@method, @one_minus).nan?.should == true
     @infinity.send(@method, @frac_1).nan?.should == true
-    @one.send(@method, @infinity).nan?.should == true
 
     @infinity_minus.send(@method, @infinity_minus).nan?.should == true
     @infinity_minus.send(@method, @one).nan?.should == true
-    @one.send(@method, @infinity_minus).nan?.should == true
-    @frac_2.send(@method, @infinity_minus).nan?.should == true
 
     @infinity.send(@method, @infinity_minus).nan?.should == true
     @infinity_minus.send(@method, @infinity).nan?.should == true
   end
+
+  ruby_version_is "" ... "1.9" do
+    it "returns NaN if the divisor is Infinity" do
+      @one.send(@method, @infinity).nan?.should == true
+      @one.send(@method, @infinity_minus).nan?.should == true
+      @frac_2.send(@method, @infinity_minus).nan?.should == true
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "returns the dividend if the divisor is Infinity" do
+      @one.send(@method, @infinity).should == @one
+      @one.send(@method, @infinity_minus).should == @one
+      @frac_2.send(@method, @infinity_minus).should == @frac_2
+    end
+  end
   
   it "raises TypeError if the argument cannot be coerced to BigDecimal" do
     lambda {
@@ -103,14 +116,29 @@
 end
 
 describe :bigdecimal_modulo_zerodivisionerror, :shared => true do
-  it "does NOT raise ZeroDivisionError if other is zero" do
-    bd6543 = BigDecimal.new("6543.21")
-    bd5667 = BigDecimal.new("5667.19")
-    a = BigDecimal("1.0000000000000000000000000000000000000000005")
-    b = BigDecimal("1.00000000000000000000000000000000000000000005")
+  ruby_version_is "" ... "1.9" do
+    it "does NOT raise ZeroDivisionError if other is zero" do
+      bd6543 = BigDecimal.new("6543.21")
+      bd5667 = BigDecimal.new("5667.19")
+      a = BigDecimal("1.0000000000000000000000000000000000000000005")
+      b = BigDecimal("1.00000000000000000000000000000000000000000005")
 
-    bd5667.send(@method, 0).nan?.should == true
-    bd5667.send(@method, BigDecimal("0")).nan?.should == true
-    @zero.send(@method, @zero).nan?.should == true
+      bd5667.send(@method, 0).nan?.should == true
+      bd5667.send(@method, BigDecimal("0")).nan?.should == true
+      @zero.send(@method, @zero).nan?.should == true
+    end
   end
+
+  ruby_version_is "1.9" do
+    it "raises ZeroDivisionError if other is zero" do
+      bd6543 = BigDecimal.new("6543.21")
+      bd5667 = BigDecimal.new("5667.19")
+      a = BigDecimal("1.0000000000000000000000000000000000000000005")
+      b = BigDecimal("1.00000000000000000000000000000000000000000005")
+
+      lambda { bd5667.send(@method, 0) }.should raise_error(ZeroDivisionError)
+      lambda { bd5667.send(@method, BigDecimal("0")) }.should raise_error(ZeroDivisionError)
+      lambda { @zero.send(@method, @zero) }.should raise_error(ZeroDivisionError)
+    end
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/shared/power.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/shared/power.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/shared/power.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -57,10 +57,27 @@
     BigDecimal("NaN").send(@method, 5).nan?.should == true
   end
 
-  it "returns NaN if self is infinite" do
-    BigDecimal("Infinity").send(@method, -5).nan?.should == true
-    BigDecimal("-Infinity").send(@method, -5).nan?.should == true
-    BigDecimal("Infinity").send(@method, 5).nan?.should == true
-    BigDecimal("-Infinity").send(@method, 5).nan?.should == true
+  ruby_version_is "" ... "1.8.8" do
+    it "returns NaN if self is infinite" do
+      BigDecimal("Infinity").send(@method, -5).nan?.should == true
+      BigDecimal("-Infinity").send(@method, -5).nan?.should == true
+      BigDecimal("Infinity").send(@method, 5).nan?.should == true
+      BigDecimal("-Infinity").send(@method, 5).nan?.should == true
+    end
   end
+
+  ruby_version_is "1.8.8" do # this behavior may be backported to 1.8.7 [ruby-dev:40182]
+    it "returns 0.0 if self is infinite and argument is negative" do
+      BigDecimal("Infinity").send(@method, -5).should == 0
+      BigDecimal("-Infinity").send(@method, -5).should == 0
+    end
+
+    it "returns infinite if self is infinite and argument is positive" do
+      infinity = BigDecimal("Infinity")
+      BigDecimal("Infinity").send(@method, 4).should == infinity
+      BigDecimal("-Infinity").send(@method, 4).should == infinity
+      BigDecimal("Infinity").send(@method, 5).should == infinity
+      BigDecimal("-Infinity").send(@method, 5).should == -infinity
+    end
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/shared/quo.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/shared/quo.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/shared/quo.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -29,11 +29,6 @@
     @one.send(@method, BigDecimal('2E-5555'), *@object).should == BigDecimal('0.5E5555')
   end
 
-  it "returns NaN if NaN is involved" do
-    @one.send(@method, @nan, *@object).nan?.should == true
-    @nan.send(@method , at one).nan?.should == true
-  end
-
   it "returns 0 if divided by Infinity" do
     @zero.send(@method, @infinity, *@object).should == 0
     @frac_2.send(@method, @infinity, *@object).should == 0

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/shared/to_int.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/shared/to_int.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/shared/to_int.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,13 +1,22 @@
 require 'bigdecimal'
 
 describe :bigdecimal_to_int , :shared => true do
-  ruby_bug "fixed_in_ruby_1_8_7 at 25799", "1.8.7.202" do
-    it "returns nil if BigDecimal is infinity or NaN" do
-      BigDecimal("Infinity").send(@method).should == nil
-      BigDecimal("NaN").send(@method).should == nil
+  ruby_version_is "" ... "1.9" do
+    ruby_bug "fixed_in_ruby_1_8_7 at 25799", "1.8.7.202" do
+      it "returns nil if BigDecimal is infinity or NaN" do
+        BigDecimal("Infinity").send(@method).should == nil
+        BigDecimal("NaN").send(@method).should == nil
+      end
     end
   end
 
+  ruby_version_is "1.9" do
+    it "raises FloatDomainError if BigDecimal is infinity or NaN" do
+      lambda { BigDecimal("Infinity").send(@method) }.should raise_error(FloatDomainError)
+      lambda { BigDecimal("NaN").send(@method) }.should raise_error(FloatDomainError)
+    end
+  end
+
   it "returns Integer or Bignum otherwise" do
     BigDecimal("3E-20001").send(@method).should == 0
     BigDecimal("2E4000").send(@method).should == 2 * 10 ** 4000

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/sign_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/sign_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/sign_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#sign" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/split_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/split_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/split_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#split" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/sqrt_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/sqrt_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/sqrt_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#sqrt" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/sub_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/sub_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/sub_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#sub" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/to_f_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/to_f_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/to_f_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#to_f" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/to_i_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/to_i_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/to_i_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/to_int'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/to_int', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#to_i" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/to_int_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/to_int_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/to_int_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/to_int'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/to_int', __FILE__)
 require 'bigdecimal'
 
 

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#to_s" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/truncate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/truncate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/truncate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#truncate" do
@@ -11,12 +11,22 @@
       @infinity_negative = BigDecimal('-Infinity')
   end
 
-  it "returns value of type Bigdecimal." do
-    @arr.each do |x|
-      BigDecimal(x).truncate.kind_of?(BigDecimal).should == true
+  ruby_version_is "" ... "1.9" do
+    it "returns value of type Bigdecimal." do
+      @arr.each do |x|
+        BigDecimal(x).truncate.kind_of?(BigDecimal).should == true
+      end
     end
   end
 
+  ruby_version_is "1.9" do
+    it "returns value of type Integer." do
+      @arr.each do |x|
+        BigDecimal(x).truncate.kind_of?(Integer).should == true
+      end
+    end
+  end
+
   it "returns the integer part as a BigDecimal if no precision given" do
     BigDecimal(@arr[0]).truncate.should == 3
     BigDecimal(@arr[1]).truncate.should == 8
@@ -61,18 +71,31 @@
     @nan.truncate(-1).nan?.should == true
     @nan.truncate(+1).nan?.should == true
     @nan.truncate(0).nan?.should == true
-    @nan.truncate.nan?.should == true
   end
 
   it "returns Infinity if self is infinite" do
     @infinity.truncate(-1).should == @infinity
     @infinity.truncate(+1).should == @infinity
     @infinity.truncate(0).should == @infinity
-    @infinity.truncate.should == @infinity
 
     @infinity_negative.truncate(-1).should == @infinity_negative
     @infinity_negative.truncate(+1).should == @infinity_negative
     @infinity_negative.truncate(0).should == @infinity_negative
-    @infinity_negative.truncate.should == @infinity_negative
   end
+
+  ruby_version_is "" ... "1.9" do
+    it "returns the same value if self is special value" do
+      @nan.truncate.nan?.should == true
+      @infinity.truncate.should == @infinity
+      @infinity_negative.truncate.should == @infinity_negative
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "returns the same value if self is special value" do
+      lambda { @nan.truncate }.should raise_error(FloatDomainError)
+      lambda { @infinity.truncate }.should raise_error(FloatDomainError)
+      lambda { @infinity_negative.truncate }.should raise_error(FloatDomainError)
+    end
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/uminus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/uminus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/uminus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#-@" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/uplus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/uplus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/uplus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#+@" do 

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/ver_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/ver_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/ver_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal.ver" do

Modified: MacRuby/trunk/spec/frozen/library/bigdecimal/zero_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/bigdecimal/zero_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/bigdecimal/zero_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'bigdecimal'
 
 describe "BigDecimal#zero?" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/cookie/domain_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/cookie/domain_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/cookie/domain_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::Cookie#domain" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/cookie/expires_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/cookie/expires_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/cookie/expires_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::Cookie#expires" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/cookie/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/cookie/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/cookie/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::Cookie#initialize when passed String" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/cookie/name_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/cookie/name_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/cookie/name_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::Cookie#name" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/cookie/parse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/cookie/parse_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/cookie/parse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::Cookie.parse" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/cookie/path_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/cookie/path_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/cookie/path_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::Cookie#path" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/cookie/secure_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/cookie/secure_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/cookie/secure_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::Cookie#secure" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/cookie/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/cookie/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/cookie/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::Cookie#to_s" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/cookie/value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/cookie/value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/cookie/value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::Cookie#value" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/escapeElement_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/escapeElement_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/escapeElement_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI.escapeElement when passed String, elements, ..." do

Modified: MacRuby/trunk/spec/frozen/library/cgi/escapeHTML_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/escapeHTML_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/escapeHTML_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI.escapeHTML" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/escape_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/escape_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/escape_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI.escape" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/header_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/header_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/header_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI#header when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/a_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/a_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/a_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#a" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
   
   describe "when passed a String" do
@@ -30,4 +30,20 @@
       @html.a(attributes) { "Example" }.should equal_element("A", attributes, "Example")
     end
   end
-end
\ No newline at end of file
+
+  describe "when each HTML generation" do
+    it "returns the doctype declaration for HTML3" do
+      CGISpecs.cgi_new("html3").a.should == %(<A HREF=""></A>)
+      CGISpecs.cgi_new("html3").a { "link text" }.should == %(<A HREF="">link text</A>)
+    end
+
+    it "returns the doctype declaration for HTML4" do
+      CGISpecs.cgi_new("html4").a.should == %(<A HREF=""></A>)
+      CGISpecs.cgi_new("html4").a { "link text" }.should == %(<A HREF="">link text</A>)
+    end
+    it "returns the doctype declaration for the Transitional version of HTML4" do
+      CGISpecs.cgi_new("html4Tr").a.should == %(<A HREF=""></A>)
+      CGISpecs.cgi_new("html4Tr").a { "link text" }.should == %(<A HREF="">link text</A>)
+    end
+  end
+end

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/base_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/base_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/base_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#base" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
   
   describe "when bassed a String" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/blockquote_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/blockquote_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/blockquote_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#blockquote" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
   
   describe "when passed a String" do

Added: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/br_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/br_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/br_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,22 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#br" do
+  before(:each) do
+    @html = CGISpecs.cgi_new
+  end
+
+  describe "when each HTML generation" do
+    it "returns the doctype declaration for HTML3" do
+      CGISpecs.cgi_new("html3").br.should == "<BR>"
+    end
+
+    it "returns the doctype declaration for HTML4" do
+      CGISpecs.cgi_new("html4").br.should == "<BR>"
+    end
+    it "returns the doctype declaration for the Transitional version of HTML4" do
+      CGISpecs.cgi_new("html4Tr").br.should == "<BR>"
+    end
+  end
+end

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/caption_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/caption_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/caption_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#caption" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
   
   describe "when passed a String" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/checkbox_group_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/checkbox_group_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/checkbox_group_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#checkbox_group" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed name, values ..." do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/checkbox_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/checkbox_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/checkbox_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#checkbox" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed no arguments" do

Added: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/doctype_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/doctype_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/doctype_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,27 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'cgi'
+require File.expand_path('../fixtures/common', __FILE__)
+
+describe "CGI::HtmlExtension#doctype" do
+  describe "when each HTML generation" do
+    it "returns the doctype declaration for HTML3" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
+      CGISpecs.cgi_new("html3").doctype.should == expect
+    end
+
+    it "returns the doctype declaration for HTML4" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
+      CGISpecs.cgi_new("html4").doctype.should == expect
+    end
+
+    it "returns the doctype declaration for the Frameset version of HTML4" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
+      CGISpecs.cgi_new("html4Fr").doctype.should == expect
+    end
+
+    it "returns the doctype declaration for the Transitional version of HTML4" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
+      CGISpecs.cgi_new("html4Tr").doctype.should == expect
+    end
+  end
+end

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/file_field_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/file_field_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/file_field_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#file_field" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
   
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/fixtures/common.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/fixtures/common.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/fixtures/common.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,13 +1,16 @@
 module CGISpecs
-  class HtmlExtension
-    def initialize
-      self.extend(CGI::Html4)
-      self.element_init
-      self.extend(CGI::HtmlExtension)
+  def self.cgi_new(html = "html4")
+    cgi = nil
+    ruby_version_is "" ... "1.9" do
+      cgi = CGI.new(html)
     end
+    ruby_version_is "1.9" do
+      cgi = CGI.new(:tag_maker => html)
+    end
+    cgi
   end
   
   def self.split(string)
     string.split("<").reject { |x| x.empty? }.map { |x| "<#{x}" }
   end
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/form_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/form_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/form_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#form" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
     @html.stub!(:script_name).and_return("/path/to/some/script")
   end
   

Added: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/frame_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/frame_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/frame_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,14 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
+require 'cgi'
+
+describe "CGI::HtmlExtension#frame" do
+  before(:each) do
+    @html = CGISpecs.cgi_new("html4Fr")
+  end
+
+  it "initializes the HTML Generation methods for the Frameset version of HTML4" do
+    @html.frameset.should == "<FRAMESET></FRAMESET>"
+    @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
+  end
+end

Added: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/frameset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/frameset_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/frameset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,14 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
+require 'cgi'
+
+describe "CGI::HtmlExtension#frameset" do
+  before(:each) do
+    @html = CGISpecs.cgi_new("html4Fr")
+  end
+
+  it "initializes the HTML Generation methods for the Frameset version of HTML4" do
+    @html.frameset.should == "<FRAMESET></FRAMESET>"
+    @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
+  end
+end

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/hidden_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/hidden_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/hidden_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#hidden" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/html_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/html_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/html_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#html" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
     @html.stub!(:doctype).and_return("<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>")
   end
 
@@ -43,4 +43,24 @@
       @html.html("DOCTYPE" => nil).should == "<HTML>"
     end
   end
+
+  describe "when each HTML generation" do
+    it "returns the doctype declaration for HTML3" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
+      CGISpecs.cgi_new("html3").html.should == expect + "<HTML>"
+      CGISpecs.cgi_new("html3").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+    end
+
+    it "returns the doctype declaration for HTML4" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
+      CGISpecs.cgi_new("html4").html.should == expect + "<HTML>"
+      CGISpecs.cgi_new("html4").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+    end
+
+    it "returns the doctype declaration for the Transitional version of HTML4" do
+      expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
+      CGISpecs.cgi_new("html4Tr").html.should == expect + "<HTML>"
+      CGISpecs.cgi_new("html4Tr").html { "html body" }.should == expect + "<HTML>html body</HTML>"
+    end
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/image_button_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/image_button_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/image_button_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#image_button" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/img_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/img_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/img_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#img" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
   
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/multipart_form_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/multipart_form_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/multipart_form_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#multipart_form" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
     @html.stub!(:script_name).and_return("/path/to/some/script.rb")
   end
 

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/password_field_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/password_field_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/password_field_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#password_field" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/popup_menu_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/popup_menu_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/popup_menu_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
-require File.dirname(__FILE__) + "/shared/popup_menu"
+require File.expand_path('../fixtures/common', __FILE__)
+require File.expand_path('../shared/popup_menu', __FILE__)
 
 describe "CGI::HtmlExtension#popup_menu" do
   it_behaves_like :cgi_htmlextension_popup_menu, :popup_menu

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/radio_button_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/radio_button_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/radio_button_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#radio_button" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/radio_group_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/radio_group_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/radio_group_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#radio_group" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed name, values ..." do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/reset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/reset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/reset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#reset" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/scrolling_list_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/scrolling_list_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/scrolling_list_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/shared/popup_menu"
+require File.expand_path('../shared/popup_menu', __FILE__)
 
 describe "CGI::HtmlExtension#scrolling_list" do
   it_behaves_like :cgi_htmlextension_popup_menu, :scrolling_list

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/shared/popup_menu.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/shared/popup_menu.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/shared/popup_menu.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
 describe :cgi_htmlextension_popup_menu, :shared => true do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
   
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/submit_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/submit_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/submit_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#submit" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/text_field_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/text_field_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/text_field_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#text_field" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/htmlextension/textarea_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/htmlextension/textarea_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/htmlextension/textarea_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/fixtures/common"
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "CGI::HtmlExtension#textarea" do
   before(:each) do
-    @html = CGISpecs::HtmlExtension.new
+    @html = CGISpecs.cgi_new
   end
 
   describe "when passed no arguments" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI#initialize" do
@@ -143,28 +143,30 @@
   end
 
 
-  it "prints out a warning" do
-    begin
-      CGI_PARAMS = { "test" => "test" }
-      CGI_COOKIES = [ "cookie!" ]
-      lambda { @cgi.send(:initialize) }.should complain("do not use CGI_PARAMS and CGI_COOKIES\n")
-    ensure
-      Object.send(:remove_const, :CGI_PARAMS)
-      Object.send(:remove_const, :CGI_COOKIES)
+  ruby_version_is "" ... "1.9" do
+    it "prints out a warning" do
+      begin
+	CGI_PARAMS = { "test" => "test" }
+	CGI_COOKIES = [ "cookie!" ]
+	lambda { @cgi.send(:initialize) }.should complain("do not use CGI_PARAMS and CGI_COOKIES\n")
+      ensure
+	Object.send(:remove_const, :CGI_PARAMS)
+	Object.send(:remove_const, :CGI_COOKIES)
+      end
     end
-  end
 
-  it "sets #cookies and #params to the contents of CGI_PARAMS and CGI_COOKIES" do
-    begin
-      CGI_PARAMS = { "test" => "test" }
-      CGI_COOKIES = [ "cookie!" ]
+    it "sets #cookies and #params to the contents of CGI_PARAMS and CGI_COOKIES" do
+      begin
+	CGI_PARAMS = { "test" => "test" }
+	CGI_COOKIES = [ "cookie!" ]
       
-      @cgi.send(:initialize)
-      @cgi.params.should == CGI_PARAMS
-      @cgi.cookies.should == CGI_COOKIES
-    ensure
-      Object.send(:remove_const, :CGI_PARAMS)
-      Object.send(:remove_const, :CGI_COOKIES)
+	@cgi.send(:initialize)
+	@cgi.params.should == CGI_PARAMS
+	@cgi.cookies.should == CGI_COOKIES
+      ensure
+	Object.send(:remove_const, :CGI_PARAMS)
+	Object.send(:remove_const, :CGI_COOKIES)
+      end
     end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/cgi/out_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/out_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/out_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI#out" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/parse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/parse_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/parse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI.parse when passed String" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/pretty_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/pretty_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/pretty_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI.pretty when passed html" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/print_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/print_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/print_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI#print" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_charset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_charset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_charset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#accept_charset" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_encoding_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_encoding_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_encoding_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#accept_encoding" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_language_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_language_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_language_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#accept_language" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/accept_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#accept" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/auth_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/auth_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/auth_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#auth_type" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/cache_control_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/cache_control_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/cache_control_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#cache_control" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/content_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/content_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/content_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#content_length" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/content_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/content_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/content_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#content_type" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/cookies_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/cookies_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/cookies_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#cookies" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/element_reference_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/element_reference_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/element_reference_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#[]" do
@@ -21,13 +21,14 @@
     @cgi["two"].should == "b"
   end
   
-  it "returns a String that was extended with CGI::QueryExtension::Value" do
+  it "returns a String" do
     @cgi["one"].should be_kind_of(String)
-    @cgi["one"].should be_kind_of(CGI::QueryExtension::Value)
   end
 
-  it "sets the other values in the returned value" do
-    @cgi["one"].to_a.should == ["a"]
-    @cgi["two"].to_a.should == ["b", "c"]
+  ruby_version_is "" ... "1.9" do
+    it "sets the other values in the returned value" do
+      @cgi["one"].to_a.should == ["a"]
+      @cgi["two"].to_a.should == ["b", "c"]
+    end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/from_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/from_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/from_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#from" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/gateway_interface_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/gateway_interface_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/gateway_interface_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#gateway_interface" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/has_key_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/has_key_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/has_key_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/shared/has_key"
+require File.expand_path('../shared/has_key', __FILE__)
 
 describe "CGI::QueryExtension#has_key?" do
   it_behaves_like :cgi_query_extension_has_key_p, :has_key?

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/host_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/host_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/host_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#host" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/include_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/include_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/include_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/shared/has_key"
+require File.expand_path('../shared/has_key', __FILE__)
 
 describe "CGI::QueryExtension#include?" do
   it_behaves_like :cgi_query_extension_has_key_p, :include?

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/key_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/key_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/key_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
-require File.dirname(__FILE__) + "/shared/has_key"
+require File.expand_path('../shared/has_key', __FILE__)
 
 describe "CGI::QueryExtension#key?" do
   it_behaves_like :cgi_query_extension_has_key_p, :key?

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/keys_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/keys_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/keys_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#keys" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/multipart_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/multipart_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/multipart_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 require "stringio"
 

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/negotiate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/negotiate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/negotiate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#negotiate" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/params_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/params_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/params_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#params" do
@@ -13,9 +13,17 @@
     ENV['REQUEST_METHOD'] = @old_request_method
   end
   
-  it "returns the parsed HTTP Query Params" do
-    @cgi.params.should == {"three"=>[nil], "two"=>["b", "c"], "one"=>["a"]}
+  ruby_version_is "" ... "1.9" do
+    it "returns the parsed HTTP Query Params" do
+      @cgi.params.should == {"three"=>[nil], "two"=>["b", "c"], "one"=>["a"]}
+    end
   end
+  
+  ruby_version_is "1.9" do
+    it "returns the parsed HTTP Query Params" do
+      @cgi.params.should == {"three"=>[], "two"=>["b", "c"], "one"=>["a"]}
+    end
+  end
 end
 
 describe "CGI::QueryExtension#params=" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/path_info_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/path_info_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/path_info_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#path_info" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/path_translated_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/path_translated_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/path_translated_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#path_translated" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/pragma_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/pragma_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/pragma_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#pragma" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/query_string_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/query_string_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/query_string_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#query_string" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/raw_cookie2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/raw_cookie2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/raw_cookie2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#raw_cookie2" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/raw_cookie_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/raw_cookie_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/raw_cookie_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#raw_cookie" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/referer_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/referer_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/referer_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#referer" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_addr_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_addr_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_addr_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#remote_addr" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_host_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_host_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_host_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#remote_host" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_ident_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_ident_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_ident_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#remote_ident" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_user_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_user_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/remote_user_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#remote_user" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/request_method_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/request_method_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/request_method_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#request_method" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/script_name_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/script_name_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/script_name_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#script_name" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_name_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_name_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_name_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#server_name" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_port_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_port_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_port_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#server_port" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_protocol_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_protocol_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_protocol_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#server_protocol" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_software_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_software_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/server_software_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#server_software" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/queryextension/user_agent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/queryextension/user_agent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/queryextension/user_agent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI::QueryExtension#user_agent" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/rfc1123_date_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/rfc1123_date_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/rfc1123_date_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI.rfc1123_date when passsed Time" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/unescapeElement_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/unescapeElement_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/unescapeElement_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI.unescapeElement when passed String, elements, ..." do

Modified: MacRuby/trunk/spec/frozen/library/cgi/unescapeHTML_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/unescapeHTML_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/unescapeHTML_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI.unescapeHTML" do

Modified: MacRuby/trunk/spec/frozen/library/cgi/unescape_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/cgi/unescape_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/cgi/unescape_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+# -*- encoding: utf-8 -*-
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe "CGI.unescape" do

Modified: MacRuby/trunk/spec/frozen/library/complex/Complex_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/Complex_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/Complex_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../shared/complex/Complex'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/complex/Complex', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/abs2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/abs2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/abs2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/abs2'
+require File.expand_path('../../../shared/complex/abs2', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/complex/abs_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/abs_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/abs_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/abs'
+require File.expand_path('../../../shared/complex/abs', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/angle_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/angle_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/angle_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../shared/complex/arg'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/complex/arg', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Complex#angle" do

Modified: MacRuby/trunk/spec/frozen/library/complex/arg_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/arg_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/arg_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../shared/complex/arg'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/complex/arg', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Complex#arg" do

Modified: MacRuby/trunk/spec/frozen/library/complex/coerce_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/coerce_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/coerce_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/coerce'
+require File.expand_path('../../../shared/complex/coerce', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/complex/comparison_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/comparison_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/comparison_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/complex/conj_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/conj_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/conj_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../shared/complex/conjugate'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/complex/conjugate', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Complex#conj" do

Modified: MacRuby/trunk/spec/frozen/library/complex/conjugate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/conjugate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/conjugate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../shared/complex/conjugate'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/complex/conjugate', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Complex#conjugate" do

Modified: MacRuby/trunk/spec/frozen/library/complex/denominator_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/denominator_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/denominator_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/denominator'
+require File.expand_path('../../../shared/complex/denominator', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/complex/divide_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/divide_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/divide_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/divide'
+require File.expand_path('../../../shared/complex/divide', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/complex/equal_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/equal_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/equal_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/equal_value'
+require File.expand_path('../../../shared/complex/equal_value', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/complex/exponent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/exponent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/exponent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/exponent'
+require File.expand_path('../../../shared/complex/exponent', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/complex/generic_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/generic_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/generic_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/hash_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/hash_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/hash_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../shared/complex/hash'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/complex/hash', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/imag_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/imag_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/imag_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/image'
+require File.expand_path('../../../shared/complex/image', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/image_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/image_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/image_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../shared/complex/image'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/complex/image', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/inspect'
+require File.expand_path('../../../shared/complex/inspect', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/math/acos_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/acos_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/acos_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/acos'
+require File.expand_path('../shared/acos', __FILE__)
 
 describe "Math#acos" do
   it_behaves_like :complex_math_acos, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/acosh_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/acosh_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/acosh_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/acosh'
+require File.expand_path('../shared/acosh', __FILE__)
 
 describe "Math#acosh" do
   it_behaves_like :complex_math_acosh, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/asin_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/asin_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/asin_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/asin'
+require File.expand_path('../shared/asin', __FILE__)
 
 describe "Math#asin" do
   it_behaves_like :complex_math_asin, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/asinh_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/asinh_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/asinh_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/asinh'
+require File.expand_path('../shared/asinh', __FILE__)
 
 describe "Math#asinh" do
   it_behaves_like :complex_math_asinh, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/atan2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/atan2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/atan2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/atan2'
+require File.expand_path('../shared/atan2', __FILE__)
 
 describe "Math#atan2" do
   it_behaves_like :complex_math_atan2, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/atan_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/atan_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/atan_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/atan'
+require File.expand_path('../shared/atan', __FILE__)
 
 describe "Math#atan" do
   it_behaves_like :complex_math_atan, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/atanh_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/atanh_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/atanh_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,31 +1,35 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../../../fixtures/math/common', __FILE__)
+require File.expand_path('../../../../shared/math/atanh', __FILE__)
+require File.expand_path('../shared/atanh', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/atanh'
 
 describe "Math#atanh" do
-  it_behaves_like :complex_math_atanh, :_, IncludesMath.new
+  it_behaves_like :math_atanh_base, :atanh, IncludesMath.new
+  it_behaves_like :complex_math_atanh_complex, :atanh, IncludesMath.new
 
-  it "should be private" do
-    IncludesMath.should have_private_instance_method(:atanh)
-  end
+  it_behaves_like :math_atanh_private, :atanh
 end
 
 ruby_version_is ""..."1.9" do
   describe "Math#atanh!" do
-    it_behaves_like :complex_math_atanh_bang, :_, IncludesMath.new
+    it_behaves_like :math_atanh_base, :atanh!, IncludesMath.new
+    it_behaves_like :math_atanh_no_complex, :atanh!, IncludesMath.new
+    it_behaves_like :complex_math_atanh_no_complex, :atanh!, IncludesMath.new
 
-    it "should be private" do
-      IncludesMath.should have_private_instance_method(:atanh!)
-    end
+    it_behaves_like :math_atanh_private, :atanh!
   end
 end
 
 describe "Math.atanh" do
-  it_behaves_like :complex_math_atanh, :_, Math
+  it_behaves_like :math_atanh_base, :atanh, Math
+  it_behaves_like :complex_math_atanh_complex, :atanh, Math
 end
 
 ruby_version_is ""..."1.9" do
   describe "Math.atanh!" do
-    it_behaves_like :complex_math_atanh_bang, :_, Math
+    it_behaves_like :math_atanh_base, :atanh!, Math
+    it_behaves_like :math_atanh_no_complex, :atanh!, IncludesMath.new
+    it_behaves_like :complex_math_atanh_no_complex, :atanh!, Math
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/complex/math/cos_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/cos_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/cos_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/cos'
+require File.expand_path('../shared/cos', __FILE__)
 
 describe "Math#cos" do
   it_behaves_like :complex_math_cos, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/cosh_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/cosh_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/cosh_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/cosh'
+require File.expand_path('../shared/cosh', __FILE__)
 
 describe "Math#cosh" do
   it_behaves_like :complex_math_cosh, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/exp_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/exp_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/exp_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/exp'
+require File.expand_path('../shared/exp', __FILE__)
 
 describe "Math#exp" do
   it_behaves_like :complex_math_exp, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/log10_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/log10_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/log10_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/log10'
+require File.expand_path('../shared/log10', __FILE__)
 
 describe "Math#log10" do
   it_behaves_like :complex_math_log10, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/log_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/log_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/log_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/log'
+require File.expand_path('../shared/log', __FILE__)
 
 describe "Math#log" do
   it_behaves_like :complex_math_log, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/acos.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/acos.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/acos.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_acos, :shared => true do
   it "returns the arccosine of the passed argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/acosh.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/acosh.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/acosh.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_acosh, :shared => true do
   it "returns the principle value of the inverse hyperbolic cosine of the argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/asin.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/asin.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/asin.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_asin, :shared => true do
   it "returns the arcsine of the argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/asinh.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/asinh.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/asinh.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_asinh, :shared => true do
   it "returns the inverse hyperbolic sin of the argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/atan.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/atan.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/atan.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_atan, :shared => true do
   it "returns the arctangent of the argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/atan2.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/atan2.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/atan2.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_atan2, :shared => true do
   it "returns the arc tangent of the passed arguments" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/atanh.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/atanh.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/atanh.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,90 +1,29 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
-describe :complex_math_atanh, :shared => true do
-  it "returns the inverse hyperbolic tangent of the argument" do
-    @object.send(:atanh, 0.0).should == 0.0
-    @object.send(:atanh, -0.0).should == -0.0
-    @object.send(:atanh, 0.5).should be_close(0.549306144334055, TOLERANCE)
-    @object.send(:atanh, -0.2).should be_close(-0.202732554054082, TOLERANCE)
-  end
+describe :complex_math_atanh_complex, :shared => true do
+  it "returns the inverse hyperbolic tangent as a Complex number for arguments greater than 1.0" do
+    value = Complex(18.36840028483855, 1.5707963267948966)
+    @object.send(@method, 1.0 + Float::EPSILON).should be_close(value, TOLERANCE)
 
-  platform_is :darwin, :freebsd, :java do
-    it "returns Infinity for 1.0" do
-      @object.send(:atanh, 1.0).infinite?.should == 1
-    end
-
-    it "returns -Infinity for -1.0" do
-      @object.send(:atanh, -1.0).infinite?.should == -1
-    end
+    value = Complex(0.100335347731076, 1.5707963267949)
+    @object.send(@method, 10).should be_close(value, TOLERANCE)
   end
 
-  platform_is :windows, :linux, :openbsd do
-    # jruby is cross-platform and behaves as :darwin above
-    not_compliant_on :jruby do
-      it "raises an Errno::EDOM if x = 1.0" do
-        lambda { @object.send(:atanh, 1.0) }.should raise_error(Errno::EDOM)
-      end
-
-      it "raises an Errno::EDOM if x = -1.0" do
-        lambda { @object.send(:atanh, -1.0) }.should raise_error(Errno::EDOM)
-      end
-    end
-  end
-
   it "returns the inverse hyperbolic tangent as a Complex number for arguments greater than 1.0" do
-    @object.send(:atanh, 1.0 + TOLERANCE).should be_close(Complex(5.55373767837521, 1.5707963267949), TOLERANCE)
-    @object.send(:atanh, 10).should be_close(Complex(0.100335347731076, 1.5707963267949), TOLERANCE)
-  end
+    value = Complex(-18.36840028483855, 1.5707963267948966)
+    @object.send(@method, -1.0 - Float::EPSILON).should be_close(value, TOLERANCE)
 
-  it "returns the inverse hyperbolic tangent as a Complex number for arguments greater than 1.0" do
-    @object.send(:atanh, -1.0 - TOLERANCE).should be_close(Complex(-5.55373767837521, 1.5707963267949), TOLERANCE)
-    @object.send(:atanh, 10).should be_close(Complex(0.100335347731076, 1.5707963267949), TOLERANCE)
+    value = Complex(0.100335347731076, 1.5707963267949)
+    @object.send(@method, 10).should be_close(value, TOLERANCE)
   end
 
   it "returns the inverse hyperbolic tangent for Complex numbers" do
-    @object.send(:atanh, Complex(3, 4)).should be_close(Complex(0.117500907311434, 1.40992104959658), TOLERANCE)
+    value = Complex(0.117500907311434, 1.40992104959658)
+    @object.send(@method, Complex(3, 4)).should be_close(value, TOLERANCE)
   end
 end
 
-describe :complex_math_atanh_bang, :shared => true do
-  it "returns the inverse hyperbolic tangent of the argument" do
-    @object.send(:atanh!, 0.0).should == 0.0
-    @object.send(:atanh!, -0.0).should == -0.0
-    @object.send(:atanh!, 0.5).should be_close(0.549306144334055, TOLERANCE)
-    @object.send(:atanh!, -0.2).should be_close(-0.202732554054082, TOLERANCE)
-  end
-
-  platform_is :darwin, :freebsd, :java do
-    it "returns Infinity for 1.0" do
-      @object.send(:atanh!, 1.0).infinite?.should == 1
-    end
-
-    it "returns -Infinity for -1.0" do
-      @object.send(:atanh!, -1.0).infinite?.should == -1
-    end
-  end
-
-  platform_is :windows, :linux, :openbsd do
-    # jruby is cross-platform and behaves as :darwin above
-    not_compliant_on :jruby do
-      it "raises an Errno::EDOM if x = 1.0" do
-        lambda { @object.send(:atanh!, 1.0) }.should raise_error(Errno::EDOM)
-      end
-
-      it "raises an Errno::EDOM if x = -1.0" do
-        lambda { @object.send(:atanh!, -1.0) }.should raise_error(Errno::EDOM)
-      end
-    end
-  end
-
-  it "raises an Errno::EDOM for arguments greater than 1.0" do
-    lambda { @object.send(:atanh!, 1.0 + TOLERANCE)  }.should raise_error(Errno::EDOM)
-  end
-
-  it "raises an Errno::EDOM for arguments less than -1.0" do
-    lambda { @object.send(:atanh!, -1.0 - TOLERANCE) }.should raise_error(Errno::EDOM)
-  end
-
+describe :complex_math_atanh_no_complex, :shared => true do
   it "raises a TypeError when passed a Complex number" do
     lambda { @object.send(:atanh!, Complex(4, 5)) }.should raise_error(TypeError)
   end

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/cos.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/cos.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/cos.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_cos, :shared => true do
   it "returns the cosine of the argument expressed in radians" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/cosh.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/cosh.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/cosh.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_cosh, :shared => true do
   it "returns the hyperbolic cosine of the passed argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/exp.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/exp.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/exp.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_exp, :shared => true do
   it "returns the base-e exponential of the passed argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/log.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/log.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/log.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_log, :shared => true do
   it "returns the natural logarithm of the passed argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/log10.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/log10.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/log10.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_log10, :shared => true do
   it "returns the base-10 logarithm of the passed argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/sin.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/sin.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/sin.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_sin, :shared => true do
   it "returns the sine of the passed argument expressed in radians" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/sinh.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/sinh.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/sinh.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_sinh, :shared => true do
   it "returns the hyperbolic sin of the argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/sqrt.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/sqrt.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/sqrt.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_sqrt, :shared => true do
   it "returns the square root for positive numbers" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/tan.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/tan.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/tan.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_tan, :shared => true do
   it "returns the tangent of the argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/shared/tanh.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/shared/tanh.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/shared/tanh.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe :complex_math_tanh, :shared => true do
   it "returns the hyperbolic tangent of the argument" do

Modified: MacRuby/trunk/spec/frozen/library/complex/math/sin_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/sin_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/sin_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/sin'
+require File.expand_path('../shared/sin', __FILE__)
 
 describe "Math#sin" do
   it_behaves_like :complex_math_sin, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/sinh_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/sinh_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/sinh_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/sinh'
+require File.expand_path('../shared/sinh', __FILE__)
 
 describe "Math#sinh" do
   it_behaves_like :complex_math_sinh, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/sqrt_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/sqrt_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/sqrt_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/sqrt'
+require File.expand_path('../shared/sqrt', __FILE__)
 
 describe "Math#sqrt" do
   it_behaves_like :complex_math_sqrt, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/tan_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/tan_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/tan_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/tan'
+require File.expand_path('../shared/tan', __FILE__)
 
 describe "Math#tan" do
   it_behaves_like :complex_math_tan, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/math/tanh_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/math/tanh_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/math/tanh_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'complex'
-require File.dirname(__FILE__) + '/shared/tanh'
+require File.expand_path('../shared/tanh', __FILE__)
 
 describe "Math#tanh" do
   it_behaves_like :complex_math_tanh, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/complex/minus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/minus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/minus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/minus'
+require File.expand_path('../../../shared/complex/minus', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/modulo_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/modulo_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/modulo_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/modulo'
+require File.expand_path('../../../shared/complex/modulo', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/multiply_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/multiply_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/multiply_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/multiply'
+require File.expand_path('../../../shared/complex/multiply', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/numerator_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/numerator_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/numerator_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/numerator'
+require File.expand_path('../../../shared/complex/numerator', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/complex/numeric/angle_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/numeric/angle_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/numeric/angle_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../shared/complex/numeric/arg'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../../../shared/complex/numeric/arg', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/numeric/arg_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/numeric/arg_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/numeric/arg_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../shared/complex/numeric/arg'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../../../shared/complex/numeric/arg', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/numeric/conj_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/numeric/conj_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/numeric/conj_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../shared/complex/numeric/conj'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../../../shared/complex/numeric/conj', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/complex/numeric/conjugate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/numeric/conjugate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/numeric/conjugate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../shared/complex/numeric/conj'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../../../shared/complex/numeric/conj', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/numeric/im_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/numeric/im_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/numeric/im_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/numeric/imag_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/numeric/imag_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/numeric/imag_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../shared/complex/numeric/imag'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../../../shared/complex/numeric/imag', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/numeric/image_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/numeric/image_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/numeric/image_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../shared/complex/numeric/imag'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../../../shared/complex/numeric/imag', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/numeric/polar_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/numeric/polar_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/numeric/polar_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../shared/complex/numeric/polar'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../../../shared/complex/numeric/polar', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/numeric/real_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/numeric/real_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/numeric/real_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../shared/complex/numeric/real'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../../../shared/complex/numeric/real', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/plus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/plus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/plus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/plus'
+require File.expand_path('../../../shared/complex/plus', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/polar_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/polar_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/polar_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/polar'
+require File.expand_path('../../../shared/complex/polar', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/complex/real_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/real_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/real_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/real'
+require File.expand_path('../../../shared/complex/real', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/complex/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/complex/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/complex/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/complex/to_s'
+require File.expand_path('../../../shared/complex/to_s', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/conditionvariable/broadcast_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/conditionvariable/broadcast_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/conditionvariable/broadcast_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "ConditionVariable#broadcast" do

Modified: MacRuby/trunk/spec/frozen/library/conditionvariable/signal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/conditionvariable/signal_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/conditionvariable/signal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "ConditionVariable#signal" do

Modified: MacRuby/trunk/spec/frozen/library/conditionvariable/wait_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/conditionvariable/wait_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/conditionvariable/wait_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "ConditionVariable#wait" do

Added: MacRuby/trunk/spec/frozen/library/continuation/call_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/continuation/call_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/continuation/call_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,10 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/continuation/call', __FILE__)
+
+with_feature :continuation_library do
+  require 'continuation'
+
+  describe "Continuation#call" do
+    it_behaves_like :continuation_call, :call
+  end
+end

Added: MacRuby/trunk/spec/frozen/library/continuation/element_reference_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/continuation/element_reference_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/continuation/element_reference_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,10 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/continuation/call', __FILE__)
+
+with_feature :continuation_library do
+  require 'continuation'
+
+  describe "Continuation#call" do
+    it_behaves_like :continuation_call, :[]
+  end
+end

Added: MacRuby/trunk/spec/frozen/library/continuation/kernel/callcc_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/continuation/kernel/callcc_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/continuation/kernel/callcc_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,17 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../../../fixtures/kernel/callcc', __FILE__)
+require File.expand_path('../../../../shared/kernel/callcc', __FILE__)
+
+with_feature :continuation_library do
+  require 'continuation'
+
+  describe "Kernel#callcc" do
+    it_behaves_like :kernel_instance_callcc, :callcc
+
+    it_behaves_like :kernel_callcc, :callcc, KernelSpecs::Method.new
+  end
+
+  describe "Kernel.callcc" do
+    it_behaves_like :kernel_callcc, :callcc, Kernel
+  end
+end

Added: MacRuby/trunk/spec/frozen/library/continuation/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/continuation/new_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/continuation/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,10 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/continuation/new', __FILE__)
+
+with_feature :continuation_library do
+  require 'continuation'
+
+  describe "Continuation.new" do
+    it_behaves_like :continuation_new, :new
+  end
+end

Modified: MacRuby/trunk/spec/frozen/library/csv/basicwriter/close_on_terminate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/basicwriter/close_on_terminate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/basicwriter/close_on_terminate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::BasicWriter#close_on_terminate" do

Modified: MacRuby/trunk/spec/frozen/library/csv/basicwriter/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/basicwriter/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/basicwriter/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::BasicWriter#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/csv/basicwriter/terminate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/basicwriter/terminate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/basicwriter/terminate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::BasicWriter#terminate" do

Modified: MacRuby/trunk/spec/frozen/library/csv/cell/data_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/cell/data_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/cell/data_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::Cell#data" do

Modified: MacRuby/trunk/spec/frozen/library/csv/cell/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/cell/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/cell/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::Cell#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/csv/foreach_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/foreach_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/foreach_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV.foreach" do

Modified: MacRuby/trunk/spec/frozen/library/csv/generate_line_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/generate_line_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/generate_line_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,30 +1,59 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV.generate_line" do
 
-  it "generates an empty string" do
-    result = CSV::generate_line([]) 
-    result.should == ""
-  end
+  ruby_version_is "" ... "1.9" do
+    it "generates an empty string" do
+      result = CSV::generate_line([]) 
+      result.should == ""
+    end
  
-  it "generates the string 'foo,bar'" do
-    result = CSV::generate_line(["foo", "bar"])
-    result.should == "foo,bar"
-  end
+    it "generates the string 'foo,bar'" do
+      result = CSV::generate_line(["foo", "bar"])
+      result.should == "foo,bar"
+    end
 
-  it "generates the string 'foo;bar'" do
-    result = CSV::generate_line(["foo", "bar"], ?;)
-    result.should == "foo;bar"
-  end
+    it "generates the string 'foo;bar'" do
+      result = CSV::generate_line(["foo", "bar"], ?;)
+      result.should == "foo;bar"
+    end
 
-  it "generates the string 'foo,,bar'" do
-    result = CSV::generate_line(["foo", nil, "bar"])
-    result.should == "foo,,bar"
+    it "generates the string 'foo,,bar'" do
+      result = CSV::generate_line(["foo", nil, "bar"])
+      result.should == "foo,,bar"
+    end
+
+    it "generates the string 'foo;;bar'" do
+      result = CSV::generate_line(["foo", nil, "bar"], ?;)
+      result.should == "foo;;bar"
+    end
   end
 
-  it "generates the string 'foo;;bar'" do
-    result = CSV::generate_line(["foo", nil, "bar"], ?;)
-    result.should == "foo;;bar"
+  ruby_version_is "1.9" do
+    it "generates an empty string" do
+      result = CSV::generate_line([]) 
+      result.should == "\n"
+    end
+ 
+    it "generates the string 'foo,bar'" do
+      result = CSV::generate_line(["foo", "bar"])
+      result.should == "foo,bar\n"
+    end
+
+    it "generates the string 'foo;bar'" do
+      result = CSV::generate_line(["foo", "bar"], :col_sep => ?;)
+      result.should == "foo;bar\n"
+    end
+
+    it "generates the string 'foo,,bar'" do
+      result = CSV::generate_line(["foo", nil, "bar"])
+      result.should == "foo,,bar\n"
+    end
+
+    it "generates the string 'foo;;bar'" do
+      result = CSV::generate_line(["foo", nil, "bar"], :col_sep => ?;)
+      result.should == "foo;;bar\n"
+    end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/generate_row_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/generate_row_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/generate_row_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV.generate_row" do

Modified: MacRuby/trunk/spec/frozen/library/csv/generate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/generate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/generate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,44 +1,74 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'csv'
 require 'tempfile'
 
 describe "CSV.generate" do
-  
-  before :each do
-    @outfile_name = tmp("generate_test_#{$$}.csv")  
-  end
  
-  it "creates a BasicWriter" do
-    writer = CSV::generate(@outfile_name)
-    writer.should be_kind_of(CSV::BasicWriter)
-    writer.close
-  end
+  ruby_version_is "" ... "1.9" do
+    before :each do
+      @outfile_name = tmp("generate_test_#{$$}.csv")  
+    end
 
-  it "accepts a field separator" do
-    writer = CSV::generate(@outfile_name, ",")
-    writer.should be_kind_of(CSV::BasicWriter)
-    writer.close
-  end
+    it "creates a BasicWriter" do
+      writer = CSV::generate(@outfile_name)
+      writer.should be_kind_of(CSV::BasicWriter)
+      writer.close
+    end
 
-  it "accepts a row separator" do
-    writer = CSV::generate(@outfile_name, ".")
-    writer.should be_kind_of(CSV::BasicWriter)
-    writer.close
-  end
-  
-  it "creates a BasicWriter to use in a block" do
-    CSV::generate(@outfile_name) do |writer|
+    it "accepts a field separator" do
+      writer = CSV::generate(@outfile_name, ",")
       writer.should be_kind_of(CSV::BasicWriter)
+      writer.close
     end
-  end
 
-  it "creates a BasicWriter with ; as the separator inside the block" do
-    CSV::generate(@outfile_name, ?;) do |writer|
+    it "accepts a row separator" do
+      writer = CSV::generate(@outfile_name, ".")
       writer.should be_kind_of(CSV::BasicWriter)
+      writer.close
     end
+  
+    it "creates a BasicWriter to use in a block" do
+      CSV::generate(@outfile_name) do |writer|
+	writer.should be_kind_of(CSV::BasicWriter)
+      end
+    end
+
+    it "creates a BasicWriter with ; as the separator inside the block" do
+      CSV::generate(@outfile_name, ?;) do |writer|
+	writer.should be_kind_of(CSV::BasicWriter)
+      end
+    end
+
+    after :each do
+      File.unlink(@outfile_name)
+    end
   end
 
-  after :each do
-    File.unlink(@outfile_name)
+  ruby_version_is "1.9" do
+    it "returns CSV string" do
+      csv_str = CSV.generate do |csv|
+	csv.add_row [1, 2, 3]
+	csv << [4, 5, 6]
+      end
+      csv_str.should == "1,2,3\n4,5,6\n"
+    end
+
+    it "accepts a col separator" do
+      csv_str = CSV.generate(:col_sep => ";") do |csv|
+	csv.add_row [1, 2, 3]
+	csv << [4, 5, 6]
+      end
+      csv_str.should == "1;2;3\n4;5;6\n"
+    end
+
+    it "appends and returns the argument itself" do
+      str = ""
+      csv_str = CSV.generate(str) do |csv|
+	csv.add_row [1, 2, 3]
+	csv << [4, 5, 6]
+      end
+      csv_str.object_id.should == str.object_id
+      str.should == "1,2,3\n4,5,6\n"
+    end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/iobuf/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/iobuf/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/iobuf/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::IOBuf#close" do

Modified: MacRuby/trunk/spec/frozen/library/csv/iobuf/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/iobuf/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/iobuf/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::IOBuf#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/csv/iobuf/read_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/iobuf/read_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/iobuf/read_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::IOBuf#read" do

Modified: MacRuby/trunk/spec/frozen/library/csv/iobuf/terminate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/iobuf/terminate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/iobuf/terminate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::IOBuf#terminate" do

Modified: MacRuby/trunk/spec/frozen/library/csv/ioreader/close_on_terminate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/ioreader/close_on_terminate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/ioreader/close_on_terminate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::IOReader#close_on_terminate" do

Modified: MacRuby/trunk/spec/frozen/library/csv/ioreader/get_row_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/ioreader/get_row_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/ioreader/get_row_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::IOReader#get_row" do

Modified: MacRuby/trunk/spec/frozen/library/csv/ioreader/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/ioreader/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/ioreader/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::IOReader#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/csv/ioreader/terminate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/ioreader/terminate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/ioreader/terminate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::IOReader#terminate" do

Modified: MacRuby/trunk/spec/frozen/library/csv/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV.open" do

Modified: MacRuby/trunk/spec/frozen/library/csv/parse_row_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/parse_row_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/parse_row_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,28 +1,30 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'csv'
 
-describe "CSV.parse_row" do
+ruby_version_is "" ... "1.9" do
+  describe "CSV.parse_row" do
   
-  it "parses 'foo\nbar' one row at a time" do
-    parse_me = "foo\nbar"
+    it "parses 'foo\nbar' one row at a time" do
+      parse_me = "foo\nbar"
     
-    parsed_row = []
-    parsed_count, next_row_index = CSV::parse_row parse_me, 0, parsed_row
-    parsed_count.should == 1
-    next_row_index.should == 4
-    parsed_row.should == ['foo']
+      parsed_row = []
+      parsed_count, next_row_index = CSV::parse_row parse_me, 0, parsed_row
+      parsed_count.should == 1
+      next_row_index.should == 4
+      parsed_row.should == ['foo']
     
-    parsed_row = []
-    parsed_count, next_row_index = CSV::parse_row parse_me, next_row_index, parsed_row 
-    parsed_count.should == 1
-    next_row_index.should == 7
-    parsed_row.should == ['bar']
+      parsed_row = []
+      parsed_count, next_row_index = CSV::parse_row parse_me, next_row_index, parsed_row 
+      parsed_count.should == 1
+      next_row_index.should == 7
+      parsed_row.should == ['bar']
 
-    parsed_row = []
-    parsed_count, next_row_index = CSV::parse_row parse_me, next_row_index, parsed_row
-    parsed_count.should == 0
-    next_row_index.should == 0
-    parsed_row.should == []
-  end  
+      parsed_row = []
+      parsed_count, next_row_index = CSV::parse_row parse_me, next_row_index, parsed_row
+      parsed_count.should == 0
+      next_row_index.should == 0
+      parsed_row.should == []
+    end  
   
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/parse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/parse_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/parse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,127 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV.parse" do
-  it "needs to be reviewed for spec completeness"
+  
+  it "parses '' into []" do
+    result = CSV::parse ''
+    result.should be_kind_of(Array)
+    result.should == []
+  end
+
+  ruby_version_is "" ... "1.9" do
+    it "parses '\n' into [[nil]]" do
+      result = CSV::parse "\n"
+      result.should == [[nil]]
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "parses '\n' into [[]]" do
+      result = CSV::parse "\n"
+      result.should == [[]]
+    end
+  end
+ 
+  it "parses 'foo' into [['foo']]" do
+    result = CSV::parse 'foo'
+    result.should == [['foo']]
+  end
+
+  it "parses 'foo,bar,baz' into [['foo','bar','baz']]" do
+    result = CSV::parse 'foo,bar,baz'
+    result.should == [['foo','bar','baz']]
+  end
+
+  it "parses 'foo,baz' into [[foo,nil,baz]]" do
+    result = CSV::parse 'foo,,baz'
+    result.should == [['foo',nil,'baz']]
+  end
+
+  ruby_version_is "" ... "1.9" do
+    it "parses '\nfoo' into [[nil],['foo']]" do
+      result = CSV::parse "\nfoo"
+      result.should == [[nil],['foo']]
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "parses '\nfoo' into [[],['foo']]" do
+      result = CSV::parse "\nfoo"
+      result.should == [[],['foo']]
+    end
+  end
+
+  it "parses 'foo\n' into [['foo']]" do
+    result = CSV::parse "foo\n"
+    result.should == [['foo']]
+  end
+
+  it "parses 'foo\nbar' into [['foo'],['bar']]" do 
+    result = CSV::parse "foo\nbar"
+    result.should == [['foo'],['bar']]
+  end
+
+  it "parses 'foo,bar\nbaz,quz' into [['foo','bar'],['baz','quz']]" do
+    result = CSV::parse "foo,bar\nbaz,quz"
+    result.should == [['foo','bar'],['baz','quz']]
+  end
+
+  it "parses 'foo,bar'\nbaz' into [['foo','bar'],['baz']]" do
+    result = CSV::parse "foo,bar\nbaz"
+    result.should == [['foo','bar'],['baz']]
+  end
+
+  it "parses 'foo\nbar,baz' into [['foo'],['bar','baz']]" do
+    result = CSV::parse "foo\nbar,baz"
+    result.should == [['foo'],['bar','baz']]
+  end
+
+  ruby_version_is "" ... "1.9" do
+    it "parses '\n\nbar' into [[nil],[nil],'bar']]" do
+      result = CSV::parse "\n\nbar"
+      result.should == [[nil],[nil],['bar']]
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "parses '\n\nbar' into [[],[],'bar']]" do
+      result = CSV::parse "\n\nbar"
+      result.should == [[],[],['bar']]
+    end
+  end
+
+  ruby_version_is "" ... "1.9" do
+    it "parses 'foo' into [['foo']] with a separator of ;" do
+      result = CSV::parse "foo", ?;
+      result.should == [['foo']]
+    end
+
+    it "parses 'foo;bar' into [['foo','bar']] with a separator of ;" do
+      result = CSV::parse "foo;bar", ?;
+      result.should == [['foo','bar']]
+    end
+
+    it "parses 'foo;bar\nbaz;quz' into [['foo','bar'],['baz','quz']] with a separator of ;" do
+      result = CSV::parse "foo;bar\nbaz;quz", ?;
+      result.should == [['foo','bar'],['baz','quz']]
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "parses 'foo' into [['foo']] with a separator of ;" do
+      result = CSV::parse "foo", :col_sep => ?;
+      result.should == [['foo']]
+    end
+
+    it "parses 'foo;bar' into [['foo','bar']] with a separator of ;" do
+      result = CSV::parse "foo;bar", :col_sep => ?;
+      result.should == [['foo','bar']]
+    end
+
+    it "parses 'foo;bar\nbaz;quz' into [['foo','bar'],['baz','quz']] with a separator of ;" do
+      result = CSV::parse "foo;bar\nbaz;quz", :col_sep => ?;
+      result.should == [['foo','bar'],['baz','quz']]
+    end
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/read_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/read_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/read_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV.read" do

Modified: MacRuby/trunk/spec/frozen/library/csv/reader/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/reader/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/reader/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,8 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
-describe "CSV::Reader#close" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is "" ... "1.9" do
+  describe "CSV::Reader#close" do
+    it "needs to be reviewed for spec completeness"
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/reader/create_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/reader/create_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/reader/create_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,8 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
-describe "CSV::Reader.create" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is "" ... "1.9" do
+  describe "CSV::Reader.create" do
+    it "needs to be reviewed for spec completeness"
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/reader/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/reader/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/reader/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,8 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
-describe "CSV::Reader#each" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is "" ... "1.9" do
+  describe "CSV::Reader#each" do
+    it "needs to be reviewed for spec completeness"
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/reader/get_row_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/reader/get_row_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/reader/get_row_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,8 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
-describe "CSV::Reader#get_row" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is "" ... "1.9" do
+  describe "CSV::Reader#get_row" do
+    it "needs to be reviewed for spec completeness"
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/reader/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/reader/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/reader/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,8 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
-describe "CSV::Reader#initialize" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is "" ... "1.9" do
+  describe "CSV::Reader#initialize" do
+    it "needs to be reviewed for spec completeness"
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/reader/parse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/reader/parse_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/reader/parse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,23 +1,25 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
-describe "CSV::Reader.parse" do
+ruby_version_is "" ... "1.9" do
+  describe "CSV::Reader.parse" do
 
-  it "processes empty input without calling block" do
-    empty_input = mock('empty file')
-    empty_input.should_receive(:read).once.and_return(nil)
-    CSV::Reader.parse(empty_input) do |row|
-      Expectation.fail_with('block should not be executed', 'but executed')
+    it "processes empty input without calling block" do
+      empty_input = mock('empty file')
+      empty_input.should_receive(:read).once.and_return(nil)
+      CSV::Reader.parse(empty_input) do |row|
+	Expectation.fail_with('block should not be executed', 'but executed')
+      end
     end
-  end
 
-  it "calls block once for one row of input" do
-    input_stream = File.open(File.dirname(__FILE__) + '/../fixtures/one_line.csv', 'rb')
-    count = 0
-    CSV::Reader.parse(input_stream) do |row|
-      count += 1
+    it "calls block once for one row of input" do
+      input_stream = File.open(File.dirname(__FILE__) + '/../fixtures/one_line.csv', 'rb')
+      count = 0
+      CSV::Reader.parse(input_stream) do |row|
+	count += 1
+      end
+      count.should == 1
     end
-    count.should == 1
+
   end
-
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/reader/shift_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/reader/shift_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/reader/shift_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,8 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
-describe "CSV::Reader#shift" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is "" ... "1.9" do
+  describe "CSV::Reader#shift" do
+    it "needs to be reviewed for spec completeness"
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/reader/terminate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/reader/terminate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/reader/terminate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,8 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
-describe "CSV::Reader#terminate" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is "" ... "1.9" do
+  describe "CSV::Reader#terminate" do
+    it "needs to be reviewed for spec completeness"
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/csv/readlines_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/readlines_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/readlines_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV.readlines" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/add_buf_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/add_buf_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/add_buf_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#add_buf" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/buf_size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/buf_size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/buf_size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#buf_size" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/drop_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/drop_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/drop_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#drop" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/element_reference_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/element_reference_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/element_reference_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#[]" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/get_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/get_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/get_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#get" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/idx_is_eos_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/idx_is_eos_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/idx_is_eos_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#idx_is_eos?" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/is_eos_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/is_eos_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/is_eos_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#is_eos?" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/read_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/read_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/read_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#read" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/rel_buf_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/rel_buf_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/rel_buf_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#rel_buf" do

Modified: MacRuby/trunk/spec/frozen/library/csv/streambuf/terminate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/streambuf/terminate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/streambuf/terminate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StreamBuf#terminate" do

Modified: MacRuby/trunk/spec/frozen/library/csv/stringreader/get_row_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/stringreader/get_row_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/stringreader/get_row_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StringReader#get_row" do

Modified: MacRuby/trunk/spec/frozen/library/csv/stringreader/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/stringreader/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/stringreader/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::StringReader#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/csv/writer/add_row_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/writer/add_row_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/writer/add_row_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::Writer#add_row" do

Modified: MacRuby/trunk/spec/frozen/library/csv/writer/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/writer/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/writer/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::Writer#<<" do

Modified: MacRuby/trunk/spec/frozen/library/csv/writer/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/writer/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/writer/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::Writer#close" do

Modified: MacRuby/trunk/spec/frozen/library/csv/writer/create_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/writer/create_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/writer/create_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::Writer.create" do

Modified: MacRuby/trunk/spec/frozen/library/csv/writer/generate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/writer/generate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/writer/generate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::Writer.generate" do

Modified: MacRuby/trunk/spec/frozen/library/csv/writer/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/writer/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/writer/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::Writer#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/csv/writer/terminate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/csv/writer/terminate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/csv/writer/terminate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'csv'
 
 describe "CSV::Writer#terminate" do

Modified: MacRuby/trunk/spec/frozen/library/date/accessor_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/accessor_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/accessor_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#ajd" do
   it "should be able to determine the Astronomical Julian day for a date" do

Modified: MacRuby/trunk/spec/frozen/library/date/add_month_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/add_month_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/add_month_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#>>" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/add_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/add_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/add_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#+" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/boat_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/boat_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/boat_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#<=>" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/civil_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/civil_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/civil_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/civil'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/civil', __FILE__)
 
 describe "Date#civil" do
 
@@ -8,41 +8,66 @@
 
 end
 
+# reference:
+# October 1582 (the Gregorian calendar, Civil Date)
+#   S   M  Tu   W  Th   F   S
+#       1   2   3   4  15  16
+#  17  18  19  20  21  22  23
+#  24  25  26  27  28  29  30
+#  31
+
 describe "Date#valid_civil?" do
 
-  ruby_version_is '' ... '1.9' do
+  ruby_version_is "" ... "1.9" do
     it "should be able to determine if a date is valid" do
       Date.valid_civil?(1582, 10, 14).should == nil
       Date.valid_civil?(1582, 10, 15).should == Date.civil(1582, 10, 15).jd
       Date.valid_civil?(1582, 10, 14, Date::ENGLAND).should_not == nil
       Date.valid_civil?(1582, 10, 14, Date::ENGLAND).should == Date.civil(1582, 10, 14, Date::ENGLAND).jd
     end
-  end
 
-  ruby_version_is '1.9' do
-    it "should be able to determine if a date is valid" do
-      Date.valid_civil?(1582, 10, 14).should == false
-      Date.valid_civil?(1582, 10, 15).should == true
-      Date.valid_civil?(1582, 10, 14, Date::ENGLAND).should == true
-    end
-  end
-  
-  ruby_version_is '' ... '1.9' do
     it "should be able to handle negative months and days" do
+      # October 1582 (the Gregorian calendar, Civil Date in 1.8)
+      #     S   M  Tu   W  Th   F   S
+      #       -31 -30 -29 -28 -17 -16
+      #   -15 -14 -13 -12 -11 -10  -9
+      #    -8  -7  -6  -5  -4  -3  -2
+      #    -1
+      Date.valid_civil?(1582, -3, -31).should == Date.civil(1582, 10,  1).jd
+      Date.valid_civil?(1582, -3, -28).should == Date.civil(1582, 10,  4).jd
+      Date.valid_civil?(1582, -3, -27).should == nil
+      Date.valid_civil?(1582, -3, -22).should == nil
+      Date.valid_civil?(1582, -3, -21).should == nil
       Date.valid_civil?(1582, -3, -18).should == nil
       Date.valid_civil?(1582, -3, -17).should == Date.civil(1582, 10, 15).jd
-      
+    
       Date.valid_civil?(2007, -11, -10).should == Date.civil(2007, 2, 19).jd
       Date.valid_civil?(2008, -11, -10).should == Date.civil(2008, 2, 20).jd
     end
   end
 
-  ruby_version_is '1.9' do
+  ruby_version_is "1.9" do
+    it "should be able to determine if a date is valid" do
+      Date.valid_civil?(1582, 10, 14).should == false
+      Date.valid_civil?(1582, 10, 15).should == true
+      Date.valid_civil?(1582, 10, 14, Date::ENGLAND).should == true
+    end
+
+    it "should be able to handle negative months and days" do
+      # October 1582 (the Gregorian calendar, Civil Date in 1.9)
+      #     S   M  Tu   W  Th   F   S
+      #       -21 -20 -19 -18 -17 -16
+      #   -15 -14 -13 -12 -11 -10  -9
+      #    -8  -7  -6  -5  -4  -3  -2
+      #    -1
+      Date.valid_civil?(1582, -3, -22).should == false
+      Date.valid_civil?(1582, -3, -21).should == true
       Date.valid_civil?(1582, -3, -18).should == true
       Date.valid_civil?(1582, -3, -17).should == true
-      
+    
       Date.valid_civil?(2007, -11, -10).should == true
       Date.valid_civil?(2008, -11, -10).should == true
+    end
   end
 
-end
+end
\ No newline at end of file

Modified: MacRuby/trunk/spec/frozen/library/date/commercial_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/commercial_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/commercial_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/commercial'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/commercial', __FILE__)
 
 describe "Date#commercial" do
 
@@ -8,10 +8,23 @@
 
 end
 
+# reference:
+# October 1582 (the Gregorian calendar, Civil Date)
+#   S   M  Tu   W  Th   F   S
+#       1   2   3   4  15  16
+#  17  18  19  20  21  22  23
+#  24  25  26  27  28  29  30
+#  31
+
 describe "Date#valid_commercial?" do
 
   ruby_version_is "" ... "1.9" do
     it "should be able to determine if the date is a valid commercial date" do
+      # October 1582 (the Gregorian calendar, Commercial Date in 1.8)
+      #      M Tu  W Th  F Sa Su
+      # 41:  -  -  -  -  5  6  7
+      # 42:  1  2  3  4  5  6  7
+      # 43:  1  2  3  4  5  6  7
       Date.valid_commercial?(1582, 41, 4).should == nil
       Date.valid_commercial?(1582, 41, 5).should == Date.civil(1582, 10, 15).jd
       # valid_commercial? can't handle dates before the Gregorian calendar
@@ -20,6 +33,11 @@
     end
 
     it "should be able to handle negative week and day numbers" do
+      # October 1582 (the Gregorian calendar, Commercial Date in 1.8)
+      #       M Tu  W Th  F Sa Su
+      # -12:  -  -  -  - -3 -2 -1
+      # -11: -7 -6 -5 -4 -3 -2 -1
+      # -10: -7 -6 -5 -4 -3 -2 -1
       Date.valid_commercial?(1582, -12, -4).should == nil
       Date.valid_commercial?(1582, -12, -3).should == Date.civil(1582, 10, 15).jd
       
@@ -30,6 +48,13 @@
 
   ruby_version_is "1.9" do
     it "should be able to determine if the date is a valid commercial date" do
+      # October 1582 (the Gregorian calendar, Commercial Date in 1.9)
+      #      M Tu  W Th  F Sa Su
+      # 39:  1  2  3  4  5  6  7
+      # 40:  1  2  3  4  5  6  7
+      # 41:  1  2  3  4  5  6  7
+      Date.valid_commercial?(1582, 39, 4).should == true
+      Date.valid_commercial?(1582, 39, 5).should == true
       Date.valid_commercial?(1582, 41, 4).should == true
       Date.valid_commercial?(1582, 41, 5).should == true
       Date.valid_commercial?(1582, 41, 4, Date::ENGLAND).should == true
@@ -37,12 +62,17 @@
     end
 
     it "should be able to handle negative week and day numbers" do
+      # October 1582 (the Gregorian calendar, Commercial Date in 1.9)
+      #       M Tu  W Th  F Sa Su
+      # -12: -7 -6 -5 -4 -3 -2 -1
+      # -11: -7 -6 -5 -4 -3 -2 -1
+      # -10: -7 -6 -5 -4 -3 -2 -1
       Date.valid_commercial?(1582, -12, -4).should == true
       Date.valid_commercial?(1582, -12, -3).should == true
+      
       Date.valid_commercial?(2007, -44, -2).should == true
       Date.valid_commercial?(2008, -44, -2).should == true
     end
   end
 
-
-end
+end
\ No newline at end of file

Modified: MacRuby/trunk/spec/frozen/library/date/constants_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/constants_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/constants_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date constants" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/conversions_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/conversions_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/conversions_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 
 describe "Date#new_start" do
@@ -47,113 +47,115 @@
 # should we rewrite the specs using #send?
 ruby_version_is "" ... "1.9" do
 
-describe "Date#ordinal_to_jd" do
-  it "should convert an ordinal date (year-day) to a Julian day number" do
-    Date.ordinal_to_jd(2007, 55).should == 2454156
+ruby_version_is "" ... "1.9" do
+  describe "Date#ordinal_to_jd" do
+    it "should convert an ordinal date (year-day) to a Julian day number" do
+      Date.ordinal_to_jd(2007, 55).should == 2454156
+    end
   end
-end
-
-describe "Date#jd_to_ordinal" do
-  it "should convert a Julian day number into an ordinal date" do
-    Date.jd_to_ordinal(2454156).should == [2007, 55]
+  
+  describe "Date#jd_to_ordinal" do
+    it "should convert a Julian day number into an ordinal date" do
+      Date.jd_to_ordinal(2454156).should == [2007, 55]
+    end
   end
-end
-
-describe "Date#civil_to_jd" do
-  it "should convert a civil date into a Julian day number" do
-    Date.civil_to_jd(2007, 2, 24).should == 2454156
+  
+  describe "Date#civil_to_jd" do
+    it "should convert a civil date into a Julian day number" do
+      Date.civil_to_jd(2007, 2, 24).should == 2454156
+    end
   end
-end
-
-describe "Date#jd_to_civil" do
-  it "should convert a Julian day into a civil date" do
-    Date.jd_to_civil(2454156).should == [2007, 2, 24]
+  
+  describe "Date#jd_to_civil" do
+    it "should convert a Julian day into a civil date" do
+      Date.jd_to_civil(2454156).should == [2007, 2, 24]
+    end
   end
-end
-
-describe "Date#commercial_to_jd" do
-  it "should convert a commercial date (year - week - day of week) into a Julian day number" do
-    Date.commercial_to_jd(2007, 45, 1).should == 2454410
+  
+  describe "Date#commercial_to_jd" do
+    it "should convert a commercial date (year - week - day of week) into a Julian day number" do
+      Date.commercial_to_jd(2007, 45, 1).should == 2454410
+    end
   end
-end
-
-describe "Date#jd_to_commercial" do
-  it "should convert a Julian day number into a commercial date" do
-    Date.jd_to_commercial(2454410).should == [2007, 45, 1]
+  
+  describe "Date#jd_to_commercial" do
+    it "should convert a Julian day number into a commercial date" do
+      Date.jd_to_commercial(2454410).should == [2007, 45, 1]
+    end
   end
-end
-
-describe "Date#ajd_to_jd" do
-  it "should convert a Astronomical Julian day number into a Julian day number" do
-    Date.ajd_to_jd(2454410).should == [2454410, Rational(1,2)]
-    Date.ajd_to_jd(2454410, 1.to_r / 2).should == [2454411, 0]
+  
+  describe "Date#ajd_to_jd" do
+    it "should convert a Astronomical Julian day number into a Julian day number" do
+      Date.ajd_to_jd(2454410).should == [2454410, Rational(1,2)]
+      Date.ajd_to_jd(2454410, 1.to_r / 2).should == [2454411, 0]
+    end
   end
-end
-
-describe "Date#jd_to_ajd" do
-  it "should convert a Julian day number into a Astronomical Julian day number" do
-    Date.jd_to_ajd(2454410, 0).should == 2454410 - Rational(1, 2)
-    Date.jd_to_ajd(2454410, 1.to_r / 2).should == 2454410
+  
+  describe "Date#jd_to_ajd" do
+    it "should convert a Julian day number into a Astronomical Julian day number" do
+      Date.jd_to_ajd(2454410, 0).should == 2454410 - Rational(1, 2)
+      Date.jd_to_ajd(2454410, 1.to_r / 2).should == 2454410
+    end
   end
-end
-
-describe "Date#day_fraction_to_time" do
-  it "should be able to convert a day fraction into time" do
-    Date.day_fraction_to_time(2).should == [48, 0, 0, 0]
-    Date.day_fraction_to_time(1).should == [24, 0, 0, 0]
-    Date.day_fraction_to_time(1.to_r / 2).should == [12, 0, 0, 0]
-    Date.day_fraction_to_time(1.to_r / 7).should == [3, 25, 42, 1.to_r / 100800]
+  
+  describe "Date#day_fraction_to_time" do
+    it "should be able to convert a day fraction into time" do
+      Date.day_fraction_to_time(2).should == [48, 0, 0, 0]
+      Date.day_fraction_to_time(1).should == [24, 0, 0, 0]
+      Date.day_fraction_to_time(1.to_r / 2).should == [12, 0, 0, 0]
+      Date.day_fraction_to_time(1.to_r / 7).should == [3, 25, 42, 1.to_r / 100800]
+    end
   end
-end
-
-describe "Date#time_to_day_fraction" do
-  it "should be able to convert a time into a day fraction" do
-    Date.time_to_day_fraction(48, 0, 0).should == 2
-    Date.time_to_day_fraction(24, 0, 0).should == 1
-    Date.time_to_day_fraction(12, 0, 0).should == 1.to_r / 2
-    Date.time_to_day_fraction(10, 20, 10).should == 10.to_r / 24 + 20.to_r / (24 * 60) + 10.to_r / (24 * 60 * 60)
+  
+  describe "Date#time_to_day_fraction" do
+    it "should be able to convert a time into a day fraction" do
+      Date.time_to_day_fraction(48, 0, 0).should == 2
+      Date.time_to_day_fraction(24, 0, 0).should == 1
+      Date.time_to_day_fraction(12, 0, 0).should == 1.to_r / 2
+      Date.time_to_day_fraction(10, 20, 10).should == 10.to_r / 24 + 20.to_r / (24 * 60) + 10.to_r / (24 * 60 * 60)
+    end
   end
-end
-
-describe "Date#amjd_to_ajd" do
-  it "shoud be able to convert Astronomical Modified Julian day numbers into Astronomical Julian day numbers" do
-    Date.amjd_to_ajd(10).should == 10 + 2400000 + 1.to_r / 2
+  
+  describe "Date#amjd_to_ajd" do
+    it "shoud be able to convert Astronomical Modified Julian day numbers into Astronomical Julian day numbers" do
+      Date.amjd_to_ajd(10).should == 10 + 2400000 + 1.to_r / 2
+    end
   end
-end
-
-describe "Date#ajd_to_amjd" do
-  it "shoud be able to convert Astronomical Julian day numbers into Astronomical Modified Julian day numbers" do
-    Date.ajd_to_amjd(10000010).should == 10000010 - 2400000 - 1.to_r / 2
+  
+  describe "Date#ajd_to_amjd" do
+    it "shoud be able to convert Astronomical Julian day numbers into Astronomical Modified Julian day numbers" do
+      Date.ajd_to_amjd(10000010).should == 10000010 - 2400000 - 1.to_r / 2
+    end
   end
-end
-
-describe "Date#mjd_to_jd" do
-  it "shoud be able to convert Modified Julian day numbers into Julian day numbers" do
-    Date.mjd_to_jd(2000).should == 2000 + 2400001
+  
+  describe "Date#mjd_to_jd" do
+    it "shoud be able to convert Modified Julian day numbers into Julian day numbers" do
+      Date.mjd_to_jd(2000).should == 2000 + 2400001
+    end
   end
-end
-
-describe "Date#jd_to_mjd" do
-  it "shoud be able to convert Julian day numbers into Modified Julian day numbers" do
-    Date.jd_to_mjd(2500000).should == 2500000 - 2400001
+  
+  describe "Date#jd_to_mjd" do
+    it "shoud be able to convert Julian day numbers into Modified Julian day numbers" do
+      Date.jd_to_mjd(2500000).should == 2500000 - 2400001
+    end
   end
-end
-
-describe "Date#ld_to_jd" do
-  it "should be able to convert the number of days since the Gregorian calendar in Italy into Julian day numbers" do
-    Date.ld_to_jd(450000).should == 450000 + 2299160
+  
+  describe "Date#ld_to_jd" do
+    it "should be able to convert the number of days since the Gregorian calendar in Italy into Julian day numbers" do
+      Date.ld_to_jd(450000).should == 450000 + 2299160
+    end
   end
-end
-
-describe "Date#jd_to_ld" do
-  it "should be able to convert Julian day numbers into the number of days since the Gregorian calendar in Italy" do
-    Date.jd_to_ld(2450000).should == 2450000 - 2299160
+  
+  describe "Date#jd_to_ld" do
+    it "should be able to convert Julian day numbers into the number of days since the Gregorian calendar in Italy" do
+      Date.jd_to_ld(2450000).should == 2450000 - 2299160
+    end
   end
-end
-
-describe "Date#jd_to_wday" do
-  it "should be able to convert a Julian day number into a week day number" do
-    Date.jd_to_wday(2454482).should == 3
+  
+  describe "Date#jd_to_wday" do
+    it "should be able to convert a Julian day number into a week day number" do
+      Date.jd_to_wday(2454482).should == 3
+    end
   end
 end
 

Modified: MacRuby/trunk/spec/frozen/library/date/downto_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/downto_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/downto_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#downto" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/eql_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/eql_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/eql_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#eql?" do
   it "should be able determine equality between date objects" do

Modified: MacRuby/trunk/spec/frozen/library/date/gregorian_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/gregorian_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/gregorian_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#gregorian?" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/hash_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/hash_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/hash_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#hash" do
   

Modified: MacRuby/trunk/spec/frozen/library/date/infinity_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/infinity_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/infinity_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date::Infinity" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/julian_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/julian_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/julian_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#jd" do
 
@@ -39,9 +39,9 @@
 
 end
 
-describe "Date#valid_jd?" do
+ruby_version_is "" ... "1.9" do
+  describe "Date#valid_jd?" do
 
-  ruby_version_is "" ... "1.9" do
     it "should be able to determine if a day number is a valid Julian day number, true for all numbers" do
       # This might need to check the type of the jd parameter. Date.valid_jd?(:number) is of course
       # bogus but returns itself with the current implementation
@@ -49,14 +49,20 @@
       Date.valid_jd?(0).should    ==    0
       Date.valid_jd?(100).should  ==  100
     end
+
   end
+end
 
-  ruby_version_is "1.9" do
+ruby_version_is "1.9" do
+  describe "Date#valid_jd?" do
+
     it "should be able to determine if a day number is a valid Julian day number, true for all numbers" do
+      # This might need to check the type of the jd parameter. Date.valid_jd?(:number) is of course
+      # bogus but returns itself with the current implementation
       Date.valid_jd?(-100).should == true
       Date.valid_jd?(0).should    == true
       Date.valid_jd?(100).should  == true
     end
+
   end
-
-end
+end
\ No newline at end of file

Modified: MacRuby/trunk/spec/frozen/library/date/minus_month_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/minus_month_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/minus_month_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#<<" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/minus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/minus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/minus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#-" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/civil'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/civil', __FILE__)
 
 describe "Date#new" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/ordinal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/ordinal_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/ordinal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,11 +1,28 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/commercial'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/commercial', __FILE__)
 
+# reference:
+# October 1582 (the Gregorian calendar, Civil Date)
+#   S   M  Tu   W  Th   F   S
+#       1   2   3   4  15  16
+#  17  18  19  20  21  22  23
+#  24  25  26  27  28  29  30
+#  31
+
 describe "Date#ordinal" do
 
   ruby_version_is "" ... "1.9" do
     it "should be able to construct a Date object from an ordinal date" do
+      # October 1582 (the Gregorian calendar, Ordinal Date in 1.8)
+      #   S   M  Tu   W  Th   F   S
+      #     274 275 276 277 288 289
+      # 290 291 292 293 294 295 296
+      # 297 298 299 300 301 302 303
+      # 304
+      Date.ordinal(1582, 274).should == Date.civil(1582, 10,  1)
+      Date.ordinal(1582, 277).should == Date.civil(1582, 10,  4)
+      lambda { Date.ordinal(1582, 278) }.should raise_error(ArgumentError)
       lambda { Date.ordinal(1582, 287) }.should raise_error(ArgumentError)
       Date.ordinal(1582, 288).should == Date.civil(1582, 10, 15)
       Date.ordinal(1582, 287, Date::ENGLAND).should == Date.civil(1582, 10, 14, Date::ENGLAND)
@@ -14,7 +31,15 @@
 
   ruby_version_is "1.9" do
     it "should be able to construct a Date object from an ordinal date" do
-      Date.ordinal(1582, 288).should == Date.civil(1582, 10, 25)
+      # October 1582 (the Gregorian calendar, Ordinal Date in 1.9)
+      #   S   M  Tu   W  Th   F   S
+      #     274 275 276 277 278 279
+      # 280 281 282 283 284 285 286
+      # 287 288 289 290 291 292 293
+      # 294
+      Date.ordinal(1582, 274).should == Date.civil(1582, 10,  1)
+      Date.ordinal(1582, 277).should == Date.civil(1582, 10,  4)
+      Date.ordinal(1582, 278).should == Date.civil(1582, 10, 15)
       Date.ordinal(1582, 287, Date::ENGLAND).should == Date.civil(1582, 10, 14, Date::ENGLAND)
     end
   end
@@ -25,29 +50,60 @@
 
   ruby_version_is "" ... "1.9" do
     it "should be able to determine if the date is a valid ordinal date" do
+      # October 1582 (the Gregorian calendar, Ordinal Date in 1.8)
+      #   S   M  Tu   W  Th   F   S
+      #     274 275 276 277 278 279
+      # 280 281 282 283 284 285 286
+      # 287 288 289 290 291 292 293
+      # 294
+      Date.valid_ordinal?(1582, 277).should == Date.civil(1582, 10,  4).jd
+      Date.valid_ordinal?(1582, 278).should == nil
       Date.valid_ordinal?(1582, 287).should == nil
       Date.valid_ordinal?(1582, 288).should == Date.civil(1582, 10, 15).jd
       Date.valid_ordinal?(1582, 287, Date::ENGLAND).should_not == nil
       Date.valid_ordinal?(1582, 287, Date::ENGLAND).should == Date.civil(1582, 10, 14, Date::ENGLAND).jd
     end
-  
+
     it "should be able to handle negative day numbers" do
+      # October 1582 (the Gregorian calendar, Ordinal Date in 1.8)
+      #   S   M  Tu   W  Th   F   S
+      #     -92 -91 -90 -89 -78 -77
+      # -76 -75 -74 -73 -72 -71 -70
+      # -69 -68 -67 -66 -65 -64 -63
+      # -62
+      Date.valid_ordinal?(1582, -89).should == Date.civil(1582, 10,  4).jd
+      Date.valid_ordinal?(1582, -88).should == nil
       Date.valid_ordinal?(1582, -79).should == nil
+      Date.valid_ordinal?(1582, -78).should == Date.civil(1582, 10, 15).jd
       Date.valid_ordinal?(2007, -100).should == Date.valid_ordinal?(2007, 266)
     end
   end
 
   ruby_version_is "1.9" do
     it "should be able to determine if the date is a valid ordinal date" do
-      Date.valid_ordinal?(1582, 287).should == true 
+      # October 1582 (the Gregorian calendar, Ordinal Date in 1.9)
+      #   S   M  Tu   W  Th   F   S
+      #     274 275 276 277 278 279
+      # 280 281 282 283 284 285 286
+      # 287 288 289 290 291 292 293
+      # 294
+      Date.valid_ordinal?(1582, 277).should == true
+      Date.valid_ordinal?(1582, 278).should == true
+      Date.valid_ordinal?(1582, 287).should == true
       Date.valid_ordinal?(1582, 288).should == true
-      Date.valid_ordinal?(1582, 287, Date::ENGLAND).should == true
-      Date.valid_ordinal?(1582, 287, Date::ENGLAND).should == true
     end
-  
+
     it "should be able to handle negative day numbers" do
+      # October 1582 (the Gregorian calendar, Ordinal Date in 1.9)
+      #   S   M  Tu   W  Th   F   S
+      #     -82 -81 -80 -79 -78 -77
+      # -76 -75 -74 -73 -72 -71 -70
+      # -69 -68 -67 -66 -65 -64 -63
+      # -62
       Date.valid_ordinal?(1582, -79).should == true
+      Date.valid_ordinal?(1582, -78).should == true
       Date.valid_ordinal?(2007, -100).should == true
     end
   end
-end
+
+end
\ No newline at end of file

Modified: MacRuby/trunk/spec/frozen/library/date/parse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/parse_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/parse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/parse'
-require File.dirname(__FILE__) + '/shared/parse_us'
-require File.dirname(__FILE__) + '/shared/parse_eu'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/parse', __FILE__)
+require File.expand_path('../shared/parse_us', __FILE__)
+require File.expand_path('../shared/parse_eu', __FILE__)
 require 'date'
 
 describe "Date#parse" do
@@ -50,16 +50,7 @@
       d = Date.parse("10100")
       d.should == Date.civil(10, 4, 10)
     end
-  end
 
-  ruby_version_is "1.9" do
-    it "can handle YYDDD as year and day number" do
-      d = Date.parse("10100")
-      d.should == Date.civil(2010, 4, 10)
-    end
-  end
-
-  ruby_version_is "" ... "1.9" do
     it "can handle YYMMDD as year month and day" do
       d = Date.parse("201023")
       d.should == Date.civil(20, 10, 23)
@@ -67,7 +58,12 @@
   end
 
   ruby_version_is "1.9" do
-    it "can handle YYMMDD as year month and day" do
+    it "can handle YYDDD as year and day number in 1969--2068" do
+      d = Date.parse("10100")
+      d.should == Date.civil(2010, 4, 10)
+    end
+
+    it "can handle YYMMDD as year month and day in 1969--2068" do
       d = Date.parse("201023")
       d.should == Date.civil(2020, 10, 23)
     end
@@ -152,19 +148,19 @@
 
     ruby_version_is "" ... "1.9" do
       it "parses a YY.MM.DD string into a Date object" do
-        d = Date.parse("10.01.07")
-        d.year.should  == 10
-        d.month.should == 1
-        d.day.should   == 7
+	d = Date.parse("10.01.07")
+	d.year.should  == 10
+	d.month.should == 1
+	d.day.should   == 7
       end
     end
 
     ruby_version_is "1.9" do
       it "parses a YY.MM.DD string into a Date object" do
-        d = Date.parse("10.01.07")
-        d.year.should  == 2010
-        d.month.should == 1
-        d.day.should   == 7
+	d = Date.parse("10.01.07")
+	d.year.should  == 2010
+	d.month.should == 1
+	d.day.should   == 7
       end
     end
 

Modified: MacRuby/trunk/spec/frozen/library/date/relationship_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/relationship_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/relationship_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#===" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/shared/commercial.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/shared/commercial.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/shared/commercial.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -6,7 +6,18 @@
       d.month.should == 10
       d.day.should   == 15
     end
+  end
 
+  ruby_version_is "1.9" do
+    it "creates a Date for Julian Day Number day 0 by default" do
+      d = Date.send(@method)
+      d.year.should  == -4712
+      d.month.should == 1
+      d.day.should   == 1
+    end
+  end
+
+  ruby_version_is "" ... "1.9" do
     it "Creates a Date for the friday in the year and week given" do
       d = Date.send(@method, 2000, 1)
       d.year.should  == 2000
@@ -17,13 +28,6 @@
   end
 
   ruby_version_is "1.9" do
-    it "creates a Date for the day of Julian calendar reform in Italy by default" do
-      d = Date.send(@method)
-      d.year.should  == -4712
-      d.month.should == 1
-      d.day.should   == 1
-    end
-
     it "Creates a Date for the monday in the year and week given" do
       d = Date.send(@method, 2000, 1)
       d.year.should  == 2000
@@ -55,4 +59,4 @@
     lambda { Date.send(@method, 2003, 52, 0) }.should raise_error(ArgumentError)
     lambda { Date.send(@method, 2003, 52, 8) }.should raise_error(ArgumentError)
   end
-end
+end
\ No newline at end of file

Modified: MacRuby/trunk/spec/frozen/library/date/shared/parse_eu.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/shared/parse_eu.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/shared/parse_eu.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -30,6 +30,13 @@
       d.month.should == 1
       d.day.should   == 7
     end
+
+    it "can parse a MM-DD-YY string into a Date object NOT using the year digits as 20XX" do
+      d = Date.parse("10#{@sep}01#{@sep}07", false)
+      d.year.should  == 10
+      d.month.should == 1
+      d.day.should   == 7
+    end
   end
 
   it "can parse a MM-DD-YY string into a Date object using the year digits as 20XX" do

Modified: MacRuby/trunk/spec/frozen/library/date/shared/parse_us.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/shared/parse_us.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/shared/parse_us.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -30,18 +30,32 @@
   end
 
   ruby_version_is "1.9" do
-    it "parses a DD#{@sep}MM#{@sep}YYYY string into a Date object" do
+    it "parses a MM#{@sep}DD#{@sep}YYYY string into a Date object" do
       d = Date.parse("10#{@sep}01#{@sep}2007")
       d.year.should  == 2007
       d.month.should == 1
       d.day.should   == 10
     end
 
-    it "parses a YY#{@sep}MM#{@sep}DD string into a Date object" do
+    it "parses a MM#{@sep}DD#{@sep}YY string into a Date object" do
       d = Date.parse("10#{@sep}01#{@sep}07")
       d.year.should  == 2010
       d.month.should == 1
       d.day.should   == 7
     end
+
+    it "parses a MM#{@sep}DD#{@sep}YY string into a Date object NOT using the year digits as 20XX" do
+      d = Date.parse("10#{@sep}01#{@sep}07", false)
+      d.year.should  == 10
+      d.month.should == 1
+      d.day.should   == 7
+    end
+
+    it "parses a MM#{@sep}DD#{@sep}YY string into a Date object using the year digits as 20XX" do
+      d = Date.parse("10#{@sep}01#{@sep}07", true)
+      d.year.should  == 2010
+      d.month.should == 1
+      d.day.should   == 7
+    end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/date/step_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/step_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/step_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#step" do
   

Modified: MacRuby/trunk/spec/frozen/library/date/strftime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/strftime_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/strftime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#strftime" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/strptime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/strptime_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/strptime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#strptime" do
 

Modified: MacRuby/trunk/spec/frozen/library/date/upto_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/date/upto_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/date/upto_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'date' 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Date#upto" do
   

Added: MacRuby/trunk/spec/frozen/library/datetime/_strptime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/_strptime_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/_strptime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime._strptime" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/civil_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/civil_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/civil_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.civil" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/commercial_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/commercial_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/commercial_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.commercial" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/hour_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/hour_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/hour_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#hour" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/httpdate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/httpdate_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/httpdate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.httpdate" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/iso8601_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/iso8601_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/iso8601_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,10 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.iso8601" do
+  it "needs to be reviewed for spec completeness"
+end
+
+describe "DateTime#iso8601" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/jd_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/jd_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/jd_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.jd" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/jisx0301_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/jisx0301_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/jisx0301_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,10 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.jisx0301" do
+  it "needs to be reviewed for spec completeness"
+end
+
+describe "DateTime#jisx0301" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/min_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/min_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/min_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#min" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/minute_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/minute_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/minute_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#minute" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/new_offset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/new_offset_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/new_offset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#new_offset" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/new_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.new" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/now_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/now_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/now_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,8 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.now" do
+  it "creates an instance of DateTime" do
+    DateTime.now.should be_an_instance_of(DateTime)
+  end
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/offset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/offset_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/offset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#offset" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/ordinal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/ordinal_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/ordinal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.ordinal" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/parse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/parse_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/parse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.parse" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/rfc2822_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/rfc2822_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/rfc2822_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.rfc2822" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/rfc3339_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/rfc3339_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/rfc3339_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,10 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.rfc3339" do
+  it "needs to be reviewed for spec completeness"
+end
+
+describe "DateTime#rfc3339" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/rfc822_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/rfc822_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/rfc822_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.rfc822" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/sec_fraction_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/sec_fraction_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/sec_fraction_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#sec_fraction" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/sec_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/sec_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/sec_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#sec" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/second_fraction_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/second_fraction_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/second_fraction_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#second_fraction" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/second_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/second_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/second_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#second" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/strftime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/strftime_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/strftime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,26 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+ruby_version_is "1.9.1" do
+  describe "DateTime#strftime" do
+    it "shows the number of fractional seconds with leading zeroes" do
+      DateTime.civil(2000, 4, 6).strftime("%N").should == "000000000"
+    end
+
+    it "shows the number of fractional seconds with leading zeroes to two decimal places" do
+      DateTime.civil(2000, 4, 6).strftime("%2N").should == "00"
+    end
+
+    it "shows the number of fractional milliseconds with leading zeroes" do
+      DateTime.civil(2000, 4, 6).strftime("%3N").should == "000"
+    end
+
+    it "shows the number of fractional microseconds with leading zeroes" do
+      DateTime.civil(2000, 4, 6).strftime("%6N").should == "000000"
+    end
+
+    it "shows the number of fractional nanoseconds with leading zeroes" do
+      DateTime.civil(2000, 4, 6).strftime("%9N").should == "000000000"
+    end
+  end
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/strptime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/strptime_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/strptime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.strptime" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/to_date_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/to_date_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/to_date_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#to_date" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/to_datetime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/to_datetime_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/to_datetime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#to_datetime" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/to_s_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#to_s" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/to_time_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/to_time_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/to_time_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#to_time" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/xmlschema_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/xmlschema_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/xmlschema_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,10 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime.xmlschema" do
+  it "needs to be reviewed for spec completeness"
+end
+
+describe "DateTime#xmlschema" do
+  it "needs to be reviewed for spec completeness"
+end

Added: MacRuby/trunk/spec/frozen/library/datetime/zone_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/datetime/zone_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/datetime/zone_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "DateTime#zone" do
+  it "needs to be reviewed for spec completeness"
+end

Modified: MacRuby/trunk/spec/frozen/library/delegate/frozen_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/delegate/frozen_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/delegate/frozen_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'delegate'
 
 describe "SimpleDelegator when frozen" do

Modified: MacRuby/trunk/spec/frozen/library/delegate/marshal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/delegate/marshal_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/delegate/marshal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'delegate'
 
 describe "SimpleDelegator" do

Modified: MacRuby/trunk/spec/frozen/library/delegate/method_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/delegate/method_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/delegate/method_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 require 'delegate'
 
 describe "SimpleDelegator#method" do

Modified: MacRuby/trunk/spec/frozen/library/delegate/send_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/delegate/send_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/delegate/send_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 require 'delegate'
 
 describe "SimpleDelegator.new" do
@@ -16,11 +16,20 @@
     lambda{ @delegate.priv }.should raise_error( NoMethodError )
   end
 
-  ruby_bug "redmine:2206", "1.8.7" do
-    it "forwards private method calls made via send or __send__" do
-      @delegate.send(:priv, 42).should == [:priv, 42]
-      @delegate.__send__(:priv, 42).should == [:priv, 42]
-      lambda{ @delegate.__send__(:priv, 42){@delegate.priv} }.should raise_error( NoMethodError )
+  ruby_version_is "" ... "1.9" do
+    ruby_bug "redmine:2206", "1.8.7" do
+      it "forwards private method calls made via send or __send__" do
+	@delegate.send(:priv, 42).should == [:priv, 42]
+	@delegate.__send__(:priv, 42).should == [:priv, 42]
+	lambda{ @delegate.__send__(:priv, 42){@delegate.priv} }.should raise_error( NoMethodError )
+      end
     end
   end
+
+  ruby_version_is "1.9" do
+    it "doesn't forward private method calls even via send or __send__" do
+      lambda{ @delegate.send(:priv, 42) }.should raise_error( NoMethodError )
+      lambda{ @delegate.__send__(:priv, 42) }.should raise_error( NoMethodError )
+    end
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/update'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/update', __FILE__)
 
 describe "Digest::MD5#<<" do
  it_behaves_like(:md5_update, :<<)

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/block_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/block_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/block_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::MD5#block_length" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/digest_bang_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/digest_bang_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/digest_bang_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::MD5#digest!" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/digest_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/digest_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/digest_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::MD5#digest_length" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/digest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/digest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/digest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::MD5#digest" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/equal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/equal_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/equal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::MD5#==" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/hexdigest_bang_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/hexdigest_bang_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/hexdigest_bang_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::MD5#hexdigest!" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/hexdigest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/hexdigest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/hexdigest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::MD5#hexdigest" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::MD5#inspect" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Digest::MD5#length" do
   it_behaves_like :md5_length, :length

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/reset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/reset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/reset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::MD5#reset" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Digest::MD5#size" do
   it_behaves_like :md5_length, :size

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 require 'digest/md5'
 
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::MD5#to_s" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/md5/update_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/md5/update_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/md5/update_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/update'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/update', __FILE__)
 
 describe "Digest::MD5#update" do
   it_behaves_like :md5_update, :update

Modified: MacRuby/trunk/spec/frozen/library/digest/sha1/digest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha1/digest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha1/digest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA1#digest" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/update'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/update', __FILE__)
 
 describe "Digest::SHA256#<<" do
  it_behaves_like(:sha256_update, :<<)

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/block_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/block_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/block_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA256#block_length" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/digest_bang_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/digest_bang_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/digest_bang_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA256#digest!" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/digest_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/digest_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/digest_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA256#digest_length" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/digest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/digest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/digest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA256#digest" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/equal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/equal_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/equal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA256#==" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/hexdigest_bang_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/hexdigest_bang_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/hexdigest_bang_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA256#hexdigest!" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/hexdigest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/hexdigest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/hexdigest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA256#hexdigest" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA256#inspect" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Digest::SHA256#length" do
   it_behaves_like :sha256_length, :length

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/reset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/reset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/reset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA256#reset" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Digest::SHA256#size" do
   it_behaves_like :sha256_length, :size

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA256#to_s" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/update_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha256/update_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha256/update_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/update'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/update', __FILE__)
 
 describe "Digest::SHA256#update" do
   it_behaves_like :sha256_update, :update

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/update'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/update', __FILE__)
 
 describe "Digest::SHA384#<<" do
  it_behaves_like(:sha384_update, :<<)

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/block_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/block_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/block_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA384#block_length" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/digest_bang_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/digest_bang_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/digest_bang_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA384#digest!" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/digest_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/digest_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/digest_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA384#digest_length" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/digest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/digest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/digest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA384#digest" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/equal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/equal_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/equal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA384#==" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/hexdigest_bang_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/hexdigest_bang_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/hexdigest_bang_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA384#hexdigest!" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/hexdigest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/hexdigest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/hexdigest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA384#hexdigest" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA384#inspect" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Digest::SHA384#length" do
   it_behaves_like :sha384_length, :length

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/reset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/reset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/reset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA384#reset" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Digest::SHA384#size" do
   it_behaves_like :sha384_length, :size

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA384#to_s" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/update_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha384/update_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha384/update_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/update'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/update', __FILE__)
 
 describe "Digest::SHA384#update" do
   it_behaves_like :sha384_update, :update

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/update'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/update', __FILE__)
 
 describe "Digest::SHA512#<<" do
  it_behaves_like(:sha512_update, :<<)

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/block_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/block_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/block_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA512#block_length" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/digest_bang_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/digest_bang_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/digest_bang_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA512#digest!" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/digest_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/digest_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/digest_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA512#digest_length" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/digest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/digest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/digest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA512#digest" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/equal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/equal_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/equal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA512#==" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/hexdigest_bang_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/hexdigest_bang_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/hexdigest_bang_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA512#hexdigest!" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/hexdigest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/hexdigest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/hexdigest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA512#hexdigest" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA512#inspect" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Digest::SHA512#length" do
   it_behaves_like :sha512_length, :length

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/reset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/reset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/reset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA512#reset" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Digest::SHA512#size" do
   it_behaves_like :sha512_length, :size

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 
 describe "Digest::SHA512#to_s" do
 

Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/update_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/digest/sha512/update_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/digest/sha512/update_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
-require File.dirname(__FILE__) + '/shared/update'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
+require File.expand_path('../shared/update', __FILE__)
 
 describe "Digest::SHA512#update" do
   it_behaves_like :sha512_update, :update

Modified: MacRuby/trunk/spec/frozen/library/drb/config_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/config_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/config_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/current_server_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/current_server_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/current_server_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/__drbref_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/__drbref_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/__drbref_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/__drburi_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/__drburi_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/__drburi_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/_dump_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/_dump_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/_dump_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/_load_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/_load_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/_load_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/eql_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/eql_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/eql_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/equal_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/equal_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/equal_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/hash_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/hash_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/hash_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/method_missing_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/method_missing_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/method_missing_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/new_with_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/new_with_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/new_with_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/new_with_uri_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/new_with_uri_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/new_with_uri_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/prepare_backtrace_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/prepare_backtrace_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/prepare_backtrace_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/pretty_print_cycle_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/pretty_print_cycle_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/pretty_print_cycle_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/pretty_print_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/pretty_print_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/pretty_print_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/respond_to_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/respond_to_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/respond_to_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/drbobject/with_friend_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/drbobject/with_friend_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/drbobject/with_friend_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/fetch_server_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/fetch_server_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/fetch_server_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/front_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/front_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/front_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/here_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/here_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/here_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/install_acl_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/install_acl_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/install_acl_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/install_id_conv_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/install_id_conv_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/install_id_conv_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/primary_server_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/primary_server_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/primary_server_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/regist_server_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/regist_server_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/regist_server_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/remove_server_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/remove_server_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/remove_server_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/start_service_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/start_service_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/start_service_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/test_server'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/test_server', __FILE__)
 require 'drb'
 
 describe "DRb.start_service" do

Modified: MacRuby/trunk/spec/frozen/library/drb/stop_service_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/stop_service_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/stop_service_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "DRb.stop_service" do
   before :all do

Modified: MacRuby/trunk/spec/frozen/library/drb/thread_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/thread_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/thread_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/to_id_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/to_id_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/to_id_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/to_obj_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/to_obj_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/to_obj_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/drb/uri_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/drb/uri_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/drb/uri_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/enumerator/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/enumerator/each'
+require File.expand_path('../../../shared/enumerator/each', __FILE__)
 
 ruby_version_is "1.8.7"..."1.9" do
   describe "Enumerator#each" do

Modified: MacRuby/trunk/spec/frozen/library/enumerator/each_with_index_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/each_with_index_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/each_with_index_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is "1.8.7"..."1.9" do
-  require File.dirname(__FILE__) + '/../../shared/enumerator/with_index'
+  require File.expand_path('../../../shared/enumerator/with_index', __FILE__)
 
   describe "Enumerator#each_with_index" do
     it_behaves_like(:enum_with_index, :each_with_index)

Modified: MacRuby/trunk/spec/frozen/library/enumerator/enum_cons_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/enum_cons_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/enum_cons_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
   require 'enumerator'
-  require File.dirname(__FILE__) + '/../../shared/enumerator/enum_cons'
+  require File.expand_path('../../../shared/enumerator/enum_cons', __FILE__)
   
   describe "Enumerator#enum_cons" do
     it_behaves_like(:enum_cons, :enum_cons)

Modified: MacRuby/trunk/spec/frozen/library/enumerator/enum_for_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/enum_for_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/enum_for_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
   require 'enumerator'
-  require File.dirname(__FILE__) + '/../../shared/enumerator/enum_for'
+  require File.expand_path('../../../shared/enumerator/enum_for', __FILE__)
   
   describe "#enum_for" do
     it_behaves_like :enum_for, :enum_for

Modified: MacRuby/trunk/spec/frozen/library/enumerator/enum_slice_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/enum_slice_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/enum_slice_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../fixtures/enumerator/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../fixtures/enumerator/classes', __FILE__)
 
 ruby_version_is ""..."1.9" do
 require 'enumerator'
@@ -8,7 +8,7 @@
     it "returns an enumerator of the receiver with iteration of each_slice for each slice of n elemts" do
       a = []
       enum = EnumSpecs::Numerous.new.enum_slice(4)
-      enum.should be_kind_of(enumerator_class)
+      enum.should be_an_instance_of(enumerator_class)
       enum.each { |e| a << e }
       a.should == [[2, 5, 3, 6], [1, 4]]
     end  

Modified: MacRuby/trunk/spec/frozen/library/enumerator/enum_with_index_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/enum_with_index_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/enum_with_index_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,14 +1,14 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do 
-  require File.dirname(__FILE__) + '/../../fixtures/enumerator/classes'
+  require File.expand_path('../../../fixtures/enumerator/classes', __FILE__)
   require 'enumerator'
 
   describe "Enumerator#enum_with_index" do
     it "returns an enumerator of the receiver with an iteration of each_with_index" do
       a = []
       enum = EnumSpecs::Numerous.new.enum_with_index
-      enum.should be_kind_of(enumerator_class)
+      enum.should be_an_instance_of(enumerator_class)
       enum.each { |e| a << e }
       a.should == [[2, 0], [5, 1], [3, 2], [6, 3], [1, 4], [4, 5]]
     end

Modified: MacRuby/trunk/spec/frozen/library/enumerator/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
   require 'enumerator'
-  require File.dirname(__FILE__) + '/../../shared/enumerator/new'
+  require File.expand_path('../../../shared/enumerator/new', __FILE__)
 
   describe "Enumerator.new" do
     it "requires an argument" do

Modified: MacRuby/trunk/spec/frozen/library/enumerator/next_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/next_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/next_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is "1.8.7"..."1.9" do  
-  require File.dirname(__FILE__) + '/../../shared/enumerator/next'
+  require File.expand_path('../../../shared/enumerator/next', __FILE__)
   require 'enumerator'
   
   describe "Enumerator#next" do

Modified: MacRuby/trunk/spec/frozen/library/enumerator/rewind_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/rewind_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/rewind_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is "1.8.7"..."1.9" do  
-  require File.dirname(__FILE__) + '/../../shared/enumerator/rewind'
+  require File.expand_path('../../../shared/enumerator/rewind', __FILE__)
   require 'enumerator'
 
   describe "Enumerator#rewind" do

Modified: MacRuby/trunk/spec/frozen/library/enumerator/to_enum_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/to_enum_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/to_enum_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
-  require File.dirname(__FILE__) + '/../../shared/enumerator/enum_for'
+  require File.expand_path('../../../shared/enumerator/enum_for', __FILE__)
   require 'enumerator'
 
   describe "#to_enum" do

Modified: MacRuby/trunk/spec/frozen/library/enumerator/with_index_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/enumerator/with_index_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/enumerator/with_index_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is "1.8.7"..."1.9" do
-  require File.dirname(__FILE__) + '/../../shared/enumerator/with_index'
+  require File.expand_path('../../../shared/enumerator/with_index', __FILE__)
 
   describe "Enumerator#with_index" do
     it_behaves_like(:enum_with_index, :with_index)

Modified: MacRuby/trunk/spec/frozen/library/erb/def_class_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/def_class_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/def_class_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe 'ERB#def_class' do
 

Modified: MacRuby/trunk/spec/frozen/library/erb/def_method_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/def_method_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/def_method_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe 'ERB#def_method' do
 

Modified: MacRuby/trunk/spec/frozen/library/erb/def_module_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/def_module_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/def_module_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe 'ERB#def_module' do
 

Modified: MacRuby/trunk/spec/frozen/library/erb/defmethod/def_erb_method_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/defmethod/def_erb_method_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/defmethod/def_erb_method_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe 'ERB::DefMethod.def_erb_method' do
 

Modified: MacRuby/trunk/spec/frozen/library/erb/filename_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/filename_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/filename_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "ERB#filename" do
   # TODO: why does this fail on rubinius?

Modified: MacRuby/trunk/spec/frozen/library/erb/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "ERB.new" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/erb/result_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/result_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/result_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "ERB#result" do
 

Modified: MacRuby/trunk/spec/frozen/library/erb/run_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/run_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/run_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "ERB#run" do
   # TODO: what is this? why does it not use

Modified: MacRuby/trunk/spec/frozen/library/erb/src_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/src_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/src_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,53 +1,33 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "ERB#src" do
 
-  ruby_version_is "" ... "1.8.7" do
-    it "returns the compiled ruby code" do
-      input = <<'END'
+  it "returns the compiled ruby code evaluated to a String" do
+    # note that what concrete code is emitted is not guaranteed.
+
+    input = <<'END'
 <ul>
 <% for item in list %>
-<li><%= item %></li>
+  <li><%= item %>
 <% end %>
 </ul>
 END
-      expected = <<'END'
-_erbout = ''; _erbout.concat "<ul>\n"
- for item in list ; _erbout.concat "\n"
-_erbout.concat "<li>"; _erbout.concat(( item ).to_s); _erbout.concat "</li>\n"
- end ; _erbout.concat "\n"
-_erbout.concat "</ul>\n"
-_erbout
-END
 
-      expected.chomp!
-      ERB.new(input).src.should == expected
-    end
-  end
-
-  ruby_version_is "1.8.7" do
-    it "returns the compiled ruby code" do
-      input = <<'END'
+    expected = <<'END'
 <ul>
-<% for item in list %>
-<li><%= item %></li>
-<% end %>
-</ul>
-END
 
-      expected = <<EOS
-_erbout = ''; _erbout.concat "<ul>\\n"
-;  for item in list ; _erbout.concat "\\n<li>"
-; _erbout.concat(( item ).to_s); _erbout.concat "</li>\\n"
-;  end ; _erbout.concat "\\n</ul>\\n"
+  <li>AAA
 
-; _erbout
-EOS
+  <li>BBB
 
-      expected.chomp!
-      ERB.new(input).src.should == expected
-    end
+  <li>CCC
+
+</ul>
+END
+
+    list = %w[AAA BBB CCC]
+    eval(ERB.new(input).src).should == expected
   end
 
 end

Modified: MacRuby/trunk/spec/frozen/library/erb/util/h_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/util/h_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/util/h_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/html_escape'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/html_escape', __FILE__)
 
 describe "ERB::Util.h" do
   it_behaves_like :erb_util_html_escape, :h

Modified: MacRuby/trunk/spec/frozen/library/erb/util/html_escape_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/util/html_escape_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/util/html_escape_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/html_escape'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/html_escape', __FILE__)
 
 describe "ERB::Util.html_escape" do
   it_behaves_like :erb_util_html_escape, :html_escape

Modified: MacRuby/trunk/spec/frozen/library/erb/util/u_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/util/u_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/util/u_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/url_encode'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/url_encode', __FILE__)
 
 describe "ERB::Util.u" do
   it_behaves_like :erb_util_url_encode, :u

Modified: MacRuby/trunk/spec/frozen/library/erb/util/url_encode_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/erb/util/url_encode_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/erb/util/url_encode_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
 require 'erb'
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/url_encode'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/url_encode', __FILE__)
 
 describe "ERB::Util.url_encode" do
   it_behaves_like :erb_util_url_encode, :url_encode

Modified: MacRuby/trunk/spec/frozen/library/etc/endgrent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/endgrent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/endgrent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/windows'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/windows', __FILE__)
 require 'etc'
 
 describe "Etc.endgrent" do

Modified: MacRuby/trunk/spec/frozen/library/etc/endpwent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/endpwent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/endpwent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/windows'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/windows', __FILE__)
 require 'etc'
 
 describe "Etc.endpwent" do

Modified: MacRuby/trunk/spec/frozen/library/etc/getgrent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/getgrent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/getgrent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/windows'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/windows', __FILE__)
 require 'etc'
 
 describe "Etc.getgrent" do

Modified: MacRuby/trunk/spec/frozen/library/etc/getgrgid_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/getgrgid_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/getgrgid_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'etc'
 
 platform_is :windows do

Modified: MacRuby/trunk/spec/frozen/library/etc/getgrnam_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/getgrnam_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/getgrnam_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'etc'
 
 platform_is :windows do

Modified: MacRuby/trunk/spec/frozen/library/etc/getlogin_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/getlogin_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/getlogin_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'etc'
 
 describe "Etc.getlogin" do

Modified: MacRuby/trunk/spec/frozen/library/etc/getpwent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/getpwent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/getpwent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/windows'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/windows', __FILE__)
 require 'etc'
 
 describe "Etc.getpwent" do

Modified: MacRuby/trunk/spec/frozen/library/etc/getpwnam_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/getpwnam_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/getpwnam_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'etc'
 
 platform_is :windows do

Modified: MacRuby/trunk/spec/frozen/library/etc/getpwuid_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/getpwuid_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/getpwuid_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'etc'
 
 platform_is :windows do

Modified: MacRuby/trunk/spec/frozen/library/etc/group_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/group_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/group_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/windows'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/windows', __FILE__)
 require 'etc'
 
 describe "Etc.group" do

Modified: MacRuby/trunk/spec/frozen/library/etc/passwd_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/passwd_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/passwd_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'etc'

Modified: MacRuby/trunk/spec/frozen/library/etc/setgrent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/setgrent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/setgrent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'etc'

Modified: MacRuby/trunk/spec/frozen/library/etc/setpwent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/etc/setpwent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/etc/setpwent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'etc'

Added: MacRuby/trunk/spec/frozen/library/fiber/alive_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/fiber/alive_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/fiber/alive_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,48 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+with_feature :fiber_library do
+  require 'fiber'
+
+  describe "Fiber#alive?" do
+    it "returns true for a Fiber that hasn't had #resume called" do
+      fiber = Fiber.new { true }
+      fiber.alive?.should be_true
+    end
+
+    # FIXME: Better description?
+    it "returns true for a Fiber that's yielded to the caller" do
+      fiber = Fiber.new { Fiber.yield }
+      fiber.resume
+      fiber.alive?.should be_true
+    end
+
+    it "returns true when called from its Fiber" do
+      fiber = Fiber.new { fiber.alive?.should be_true }
+      fiber.resume
+    end
+
+    it "doesn't invoke the block associated with the Fiber" do
+      offthehook = mock('do not call')
+      offthehook.should_not_receive(:ring)
+      fiber = Fiber.new { offthehook.ring }
+      fiber.alive?
+    end
+
+    it "returns false for a Fiber that's dead" do
+      fiber = Fiber.new { true }
+      fiber.resume
+      lambda { fiber.resume }.should raise_error(FiberError)
+      fiber.alive?.should be_false
+    end
+
+    it "always returns false for a dead Fiber" do
+      fiber = Fiber.new { true }
+      fiber.resume
+      lambda { fiber.resume }.should raise_error(FiberError)
+      fiber.alive?.should be_false
+      lambda { fiber.resume }.should raise_error(FiberError)
+      fiber.alive?.should be_false
+      fiber.alive?.should be_false
+    end
+  end
+end

Added: MacRuby/trunk/spec/frozen/library/fiber/current_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/fiber/current_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/fiber/current_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,61 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+with_feature :fiber_library do
+  require 'fiber'
+
+  describe "Fiber.current" do
+    it "returns the root Fiber when called outside of a Fiber" do
+      root = Fiber.current
+      root.should be_an_instance_of(Fiber)
+      # We can always transfer to the root Fiber; it will never die
+      5.times do
+        root.transfer.should be_nil
+        root.alive?.should_not be_false #Workaround for bug #1547
+      end
+    end
+
+    it "returns the current Fiber when called from a Fiber" do
+      fiber = Fiber.new do
+        this = Fiber.current
+        this.should be_an_instance_of(Fiber)
+        this.should == fiber
+        this.alive?.should_not be_false # Workaround for bug #1547
+      end
+      fiber.resume
+    end
+
+    it "returns the current Fiber when called from a Fiber that transferred to another" do
+
+      states = []
+      fiber = Fiber.new do
+        states << :fiber
+        this = Fiber.current
+        this.should be_an_instance_of(Fiber)
+        this.should === fiber
+        this.alive?.should_not be_false # Workaround for bug #1547
+      end
+
+      fiber2 = Fiber.new do
+        states << :fiber2
+        fiber.transfer
+        this = Fiber.current
+        this.should be_an_instance_of(Fiber)
+        this.should === fiber2
+        this.alive?.should_not be_false # Workaround for bug #1547
+      end
+
+      fiber3 = Fiber.new do
+        states << :fiber3
+        fiber2.transfer
+        this = Fiber.current
+        this.should be_an_instance_of(Fiber)
+        this.should === fiber3
+        this.alive?.should_not be_false # Workaround for bug #1547
+        fiber2.transfer
+      end
+
+      fiber3.resume
+      states.should == [:fiber3, :fiber2, :fiber]
+    end
+  end
+end

Added: MacRuby/trunk/spec/frozen/library/fiber/resume_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/fiber/resume_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/fiber/resume_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,12 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+with_feature :fiber_library do
+  describe "Fiber#resume" do
+    it "raises a FiberError if the Fiber has transfered control to another Fiber" do
+      fiber1 = Fiber.new { true }
+      fiber2 = Fiber.new { fiber1.transfer; Fiber.yield }
+      fiber2.resume
+      lambda { fiber2.resume }.should raise_error(FiberError)
+    end
+  end
+end

Added: MacRuby/trunk/spec/frozen/library/fiber/transfer_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/fiber/transfer_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/fiber/transfer_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,43 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/fiber/resume', __FILE__)
+
+with_feature :fiber_library do
+  require 'fiber'
+
+  describe "Fiber#transfer" do
+    it_behaves_like :fiber_resume, :transfer
+  end
+
+  describe "Fiber#transfer" do
+    it "transfers control from one Fiber to another when called from a Fiber" do
+      fiber1 = Fiber.new { :fiber1 }
+      fiber2 = Fiber.new { fiber1.transfer; :fiber2 }
+      fiber2.resume.should == :fiber1
+    end
+
+    it "can be invoked from the same Fiber it transfers control to" do
+      states = []
+      fiber = Fiber.new { states << :start; fiber.transfer; states << :end }
+      fiber.transfer
+      states.should == [:start, :end]
+
+      states = []
+      fiber = Fiber.new { states << :start; fiber.transfer; states << :end }
+      fiber.resume
+      states.should == [:start, :end]
+    end
+
+    it "can transfer control to a Fiber that has transfered to another Fiber" do
+      states = []
+      fiber1 = Fiber.new { states << :fiber1 }
+      fiber2 = Fiber.new { states << :fiber2_start; fiber1.transfer; states << :fiber2_end}
+      fiber2.resume.should == [:fiber2_start, :fiber1]
+      fiber2.transfer.should == [:fiber2_start, :fiber1, :fiber2_end]
+    end
+
+    it "raises a FiberError when transferring to a Fiber which resumes itself" do
+      fiber = Fiber.new { fiber.resume }
+      lambda { fiber.transfer }.should raise_error(FiberError)
+    end
+  end
+end

Modified: MacRuby/trunk/spec/frozen/library/ftools/catname_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ftools/catname_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ftools/catname_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/ftools/chmod_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ftools/chmod_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ftools/chmod_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/ftools/compare_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ftools/compare_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ftools/compare_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/ftools/copy_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ftools/copy_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ftools/copy_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/ftools/install_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ftools/install_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ftools/install_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/ftools/makedirs_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ftools/makedirs_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ftools/makedirs_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/ftools/move_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ftools/move_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ftools/move_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/ftools/safe_unlink_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ftools/safe_unlink_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ftools/safe_unlink_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/ftools/syscopy_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ftools/syscopy_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ftools/syscopy_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
 

Modified: MacRuby/trunk/spec/frozen/library/generator/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/generator/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/generator/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
   
-  require File.dirname(__FILE__) + '/fixtures/common'
+  require File.expand_path('../fixtures/common', __FILE__)
   
   describe "Generator#each" do
     it "enumerates the elements" do

Modified: MacRuby/trunk/spec/frozen/library/generator/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/generator/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/generator/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9"  do
   require 'generator'

Modified: MacRuby/trunk/spec/frozen/library/generator/next_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/generator/next_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/generator/next_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
-  require File.dirname(__FILE__) + '/fixtures/common'
+  require File.expand_path('../fixtures/common', __FILE__)
 
   describe "Generator#next?" do
     it "returns false for empty generator" do

Modified: MacRuby/trunk/spec/frozen/library/generator/rewind_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/generator/rewind_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/generator/rewind_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
   
-  require File.dirname(__FILE__) + '/fixtures/common'
+  require File.expand_path('../fixtures/common', __FILE__)
 
   describe "Generator#rewind" do
     it "does nothing for empty generator" do

Modified: MacRuby/trunk/spec/frozen/library/getoptlong/each_option_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/getoptlong/each_option_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/getoptlong/each_option_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'getoptlong'
-require File.dirname(__FILE__) + '/shared/each'
+require File.expand_path('../shared/each', __FILE__)
 
 describe "GetoptLong#each_option" do
   it_behaves_like(:getoptlong_each, :each_option)

Modified: MacRuby/trunk/spec/frozen/library/getoptlong/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/getoptlong/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/getoptlong/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'getoptlong'
-require File.dirname(__FILE__) + '/shared/each'
+require File.expand_path('../shared/each', __FILE__)
 
 describe "GetoptLong#each" do
   it_behaves_like(:getoptlong_each, :each)

Modified: MacRuby/trunk/spec/frozen/library/getoptlong/error_message_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/getoptlong/error_message_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/getoptlong/error_message_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'getoptlong'
 
 describe "GetoptLong#error_message" do

Modified: MacRuby/trunk/spec/frozen/library/getoptlong/get_option_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/getoptlong/get_option_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/getoptlong/get_option_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'getoptlong'
-require File.dirname(__FILE__) + '/shared/get'
+require File.expand_path('../shared/get', __FILE__)
 
 describe "GetoptLong#get_option" do
   it_behaves_like(:getoptlong_get, :get_option)

Modified: MacRuby/trunk/spec/frozen/library/getoptlong/get_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/getoptlong/get_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/getoptlong/get_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'getoptlong'
-require File.dirname(__FILE__) + '/shared/get'
+require File.expand_path('../shared/get', __FILE__)
 
 describe "GetoptLong#get" do
   it_behaves_like(:getoptlong_get, :get)

Modified: MacRuby/trunk/spec/frozen/library/getoptlong/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/getoptlong/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/getoptlong/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'getoptlong'
 
 describe "GetoptLong#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/getoptlong/ordering_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/getoptlong/ordering_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/getoptlong/ordering_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'getoptlong'
 
 describe "GetoptLong#ordering=" do

Modified: MacRuby/trunk/spec/frozen/library/getoptlong/set_options_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/getoptlong/set_options_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/getoptlong/set_options_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'getoptlong'
 
 describe "GetoptLong#set_options" do

Modified: MacRuby/trunk/spec/frozen/library/getoptlong/terminate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/getoptlong/terminate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/getoptlong/terminate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'getoptlong'
 
 describe "GetoptLong#terminate" do

Modified: MacRuby/trunk/spec/frozen/library/getoptlong/terminated_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/getoptlong/terminated_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/getoptlong/terminated_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'getoptlong'
 
 describe "GetoptLong#terminated?" do

Modified: MacRuby/trunk/spec/frozen/library/iconv/charset_map_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/charset_map_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/charset_map_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'iconv'
 
 describe "Iconv.charset_map" do

Modified: MacRuby/trunk/spec/frozen/library/iconv/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'iconv'
 
 describe "Iconv#close" do
@@ -17,7 +17,7 @@
   it "returns a string containing the byte sequence to change the output buffer to its initial shift state" do
     Iconv.open "ISO-2022-JP", "UTF-8" do |cd|
       cd.iconv("\343\201\262")
-      cd.close.should == "\e(B"
+      cd.close.should == encode("\e(B", "iso-2022-jp")
     end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/iconv/conv_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/conv_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/conv_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,16 +1,16 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/initialize_exceptions'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/initialize_exceptions', __FILE__)
 require 'iconv'
 
 describe "Iconv.conv" do
   it_behaves_like :iconv_initialize_exceptions, :conv, "test"
 
   it "acts exactly as if opening a converter and invoking #iconv once" do
-    Iconv.conv("utf-8", "iso-8859-1", "expos\xe9").should == "expos\xc3\xa9"
+    Iconv.conv("utf-8", "iso-8859-1", "expos\xe9").should == encode("expos\xc3\xa9", "utf-8")
 
-    stringlike = mock("string-like")
-    stringlike.should_receive(:to_str).and_return("cacha\xc3\xa7a")
-    Iconv.conv("iso-8859-1", "utf-8", stringlike).should == "cacha\xe7a"
+    str = mock("string-like")
+    str.should_receive(:to_str).and_return("cacha\xc3\xa7a")
+    Iconv.conv("iso-8859-1", "utf-8", str).should == encode("cacha\xe7a", "iso-8859-1")
 
     Iconv.conv("utf-16", "us-ascii", "a").should equal_utf16("\xfe\xff\0a")
     # each call is completely independent; never retain context!
@@ -20,8 +20,12 @@
 
     Iconv.conv("utf-16", "utf-8", "").should == ""
 
-    lambda { Iconv.conv("us-ascii", "us-ascii", "test\xa9") }.should raise_error(Iconv::IllegalSequence)
+    lambda do
+      Iconv.conv("us-ascii", "us-ascii", "test\xa9")
+    end.should raise_error(Iconv::IllegalSequence)
 
-    lambda { Iconv.conv("utf-8", "utf-8", "euro \xe2") }.should raise_error(Iconv::InvalidCharacter)
+    lambda do
+      Iconv.conv("utf-8", "utf-8", "euro \xe2")
+    end.should raise_error(Iconv::InvalidCharacter)
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/iconv/failure/failed_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/failure/failed_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/failure/failed_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'iconv'
 
 describe "Iconv::Failure#failed" do

Modified: MacRuby/trunk/spec/frozen/library/iconv/failure/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/failure/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/failure/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'iconv'
 
 describe "Iconv::Failure#inspect" do

Modified: MacRuby/trunk/spec/frozen/library/iconv/failure/success_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/failure/success_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/failure/success_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'iconv'
 
 describe "Iconv::Failure#success" do

Modified: MacRuby/trunk/spec/frozen/library/iconv/failure_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/failure_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/failure_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'iconv'
 
 describe "Iconv::Failure" do

Modified: MacRuby/trunk/spec/frozen/library/iconv/iconv_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/iconv_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/iconv_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/initialize_exceptions'
+# -*- encoding: utf-8 -*-
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/initialize_exceptions', __FILE__)
 require 'iconv'
 
 # These specs assume the Iconv implementation supports at least
@@ -109,7 +110,8 @@
 
 describe "Iconv.iconv" do
   it "converts a series of strings with a single converter" do
-    Iconv.iconv("utf-16be", "us-ascii", "abc", "de").should == ["\0a\0b\0c", "\0d\0e"]
+    ary = [encode("\0a\0b\0c", "utf-16be"), encode("\0d\0e", "utf-16be")]
+    Iconv.iconv("utf-16be", "us-ascii", "abc", "de").should == ary
     # BOM only on first string
     Iconv.iconv("utf-16", "utf-8", "abc", "de").should equal_utf16(["\xfe\xff\0a\0b\0c", "\0d\0e"])
   end
@@ -159,7 +161,7 @@
 
 describe "The 'utf-16be' decoder" do
   it "does not emit a byte-order mark" do
-    Iconv.iconv("utf-16be", "utf-8", "ab").should == ["\0a\0b"]
+    Iconv.iconv("utf-16be", "utf-8", "ab").should == [encode("\0a\0b", "utf-16be")]
   end
 
   it "treats possible byte-order marks as regular characters" do
@@ -170,7 +172,7 @@
 
 describe "The 'utf-16le' decoder" do
   it "does not emit a byte-order mark" do
-    Iconv.iconv("utf-16le", "utf-8", "ab").should == ["a\0b\0"]
+    Iconv.iconv("utf-16le", "utf-8", "ab").should == [encode("a\0b\0", "utf-16le")]
   end
 
   it "treats possible byte-order marks as regular characters" do

Modified: MacRuby/trunk/spec/frozen/library/iconv/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/new'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/new', __FILE__)
 require 'iconv'
 
 describe "Iconv.new" do

Modified: MacRuby/trunk/spec/frozen/library/iconv/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/new'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/new', __FILE__)
 require 'iconv'
 
 describe "Iconv.open" do

Modified: MacRuby/trunk/spec/frozen/library/iconv/shared/new.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/iconv/shared/new.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/iconv/shared/new.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/initialize_exceptions.rb'
-require File.dirname(__FILE__) + '/../fixtures/classes.rb'
+require File.expand_path('../initialize_exceptions.rb', __FILE__)
+require File.expand_path('../../fixtures/classes.rb', __FILE__)
 
 describe :iconv_new, :shared => true do
   it "creates a new encoding converter" do

Modified: MacRuby/trunk/spec/frozen/library/ipaddr/hton_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ipaddr/hton_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ipaddr/hton_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ipaddr'
 
 describe 'IPAddr#hton' do

Modified: MacRuby/trunk/spec/frozen/library/ipaddr/ipv4_conversion_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ipaddr/ipv4_conversion_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ipaddr/ipv4_conversion_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ipaddr'
 
 describe 'IPAddr#ipv4_compat' do

Modified: MacRuby/trunk/spec/frozen/library/ipaddr/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ipaddr/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ipaddr/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ipaddr'
 
 describe "IPAddr#new" do

Modified: MacRuby/trunk/spec/frozen/library/ipaddr/operator_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ipaddr/operator_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ipaddr/operator_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ipaddr'
 
 describe 'IPAddr Operator' do

Modified: MacRuby/trunk/spec/frozen/library/ipaddr/reverse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ipaddr/reverse_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ipaddr/reverse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ipaddr'
 
 describe "IPAddr#reverse" do

Modified: MacRuby/trunk/spec/frozen/library/ipaddr/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ipaddr/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ipaddr/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ipaddr'
 
 describe "IPAddr#to_s" do

Modified: MacRuby/trunk/spec/frozen/library/logger/application/level_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/application/level_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/application/level_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger::Application#level=" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/application/log_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/application/log_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/application/log_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger::Application#log" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/application/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/application/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/application/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger::Application.new" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/application/set_log_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/application/set_log_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/application/set_log_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger::Application#set_log"do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/application/start_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/application/start_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/application/start_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger::Application#start" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/device/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/device/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/device/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger::LogDevice#close" do
   before :each do
@@ -15,13 +15,23 @@
     File.unlink(@file_path) if File.exists?(@file_path)
   end
 
-  it "closes the LogDevice's stream" do
-    @device.close
-    lambda { @device.write("Test") }.should raise_error
+  ruby_version_is "" ... "1.9" do
+    it "closes the LogDevice's stream" do
+      @device.close
+      lambda { @device.write("Test") }.should raise_error
+    end
+ 
+    it "raises an error if it's already closed" do
+      @device.close
+      lambda { @device.close }.should raise_error
+    end
   end
 
-  it "raises an error if it's already closed" do
-    @device.close
-    lambda { @device.close}.should raise_error
+  ruby_version_is "1.9" do
+    it "closes the LogDevice's stream" do
+      @device.close
+      lambda { @device.write("Test") }.should complain(/\Alog writing failed\./)
+    end
   end
+
 end

Modified: MacRuby/trunk/spec/frozen/library/logger/device/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/device/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/device/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger::LogDevice#new" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/device/write_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/device/write_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/device/write_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger::LogDevice#write" do
   before  :each do
@@ -35,8 +35,17 @@
     File.unlink(path)
   end
 
-  it "fails if the device is already closed" do
-    @device.close
-    lambda { @device.write "foo" }.should raise_error
+  ruby_version_is "" ... "1.9" do
+    it "fails if the device is already closed" do
+      @device.close
+      lambda { @device.write "foo" }.should raise_error
+    end
   end
+
+  ruby_version_is "1.9" do
+    it "fails if the device is already closed" do
+      @device.close
+      lambda { @device.write "foo" }.should complain(/\Alog writing failed\./)
+    end
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/logger/logger/add_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/logger/add_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/logger/add_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger#add" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/logger/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/logger/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/logger/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger#close" do
   before :each do
@@ -13,13 +13,22 @@
     File.unlink(@path) if File.exists?(@path)
   end
 
-  it "closes the logging device" do
-    @logger.close
-    lambda { @logger.add(nil, "Foo") }.should raise_error(IOError)
+  ruby_version_is "" ... "1.9" do
+    it "closes the logging device" do
+      @logger.close
+      lambda { @logger.add(nil, "Foo") }.should raise_error(IOError)
+    end
+
+    it "fails when called on a closed device" do
+      @logger.close
+      lambda { @logger.close }.should raise_error(IOError)
+    end
   end
 
-  it "fails when called on a closed device" do
-    @logger.close
-    lambda { @logger.close }.should raise_error(IOError)
+  ruby_version_is "1.9" do
+    it "closes the logging device" do
+      @logger.close
+      lambda { @logger.add(nil, "Foo") }.should complain(/\Alog writing failed\./)
+    end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/logger/logger/datetime_format_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/logger/datetime_format_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/logger/datetime_format_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger#datetime_format" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/logger/debug_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/logger/debug_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/logger/debug_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger#debug?" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/logger/error_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/logger/error_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/logger/error_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger#error?" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/logger/fatal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/logger/fatal_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/logger/fatal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger#fatal?" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/logger/info_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/logger/info_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/logger/info_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger#info?" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/logger/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/logger/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/logger/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger#new" do
 

Modified: MacRuby/trunk/spec/frozen/library/logger/logger/unknown_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/logger/unknown_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/logger/unknown_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger#unknown" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/logger/warn_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/logger/warn_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/logger/warn_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/common'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/common', __FILE__)
 
 describe "Logger#warn?" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/logger/severity_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/logger/severity_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/logger/severity_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'logger'
 
 describe "Logger::Severity" do

Modified: MacRuby/trunk/spec/frozen/library/mathn/bignum/exponent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/bignum/exponent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/bignum/exponent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 describe "Bignum#**" do

Modified: MacRuby/trunk/spec/frozen/library/mathn/complex/Complex_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/complex/Complex_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/complex/Complex_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 ruby_version_is '1.9' do

Modified: MacRuby/trunk/spec/frozen/library/mathn/fixnum/exponent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/fixnum/exponent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/fixnum/exponent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 describe "Fixnum#**" do

Modified: MacRuby/trunk/spec/frozen/library/mathn/float/exponent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/float/exponent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/float/exponent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 describe "Float#**" do

Modified: MacRuby/trunk/spec/frozen/library/mathn/integer/from_prime_division_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/integer/from_prime_division_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/integer/from_prime_division_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 describe "Integer::from_prime_division" do

Modified: MacRuby/trunk/spec/frozen/library/mathn/integer/gcd2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/integer/gcd2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/integer/gcd2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 ruby_version_is ''...'1.9' do

Modified: MacRuby/trunk/spec/frozen/library/mathn/integer/prime_division_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/integer/prime_division_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/integer/prime_division_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 describe "Integer#prime_division" do

Modified: MacRuby/trunk/spec/frozen/library/mathn/math/rsqrt_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/math/rsqrt_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/math/rsqrt_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/rsqrt'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/rsqrt', __FILE__)
 
 describe "Math#rsqrt" do
   it_behaves_like :mathn_math_rsqrt, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/mathn/math/shared/rsqrt.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/math/shared/rsqrt.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/math/shared/rsqrt.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 require 'mathn'
 
 describe :mathn_math_rsqrt, :shared => true do
@@ -13,9 +13,19 @@
     @object.send(:rsqrt, 12.34).should == Math.sqrt!(12.34)
   end
 
-  it "raises an Errno::EDOM if the argument is a negative number" do
-    lambda { @object.send(:rsqrt, -1) }.should raise_error(Errno::EDOM)
-    lambda { @object.send(:rsqrt, -4.0) }.should raise_error(Errno::EDOM)
-    lambda { @object.send(:rsqrt, -16/64) }.should raise_error(Errno::EDOM)
+  ruby_version_is ""..."1.9" do
+    it "raises an Errno::EDOM if the argument is a negative number" do
+      lambda { @object.send(:rsqrt, -1) }.should raise_error(Errno::EDOM)
+      lambda { @object.send(:rsqrt, -4.0) }.should raise_error(Errno::EDOM)
+      lambda { @object.send(:rsqrt, -16/64) }.should raise_error(Errno::EDOM)
+    end
   end
+
+  ruby_version_is "1.9" do
+    it "raises an Math::DomainError if the argument is a negative number" do
+      lambda { @object.send(:rsqrt, -1) }.should raise_error(Math::DomainError)
+      lambda { @object.send(:rsqrt, -4.0) }.should raise_error(Math::DomainError)
+      lambda { @object.send(:rsqrt, -16/64) }.should raise_error(Math::DomainError)
+    end
+  end
 end

Modified: MacRuby/trunk/spec/frozen/library/mathn/math/shared/sqrt.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/math/shared/sqrt.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/math/shared/sqrt.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../fixtures/classes', __FILE__)
 require 'mathn'
 
 describe :mathn_math_sqrt, :shared => true do

Modified: MacRuby/trunk/spec/frozen/library/mathn/math/sqrt_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/math/sqrt_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/math/sqrt_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/sqrt'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/sqrt', __FILE__)
 
 describe "Math#rsqrt" do
   it_behaves_like :mathn_math_sqrt, :_, IncludesMath.new

Modified: MacRuby/trunk/spec/frozen/library/mathn/prime/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/prime/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/prime/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require'mathn'
 
 describe "Prime#each" do

Modified: MacRuby/trunk/spec/frozen/library/mathn/prime/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/prime/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/prime/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 describe "Prime.new" do

Modified: MacRuby/trunk/spec/frozen/library/mathn/prime/next_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/prime/next_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/prime/next_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 describe "Prime#next" do

Modified: MacRuby/trunk/spec/frozen/library/mathn/rational/Rational_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/rational/Rational_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/rational/Rational_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 ruby_version_is '1.9' do

Modified: MacRuby/trunk/spec/frozen/library/mathn/rational/exponent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/rational/exponent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/rational/exponent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 ruby_version_is ''...'1.9' do

Modified: MacRuby/trunk/spec/frozen/library/mathn/rational/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mathn/rational/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mathn/rational/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'mathn'
 
 describe "Rational#inspect" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/I_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/I_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/I_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/identity'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/identity', __FILE__)
 
 describe "Matrix.I" do
   it_behaves_like(:matrix_identity, :I)

Modified: MacRuby/trunk/spec/frozen/library/matrix/clone_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/clone_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/clone_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#clone" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/coerce_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/coerce_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/coerce_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#coerce" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/collect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/collect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/collect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/collect'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/collect', __FILE__)
 require 'matrix'
 
 describe "Matrix#collect" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/column_size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/column_size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/column_size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#column_size" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/column_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/column_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/column_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#column" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/column_vector_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/column_vector_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/column_vector_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix.column_vector" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/column_vectors_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/column_vectors_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/column_vectors_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#column_vectors" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/columns_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/columns_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/columns_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix.columns" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/constructor_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/constructor_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/constructor_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix.[]" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/det_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/det_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/det_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/determinant'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/determinant', __FILE__)
 require 'matrix'
 
 describe "Matrix#det" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/determinant_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/determinant_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/determinant_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/determinant'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/determinant', __FILE__)
 require 'matrix'
 
 describe "Matrix#determinant" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/diagonal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/diagonal_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/diagonal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix.diagonal" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/divide_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/divide_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/divide_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#/" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/element_reference_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/element_reference_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/element_reference_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#[]" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/eql_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/eql_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/eql_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/equal_value'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/equal_value', __FILE__)
 require 'matrix'
 
 describe "Matrix#eql?" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/equal_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/equal_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/equal_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/equal_value'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/equal_value', __FILE__)
 require 'matrix'
 
 describe "Matrix#==" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/exponent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/exponent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/exponent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#**" do
@@ -35,9 +35,18 @@
     end
   end
 
-  it "raises a ErrOperationNotDefined exception for powers that aren't Integers" do
-    lambda {Matrix[ [1,2], [8,2] ] ** 2.5}.should \
-      raise_error(Matrix::ErrOperationNotDefined)
+  ruby_version_is "" ... "1.9" do
+    it "raises a ErrOperationNotDefined exception for powers that aren't Integers" do
+      lambda {Matrix[ [1,2], [8,2] ] ** 2.5}.should \
+	raise_error(Matrix::ErrOperationNotDefined)
+    end
   end
 
+  ruby_version_is "1.9" do
+    it "raises a ErrOperationNotImplemented exception for powers that aren't Integers" do
+      lambda {Matrix[ [1,2], [8,2] ] ** 2.5}.should \
+	raise_error(Matrix::ErrOperationNotImplemented)
+    end
+  end
+
 end

Modified: MacRuby/trunk/spec/frozen/library/matrix/hash_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/hash_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/hash_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#hash" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/identity_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/identity_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/identity_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/identity'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/identity', __FILE__)
 
 describe "Matrix.identity" do
   it_behaves_like(:matrix_identity, :identity)

Modified: MacRuby/trunk/spec/frozen/library/matrix/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#inspect" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/inv_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/inv_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/inv_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/inverse'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/inverse', __FILE__)
 require 'matrix'
 
 describe "Matrix#inv" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/inverse_from_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/inverse_from_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/inverse_from_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#inverse_from" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/inverse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/inverse_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/inverse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
 
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/inverse'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/inverse', __FILE__)
 require 'matrix'
 
 describe "Matrix#inverse" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/map_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/map_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/map_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/collect'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/collect', __FILE__)
 require 'matrix'
 
 describe "Matrix#map" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/minor_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/minor_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/minor_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#minor" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/minus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/minus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/minus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#-" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/multiply_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/multiply_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/multiply_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#*" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#new" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/plus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/plus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/plus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#+" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/rank_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/rank_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/rank_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#rank" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/regular_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/regular_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/regular_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#regular?" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/row_size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/row_size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/row_size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#row_size" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/row_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/row_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/row_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#row" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/row_vector_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/row_vector_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/row_vector_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix.row_vector" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/row_vectors_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/row_vectors_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/row_vectors_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#row_vectors" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/rows_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/rows_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/rows_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix.rows" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/scalar/Fail_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/scalar/Fail_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/scalar/Fail_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix::Scalar#Fail" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/scalar/Raise_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/scalar/Raise_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/scalar/Raise_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix::Scalar#Raise" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/scalar/divide_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/scalar/divide_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/scalar/divide_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix::Scalar#/" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/scalar/exponent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/scalar/exponent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/scalar/exponent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix::Scalar#**" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/scalar/included_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/scalar/included_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/scalar/included_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix::Scalar.included" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/scalar/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/scalar/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/scalar/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix::Scalar#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/scalar/minus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/scalar/minus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/scalar/minus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix::Scalar#-" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/scalar/multiply_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/scalar/multiply_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/scalar/multiply_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix::Scalar#*" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/scalar/plus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/scalar/plus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/scalar/plus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix::Scalar#+" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/scalar_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/scalar_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/scalar_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix.scalar" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/shared/collect.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/shared/collect.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/shared/collect.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -13,7 +13,7 @@
 
   ruby_bug "#1531", "1.8.7" do
     it "returns an enumerator if no block is given" do
-      @m.send(@method).should be_kind_of(enumerator_class)
+      @m.send(@method).should be_an_instance_of(enumerator_class)
     end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/matrix/singular_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/singular_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/singular_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#singular?" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/square_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/square_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/square_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#square?" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/t_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/t_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/t_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/transpose'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/transpose', __FILE__)
 
 describe "Matrix#transpose" do
   it_behaves_like(:matrix_transpose, :t)

Modified: MacRuby/trunk/spec/frozen/library/matrix/to_a_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/to_a_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/to_a_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#to_a" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix#to_s" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/tr_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/tr_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/tr_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/trace'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/trace', __FILE__)
 require 'matrix'
 
 describe "Matrix#tr" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/trace_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/trace_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/trace_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/trace'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/trace', __FILE__)
 require 'matrix'
 
 describe "Matrix#trace" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/transpose_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/transpose_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/transpose_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/transpose'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/transpose', __FILE__)
 
 describe "Matrix#transpose" do
   it_behaves_like(:matrix_transpose, :transpose)

Modified: MacRuby/trunk/spec/frozen/library/matrix/unit_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/unit_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/unit_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/identity'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/identity', __FILE__)
 
 describe "Matrix.unit" do
   it_behaves_like(:matrix_identity, :unit)

Modified: MacRuby/trunk/spec/frozen/library/matrix/vector/each2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/vector/each2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/vector/each2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Vector.each2" do
@@ -13,13 +13,6 @@
   end
 
   describe "given one argument" do
-    ruby_bug "redmine:2495", "1.9.1" do
-      it "requires the argument to be a Vector or an Array" do
-        lambda { @v.each2(5){}        }.should raise_error(TypeError)
-        lambda { @v.each2(nil){}      }.should raise_error(TypeError)
-      end
-    end
-
     it "accepts an Array argument" do
       a = []
       @v.each2([7, 8, 9]){|x, y| a << x << y}
@@ -37,12 +30,10 @@
       a.should == [[1, 4], [2, 5], [3, 6]]
     end
 
-    ruby_bug "to be submitted", "1.9.1" do
-      it "yield arguments in pairs" do
-        a = []
-        @v.each2(@v2){|pair| a << pair}
-        a.should == [[1, 4], [2, 5], [3, 6]]
-      end
+    it "yield arguments in pairs" do
+      a = []
+      @v.each2(@v2){|*pair| a << pair}
+      a.should == [[1, 4], [2, 5], [3, 6]]
     end
 
     ruby_bug "to be submitted", "1.9.1" do
@@ -54,9 +45,9 @@
     ruby_version_is "1.9" do
       it "returns an enumerator if no block given" do
         enum = @v.each2(@v2)
-        enum.should be_kind_of(enumerator_class)
+        enum.should be_an_instance_of(enumerator_class)
         enum.to_a.should == [[1, 4], [2, 5], [3, 6]]
       end
     end
   end
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/matrix/vector/eql_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/vector/eql_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/vector/eql_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Vector#eql?" do

Modified: MacRuby/trunk/spec/frozen/library/matrix/zero_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/matrix/zero_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/matrix/zero_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'matrix'
 
 describe "Matrix.zero" do

Modified: MacRuby/trunk/spec/frozen/library/mutex/lock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mutex/lock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mutex/lock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,11 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "Mutex#lock" do
+  before :each do
+    ScratchPad.clear
+  end
+
   it "returns self" do
     m = Mutex.new
     m.lock.should == m
@@ -12,24 +16,40 @@
     m = Mutex.new
 
     m.lock
-    v = 0
 
     th = Thread.new do
       m.lock
-      v = 1
+      ScratchPad.record :after_lock
     end
 
     Thread.pass while th.status and th.status != "sleep"
 
-    v.should == 0
+    ScratchPad.recorded.should be_nil
     m.unlock
     th.join
-    v.should == 1
+    ScratchPad.recorded.should == :after_lock
   end
 
-  it "raises ThreadError if the current thread already locks this monitor" do
-    mutex = Mutex.new
-    mutex.lock
-    lambda { mutex.lock }.should raise_error(ThreadError)
+  # Unable to find a specific ticket but behavior change may be
+  # related to this ML thread.
+  ruby_bug "[ruby-core:23457]", "1.8.7.174" do
+    it "raises a ThreadError when used recursively" do
+      m = Mutex.new
+
+      th = Thread.new do
+        m.lock
+        m.lock
+        v = 1
+      end
+
+      Thread.pass while th.status and th.status != "sleep"
+
+      ScratchPad.recorded.should be_nil
+
+      lambda do
+        th.kill
+        th.join
+      end.should raise_error(ThreadError)
+    end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/mutex/locked_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mutex/locked_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mutex/locked_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "Mutex#locked?" do

Modified: MacRuby/trunk/spec/frozen/library/mutex/synchronize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mutex/synchronize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mutex/synchronize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "Mutex#synchronize" do

Modified: MacRuby/trunk/spec/frozen/library/mutex/try_lock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mutex/try_lock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mutex/try_lock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,20 +1,13 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "Mutex#try_lock" do
-  it "returns true if lock can be aquired immediately" do
+  it "locks the mutex if it can" do
     m = Mutex.new
-    m.try_lock.should be_true
-    m.try_lock.should be_false
-  end
-
-  it "actually locks" do
-    m = Mutex.new
     m.try_lock
 
     m.locked?.should be_true
-    lambda { m.lock }.should raise_error(ThreadError)
-    lambda { m.try_lock }.should_not raise_error(ThreadError)
+    lambda { m.try_lock.should be_false }.should_not raise_error(ThreadError)
   end
 
   it "returns false if lock can not be aquired immediately" do

Modified: MacRuby/trunk/spec/frozen/library/mutex/unlock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/mutex/unlock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/mutex/unlock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "Mutex#unlock" do

Modified: MacRuby/trunk/spec/frozen/library/net/FTPError_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/FTPError_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/FTPError_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTPError" do

Modified: MacRuby/trunk/spec/frozen/library/net/FTPPermError_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/FTPPermError_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/FTPPermError_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTPPermError" do

Modified: MacRuby/trunk/spec/frozen/library/net/FTPProtoError_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/FTPProtoError_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/FTPProtoError_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTPProtoError" do

Modified: MacRuby/trunk/spec/frozen/library/net/FTPReplyError_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/FTPReplyError_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/FTPReplyError_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTPReplyError" do

Modified: MacRuby/trunk/spec/frozen/library/net/FTPTempError_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/FTPTempError_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/FTPTempError_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTPTempError" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/abort_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/abort_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/abort_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#abort" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/acct_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/acct_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/acct_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#acct" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/binary_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/binary_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/binary_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTP#binary" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/chdir_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/chdir_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/chdir_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#chdir" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTP#close" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/closed_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/closed_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/closed_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTP#closed?" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/connect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/connect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/connect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 # TODO: Add specs for using the SOCKSSocket
 describe "Net::FTP#connect" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/debug_mode_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/debug_mode_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/debug_mode_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTP#debug_mode" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/delete_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/delete_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/delete_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#delete" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/dir_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/dir_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/dir_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
-require File.dirname(__FILE__) + '/shared/list'
+require File.expand_path('../fixtures/server', __FILE__)
+require File.expand_path('../shared/list', __FILE__)
 
 describe "Net::FTP#dir" do
   it_behaves_like :net_ftp_list, :dir

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/fixtures/server.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/fixtures/server.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/fixtures/server.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,7 @@
 module NetFTPSpecs
   class DummyFTP
     attr_accessor :connect_message
+    attr_reader :login_user, :login_pass, :login_acct
     
     def initialize(port = 9921) 
       @server = TCPServer.new("localhost", port)
@@ -89,6 +90,7 @@
     end
     
     def acct(account)
+      @login_acct = account
       self.response("230 User '#{account}' logged in, proceed. (ACCT)")
     end
     
@@ -150,6 +152,7 @@
     end
     
     def pass(password)
+      @login_pass = password
       self.response("230 User logged in, proceed. (PASS #{password})")
     end
     
@@ -222,7 +225,7 @@
 
       mode = @restart_at ? "a" : "w"
 
-      File.open(tmp_file, mode) do |f|
+      File.open(tmp_file, mode + "b") do |f|
         loop do
           data = @datasocket.recv(1024)
           break if !data || data.empty?
@@ -233,6 +236,11 @@
       #@datasocket.close()
       self.response("200 OK, Data received. (STOR #{file})")
     end
+
+    def appe(file)
+      @restart_at = true
+      stor(file)
+    end
     
     def syst
       self.response("215 FTP Dummy Server (SYST)")
@@ -243,6 +251,7 @@
     end
     
     def user(name)
+      @login_user = name
       self.response("230 User logged in, proceed. (USER #{name})")
     end
   end

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/get_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/get_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/get_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
-require File.dirname(__FILE__) + "/shared/gettextfile"
-require File.dirname(__FILE__) + "/shared/getbinaryfile"
+require File.expand_path('../fixtures/server', __FILE__)
+require File.expand_path('../shared/gettextfile', __FILE__)
+require File.expand_path('../shared/getbinaryfile', __FILE__)
 
 describe "Net::FTP#get (binary mode)" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/getbinaryfile_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/getbinaryfile_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/getbinaryfile_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
-require File.dirname(__FILE__) + "/shared/getbinaryfile"
+require File.expand_path('../fixtures/server', __FILE__)
+require File.expand_path('../shared/getbinaryfile', __FILE__)
 
 describe "Net::FTP#getbinaryfile" do
   it_behaves_like :net_ftp_getbinaryfile, :getbinaryfile

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/getdir_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/getdir_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/getdir_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/shared/pwd"
+require File.expand_path('../shared/pwd', __FILE__)
 
 describe "Net::FTP#getdir" do
   it_behaves_like :net_ftp_pwd, :getdir

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/gettextfile_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/gettextfile_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/gettextfile_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
-require File.dirname(__FILE__) + "/shared/gettextfile"
+require File.expand_path('../fixtures/server', __FILE__)
+require File.expand_path('../shared/gettextfile', __FILE__)
 
 describe "Net::FTP#gettextfile" do
   it_behaves_like :net_ftp_gettextfile, :gettextfile

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/help_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/help_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/help_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#help" do
   def with_connection

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTP#initialize" do
@@ -8,7 +8,7 @@
   end
   
   it "is private" do
-    @ftp.private_methods.should include("initialize")
+    Net::FTP.should have_private_instance_method(:initialize)
   end
   
   it "sets self into binary mode" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/last_response_code_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/last_response_code_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/last_response_code_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/shared/last_response_code"
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../shared/last_response_code', __FILE__)
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#last_response_code" do
   it_behaves_like :net_ftp_last_response_code, :last_response_code

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/last_response_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/last_response_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/last_response_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#last_response" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/lastresp_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/lastresp_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/lastresp_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/shared/last_response_code"
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../shared/last_response_code', __FILE__)
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#lastresp" do
   it_behaves_like :net_ftp_last_response_code, :lastresp

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/list_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/list_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/list_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
-require File.dirname(__FILE__) + '/shared/list'
+require File.expand_path('../fixtures/server', __FILE__)
+require File.expand_path('../shared/list', __FILE__)
 
 describe "Net::FTP#list" do
   it_behaves_like :net_ftp_list, :list

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/login_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/login_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/login_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#login" do
   before(:each) do
@@ -20,20 +20,30 @@
   describe "when passed no arguments" do
     it "sends the USER command with 'anonymous' as name to the server" do
       @ftp.login
-      @ftp.last_response.should == "230 User logged in, proceed. (USER anonymous)\n"
+      @server.login_user.should == "anonymous"
     end
     
-    it "sends the current username + hostname as a password when required" do
-      passhost = Socket.gethostname
-      if not passhost.index(".")
-        passhost = Socket.gethostbyname(passhost)[0]
+    ruby_version_is "" ... "1.9" do
+      it "sends the current username + hostname as a password when required" do
+	passhost = Socket.gethostname
+	if not passhost.index(".")
+	  passhost = Socket.gethostbyname(passhost)[0]
+	end
+	pass = ENV["USER"] + "@" + passhost 
+	@server.should_receive(:user).and_respond("331 User name okay, need password.")
+	@ftp.login
+	@server.login_pass.should == pass
       end
-      pass = ENV["USER"] + "@" + passhost 
-      @server.should_receive(:user).and_respond("331 User name okay, need password.")
-      @ftp.login
-      @ftp.last_response.should == "230 User logged in, proceed. (PASS #{pass})\n"
     end
     
+    ruby_version_is "1.9" do
+      it "sends 'anonymous@' as a password when required" do
+	@server.should_receive(:user).and_respond("331 User name okay, need password.")
+	@ftp.login
+	@server.login_pass.should == "anonymous@"
+      end
+    end
+    
     ruby_bug "http://redmine.ruby-lang.org/issues/show/385", "1.8.7" do
       it "raises a Net::FTPReplyError when the server requests an account" do
         @server.should_receive(:user).and_respond("331 User name okay, need password.")
@@ -46,7 +56,7 @@
   describe "when passed name" do
     it "sends the USER command with the passed name to the server" do
       @ftp.login("rubyspec")
-      @ftp.last_response.should == "230 User logged in, proceed. (USER rubyspec)\n"
+      @server.login_user.should == "rubyspec"
     end
     
     ruby_bug "http://redmine.ruby-lang.org/issues/show/385", "1.8.7" do
@@ -66,13 +76,13 @@
   describe "when passed name, password" do
     it "sends the USER command with the passed name to the server" do
       @ftp.login("rubyspec", "rocks")
-      @ftp.last_response.should == "230 User logged in, proceed. (USER rubyspec)\n"
+      @server.login_user.should == "rubyspec"
     end
     
     it "sends the passed password when required" do
       @server.should_receive(:user).and_respond("331 User name okay, need password.")
       @ftp.login("rubyspec", "rocks")
-      @ftp.last_response.should == "230 User logged in, proceed. (PASS rocks)\n"
+      @server.login_pass.should == "rocks"
     end
     
     ruby_bug "http://redmine.ruby-lang.org/issues/show/385", "1.8.7" do
@@ -87,20 +97,20 @@
   describe "when passed name, password, account" do
     it "sends the USER command with the passed name to the server" do
       @ftp.login("rubyspec", "rocks", "account")
-      @ftp.last_response.should == "230 User logged in, proceed. (USER rubyspec)\n"
+      @server.login_user.should == "rubyspec"
     end
     
     it "sends the passed password when required" do
       @server.should_receive(:user).and_respond("331 User name okay, need password.")
       @ftp.login("rubyspec", "rocks", "account")
-      @ftp.last_response.should == "230 User logged in, proceed. (PASS rocks)\n"
+      @server.login_pass.should == "rocks"
     end
     
     it "sends the passed account when required" do
       @server.should_receive(:user).and_respond("331 User name okay, need password.")
       @server.should_receive(:pass).and_respond("332 Need account for login.")
       @ftp.login("rubyspec", "rocks", "account")
-      @ftp.last_response.should == "230 User 'account' logged in, proceed. (ACCT)\n"
+      @server.login_acct.should == "account"
     end
   end
   
@@ -203,4 +213,4 @@
       lambda { @ftp.login("rubyspec", "rocks", "account") }.should raise_error(Net::FTPPermError)
     end
   end
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/ls_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/ls_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/ls_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
-require File.dirname(__FILE__) + '/shared/list'
+require File.expand_path('../fixtures/server', __FILE__)
+require File.expand_path('../shared/list', __FILE__)
 
 describe "Net::FTP#ls" do
   it_behaves_like :net_ftp_list, :ls

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/mdtm_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/mdtm_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/mdtm_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#mdtm" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/mkdir_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/mkdir_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/mkdir_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#mkdir" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/mtime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/mtime_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/mtime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#mtime" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/nlst_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/nlst_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/nlst_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#nlst" do
   before(:each) do
@@ -64,30 +64,32 @@
     end
   end
   
-  describe "when switching type fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
-      lambda { @ftp.nlst }.should raise_error(Net::FTPPermError)
-    end
+  ruby_version_is "" ... "1.9" do
+    describe "when switching type fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+	@server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
+	lambda { @ftp.nlst }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
-      lambda { @ftp.nlst }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 501" do
+	@server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
+	lambda { @ftp.nlst }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 504" do
-      @server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
-      lambda { @ftp.nlst }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 504" do
+	@server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
+	lambda { @ftp.nlst }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
-      lambda { @ftp.nlst }.should raise_error(Net::FTPTempError)
-    end
+      it "raises a Net::FTPTempError when the response code is 421" do
+	@server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
+	lambda { @ftp.nlst }.should raise_error(Net::FTPTempError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:type).and_respond("530 Not logged in.")
-      lambda { @ftp.nlst }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+	@server.should_receive(:type).and_respond("530 Not logged in.")
+	lambda { @ftp.nlst }.should raise_error(Net::FTPPermError)
+      end
     end
   end
   

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/noop_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/noop_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/noop_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#noop" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTP.open" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/passive_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/passive_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/passive_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTP#passive" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/put_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/put_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/put_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
-require File.dirname(__FILE__) + "/shared/puttextfile"
-require File.dirname(__FILE__) + "/shared/putbinaryfile"
+require File.expand_path('../fixtures/server', __FILE__)
+require File.expand_path('../shared/puttextfile', __FILE__)
+require File.expand_path('../shared/putbinaryfile', __FILE__)
 
 describe "Net::FTP#put (binary mode)" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/putbinaryfile_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/putbinaryfile_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/putbinaryfile_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
-require File.dirname(__FILE__) + "/shared/putbinaryfile"
+require File.expand_path('../fixtures/server', __FILE__)
+require File.expand_path('../shared/putbinaryfile', __FILE__)
 
 describe "Net::FTP#putbinaryfile" do
   it_behaves_like :net_ftp_putbinaryfile, :putbinaryfile

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/puttextfile_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/puttextfile_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/puttextfile_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
-require File.dirname(__FILE__) + "/shared/puttextfile"
+require File.expand_path('../fixtures/server', __FILE__)
+require File.expand_path('../shared/puttextfile', __FILE__)
 
 describe "Net::FTP#puttextfile" do
   it_behaves_like :net_ftp_puttextfile, :puttextfile

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/pwd_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/pwd_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/pwd_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#pwd" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/quit_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/quit_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/quit_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#quit" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/rename_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/rename_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/rename_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#rename" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/resume_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/resume_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/resume_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTP#resume" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/retrbinary_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/retrbinary_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/retrbinary_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#retrbinary" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/retrlines_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/retrlines_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/retrlines_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#retrlines" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/return_code_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/return_code_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/return_code_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTP#return_code" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/rmdir_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/rmdir_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/rmdir_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#rmdir" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/sendcmd_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/sendcmd_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/sendcmd_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#sendcmd" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/set_socket_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/set_socket_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/set_socket_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
 
 describe "Net::FTP#set_socket" do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/shared/getbinaryfile.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/shared/getbinaryfile.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/shared/getbinaryfile.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -45,7 +45,7 @@
     before(:each) do
       @tmp_file = tmp("getbinaryfile_resume")
       
-      File.open(@tmp_file, "w") do |f|
+      File.open(@tmp_file, "wb") do |f|
         f << "This is the content\n"
       end
       
@@ -122,30 +122,32 @@
     end
   end
   
-  describe "when switching type fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
-      lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
+  ruby_version_is "" ... "1.9" do
+    describe "when switching type fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+	@server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
+	lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
-      lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 501" do
+	@server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
+	lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 504" do
-      @server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
-      lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 504" do
+	@server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
+	lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
-      lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
-    end
+      it "raises a Net::FTPTempError when the response code is 421" do
+	@server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
+	lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:type).and_respond("530 Not logged in.")
-      lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+	@server.should_receive(:type).and_respond("530 Not logged in.")
+	lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      end
     end
   end
   

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/shared/gettextfile.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/shared/gettextfile.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/shared/gettextfile.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -72,30 +72,32 @@
     end
   end
   
-  describe "when switching type fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
-      lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
+  ruby_version_is "" ... "1.9" do
+    describe "when switching type fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+	@server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
+	lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
-      lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 501" do
+	@server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
+	lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 504" do
-      @server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
-      lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 504" do
+	@server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
+	lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
-      lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
-    end
+      it "raises a Net::FTPTempError when the response code is 421" do
+	@server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
+	lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPTempError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:type).and_respond("530 Not logged in.")
-      lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+	@server.should_receive(:type).and_respond("530 Not logged in.")
+	lambda { @ftp.send(@method, "test", @tmp_file) }.should raise_error(Net::FTPPermError)
+      end
     end
   end
   

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/shared/list.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/shared/list.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/shared/list.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -76,30 +76,32 @@
     end
   end
   
-  describe "when switching type fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
-      lambda { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
-    end
+  ruby_version_is "" ... "1.9" do
+    describe "when switching type fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+	@server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
+	lambda { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
-      lambda { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 501" do
+	@server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
+	lambda { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 504" do
-      @server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
-      lambda { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 504" do
+	@server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
+	lambda { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
-      lambda { @ftp.send(@method) }.should raise_error(Net::FTPTempError)
-    end
+      it "raises a Net::FTPTempError when the response code is 421" do
+	@server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
+	lambda { @ftp.send(@method) }.should raise_error(Net::FTPTempError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:type).and_respond("530 Not logged in.")
-      lambda { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+	@server.should_receive(:type).and_respond("530 Not logged in.")
+	lambda { @ftp.send(@method) }.should raise_error(Net::FTPPermError)
+      end
     end
   end
   

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/shared/putbinaryfile.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/shared/putbinaryfile.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/shared/putbinaryfile.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -64,35 +64,71 @@
       File.read(@remote_tmp_file).should == File.read(@local_fixture_file)
     end
     
-    describe "and the REST command fails" do
-      it "raises a Net::FTPProtoError when the response code is 550" do
-        @server.should_receive(:rest).and_respond("Requested action not taken.")
-        lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPProtoError)
-      end
+    ruby_version_is "" ... "1.9" do
+      describe "and the REST command fails" do
+	it "raises a Net::FTPProtoError when the response code is 550" do
+	  @server.should_receive(:rest).and_respond("Requested action not taken.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPProtoError)
+	end
 
-      it "raises a Net::FTPPermError when the response code is 500" do
-        @server.should_receive(:rest).and_respond("500 Syntax error, command unrecognized.")
-        lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-      end
+	it "raises a Net::FTPPermError when the response code is 500" do
+	  @server.should_receive(:rest).and_respond("500 Syntax error, command unrecognized.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+	end
 
-      it "raises a Net::FTPPermError when the response code is 501" do
-        @server.should_receive(:rest).and_respond("501 Syntax error, command unrecognized.")
-        lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-      end
+	it "raises a Net::FTPPermError when the response code is 501" do
+	  @server.should_receive(:rest).and_respond("501 Syntax error, command unrecognized.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+	end
 
-      it "raises a Net::FTPPermError when the response code is 502" do
-        @server.should_receive(:rest).and_respond("502 Command not implemented.")
-        lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-      end
+	it "raises a Net::FTPPermError when the response code is 502" do
+	  @server.should_receive(:rest).and_respond("502 Command not implemented.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+	end
       
-      it "raises a Net::FTPTempError when the response code is 421" do
-        @server.should_receive(:rest).and_respond("421 Service not available, closing control connection.")
-        lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPTempError)
+	it "raises a Net::FTPTempError when the response code is 421" do
+	  @server.should_receive(:rest).and_respond("421 Service not available, closing control connection.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPTempError)
+	end
+
+	it "raises a Net::FTPPermError when the response code is 530" do
+	  @server.should_receive(:rest).and_respond("530 Not logged in.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+	end
       end
+    end
 
-      it "raises a Net::FTPPermError when the response code is 530" do
-        @server.should_receive(:rest).and_respond("530 Not logged in.")
-        lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+    ruby_version_is "1.9" do
+      describe "and the APPE command fails" do
+	it "raises a Net::FTPProtoError when the response code is 550" do
+	  @server.should_receive(:appe).and_respond("Requested action not taken.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPProtoError)
+	end
+
+	it "raises a Net::FTPPermError when the response code is 500" do
+	  @server.should_receive(:appe).and_respond("500 Syntax error, command unrecognized.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+	end
+
+	it "raises a Net::FTPPermError when the response code is 501" do
+	  @server.should_receive(:appe).and_respond("501 Syntax error, command unrecognized.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+	end
+
+	it "raises a Net::FTPPermError when the response code is 502" do
+	  @server.should_receive(:appe).and_respond("502 Command not implemented.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+	end
+      
+	it "raises a Net::FTPTempError when the response code is 421" do
+	  @server.should_receive(:appe).and_respond("421 Service not available, closing control connection.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPTempError)
+	end
+
+	it "raises a Net::FTPPermError when the response code is 530" do
+	  @server.should_receive(:appe).and_respond("530 Not logged in.")
+	  lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+	end
       end
     end
   end
@@ -139,30 +175,32 @@
     end
   end
 
-  describe "when switching type fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
-      lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-    end
+  ruby_version_is "" ... "1.9" do
+    describe "when switching type fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+	@server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
+	lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
-      lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 501" do
+	@server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
+	lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 504" do
-      @server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
-      lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 504" do
+	@server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
+	lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
-      lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPTempError)
-    end
+      it "raises a Net::FTPTempError when the response code is 421" do
+	@server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
+	lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPTempError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:type).and_respond("530 Not logged in.")
-      lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+	@server.should_receive(:type).and_respond("530 Not logged in.")
+	lambda { @ftp.send(@method, @local_fixture_file, "binary") }.should raise_error(Net::FTPPermError)
+      end
     end
   end
   

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/shared/puttextfile.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/shared/puttextfile.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/shared/puttextfile.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -27,11 +27,11 @@
   it "sends the contents of the passed local_file, using \\r\\n as the newline separator" do
     @ftp.send(@method, @local_fixture_file, "text")
     
-    remote_lines = File.readlines(@remote_tmp_file)
-    local_lines  = File.readlines(@local_fixture_file)
+    remote_lines = open(@remote_tmp_file,    "rb") {|f| f.read }
+    local_lines  = open(@local_fixture_file, "rb") {|f| f.read } + "\n"
     
     remote_lines.should_not == local_lines
-    remote_lines.should == local_lines.map { |l| l.chomp + "\r\n" }
+    remote_lines.should == local_lines.gsub("\n", "\r\n")
   end
 
   it "returns nil" do
@@ -92,30 +92,32 @@
     end
   end
 
-  describe "when switching type fails" do
-    it "raises a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
-      lambda { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
-    end
+  ruby_version_is "" ... "1.9" do
+    describe "when switching type fails" do
+      it "raises a Net::FTPPermError when the response code is 500" do
+	@server.should_receive(:type).and_respond("500 Syntax error, command unrecognized.")
+	lambda { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
-      lambda { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 501" do
+	@server.should_receive(:type).and_respond("501 Syntax error in parameters or arguments.")
+	lambda { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 504" do
-      @server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
-      lambda { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
-    end
+      it "raises a Net::FTPPermError when the response code is 504" do
+	@server.should_receive(:type).and_respond("504 Command not implemented for that parameter.")
+	lambda { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+      end
     
-    it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
-      lambda { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPTempError)
-    end
+      it "raises a Net::FTPTempError when the response code is 421" do
+	@server.should_receive(:type).and_respond("421 Service not available, closing control connection.")
+	lambda { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPTempError)
+      end
     
-    it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:type).and_respond("530 Not logged in.")
-      lambda { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+      it "raises a Net::FTPPermError when the response code is 530" do
+	@server.should_receive(:type).and_respond("530 Not logged in.")
+	lambda { @ftp.send(@method, @local_fixture_file, "text") }.should raise_error(Net::FTPPermError)
+      end
     end
   end
   

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/site_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/site_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/site_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#site" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#size" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/status_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/status_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/status_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#status" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/storbinary_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/storbinary_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/storbinary_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#storbinary" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/storlines_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/storlines_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/storlines_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#storlines" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/system_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/system_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/system_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#system" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/voidcmd_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/voidcmd_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/voidcmd_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#voidcmd" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/ftp/welcome_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/ftp/welcome_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/ftp/welcome_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/ftp'
-require File.dirname(__FILE__) + "/fixtures/server"
+require File.expand_path('../fixtures/server', __FILE__)
 
 describe "Net::FTP#welcome" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/HTTPBadResponse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/HTTPBadResponse_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/HTTPBadResponse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPBadResponse" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/HTTPError_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/HTTPError_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/HTTPError_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPError" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/HTTPFatalError_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/HTTPFatalError_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/HTTPFatalError_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPFatalError" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/HTTPHeaderSyntaxError_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/HTTPHeaderSyntaxError_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/HTTPHeaderSyntaxError_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPHeaderSyntaxError" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/HTTPRetriableError_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/HTTPRetriableError_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/HTTPRetriableError_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPRetriableError" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/HTTPServerException_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/HTTPServerException_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/HTTPServerException_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPServerException" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/Proxy_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/Proxy_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/Proxy_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.Proxy" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/active_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/active_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/active_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
-require File.dirname(__FILE__) + '/shared/started'
+require File.expand_path('../fixtures/http_server', __FILE__)
+require File.expand_path('../shared/started', __FILE__)
 
 describe "Net::HTTP#active?" do
   it_behaves_like :net_http_started_p, :active?

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/address_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/address_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/address_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP#address" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/close_on_empty_response_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/close_on_empty_response_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/close_on_empty_response_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP#close_on_empty_response" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/copy_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/copy_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/copy_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#copy" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/default_port_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/default_port_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/default_port_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.default_port" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/delete_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/delete_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/delete_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#delete" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/finish_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/finish_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/finish_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#finish" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/fixtures/http_server.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/fixtures/http_server.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/fixtures/http_server.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -51,7 +51,7 @@
   class << self
     def start_server
       server_config = {
-        :BindAddress => "0.0.0.0",
+        :BindAddress => "localhost",
         :Port => 3333,
         :Logger => WEBrick::Log.new(NullWriter.new),
         :AccessLog => [],

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/get2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/get2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/get2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
-require File.dirname(__FILE__) + "/shared/request_get"
+require File.expand_path('../fixtures/http_server', __FILE__)
+require File.expand_path('../shared/request_get', __FILE__)
 
 describe "Net::HTTP#get2" do
   it_behaves_like :net_ftp_request_get, :get2

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/get_print_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/get_print_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/get_print_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP.get_print" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/get_response_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/get_response_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/get_response_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP.get_response" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/get_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/get_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/get_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP.get when passed URI" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/head2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/head2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/head2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
-require File.dirname(__FILE__) + "/shared/request_head"
+require File.expand_path('../fixtures/http_server', __FILE__)
+require File.expand_path('../shared/request_head', __FILE__)
 
 describe "Net::HTTP#head2" do
   it_behaves_like :net_ftp_request_head, :head2

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/head_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/head_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/head_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#head" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/http_default_port_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/http_default_port_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/http_default_port_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.http_default_port" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/https_default_port_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/https_default_port_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/https_default_port_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.https_default_port" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#inspect" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/is_version_1_1_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/is_version_1_1_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/is_version_1_1_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/shared/version_1_1'
+require File.expand_path('../shared/version_1_1', __FILE__)
 
 describe "Net::HTTP.is_version_1_1?" do
   it_behaves_like :net_http_version_1_1_p, :is_version_1_1?

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/is_version_1_2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/is_version_1_2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/is_version_1_2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/shared/version_1_2'
+require File.expand_path('../shared/version_1_2', __FILE__)
 
 describe "Net::HTTP.is_version_1_2?" do
   it_behaves_like :net_http_version_1_2_p, :is_version_1_2?

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/lock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/lock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/lock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#lock" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/mkcol_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/mkcol_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/mkcol_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#mkcol" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/move_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/move_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/move_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#head" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.new" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/newobj_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/newobj_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/newobj_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.newobj" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/open_timeout_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/open_timeout_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/open_timeout_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP#open_timeout" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/options_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/options_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/options_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#options" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/port_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/port_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/port_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP#port" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/post2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/post2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/post2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,8 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/shared/request_post"
+require File.expand_path('../fixtures/http_server', __FILE__)
+require File.expand_path('../shared/request_post', __FILE__)
 
 describe "Net::HTTP#post2" do
   it_behaves_like :net_ftp_request_post, :post2
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/post_form_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/post_form_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/post_form_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP.post_form when passed URI" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/post_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/post_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/post_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#post" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/propfind_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/propfind_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/propfind_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#propfind" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/proppatch_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/proppatch_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/proppatch_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#proppatch" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/proxy_address_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/proxy_address_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/proxy_address_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.proxy_address" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/proxy_class_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/proxy_class_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/proxy_class_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.proxy_class?" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/proxy_pass_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/proxy_pass_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/proxy_pass_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.proxy_pass" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/proxy_port_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/proxy_port_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/proxy_port_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.proxy_port" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/proxy_user_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/proxy_user_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/proxy_user_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.proxy_user" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/put2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/put2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/put2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,8 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/shared/request_put"
+require File.expand_path('../fixtures/http_server', __FILE__)
+require File.expand_path('../shared/request_put', __FILE__)
 
 describe "Net::HTTP#put2" do
   it_behaves_like :net_ftp_request_put, :put2
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/put_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/put_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/put_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#put" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/read_timeout_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/read_timeout_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/read_timeout_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP#read_timeout" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/request_get_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/request_get_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/request_get_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
-require File.dirname(__FILE__) + "/shared/request_get"
+require File.expand_path('../fixtures/http_server', __FILE__)
+require File.expand_path('../shared/request_get', __FILE__)
 
 describe "Net::HTTP#request_get" do
   it_behaves_like :net_ftp_request_get, :get2

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/request_head_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/request_head_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/request_head_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
-require File.dirname(__FILE__) + "/shared/request_head"
+require File.expand_path('../fixtures/http_server', __FILE__)
+require File.expand_path('../shared/request_head', __FILE__)
 
 describe "Net::HTTP#request_head" do
   it_behaves_like :net_ftp_request_head, :request_head

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/request_post_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/request_post_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/request_post_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
-require File.dirname(__FILE__) + "/shared/request_post"
+require File.expand_path('../fixtures/http_server', __FILE__)
+require File.expand_path('../shared/request_post', __FILE__)
 
 describe "Net::HTTP#request_post" do
   it_behaves_like :net_ftp_request_post, :request_post

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/request_put_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/request_put_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/request_put_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
-require File.dirname(__FILE__) + "/shared/request_put"
+require File.expand_path('../fixtures/http_server', __FILE__)
+require File.expand_path('../shared/request_put', __FILE__)
 
 describe "Net::HTTP#request_put" do
   it_behaves_like :net_ftp_request_put, :request_put

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/request_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/request_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/request_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#request" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/request_types_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/request_types_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/request_types_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP::Get" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/send_request_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/send_request_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/send_request_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#send_request" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/set_debug_output_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/set_debug_output_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/set_debug_output_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 require "stringio"
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#set_debug_output when passed io" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/socket_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/socket_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/socket_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP.socket_type" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/start_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/start_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/start_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP.start" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/started_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/started_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/started_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
-require File.dirname(__FILE__) + '/shared/started'
+require File.expand_path('../fixtures/http_server', __FILE__)
+require File.expand_path('../shared/started', __FILE__)
 
 describe "Net::HTTP#started?" do
   it_behaves_like :net_http_started_p, :started?

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/trace_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/trace_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/trace_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/http_server'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#trace" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/unlock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/unlock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/unlock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/http_server"
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP#unlock" do
   before(:all) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/use_ssl_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/use_ssl_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/use_ssl_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTP#use_ssl?" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/version_1_1_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/version_1_1_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/version_1_1_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/shared/version_1_1'
+require File.expand_path('../shared/version_1_1', __FILE__)
 
 describe "Net::HTTP.version_1_1" do
   it "turns on net/http 1.1 features" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/http/version_1_2_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/http/version_1_2_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/http/version_1_2_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/shared/version_1_2'
+require File.expand_path('../shared/version_1_2', __FILE__)
 
 describe "Net::HTTP.version_1_2" do
   it "turns on net/http 1.2 features" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpexceptions/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpexceptions/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpexceptions/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPExceptions#initialize when passed message, response" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpexceptions/response_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpexceptions/response_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpexceptions/response_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPExceptions#response" do
   it "returns self's response" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_exist_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_exist_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_exist_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#body_exist?" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 require "stringio"
 

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_stream_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_stream_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/body_stream_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 require "stringio"
 

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/exec_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/exec_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/exec_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 require "stringio"
 
@@ -107,7 +107,7 @@
       str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
       str.should =~ %r[Accept: \*/\*\r\n]
       str.should =~ %r[Content-Type: text/html\r\n]
-      str.should =~ %r[Transfer-Encoding: chunked\r\n\r\n]
+      str.should =~ %r[Transfer-Encoding: chunked\r\n]
       str.should =~ %r[400\r\n#{'a' * 1024}\r\n400\r\n#{'a' * 1024}\r\n0\r\n\r\n$]
     end
 

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#inspect" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/method_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/method_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/method_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#method" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/path_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/path_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/path_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#path" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/request_body_permitted_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/request_body_permitted_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/request_body_permitted_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#request_body_permitted?" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/response_body_permitted_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/response_body_permitted_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/response_body_permitted_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#response_body_permitted?" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/set_body_internal_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/set_body_internal_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpgenericrequest/set_body_internal_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPGenericRequest#set_body_internal when passed string" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/add_field_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/add_field_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/add_field_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#add_field when passed key, value" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/basic_auth_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/basic_auth_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/basic_auth_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#basic_auth when passed account, password" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/canonical_each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/canonical_each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/canonical_each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/each_capitalized"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/each_capitalized', __FILE__)
 
 describe "Net::HTTPHeader#canonical_each" do
   it_behaves_like :net_httpheader_each_capitalized, :canonical_each

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/chunked_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/chunked_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/chunked_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#chunked?" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#content_length" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_range_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_range_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_range_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,18 +1,20 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#content_range" do
   before(:each) do
     @headers = NetHTTPHeaderSpecs::Example.new
   end
 
-  it "returns a Range object that represents the 'Content-Range' header entry" do
-    @headers["Content-Range"] = "bytes 0-499/1234"
-    @headers.content_range.should == (0..500)
+  ruby_bug "[ruby-dev:40295]", "1.8.8" do
+    it "returns a Range object that represents the 'Content-Range' header entry" do
+      @headers["Content-Range"] = "bytes 0-499/1234"
+      @headers.content_range.should == (0..499)
     
-    @headers["Content-Range"] = "bytes 500-1233/1234"
-    @headers.content_range.should == (500..1234)
+      @headers["Content-Range"] = "bytes 500-1233/1234"
+      @headers.content_range.should == (500..1233)
+    end
   end
   
   it "returns nil when there is no 'Content-Range' header entry" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/content_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/set_content_type"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/set_content_type', __FILE__)
 
 describe "Net::HTTPHeader#content_type" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/delete_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/delete_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/delete_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#delete when passed key" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_capitalized_name_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_capitalized_name_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_capitalized_name_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#each_capitalized_name" do
   before(:each) do
@@ -31,7 +31,7 @@
       ruby_bug "http://redmine.ruby-lang.org/issues/show/447", "1.8.7" do
         it "returns an Enumerator" do
           enumerator = @headers.each_capitalized_name
-          enumerator.should be_kind_of(enumerator_class)
+          enumerator.should be_an_instance_of(enumerator_class)
       
           res = []
           enumerator.each do |key|

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_capitalized_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_capitalized_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_capitalized_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/each_capitalized"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/each_capitalized', __FILE__)
 
 describe "Net::HTTPHeader#each_capitalized" do
   it_behaves_like :net_httpheader_each_capitalized, :each_capitalized

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_header_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_header_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_header_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/each_header"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/each_header', __FILE__)
 
 describe "Net::HTTPHeader#each_header" do
   it_behaves_like :net_httpheader_each_header, :each_header

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_key_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_key_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_key_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/each_name"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/each_name', __FILE__)
 
 describe "Net::HTTPHeader#each_key" do
   it_behaves_like :net_httpheader_each_name, :each_key

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_name_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_name_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_name_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/each_name"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/each_name', __FILE__)
 
 describe "Net::HTTPHeader#each_name" do
   it_behaves_like :net_httpheader_each_name, :each_name

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/each_header"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/each_header', __FILE__)
 
 describe "Net::HTTPHeader#each" do
   it_behaves_like :net_httpheader_each_header, :each

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/each_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#each_value" do
   before(:each) do
@@ -32,7 +32,7 @@
       ruby_bug "http://redmine.ruby-lang.org/issues/show/447", "1.8.7" do
         it "returns an Enumerator" do
           enumerator = @headers.each_value
-          enumerator.should be_kind_of(enumerator_class)
+          enumerator.should be_an_instance_of(enumerator_class)
       
           res = []
           enumerator.each do |key|

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/element_reference_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/element_reference_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/element_reference_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#[] when passed key" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/element_set_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/element_set_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/element_set_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#[]= when passed key, value" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/fetch_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/fetch_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/fetch_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#fetch" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/form_data_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/form_data_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/form_data_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/set_form_data"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/set_form_data', __FILE__)
 
 describe "Net::HTTPHeader#form_data=" do
   it_behaves_like :net_httpheader_set_form_data, :form_data=

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/get_fields_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/get_fields_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/get_fields_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#get_fields when passed key" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/initialize_http_header_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/initialize_http_header_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/initialize_http_header_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#initialize_http_header when passed Hash" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/key_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/key_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/key_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#key? when passed key" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/size"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/size', __FILE__)
 
 describe "Net::HTTPHeader#length" do
   it_behaves_like :net_httpheader_size, :length

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/main_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/main_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/main_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#main_type" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/proxy_basic_auth_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/proxy_basic_auth_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/proxy_basic_auth_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#proxy_basic_auth when passed account, password" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/range_length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/range_length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/range_length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#range_length" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/range_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/range_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/range_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/set_range"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/set_range', __FILE__)
 
 describe "Net::HTTPHeader#range" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_content_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_content_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_content_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/set_content_type"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/set_content_type', __FILE__)
 
 describe "Net::HTTPHeader#set_content_type" do
   it_behaves_like :net_httpheader_set_content_type, :set_content_type

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_form_data_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_form_data_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_form_data_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/set_form_data"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/set_form_data', __FILE__)
 
 describe "Net::HTTPHeader#set_form_data" do
   it_behaves_like :net_httpheader_set_form_data, :set_form_data

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_range_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_range_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/set_range_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/set_range"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/set_range', __FILE__)
 
 describe "Net::HTTPHeader#set_range" do
   it_behaves_like :net_httpheader_set_range, :set_range

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_capitalized.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_capitalized.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_capitalized.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -28,10 +28,10 @@
       ruby_bug "http://redmine.ruby-lang.org/issues/show/447", "1.8.7" do
         it "returns an Enumerator" do
           enumerator = @headers.send(@method)
-          enumerator.should be_kind_of(enumerator_class)
+          enumerator.should be_an_instance_of(enumerator_class)
     
           res = []
-          enumerator.each do |key|
+          enumerator.each do |*key|
             res << key
           end
           res.should == [["My-Header", "test"], ["My-Other-Header", "a, b"]]
@@ -39,4 +39,4 @@
       end
     end
   end
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_header.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_header.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_header.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -28,10 +28,10 @@
       ruby_bug "http://redmine.ruby-lang.org/issues/show/447", "1.8.7" do
         it "returns an Enumerator" do
           enumerator = @headers.send(@method)
-          enumerator.should be_kind_of(enumerator_class)
+          enumerator.should be_an_instance_of(enumerator_class)
       
           res = []
-          enumerator.each do |key|
+          enumerator.each do |*key|
             res << key
           end
           res.should == [["my-header", "test"], ["my-other-header", "a, b"]]
@@ -39,4 +39,4 @@
       end
     end
   end
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_name.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_name.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/each_name.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -26,7 +26,7 @@
     ruby_version_is "1.8.7" do
       it "returns an Enumerator" do
         enumerator = @headers.send(@method)
-        enumerator.should be_kind_of(enumerator_class)
+        enumerator.should be_an_instance_of(enumerator_class)
       
         res = []
         enumerator.each do |key|

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/set_form_data.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/set_form_data.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/shared/set_form_data.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -11,17 +11,17 @@
     
     it "sets self's body based on the passed form parameters" do
       @headers.send(@method, "cmd" => "search", "q" => "ruby", "max" => "50")
-      @headers.body.split("&").should == ["max=50", "cmd=search", "q=ruby"]
+      @headers.body.split("&").sort.should == ["cmd=search", "max=50", "q=ruby"]
     end
   end
 
   describe "when passed params, separator" do
     it "sets self's body based on the passed form parameters and the passed separator" do
       @headers.send(@method, {"cmd" => "search", "q" => "ruby", "max" => "50"}, "&")
-      @headers.body.split("&").should == ["max=50", "cmd=search", "q=ruby"]
+      @headers.body.split("&").sort.should == ["cmd=search", "max=50", "q=ruby"]
 
       @headers.send(@method, {"cmd" => "search", "q" => "ruby", "max" => "50"}, ";")
-      @headers.body.split(";").should == ["max=50", "cmd=search", "q=ruby"]
+      @headers.body.split(";").sort.should == ["cmd=search", "max=50", "q=ruby"]
     end
   end
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/size"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/size', __FILE__)
 
 describe "Net::HTTPHeader#size" do
   it_behaves_like :net_httpheader_size, :size

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/sub_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/sub_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/sub_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#sub_type" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/to_hash_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/to_hash_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/to_hash_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#to_hash" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpheader/type_params_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpheader/type_params_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpheader/type_params_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Net::HTTPHeader#type_params" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httprequest/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httprequest/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httprequest/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 module NetHTTPRequestSpecs

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/body_permitted_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/body_permitted_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/body_permitted_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse.body_permitted?" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/body_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/body_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/body_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/shared/body"
+require File.expand_path('../shared/body', __FILE__)
 
 describe "Net::HTTPResponse#body" do
   it_behaves_like :net_httpresponse_body, :body

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/code_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/code_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/code_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#code" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/code_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/code_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/code_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#code_type" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/entity_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/entity_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/entity_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
-require File.dirname(__FILE__) + "/shared/body"
+require File.expand_path('../shared/body', __FILE__)
 
 describe "Net::HTTPResponse#entity" do
   it_behaves_like :net_httpresponse_body, :entity

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/error_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/error_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/error_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#error!" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/error_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/error_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/error_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#error_type" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/exception_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/exception_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/exception_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse.exception_type" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/header_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/header_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/header_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#header" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/http_version_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/http_version_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/http_version_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#http_version" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#initialize when passed http_version, response_code, response_message" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 require "stringio"
 

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/message_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/message_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/message_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#message" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/msg_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/msg_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/msg_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#msg" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_body_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_body_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_body_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#read_body" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_header_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_header_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_header_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#read_header" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/read_new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse.read_new" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/reading_body_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/reading_body_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/reading_body_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 require "stringio"
 

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/response_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/response_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/response_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#response" do

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/to_ary_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/to_ary_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/to_ary_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 require "stringio"
 

Modified: MacRuby/trunk/spec/frozen/library/net/http/httpresponse/value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/http/httpresponse/value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/http/httpresponse/value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
 
 describe "Net::HTTPResponse#value" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/binmode_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/binmode_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/binmode_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#binmode when passed no arguments or nil" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/cmd_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/cmd_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/cmd_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#cmd" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/login_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/login_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/login_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#login" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/preprocess_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/preprocess_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/preprocess_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#preprocess" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/print_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/print_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/print_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#print" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/puts_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/puts_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/puts_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#puts" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/sock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/sock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/sock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#sock" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/telnetmode_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/telnetmode_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/telnetmode_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#telnetmode" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/waitfor_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/waitfor_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/waitfor_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#waitfor" do

Modified: MacRuby/trunk/spec/frozen/library/net/telnet/write_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/net/telnet/write_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/net/telnet/write_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'net/telnet'
 
 describe "Net::Telnet#write" do

Modified: MacRuby/trunk/spec/frozen/library/observer/add_observer_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/observer/add_observer_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/observer/add_observer_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Observer#add_observer" do
 

Modified: MacRuby/trunk/spec/frozen/library/observer/count_observers_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/observer/count_observers_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/observer/count_observers_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Observer#count_observers" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/observer/delete_observer_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/observer/delete_observer_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/observer/delete_observer_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Observer#delete_observer" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/observer/delete_observers_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/observer/delete_observers_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/observer/delete_observers_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Observer#delete_observers" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/observer/notify_observers_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/observer/notify_observers_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/observer/notify_observers_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Observer#notify_observers" do
 

Modified: MacRuby/trunk/spec/frozen/library/openssl/cipher_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openssl/cipher_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openssl/cipher_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/constants'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/constants', __FILE__)
 require 'openssl'
 
 describe "OpenSSL::Cipher's CipherError" do

Modified: MacRuby/trunk/spec/frozen/library/openssl/config/freeze_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openssl/config/freeze_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openssl/config/freeze_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../shared/constants', __FILE__)
 
 require 'openssl'
 

Modified: MacRuby/trunk/spec/frozen/library/openssl/hmac/digest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openssl/hmac/digest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openssl/hmac/digest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../shared/constants', __FILE__)
 require 'openssl'
 
 describe "OpenSSL::HMAC.digest" do

Modified: MacRuby/trunk/spec/frozen/library/openssl/hmac/hexdigest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openssl/hmac/hexdigest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openssl/hmac/hexdigest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../shared/constants'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../shared/constants', __FILE__)
 require 'openssl'
 
 describe "OpenSSL::HMAC.hexdigest" do

Modified: MacRuby/trunk/spec/frozen/library/openssl/random/pseudo_bytes_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openssl/random/pseudo_bytes_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openssl/random/pseudo_bytes_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/random_bytes.rb'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/random_bytes.rb', __FILE__)
 
 describe "OpenSSL::Random#pseudo_bytes" do
   it_behaves_like :openssl_random_bytes, :pseudo_bytes

Modified: MacRuby/trunk/spec/frozen/library/openssl/random/random_bytes_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openssl/random/random_bytes_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openssl/random/random_bytes_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/random_bytes.rb'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/random_bytes.rb', __FILE__)
 
 describe "OpenSSL::Random#random_bytes" do
   it_behaves_like :openssl_random_bytes, :random_bytes

Modified: MacRuby/trunk/spec/frozen/library/openssl/random/shared/random_bytes.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openssl/random/shared/random_bytes.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openssl/random/shared/random_bytes.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'openssl'
 
 describe :openssl_random_bytes, :shared => true do |cmd|

Modified: MacRuby/trunk/spec/frozen/library/openstruct/delete_field_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/delete_field_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/delete_field_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ostruct'
 
 describe "OpenStruct#delete_field" do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/equal_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/equal_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/equal_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "ostruct"
-require File.dirname(__FILE__) + "/fixtures/classes"
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "OpenStruct#==" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/frozen_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/frozen_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/frozen_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ostruct'
 
 describe "OpenStruct.new when frozen" do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/initialize_copy_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/initialize_copy_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/initialize_copy_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "ostruct"
 
 describe "OpenStruct#initialize_copy" do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ostruct'
 
 describe "OpenStruct#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ostruct'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/inspect"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/inspect', __FILE__)
 
 describe "OpenStruct#inspect" do
   it_behaves_like :ostruct_inspect, :inspect

Modified: MacRuby/trunk/spec/frozen/library/openstruct/marshal_dump_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/marshal_dump_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/marshal_dump_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "ostruct"
 
 describe "OpenStruct#marshal_dump" do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/marshal_load_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/marshal_load_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/marshal_load_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "ostruct"
 
 describe "OpenStruct#marshal_load when passed [Hash]" do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/method_missing_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/method_missing_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/method_missing_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "ostruct"
 
 describe "OpenStruct#method_missing when called with a method name ending in '='" do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/new_ostruct_member_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/new_ostruct_member_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/new_ostruct_member_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "ostruct"
 
 describe "OpenStruct#new_ostruct_member when passed [method_name]" do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ostruct'
 
 describe "OpenStruct.new when passed [Hash]" do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/table_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/table_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/table_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ostruct'
 
 describe "OpenStruct#table" do
@@ -7,7 +7,7 @@
   end
   
   it "is protected" do
-    @os.protected_methods.should include("table")
+    OpenStruct.should have_protected_instance_method(:table)
   end
   
   it "returns self's method/value table" do

Modified: MacRuby/trunk/spec/frozen/library/openstruct/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/openstruct/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/openstruct/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'ostruct'
-require File.dirname(__FILE__) + "/fixtures/classes"
-require File.dirname(__FILE__) + "/shared/inspect"
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/inspect', __FILE__)
 
 describe "OpenStruct#to_s" do
   it_behaves_like :ostruct_inspect, :to_s
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/parsedate/parsedate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/parsedate/parsedate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/parsedate/parsedate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../spec_helper"
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
   require "parsedate"

Modified: MacRuby/trunk/spec/frozen/library/pathname/absolute_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/pathname/absolute_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/pathname/absolute_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'pathname'
 
 describe "Pathname#absolute?" do

Modified: MacRuby/trunk/spec/frozen/library/pathname/equal_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/pathname/equal_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/pathname/equal_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'pathname'
 
 describe "Pathname#==" do

Modified: MacRuby/trunk/spec/frozen/library/pathname/hash_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/pathname/hash_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/pathname/hash_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'pathname'
 
 describe "Pathname#hash" do

Modified: MacRuby/trunk/spec/frozen/library/pathname/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/pathname/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/pathname/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'pathname'
 
 describe "Pathname.new" do

Modified: MacRuby/trunk/spec/frozen/library/pathname/parent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/pathname/parent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/pathname/parent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'pathname'
 
 describe "Pathname#parent" do

Modified: MacRuby/trunk/spec/frozen/library/pathname/relative_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/pathname/relative_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/pathname/relative_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'pathname'
 
 describe "Pathname#relative?" do

Modified: MacRuby/trunk/spec/frozen/library/pathname/root_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/pathname/root_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/pathname/root_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'pathname'
 
 describe "Pathname#root?" do

Modified: MacRuby/trunk/spec/frozen/library/pathname/sub_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/pathname/sub_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/pathname/sub_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'pathname'
 
 describe "Pathname#sub" do

Modified: MacRuby/trunk/spec/frozen/library/ping/pingecho_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/ping/pingecho_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/ping/pingecho_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is ""..."1.9" do
   

Modified: MacRuby/trunk/spec/frozen/library/prime/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/each'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/each', __FILE__)
 require 'timeout'
 
 # force reload for Prime::method_added and Prime::instance

Modified: MacRuby/trunk/spec/frozen/library/prime/instance_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/instance_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/instance_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'prime'
 
 describe "Prime.instance" do

Modified: MacRuby/trunk/spec/frozen/library/prime/int_from_prime_division_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/int_from_prime_division_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/int_from_prime_division_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'prime'
 
 describe "Prime.int_from_prime_division" do

Modified: MacRuby/trunk/spec/frozen/library/prime/integer/each_prime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/integer/each_prime_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/integer/each_prime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'prime'
 
 describe "Integer.each_prime" do

Modified: MacRuby/trunk/spec/frozen/library/prime/integer/from_prime_division_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/integer/from_prime_division_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/integer/from_prime_division_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'prime'
 
 describe "Integer.from_prime_division" do

Modified: MacRuby/trunk/spec/frozen/library/prime/integer/prime_division_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/integer/prime_division_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/integer/prime_division_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'prime'
 
 describe "Integer#prime_division" do
@@ -11,7 +11,7 @@
     1.prime_division.should == []
   end
   it "returns an empty array for -1" do
-    -1.prime_division.should == []
+    -1.prime_division.should == [[-1, 1]]
   end
   it "raises ZeroDivisionError for 0" do
     lambda { 0.prime_division }.should raise_error(ZeroDivisionError)

Modified: MacRuby/trunk/spec/frozen/library/prime/integer/prime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/integer/prime_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/integer/prime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'prime'
 
 describe "Integer#prime?" do

Modified: MacRuby/trunk/spec/frozen/library/prime/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'prime'
 
 describe "Prime.new" do

Modified: MacRuby/trunk/spec/frozen/library/prime/next_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/next_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/next_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/next'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/next', __FILE__)
 require 'prime'
 
 describe "Prime#next" do

Modified: MacRuby/trunk/spec/frozen/library/prime/prime_division_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/prime_division_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/prime_division_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'prime'
 
 describe "Prime.prime_division" do

Modified: MacRuby/trunk/spec/frozen/library/prime/prime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/prime_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/prime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'prime'
 
 describe "Prime#prime?" do

Modified: MacRuby/trunk/spec/frozen/library/prime/succ_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/prime/succ_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/prime/succ_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/next'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/next', __FILE__)
 require 'prime'
 
 describe "Prime#succ" do

Modified: MacRuby/trunk/spec/frozen/library/queue/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__)+'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
-require File.dirname(__FILE__)+'/shared/enque'
+require File.expand_path('../shared/enque', __FILE__)
 
 describe "Queue#<<" do
   it_behaves_like :queue_enq, :<<

Modified: MacRuby/trunk/spec/frozen/library/queue/clear_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/clear_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/clear_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) +'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "Queue#clear" do

Modified: MacRuby/trunk/spec/frozen/library/queue/deq_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/deq_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/deq_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__)+'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
-require File.dirname(__FILE__)+'/shared/deque'
+require File.expand_path('../shared/deque', __FILE__)
 
 describe "Queue#deq" do
   it_behaves_like :queue_deq, :deq

Modified: MacRuby/trunk/spec/frozen/library/queue/empty_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/empty_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/empty_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) +'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "Queue#empty?" do

Modified: MacRuby/trunk/spec/frozen/library/queue/enq_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/enq_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/enq_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__)+'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
-require File.dirname(__FILE__)+'/shared/enque'
+require File.expand_path('../shared/enque', __FILE__)
 
 describe "Queue#enq" do
   it_behaves_like :queue_enq, :enq

Modified: MacRuby/trunk/spec/frozen/library/queue/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__)+'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
-require File.dirname(__FILE__)+'/shared/length'
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Queue#length" do
   it_behaves_like :queue_length, :length

Modified: MacRuby/trunk/spec/frozen/library/queue/num_waiting_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/num_waiting_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/num_waiting_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) +'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
 
 describe "Queue#num_waiting" do

Modified: MacRuby/trunk/spec/frozen/library/queue/pop_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/pop_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/pop_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__)+'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
-require File.dirname(__FILE__)+'/shared/deque'
+require File.expand_path('../shared/deque', __FILE__)
 
 describe "Queue#pop" do
   it_behaves_like :queue_deq, :pop

Modified: MacRuby/trunk/spec/frozen/library/queue/push_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/push_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/push_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__)+'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
-require File.dirname(__FILE__)+'/shared/enque'
+require File.expand_path('../shared/enque', __FILE__)
 
 describe "Queue#push" do
   it_behaves_like :queue_enq, :push

Modified: MacRuby/trunk/spec/frozen/library/queue/shift_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/shift_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/shift_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__)+'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
-require File.dirname(__FILE__)+'/shared/deque'
+require File.expand_path('../shared/deque', __FILE__)
 
 describe "Queue#shift" do
   it_behaves_like :queue_deq, :shift

Modified: MacRuby/trunk/spec/frozen/library/queue/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/queue/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/queue/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) +'/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'thread'
-require File.dirname(__FILE__)+'/shared/length'
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Queue#size" do
   it_behaves_like :queue_length, :size

Modified: MacRuby/trunk/spec/frozen/library/rational/Rational_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/Rational_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/Rational_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/Rational'
+require File.expand_path('../../../shared/rational/Rational', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational() passed Integer, Integer" do

Modified: MacRuby/trunk/spec/frozen/library/rational/abs_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/abs_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/abs_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/abs'
+require File.expand_path('../../../shared/rational/abs', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#abs" do

Modified: MacRuby/trunk/spec/frozen/library/rational/ceil_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/ceil_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/ceil_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/ceil'
+require File.expand_path('../../../shared/rational/ceil', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#ceil" do

Modified: MacRuby/trunk/spec/frozen/library/rational/coerce_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/coerce_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/coerce_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/coerce'
+require File.expand_path('../../../shared/rational/coerce', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#coerce" do

Modified: MacRuby/trunk/spec/frozen/library/rational/comparison_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/comparison_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/comparison_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/comparison'
+require File.expand_path('../../../shared/rational/comparison', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#<=> when passed a Rational object" do

Modified: MacRuby/trunk/spec/frozen/library/rational/denominator_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/denominator_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/denominator_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/denominator'
+require File.expand_path('../../../shared/rational/denominator', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#denominator" do

Modified: MacRuby/trunk/spec/frozen/library/rational/div_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/div_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/div_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/div'
+require File.expand_path('../../../shared/rational/div', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#div" do

Modified: MacRuby/trunk/spec/frozen/library/rational/divide_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/divide_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/divide_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/divide'
+require File.expand_path('../../../shared/rational/divide', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#/" do

Modified: MacRuby/trunk/spec/frozen/library/rational/divmod_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/divmod_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/divmod_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/divmod'
+require File.expand_path('../../../shared/rational/divmod', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#divmod when passed a Rational" do

Modified: MacRuby/trunk/spec/frozen/library/rational/equal_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/equal_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/equal_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/equal_value'
+require File.expand_path('../../../shared/rational/equal_value', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#==" do

Modified: MacRuby/trunk/spec/frozen/library/rational/exponent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/exponent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/exponent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/exponent'
+require File.expand_path('../../../shared/rational/exponent', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#**" do

Modified: MacRuby/trunk/spec/frozen/library/rational/fdiv_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/fdiv_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/fdiv_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/fdiv'
+require File.expand_path('../../../shared/rational/fdiv', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#fdiv" do

Modified: MacRuby/trunk/spec/frozen/library/rational/floor_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/floor_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/floor_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/floor'
+require File.expand_path('../../../shared/rational/floor', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#floor" do

Modified: MacRuby/trunk/spec/frozen/library/rational/hash_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/hash_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/hash_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/hash'
+require File.expand_path('../../../shared/rational/hash', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#hash" do

Modified: MacRuby/trunk/spec/frozen/library/rational/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/initialize'
+require File.expand_path('../../../shared/rational/initialize', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/rational/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/inspect'
+require File.expand_path('../../../shared/rational/inspect', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#inspect" do

Modified: MacRuby/trunk/spec/frozen/library/rational/minus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/minus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/minus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/minus'
+require File.expand_path('../../../shared/rational/minus', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#-" do

Modified: MacRuby/trunk/spec/frozen/library/rational/modulo_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/modulo_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/modulo_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/modulo'
+require File.expand_path('../../../shared/rational/modulo', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#%" do

Modified: MacRuby/trunk/spec/frozen/library/rational/multiply_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/multiply_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/multiply_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/multiply'
+require File.expand_path('../../../shared/rational/multiply', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#*" do

Modified: MacRuby/trunk/spec/frozen/library/rational/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/new'
+require File.expand_path('../../../shared/rational/new', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational.new" do

Modified: MacRuby/trunk/spec/frozen/library/rational/numerator_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/numerator_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/numerator_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/numerator'
+require File.expand_path('../../../shared/rational/numerator', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#numerator" do

Modified: MacRuby/trunk/spec/frozen/library/rational/plus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/plus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/plus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/plus'
+require File.expand_path('../../../shared/rational/plus', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#+" do

Modified: MacRuby/trunk/spec/frozen/library/rational/quo_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/quo_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/quo_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/divide'
+require File.expand_path('../../../shared/rational/divide', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#quo" do

Modified: MacRuby/trunk/spec/frozen/library/rational/reduce_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/reduce_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/reduce_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/reduce'
+require File.expand_path('../../../shared/rational/reduce', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational.reduce" do

Modified: MacRuby/trunk/spec/frozen/library/rational/remainder_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/remainder_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/remainder_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/remainder'
+require File.expand_path('../../../shared/rational/remainder', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#remainder" do

Modified: MacRuby/trunk/spec/frozen/library/rational/round_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/round_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/round_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/round'
+require File.expand_path('../../../shared/rational/round', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#round" do

Modified: MacRuby/trunk/spec/frozen/library/rational/to_f_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/to_f_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/to_f_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/to_f'
+require File.expand_path('../../../shared/rational/to_f', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#to_f" do

Modified: MacRuby/trunk/spec/frozen/library/rational/to_i_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/to_i_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/to_i_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/to_i'
+require File.expand_path('../../../shared/rational/to_i', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#to_i" do

Modified: MacRuby/trunk/spec/frozen/library/rational/to_r_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/to_r_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/to_r_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/to_r'
+require File.expand_path('../../../shared/rational/to_r', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#to_r" do

Modified: MacRuby/trunk/spec/frozen/library/rational/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/to_s'
+require File.expand_path('../../../shared/rational/to_s', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#to_s" do

Modified: MacRuby/trunk/spec/frozen/library/rational/truncate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rational/truncate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rational/truncate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../shared/rational/truncate'
+require File.expand_path('../../../shared/rational/truncate', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "Rational#truncate" do

Modified: MacRuby/trunk/spec/frozen/library/readline/basic_quote_characters_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/basic_quote_characters_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/basic_quote_characters_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline.basic_quote_characters" do
       it "returns not nil" do
         Readline.basic_quote_characters.should_not be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/basic_word_break_characters_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/basic_word_break_characters_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/basic_word_break_characters_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline.basic_word_break_characters" do
       it "returns not nil" do
         Readline.basic_word_break_characters.should_not be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/completer_quote_characters_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/completer_quote_characters_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/completer_quote_characters_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline.completer_quote_characters" do
       it "returns nil" do
         Readline.completer_quote_characters.should be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/completer_word_break_characters_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/completer_word_break_characters_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/completer_word_break_characters_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline.completer_word_break_characters" do
       it "returns nil" do
         Readline.completer_word_break_characters.should be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/completion_append_character_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/completion_append_character_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/completion_append_character_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline.completion_append_character" do
       it "returns not nil" do
         Readline.completion_append_character.should_not be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/completion_case_fold_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/completion_case_fold_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/completion_case_fold_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline.completion_case_fold" do
       it "returns nil" do
         Readline.completion_case_fold.should be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/completion_proc_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/completion_proc_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/completion_proc_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline.completion_proc" do
       it "returns nil" do
         Readline.completion_proc.should be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/constants_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/constants_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/constants_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     # Note: additional specs for HISTORY are in 'history' subdir.
     describe "Readline::HISTORY" do
       it "is defined" do

Modified: MacRuby/trunk/spec/frozen/library/readline/emacs_editing_mode_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/emacs_editing_mode_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/emacs_editing_mode_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline.emacs_editing_mode" do
       it "returns nil" do
         Readline.emacs_editing_mode.should be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/filename_quote_characters_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/filename_quote_characters_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/filename_quote_characters_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline.filename_quote_characters" do
       it "returns nil" do
         Readline.filename_quote_characters.should be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/history/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY.<<" do
       it "appends the given Object to the history" do
         Readline::HISTORY << "1"

Modified: MacRuby/trunk/spec/frozen/library/readline/history/delete_at_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/delete_at_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/delete_at_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY.delete_at" do
       it "deletes and returns the history entry at the specified index" do
         Readline::HISTORY.push("1", "2", "3")

Modified: MacRuby/trunk/spec/frozen/library/readline/history/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY.each" do
       before(:each) do
         Readline::HISTORY.push("1", "2", "3")

Modified: MacRuby/trunk/spec/frozen/library/readline/history/element_reference_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/element_reference_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/element_reference_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY.[]" do
       before(:each) do
         Readline::HISTORY.push("1", "2", "3")

Modified: MacRuby/trunk/spec/frozen/library/readline/history/element_set_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/element_set_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/element_set_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY.[]=" do
       before(:each) do
         Readline::HISTORY.push("1", "2", "3")

Modified: MacRuby/trunk/spec/frozen/library/readline/history/empty_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/empty_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/empty_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY.empty?" do
       it "returns true when the history is empty" do
         Readline::HISTORY.should be_empty

Modified: MacRuby/trunk/spec/frozen/library/readline/history/history_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/history_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/history_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY" do
       it "is extended with the Enumerable module" do
         Readline::HISTORY.should be_kind_of(Enumerable)

Modified: MacRuby/trunk/spec/frozen/library/readline/history/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
-
-  not_supported_on :ironruby do
+  with_feature :readline do
     require 'readline'
-    require File.dirname(__FILE__) + '/shared/size'
+    require File.expand_path('../shared/size', __FILE__)
 
     describe "Readline::HISTORY.length" do
       it_behaves_like :readline_history_size, :length

Modified: MacRuby/trunk/spec/frozen/library/readline/history/pop_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/pop_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/pop_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY.pop" do
       it "returns nil when the history is empty" do
         Readline::HISTORY.pop.should be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/history/push_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/push_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/push_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY.push" do
       it "pushes all passed Objects into the history" do
         Readline::HISTORY.push("1", "2", "3")

Modified: MacRuby/trunk/spec/frozen/library/readline/history/shift_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/shift_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/shift_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY.shift" do
       it "returns nil when the history is empty" do
         Readline::HISTORY.shift.should be_nil

Modified: MacRuby/trunk/spec/frozen/library/readline/history/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
-
-  not_supported_on :ironruby do
+  with_feature :readline do
     require 'readline'
-    require File.dirname(__FILE__) + '/shared/size'
+    require File.expand_path('../shared/size', __FILE__)
 
     describe "Readline::HISTORY.size" do
       it_behaves_like :readline_history_size, :size

Modified: MacRuby/trunk/spec/frozen/library/readline/history/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/history/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/history/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline::HISTORY.to_s" do
       it "returns 'HISTORY'" do
         Readline::HISTORY.to_s.should == "HISTORY"

Modified: MacRuby/trunk/spec/frozen/library/readline/readline_spec_disabled.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/readline_spec_disabled.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/readline_spec_disabled.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,8 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
-
-  not_supported_on :ironruby, :jruby do
+  with_feature :readline do
     require 'readline'
 
     describe "Readline.readline" do

Modified: MacRuby/trunk/spec/frozen/library/readline/vi_editing_mode_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/readline/vi_editing_mode_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/readline/vi_editing_mode_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 process_is_foreground do
+  with_feature :readline do
+    require 'readline'
 
-  not_supported_on :ironruby do
-    require 'readline'
     describe "Readline.vi_editing_mode" do
       it "returns nil" do
         Readline.vi_editing_mode.should be_nil

Modified: MacRuby/trunk/spec/frozen/library/resolv/get_address_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/resolv/get_address_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/resolv/get_address_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'socket'
 
 describe "Resolv#getaddress" do
@@ -7,17 +7,17 @@
   end
 
   it 'resolves localhost' do
+    res = Resolv.new([Resolv::Hosts.new])
 
-    localhost = Socket.getaddrinfo("127.0.0.1", nil)[0][2]
-
     lambda {
-      address = Resolv.getaddress(localhost)
+      address = res.getaddress("localhost")
     }.should_not raise_error(Resolv::ResolvError)
   end
-  
-  it 'raises ResolvError given a bogus address' do
+
+  it 'raises ResolvError if the name can not be looked up' do
+    res = Resolv.new([])
     lambda {
-      address = Resolv.getaddress("should.raise.error.")
+      address = res.getaddress("should.raise.error.")
     }.should raise_error(Resolv::ResolvError)
   end
 

Modified: MacRuby/trunk/spec/frozen/library/resolv/get_addresses_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/resolv/get_addresses_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/resolv/get_addresses_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'socket'
 
 describe "Resolv#getaddresses" do
@@ -7,14 +7,14 @@
   end
 
   it 'resolves localhost' do
-    localhost = Socket.getaddrinfo("127.0.0.1", nil)[0][2]
+    res = Resolv.new([Resolv::Hosts.new])
 
     addresses = nil
 
     lambda {
-      addresses = Resolv.getaddresses(localhost)
+      addresses = res.getaddresses("localhost")
     }.should_not raise_error(Resolv::ResolvError)
-    
+
     addresses.should_not == nil
     addresses.size.should > 0
   end

Modified: MacRuby/trunk/spec/frozen/library/resolv/get_name_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/resolv/get_name_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/resolv/get_name_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Resolv#getname" do
   before(:all) do
@@ -6,11 +6,16 @@
   end
 
   it 'resolves 127.0.0.1' do
+    res = Resolv.new([Resolv::Hosts.new])
     lambda {
       Resolv.getname("127.0.0.1")
     }.should_not raise_error(Resolv::ResolvError)
+  end
+
+  it "raises ResolvError when there is no result" do
+    res = Resolv.new([])
     lambda {
-      Resolv.getname("should.raise.error")
+      res.getname("should.raise.error")
     }.should raise_error(Resolv::ResolvError)
   end
 

Modified: MacRuby/trunk/spec/frozen/library/resolv/get_names_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/resolv/get_names_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/resolv/get_names_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Resolv#getnames" do
   before(:all) do
@@ -6,10 +6,14 @@
   end
 
   it 'resolves 127.0.0.1' do
+    res = Resolv.new([Resolv::Hosts.new])
+
     names = nil
+
     lambda {
-      names = Resolv.getnames("127.0.0.1")
+      names = res.getnames("127.0.0.1")
     }.should_not raise_error(Resolv::ResolvError)
+
     names.should_not == nil
     names.size.should > 0
   end

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/clone_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/clone_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/clone_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#clone" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/element_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/element_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/element_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#element" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/equal_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/equal_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/equal_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#==" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/hash_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/hash_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/hash_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#hash" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#inspect" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/namespace_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/namespace_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/namespace_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#namespace" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/node_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/node_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/node_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#node_type" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/prefix_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/prefix_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/prefix_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#prefix" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/remove_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/remove_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/remove_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#remove" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#to_s" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/to_string_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/to_string_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/to_string_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#to_string" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#value" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/write_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/write_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/write_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#write" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attribute/xpath_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attribute/xpath_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attribute/xpath_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attribute#xpath" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/add_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/add_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/add_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/add'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/add', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#add" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/add'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/add', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#<<" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/delete_all_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/delete_all_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/delete_all_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#delete_all" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/delete_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/delete_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/delete_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#delete" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/each_attribute_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/each_attribute_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/each_attribute_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#each_attribute" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#each" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/element_reference_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/element_reference_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/element_reference_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#[]" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/element_set_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/element_set_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/element_set_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#[]=" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/get_attribute_ns_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/get_attribute_ns_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/get_attribute_ns_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#get_attribute_ns" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/get_attribute_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/get_attribute_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/get_attribute_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#get_attribute" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#length" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/namespaces_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/namespaces_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/namespaces_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#namespaces" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/prefixes_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/prefixes_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/prefixes_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#prefixes" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/shared/length.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/shared/length.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/shared/length.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe :rexml_attribute_length, :shared => true do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#size" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/attributes/to_a_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/attributes/to_a_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/attributes/to_a_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Attributes#to_a" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/cdata/clone_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/cdata/clone_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/cdata/clone_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::CData#clone" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/cdata/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/cdata/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/cdata/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::CData#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/cdata/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/cdata/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/cdata/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/to_s'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/to_s', __FILE__)
 require 'rexml/document'
 
 describe "REXML::CData#to_s" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/cdata/value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/cdata/value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/cdata/value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/to_s'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/to_s', __FILE__)
 require 'rexml/document'
 
 describe "REXML::CData#value" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/add_element_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/add_element_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/add_element_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Document#add_element" do
   it "adds arg1 with attributes arg2 as root node" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/add_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/add_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/add_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 # This spec defines Document#add and Document#<<
 

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/clone_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/clone_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/clone_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 # According to the MRI documentation (http://www.ruby-doc.org/stdlib/libdoc/rexml/rdoc/index.html),
 # clone's behavior "should be obvious". Apparently "obvious" means cloning

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/doctype_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/doctype_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/doctype_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Document#doctype" do
   it "returns the doctype" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/encoding_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/encoding_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/encoding_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Document#encoding" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/expanded_name_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/expanded_name_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/expanded_name_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe :document_expanded_name, :shared => true do
   it "returns an empty string for root" do # root nodes have no expanded name

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Document#new" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/node_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/node_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/node_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Document#node_type" do 
   it "returns :document" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/root_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/root_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/root_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Document#root" do 
   it "returns document root tag name" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/stand_alone_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/stand_alone_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/stand_alone_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Document#stand_alone?" do 
   it "returns the XMLDecl standalone value" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/version_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/version_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/version_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Document#version" do
   it "returns XML version from declaration" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/write_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/write_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/write_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
 require 'rexml/document'
 require 'rexml/formatters/transitive'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 # Maybe this can be cleaned
 describe "REXML::Document#write" do
@@ -28,7 +28,7 @@
   ruby_bug "REXMLTracker#162", "1.8" do
     it "returns document with transitive support" do
       @d.write(@str, 2, true)
-      @str.should =~  "\s*<Springfield\s*><EvergreenTerrace\s*><House742\s*\/><\/EvergreenTerrace\s*><\/Springfield\s*>"
+      @str.should =~ /\s*<Springfield\s*><EvergreenTerrace\s*><House742\s*\/><\/EvergreenTerrace\s*><\/Springfield\s*>/
     end
   end
 

Modified: MacRuby/trunk/spec/frozen/library/rexml/document/xml_decl_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/document/xml_decl_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/document/xml_decl_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Document#xml_decl" do 
   it "returns XML declaration of the document" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/add_attribute_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/add_attribute_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/add_attribute_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#add_attribute" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/add_attributes_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/add_attributes_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/add_attributes_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#add_attribute" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/add_element_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/add_element_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/add_element_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 
 describe "REXML::Element#add_element" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/add_namespace_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/add_namespace_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/add_namespace_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#add_namespace" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/add_text_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/add_text_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/add_text_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#add_namespace" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/attribute_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/attribute_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/attribute_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#attribute" do
   it "returns an attribute by name" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/attributes_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/attributes_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/attributes_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#attributes" do
   it "returns element's Attributes" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/cdatas_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/cdatas_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/cdatas_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#cdatas" do
   before :each do 

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/clone_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/clone_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/clone_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#clone" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/comments_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/comments_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/comments_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#comments" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/delete_attribute_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/delete_attribute_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/delete_attribute_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#delete_attribute" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/delete_element_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/delete_element_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/delete_element_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#delete_element" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/delete_namespace_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/delete_namespace_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/delete_namespace_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#delete_namespace" do
 

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/document_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/document_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/document_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#document" do
 

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/each_element_with_attribute_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/each_element_with_attribute_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/each_element_with_attribute_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#each_element_with_attributes" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/each_element_with_text_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/each_element_with_text_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/each_element_with_text_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#each_element_with_text" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/get_text_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/get_text_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/get_text_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#get_text" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/has_attributes_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/has_attributes_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/has_attributes_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#has_attributes?" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/has_elements_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/has_elements_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/has_elements_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#has_elements?" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/has_text_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/has_text_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/has_text_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#has_text?" do
   

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#inspect" do
 

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/instructions_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/instructions_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/instructions_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#instructions" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/namespace_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/namespace_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/namespace_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#namespace" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/namespaces_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/namespaces_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/namespaces_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#namespaces" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#new" do
 

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/next_element_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/next_element_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/next_element_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#next_element" do
   before :each do 

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/node_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/node_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/node_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#node_type" do
   it "returns :element" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/prefixes_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/prefixes_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/prefixes_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#prefixes" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/previous_element_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/previous_element_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/previous_element_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#previous_element" do
   before :each do 

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/raw_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/raw_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/raw_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#raw" do
   it "returns true if raw mode is set to all" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/root_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/root_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/root_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Element#root" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/text_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/text_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/text_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#text" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/texts_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/texts_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/texts_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#texts" do
 

Modified: MacRuby/trunk/spec/frozen/library/rexml/element/whitespace_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/element/whitespace_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/element/whitespace_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe "REXML::Element#whitespace" do
   it "returns true if whitespace is respected in the element" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/node/each_recursive_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/node/each_recursive_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/node/each_recursive_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Node#each_recursive" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/node/find_first_recursive_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/node/find_first_recursive_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/node/find_first_recursive_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Node#find_first_recursive" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/node/index_in_parent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/node/index_in_parent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/node/index_in_parent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Node#index_in_parent" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/node/next_sibling_node_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/node/next_sibling_node_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/node/next_sibling_node_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Node#next_sibling_node" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/node/parent_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/node/parent_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/node/parent_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Node#parent?" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/node/previous_sibling_node_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/node/previous_sibling_node_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/node/previous_sibling_node_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Node#previous_sibling_node" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/shared/each_element.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/shared/each_element.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/shared/each_element.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe :rexml_each_element, :shared => true do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/shared/elements_to_a.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/shared/elements_to_a.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/shared/elements_to_a.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'rexml/document'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe :rexml_elements_to_a, :shared => true do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#<<" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/clone_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/clone_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/clone_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#clone" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/comparison_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/comparison_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/comparison_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#<=>" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/empty_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/empty_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/empty_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#empty?" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/indent_text_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/indent_text_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/indent_text_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#indent_text" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#inspect" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text.new" do
@@ -45,10 +45,5 @@
     t = REXML::Text.new("<&>", false, nil, false)
     t.should == "&lt;&amp;&gt;"
   end
-
-   it "can detect illegal expressions from a regex if raw is true" do
-    lambda{ REXML::Text.new("test text", false, nil, true, nil, /text/)}.should raise_error(Exception)
-    lambda{ REXML::Text.new("test", false, nil, true, nil, /text/)}.should_not raise_error(Exception)
-  end
 end
 

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/node_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/node_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/node_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#node_type" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/normalize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/normalize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/normalize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text.normalize" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/read_with_substitution_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/read_with_substitution_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/read_with_substitution_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text.read_with_substitution" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/to_s_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/to_s_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/to_s_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#to_s" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/unnormalize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/unnormalize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/unnormalize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text.unnormalize" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#value" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/wrap_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/wrap_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/wrap_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#wrap" do

Modified: MacRuby/trunk/spec/frozen/library/rexml/text/write_with_substitution_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/rexml/text/write_with_substitution_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/rexml/text/write_with_substitution_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'rexml/document'
 
 describe "REXML::Text#write_with_substitution" do

Modified: MacRuby/trunk/spec/frozen/library/scanf/io/block_scanf_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/scanf/io/block_scanf_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/scanf/io/block_scanf_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/block_scanf.rb'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/block_scanf.rb', __FILE__)
 require 'scanf'
 
 describe "IO#block_scanf" do

Modified: MacRuby/trunk/spec/frozen/library/scanf/io/scanf_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/scanf/io/scanf_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/scanf/io/scanf_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/block_scanf.rb'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/block_scanf.rb', __FILE__)
 require 'scanf'
 
 describe "IO#scanf" do

Modified: MacRuby/trunk/spec/frozen/library/scanf/string/block_scanf_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/scanf/string/block_scanf_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/scanf/string/block_scanf_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/block_scanf.rb'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/block_scanf.rb', __FILE__)
 require 'scanf'
 
 describe "String#block_scanf" do

Modified: MacRuby/trunk/spec/frozen/library/scanf/string/scanf_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/scanf/string/scanf_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/scanf/string/scanf_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/block_scanf.rb'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/block_scanf.rb', __FILE__)
 require 'scanf'
 
 describe "String#scanf" do

Modified: MacRuby/trunk/spec/frozen/library/securerandom/base64_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/securerandom/base64_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/securerandom/base64_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is "1.8.7" do
   require 'securerandom'

Modified: MacRuby/trunk/spec/frozen/library/securerandom/hex_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/securerandom/hex_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/securerandom/hex_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is "1.8.7" do
   require 'securerandom'

Modified: MacRuby/trunk/spec/frozen/library/securerandom/random_bytes_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/securerandom/random_bytes_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/securerandom/random_bytes_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is "1.8.7" do
   require 'securerandom'

Modified: MacRuby/trunk/spec/frozen/library/securerandom/random_number_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/securerandom/random_number_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/securerandom/random_number_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 ruby_version_is "1.8.7" do
   require 'securerandom'

Modified: MacRuby/trunk/spec/frozen/library/set/add_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/add_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/add_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/add'
+require File.expand_path('../shared/add', __FILE__)
 
 describe "Set#add" do
   it_behaves_like :set_add, :add

Modified: MacRuby/trunk/spec/frozen/library/set/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/add'
+require File.expand_path('../shared/add', __FILE__)
 
 describe "Set#<<" do
   it_behaves_like :set_add, :<<

Modified: MacRuby/trunk/spec/frozen/library/set/classify_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/classify_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/classify_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#classify" do
@@ -21,7 +21,7 @@
   ruby_version_is "1.8.8" do
     it "returns an Enumerator when passed no block" do
       enum = @set.classify
-      enum.should be_kind_of(enumerator_class)
+      enum.should be_an_instance_of(enumerator_class)
       
       classified = enum.each { |x| x.length }
       classified.should == { 3 => Set["one", "two"], 4 => Set["four"], 5 => Set["three"] }

Modified: MacRuby/trunk/spec/frozen/library/set/clear_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/clear_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/clear_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#clear" do

Modified: MacRuby/trunk/spec/frozen/library/set/collect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/collect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/collect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/collect'
+require File.expand_path('../shared/collect', __FILE__)
 
 describe "Set#collect!" do
   it_behaves_like :set_collect_bang, :collect!

Modified: MacRuby/trunk/spec/frozen/library/set/constructor_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/constructor_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/constructor_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set[]" do

Modified: MacRuby/trunk/spec/frozen/library/set/delete_if_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/delete_if_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/delete_if_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#delete_if" do
@@ -34,7 +34,7 @@
   ruby_version_is "1.8.8" do
     it "returns an Enumerator when passed no block" do
       enum = @set.delete_if
-      enum.should be_kind_of(enumerator_class)
+      enum.should be_an_instance_of(enumerator_class)
       
       enum.each { |x| x.size == 3 }
       

Modified: MacRuby/trunk/spec/frozen/library/set/delete_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/delete_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/delete_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#delete" do

Modified: MacRuby/trunk/spec/frozen/library/set/difference_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/difference_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/difference_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/difference'
+require File.expand_path('../shared/difference', __FILE__)
 
 describe "Set#difference" do
   it_behaves_like :set_difference, :difference

Modified: MacRuby/trunk/spec/frozen/library/set/divide_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/divide_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/divide_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#divide" do

Modified: MacRuby/trunk/spec/frozen/library/set/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#each" do

Modified: MacRuby/trunk/spec/frozen/library/set/empty_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/empty_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/empty_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#empty?" do

Modified: MacRuby/trunk/spec/frozen/library/set/enumerable/to_set_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/enumerable/to_set_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/enumerable/to_set_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Enumerable#to_set" do

Modified: MacRuby/trunk/spec/frozen/library/set/eql_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/eql_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/eql_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 ruby_version_is "1.8.7" do

Modified: MacRuby/trunk/spec/frozen/library/set/equal_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/equal_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/equal_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#==" do

Modified: MacRuby/trunk/spec/frozen/library/set/exclusion_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/exclusion_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/exclusion_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#^" do

Modified: MacRuby/trunk/spec/frozen/library/set/flatten_merge_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/flatten_merge_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/flatten_merge_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#flatten_merge" do

Modified: MacRuby/trunk/spec/frozen/library/set/flatten_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/flatten_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/flatten_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#flatten" do

Modified: MacRuby/trunk/spec/frozen/library/set/hash_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/hash_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/hash_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 ruby_version_is "1.8.7" do

Modified: MacRuby/trunk/spec/frozen/library/set/include_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/include_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/include_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/include'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/include', __FILE__)
 require 'set'
 
 describe "Set#include?" do

Modified: MacRuby/trunk/spec/frozen/library/set/initialize_copy_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/initialize_copy_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/initialize_copy_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#initialize_copy" do

Modified: MacRuby/trunk/spec/frozen/library/set/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/set/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#inspect" do

Modified: MacRuby/trunk/spec/frozen/library/set/intersection_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/intersection_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/intersection_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/intersection'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/intersection', __FILE__)
 require 'set'
 
 describe "Set#intersection" do

Modified: MacRuby/trunk/spec/frozen/library/set/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 require 'set'
 
 describe "Set#length" do

Modified: MacRuby/trunk/spec/frozen/library/set/map_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/map_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/map_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/collect'
+require File.expand_path('../shared/collect', __FILE__)
 
 describe "Set#map!" do
   it_behaves_like :set_collect_bang, :map!

Modified: MacRuby/trunk/spec/frozen/library/set/member_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/member_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/member_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/include'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/include', __FILE__)
 require 'set'
 
 describe "Set#member?" do

Modified: MacRuby/trunk/spec/frozen/library/set/merge_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/merge_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/merge_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#merge" do

Modified: MacRuby/trunk/spec/frozen/library/set/minus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/minus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/minus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/difference'
+require File.expand_path('../shared/difference', __FILE__)
 
 describe "Set#-" do
   it_behaves_like :set_difference, :-

Modified: MacRuby/trunk/spec/frozen/library/set/plus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/plus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/plus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/union'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/union', __FILE__)
 require 'set'
 
 describe "Set#+" do

Modified: MacRuby/trunk/spec/frozen/library/set/pretty_print_cycle_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/pretty_print_cycle_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/pretty_print_cycle_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#pretty_print_cycle" do

Modified: MacRuby/trunk/spec/frozen/library/set/pretty_print_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/pretty_print_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/pretty_print_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#pretty_print" do

Modified: MacRuby/trunk/spec/frozen/library/set/proper_subset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/proper_subset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/proper_subset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#proper_subset?" do

Modified: MacRuby/trunk/spec/frozen/library/set/proper_superset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/proper_superset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/proper_superset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#proper_superset?" do

Modified: MacRuby/trunk/spec/frozen/library/set/reject_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/reject_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/reject_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#reject!" do
@@ -38,7 +38,7 @@
   ruby_version_is "1.8.8" do
     it "returns an Enumerator when passed no block" do
       enum = @set.reject!
-      enum.should be_kind_of(enumerator_class)
+      enum.should be_an_instance_of(enumerator_class)
       
       enum.each { |x| x.size == 3 }
       

Modified: MacRuby/trunk/spec/frozen/library/set/replace_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/replace_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/replace_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#replace" do

Modified: MacRuby/trunk/spec/frozen/library/set/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 require 'set'
 
 describe "Set#size" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/add_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/add_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/add_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/add'
+require File.expand_path('../shared/add', __FILE__)
 
 describe "SortedSet#add" do
   it_behaves_like :sorted_set_add, :add

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/add'
+require File.expand_path('../shared/add', __FILE__)
 
 describe "SortedSet#<<" do
   it_behaves_like :sorted_set_add, :<<

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/classify_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/classify_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/classify_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#classify" do
@@ -21,7 +21,7 @@
   ruby_version_is "1.8.8" do
     it "returns an Enumerator when passed no block" do
       enum = @set.classify
-      enum.should be_kind_of(enumerator_class)
+      enum.should be_an_instance_of(enumerator_class)
       
       classified = enum.each { |x| x.length }
       classified.should == { 3 => SortedSet["one", "two"], 4 => SortedSet["four"], 5 => SortedSet["three"] }

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/clear_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/clear_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/clear_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#clear" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/collect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/collect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/collect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/collect'
+require File.expand_path('../shared/collect', __FILE__)
 
 describe "SortedSet#collect!" do
   it_behaves_like :sorted_set_collect_bang, :collect!

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/constructor_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/constructor_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/constructor_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet[]" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/delete_if_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/delete_if_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/delete_if_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#delete_if" do
@@ -36,7 +36,7 @@
   # ruby_version_is "1.8.8" do
   #   it "returns an Enumerator when passed no block" do
   #     enum = @set.delete_if
-  #     enum.should be_kind_of(enumerator_class)
+  #     enum.should be_an_instance_of(enumerator_class)
   #     
   #     enum.each { |x| x.size == 3 }
   #     

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/delete_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/delete_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/delete_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#delete" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/difference_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/difference_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/difference_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/difference'
+require File.expand_path('../shared/difference', __FILE__)
 
 describe "SortedSet#difference" do
   it_behaves_like :sorted_set_difference, :difference

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/divide_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/divide_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/divide_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#divide" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#each" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/empty_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/empty_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/empty_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#empty?" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/eql_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/eql_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/eql_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 ruby_version_is "1.8.7" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/equal_value_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/equal_value_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/equal_value_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#==" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/exclusion_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/exclusion_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/exclusion_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#^" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/flatten_merge_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/flatten_merge_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/flatten_merge_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#flatten_merge" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/flatten_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/flatten_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/flatten_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 # Note: Flatten make little sens on sorted sets, because SortedSets are not (by default)

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/hash_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/hash_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/hash_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 ruby_version_is "1.8.7" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/include_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/include_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/include_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/include'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/include', __FILE__)
 require 'set'
 
 describe "SortedSet#include?" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/initialize_copy_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/initialize_copy_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/initialize_copy_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#initialize_copy" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#inspect" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/intersection_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/intersection_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/intersection_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/intersection'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/intersection', __FILE__)
 require 'set'
 
 describe "SortedSet#intersection" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 require 'set'
 
 describe "SortedSet#length" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/map_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/map_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/map_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/collect'
+require File.expand_path('../shared/collect', __FILE__)
 
 describe "SortedSet#map!" do
   it_behaves_like :sorted_set_collect_bang, :map!

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/member_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/member_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/member_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/include'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/include', __FILE__)
 require 'set'
 
 describe "SortedSet#member?" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/merge_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/merge_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/merge_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#merge" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/minus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/minus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/minus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
-require File.dirname(__FILE__) + '/shared/difference'
+require File.expand_path('../shared/difference', __FILE__)
 
 describe "SortedSet#-" do
   it_behaves_like :sorted_set_difference, :-

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/plus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/plus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/plus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/union'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/union', __FILE__)
 require 'set'
 
 describe "SortedSet#+" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/pretty_print_cycle_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/pretty_print_cycle_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/pretty_print_cycle_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#pretty_print_cycle" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/pretty_print_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/pretty_print_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/pretty_print_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#pretty_print" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/proper_subset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/proper_subset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/proper_subset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#proper_subset?" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/proper_superset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/proper_superset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/proper_superset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#proper_superset?" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/reject_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/reject_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/reject_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#reject!" do
@@ -40,7 +40,7 @@
   # ruby_version_is "1.8.8" do
   #   it "returns an Enumerator when passed no block" do
   #     enum = @set.reject!
-  #     enum.should be_kind_of(enumerator_class)
+  #     enum.should be_an_instance_of(enumerator_class)
   #     
   #     enum.each { |x| x.size == 3 }
   #     

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/replace_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/replace_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/replace_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#replace" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 require 'set'
 
 describe "SortedSet#size" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/subset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/subset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/subset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#subset?" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/subtract_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/subtract_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/subtract_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#subtract" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/superset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/superset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/superset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#superset?" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/to_a_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/to_a_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/to_a_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'set'
 
 describe "SortedSet#to_a" do

Modified: MacRuby/trunk/spec/frozen/library/set/sortedset/union_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/sortedset/union_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/sortedset/union_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/union'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/union', __FILE__)
 require 'set'
 
 describe "SortedSet#union" do

Modified: MacRuby/trunk/spec/frozen/library/set/subset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/subset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/subset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#subset?" do

Modified: MacRuby/trunk/spec/frozen/library/set/subtract_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/subtract_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/subtract_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#subtract" do

Modified: MacRuby/trunk/spec/frozen/library/set/superset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/superset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/superset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#superset?" do

Modified: MacRuby/trunk/spec/frozen/library/set/to_a_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/to_a_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/to_a_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'set'
 
 describe "Set#to_a" do

Modified: MacRuby/trunk/spec/frozen/library/set/union_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/set/union_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/set/union_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/union'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/union', __FILE__)
 require 'set'
 
 describe "Set#union" do

Modified: MacRuby/trunk/spec/frozen/library/shellwords/shellwords_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/shellwords/shellwords_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/shellwords/shellwords_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'shellwords'
 include Shellwords
 

Modified: MacRuby/trunk/spec/frozen/library/singleton/allocate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/singleton/allocate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/singleton/allocate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Singleton.allocate" do
   it "is a private method" do

Modified: MacRuby/trunk/spec/frozen/library/singleton/clone_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/singleton/clone_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/singleton/clone_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Singleton#clone" do
   it "is prevented" do

Modified: MacRuby/trunk/spec/frozen/library/singleton/dump_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/singleton/dump_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/singleton/dump_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Singleton#_dump" do
 

Modified: MacRuby/trunk/spec/frozen/library/singleton/dup_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/singleton/dup_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/singleton/dup_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Singleton#dup" do
   it "is prevented" do

Modified: MacRuby/trunk/spec/frozen/library/singleton/instance_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/singleton/instance_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/singleton/instance_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Singleton.instance" do
   it "returns an instance of the singleton class" do

Modified: MacRuby/trunk/spec/frozen/library/singleton/instantiate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/singleton/instantiate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/singleton/instantiate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Singleton._instantiate?" do
 

Modified: MacRuby/trunk/spec/frozen/library/singleton/load_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/singleton/load_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/singleton/load_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 # TODO: change to a.should be_equal(b)
 # TODO: write spec for cloning classes and calling private methods

Modified: MacRuby/trunk/spec/frozen/library/singleton/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/singleton/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/singleton/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "Singleton.new" do
   it "is a private method" do

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/close_read_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/close_read_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/close_read_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::BasicSocket#close_read" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/close_write_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/close_write_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/close_write_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::BasicSocket#close_write" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/do_not_reverse_lookup_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/do_not_reverse_lookup_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/do_not_reverse_lookup_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 ruby_version_is ""..."1.9" do
   describe "BasicSocket.do_not_reverse_lookup" do
@@ -44,16 +44,19 @@
 
     it "causes 'peeraddr' to avoid name lookups" do
       @socket.do_not_reverse_lookup = true
+      BasicSocket.do_not_reverse_lookup = true
       @socket.peeraddr.should == ["AF_INET", SocketSpecs.port, "127.0.0.1", "127.0.0.1"]
     end
 
     it "looks for hostnames when set to false" do
       @socket.do_not_reverse_lookup = false
+      BasicSocket.do_not_reverse_lookup = false
       @socket.peeraddr[2].should == SocketSpecs.hostname
     end
 
     it "looks for numeric addresses when set to true" do
       @socket.do_not_reverse_lookup = true
+      BasicSocket.do_not_reverse_lookup = true
       @socket.peeraddr[2].should == "127.0.0.1"
     end
   end

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/for_fd_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/for_fd_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/for_fd_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/getpeername_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/getpeername_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/getpeername_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::BasicSocket#getpeername" do
 

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/getsockname_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/getsockname_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/getsockname_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::BasicSocket#getsockname" do
   after :each do

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/getsockopt_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/getsockopt_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/getsockopt_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "BasicSocket#getsockopt" do
   before(:each) do
@@ -12,17 +12,17 @@
   end
 
   it "gets a socket option Socket::SO_TYPE" do
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_TYPE)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_TYPE).to_s
     n.should == [Socket::SOCK_STREAM].pack("i")
   end
 
   it "gets a socket option Socket::SO_OOBINLINE" do
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
     n.should == [0].pack("i")
   end
 
   it "gets a socket option Socket::SO_LINGER" do
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER).to_s
     if (n.size == 8) # linger struct on some platforms, not just a value
       n.should == [0, 0].pack("ii")
     else
@@ -31,7 +31,7 @@
   end
 
   it "gets a socket option Socket::SO_SNDBUF" do
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).to_s
     n.unpack('i')[0].should > 0
   end
 

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/recv_nonblock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/recv_nonblock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/recv_nonblock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../shared/recv_nonblock'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../shared/recv_nonblock', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::BasicSocket#recv_nonblock" do
   it_behaves_like :socket_recv_nonblock, :recv_nonblock

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/recv_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/recv_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/recv_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "BasicSocket#recv" do
 

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/send_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/send_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/send_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "BasicSocket#send" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/setsockopt_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/setsockopt_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/setsockopt_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "BasicSocket#setsockopt" do
   
@@ -14,7 +14,7 @@
   it "sets the socket linger to 0" do
     linger = [0, 0].pack("ii")
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, linger).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER).to_s
 
     if (n.size == 8) # linger struct on some platforms, not just a value
       n.should == [0, 0].pack("ii")
@@ -26,9 +26,11 @@
   it "sets the socket linger to some positive value" do
     linger = [64, 64].pack("ii")
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, linger).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER).to_s
     if (n.size == 8) # linger struct on some platforms, not just a value
-      n.should == [1, 64].pack("ii")
+      a = n.unpack('ii')
+      a[0].should_not == 0
+      a[1].should == 64
     else
       n.should == [64].pack("i")
     end
@@ -36,24 +38,24 @@
 
   it "sets the socket option Socket::SO_OOBINLINE" do
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, true).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
-    n.should == [1].pack("i")
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
+    n.should_not == [0].pack("i")
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, false).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
     n.should == [0].pack("i")
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, 1).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
-    n.should == [1].pack("i")
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
+    n.should_not == [0].pack("i")
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, 0).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
     n.should == [0].pack("i")
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, 2).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
-    n.should == [1].pack("i")
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
+    n.should_not == [0].pack("i")
 
     platform_is_not :os => :windows do
       lambda {
@@ -62,8 +64,8 @@
     end
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, "blah").should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
-    n.should == [1].pack("i")
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
+    n.should_not == [0].pack("i")
 
     platform_is_not :os => :windows do
       lambda {
@@ -72,7 +74,7 @@
     end
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, "\x00\x00\x00\x00").should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
     n.should == [0].pack("i")
 
     platform_is_not :os => :windows do
@@ -88,26 +90,26 @@
     end
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, [1].pack('i')).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
-    n.should == [1].pack("i")
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
+    n.should_not == [0].pack("i")
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, [0].pack('i')).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
     n.should == [0].pack("i")
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, [1000].pack('i')).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE)
-    n.should == [1].pack("i")
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE).to_s
+    n.should_not == [0].pack("i")
   end
 
   it "sets the socket option Socket::SO_SNDBUF" do
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, 4000).should == 0
-    sndbuf = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF)
+    sndbuf = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).to_s
     # might not always be possible to set to exact size
     sndbuf.unpack('i')[0].should >= 4000
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, true).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).to_s
     n.unpack('i')[0].should >= 1
 
     lambda {
@@ -115,11 +117,11 @@
     }.should raise_error(TypeError)
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, 1).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).to_s
     n.unpack('i')[0].should >= 1
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, 2).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).to_s
     n.unpack('i')[0].should >= 2
 
     lambda {
@@ -143,15 +145,15 @@
     }.should raise_error(SystemCallError)
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, "\x00\x00\x01\x00").should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).to_s
     n.unpack('i')[0].should >= "\x00\x00\x01\x00".unpack('i')[0]
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, [4000].pack('i')).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).to_s
     n.unpack('i')[0].should >= 4000
 
     @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, [1000].pack('i')).should == 0
-    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF)
+    n = @sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).to_s
     n.unpack('i')[0].should >= 1000
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/socket/basicsocket/shutdown_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/basicsocket/shutdown_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/basicsocket/shutdown_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::BasicSocket#shutdown" do
 

Modified: MacRuby/trunk/spec/frozen/library/socket/constants/constants_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/constants/constants_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/constants/constants_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,40 +1,40 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 include Socket::Constants
 
 describe "Socket::Constants" do
   it "defines socket types" do
     consts = ["SOCK_DGRAM", "SOCK_RAW", "SOCK_RDM", "SOCK_SEQPACKET", "SOCK_STREAM"]
     consts.each do |c|
-      Socket::Constants.constants.include?(c).should be_true
+      Socket::Constants.should have_constant(c)
     end
   end
 
   it "defines protocol families" do
     consts = ["PF_INET6", "PF_INET", "PF_IPX", "PF_UNIX", "PF_UNSPEC"] 
     consts.each do |c|
-      Socket::Constants.constants.include?(c).should be_true
+      Socket::Constants.should have_constant(c)
     end
   end
 
   it "defines address families" do
     consts = ["AF_INET6", "AF_INET", "AF_IPX", "AF_UNIX", "AF_UNSPEC"] 
     consts.each do |c|
-      Socket::Constants.constants.include?(c).should be_true
+      Socket::Constants.should have_constant(c)
     end
   end
 
   it "defines send/receive options" do
     consts = ["MSG_DONTROUTE", "MSG_OOB", "MSG_PEEK"]     
     consts.each do |c|
-      Socket::Constants.constants.include?(c).should be_true
+      Socket::Constants.should have_constant(c)
     end
   end
 
   it "defines socket level options" do
     consts = ["SOL_SOCKET"]
     consts.each do |c|
-      Socket::Constants.constants.include?(c).should be_true
+      Socket::Constants.should have_constant(c)
     end
   end
 
@@ -42,7 +42,7 @@
     consts = ["SO_BROADCAST", "SO_DEBUG", "SO_DONTROUTE", "SO_ERROR", "SO_KEEPALIVE", "SO_LINGER", 
               "SO_OOBINLINE", "SO_RCVBUF", "SO_REUSEADDR", "SO_SNDBUF", "SO_TYPE"]  
     consts.each do |c|
-      Socket::Constants.constants.include?(c).should be_true
+      Socket::Constants.should have_constant(c)
     end
 
   end
@@ -51,14 +51,14 @@
     consts = ["IP_ADD_MEMBERSHIP", "IP_DEFAULT_MULTICAST_LOOP", "IP_DEFAULT_MULTICAST_TTL", 
               "IP_MAX_MEMBERSHIPS", "IP_MULTICAST_LOOP", "IP_MULTICAST_TTL"]
     consts.each do |c|
-      Socket::Constants.constants.include?(c).should be_true
+      Socket::Constants.should have_constant(c)
     end
   end
 
   it "defines TCP options" do
     consts = ["TCP_MAXSEG", "TCP_NODELAY"]
     consts.each do |c|
-      Socket::Constants.constants.include?(c).should be_true
+      Socket::Constants.should have_constant(c)
     end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/socket/ipsocket/addr_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/ipsocket/addr_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/ipsocket/addr_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::IPSocket#addr" do
 
@@ -36,6 +36,7 @@
   ruby_version_is "1.9" do
     it "returns an array with the socket's information" do
       @socket.do_not_reverse_lookup = false
+      BasicSocket.do_not_reverse_lookup = false
       addrinfo = @socket.addr
       addrinfo[0].should == "AF_INET"
       addrinfo[1].should == SocketSpecs.port
@@ -45,6 +46,7 @@
 
     it "returns an address in the array if do_not_reverse_lookup is true" do
       @socket.do_not_reverse_lookup = true
+      BasicSocket.do_not_reverse_lookup = true
       addrinfo = @socket.addr
       addrinfo[0].should == "AF_INET"
       addrinfo[1].should == SocketSpecs.port

Modified: MacRuby/trunk/spec/frozen/library/socket/ipsocket/getaddress_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/ipsocket/getaddress_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/ipsocket/getaddress_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::IPSocket#getaddress" do
 

Modified: MacRuby/trunk/spec/frozen/library/socket/ipsocket/peeraddr_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/ipsocket/peeraddr_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/ipsocket/peeraddr_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::IPSocket#peeraddr" do
   before :each do
@@ -43,6 +43,7 @@
 
     it "returns an array of information on the peer" do
       @client.do_not_reverse_lookup = false
+      BasicSocket.do_not_reverse_lookup = false
       addrinfo = @client.peeraddr
       addrinfo[0].should == "AF_INET"
       addrinfo[1].should == SocketSpecs.port
@@ -52,6 +53,7 @@
 
     it "returns an IP instead of hostname if do_not_reverse_lookup is true" do
       @client.do_not_reverse_lookup = true
+      BasicSocket.do_not_reverse_lookup = true
       addrinfo = @client.peeraddr
       addrinfo[0].should == "AF_INET"
       addrinfo[1].should == SocketSpecs.port

Modified: MacRuby/trunk/spec/frozen/library/socket/ipsocket/recvfrom_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/ipsocket/recvfrom_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/ipsocket/recvfrom_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::IPSocket#recvfrom" do
 
@@ -22,7 +22,8 @@
     end
 
     @client.send('hello', 0)
-    @client.shutdown
+    @client.shutdown rescue nil
+    # shutdown may raise Errno::ENOTCONN when sent data is pending.
     t.join
 
     data.first.should == 'hello'
@@ -37,7 +38,7 @@
     end
 
     @client.send('hello', 0)
-    @client.shutdown
+    @client.shutdown rescue nil
     t.join
 
     data.first.should == 'hel'
@@ -52,7 +53,7 @@
     end
 
     @client.send('hello', 0)
-    @client.shutdown
+    @client.shutdown rescue nil
     t.join
 
     data.size.should == 2

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/accept_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/accept_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/accept_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/bind_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/bind_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/bind_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 include Socket::Constants
 
@@ -44,6 +44,7 @@
 describe "Socket#bind on SOCK_STREAM socket" do
   before :each do
     @sock = Socket.new(AF_INET, SOCK_STREAM, 0);
+    @sock.setsockopt(SOL_SOCKET, SO_REUSEADDR, true)
     @sockaddr = Socket.pack_sockaddr_in(SocketSpecs.port, "127.0.0.1");
   end
 

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/connect_nonblock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/connect_nonblock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/connect_nonblock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/connect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/connect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/connect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/for_fd_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/for_fd_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/for_fd_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 require 'socket'
 
 describe "Socket.for_fd given a file descriptor" do

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/getaddrinfo_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/getaddrinfo_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/getaddrinfo_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 require 'socket'
 

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/gethostbyaddr_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/gethostbyaddr_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/gethostbyaddr_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/gethostbyname_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/gethostbyname_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/gethostbyname_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 require 'socket'
 

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/gethostname_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/gethostname_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/gethostname_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket.gethostname" do
   # This currently works in Unix and Windows. Feel free to add guards

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/getnameinfo_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/getnameinfo_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/getnameinfo_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 require 'socket'
 

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/getservbyname_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/getservbyname_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/getservbyname_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket#getservbyname" do
 

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/listen_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/listen_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/listen_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 include Socket::Constants
 

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/pack_sockaddr_in_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/pack_sockaddr_in_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/pack_sockaddr_in_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
-require File.dirname(__FILE__) + '/../shared/pack_sockaddr'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+require File.expand_path('../../shared/pack_sockaddr', __FILE__)
 
 describe "Socket#pack_sockaddr_in" do
   it_behaves_like :socket_pack_sockaddr_in, :pack_sockaddr_in

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/pack_sockaddr_un_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/pack_sockaddr_un_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/pack_sockaddr_un_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
-require File.dirname(__FILE__) + '/../shared/pack_sockaddr'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+require File.expand_path('../../shared/pack_sockaddr', __FILE__)
 
 describe "Socket#pack_sockaddr_un" do
   it_behaves_like :socket_pack_sockaddr_un, :pack_sockaddr_un

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/pair_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/pair_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/pair_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
-require File.dirname(__FILE__) + '/../shared/socketpair'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+require File.expand_path('../../shared/socketpair', __FILE__)
 
 describe "Socket#pair" do
   it_behaves_like :socket_socketpair, :pair

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/recvfrom_nonblock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/recvfrom_nonblock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/recvfrom_nonblock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/recvfrom_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/recvfrom_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/recvfrom_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/sockaddr_in_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/sockaddr_in_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/sockaddr_in_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
-require File.dirname(__FILE__) + '/../shared/pack_sockaddr'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+require File.expand_path('../../shared/pack_sockaddr', __FILE__)
 
 describe "Socket#sockaddr_in" do
   it_behaves_like :socket_pack_sockaddr_in, :sockaddr_in

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/sockaddr_un_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/sockaddr_un_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/sockaddr_un_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
-require File.dirname(__FILE__) + '/../shared/pack_sockaddr'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+require File.expand_path('../../shared/pack_sockaddr', __FILE__)
 
 describe "Socket#sockaddr_un" do
   it_behaves_like :socket_pack_sockaddr_un, :sockaddr_un

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/socket_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/socket_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/socket_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket" do
   it "inherits from BasicSocket and IO" do

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/socketpair_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/socketpair_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/socketpair_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
-require File.dirname(__FILE__) + '/../shared/socketpair'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+require File.expand_path('../../shared/socketpair', __FILE__)
 
 describe "Socket#socketpair" do
   it_behaves_like :socket_socketpair, :socketpair

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/sysaccept_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/sysaccept_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/sysaccept_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/unpack_sockaddr_in_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/unpack_sockaddr_in_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/unpack_sockaddr_in_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 require 'socket'
 
 describe "Socket#unpack_sockaddr_in" do

Modified: MacRuby/trunk/spec/frozen/library/socket/socket/unpack_sockaddr_un_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/socket/unpack_sockaddr_un_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/socket/unpack_sockaddr_un_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpserver/accept_nonblock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpserver/accept_nonblock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpserver/accept_nonblock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "Socket::TCPServer.accept_nonblock" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpserver/accept_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpserver/accept_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpserver/accept_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 
 describe "TCPServer#accept" do

Added: MacRuby/trunk/spec/frozen/library/socket/tcpserver/gets_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpserver/gets_spec.rb	                        (rev 0)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpserver/gets_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -0,0 +1,16 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+
+describe "TCPServer#gets" do
+  before :each do
+    @server = TCPServer.new(SocketSpecs.hostname, SocketSpecs.port)
+  end
+
+  after :each do
+    @server.close
+  end
+
+  it "raises Errno::ENOTCONN on gets" do
+    lambda { @server.gets }.should raise_error(Errno::ENOTCONN)
+  end
+end

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpserver/listen_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpserver/listen_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpserver/listen_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpserver/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpserver/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpserver/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "TCPServer.new" do
   after(:each) do

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpserver/output_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpserver/output_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpserver/output_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "TCPServer#<<" do
   after(:each) do

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpserver/readpartial_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpserver/readpartial_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpserver/readpartial_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "TCPServer#readpartial" do
   after(:each) do

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpserver/sysaccept_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpserver/sysaccept_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpserver/sysaccept_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpsocket/gethostbyname_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpsocket/gethostbyname_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpsocket/gethostbyname_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 # TODO: verify these for windows
 describe "TCPSocket#gethostbyname" do

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpsocket/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpsocket/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpsocket/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/shared/new'
+require File.expand_path('../shared/new', __FILE__)
 
 describe "TCPSocket.new" do
   it_behaves_like :tcpsocket_new, :new

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpsocket/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpsocket/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpsocket/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/shared/new'
+require File.expand_path('../shared/new', __FILE__)
 
 describe "TCPSocket.open" do
   it_behaves_like :tcpsocket_new, :open

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpsocket/partially_closable_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpsocket/partially_closable_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpsocket/partially_closable_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
-require File.dirname(__FILE__) + '/../shared/partially_closable_sockets'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+require File.expand_path('../../shared/partially_closable_sockets', __FILE__)
 
 describe "TCPSocket partial closability" do
   

Modified: MacRuby/trunk/spec/frozen/library/socket/tcpsocket/shared/new.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/tcpsocket/shared/new.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/tcpsocket/shared/new.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
-require File.dirname(__FILE__) + '/../../fixtures/classes'
+require File.expand_path('../../../../../spec_helper', __FILE__)
+require File.expand_path('../../../fixtures/classes', __FILE__)
 
 describe :tcpsocket_new, :shared => true do
   before :each do
@@ -14,14 +14,16 @@
   end
 
   it "connects to a listening server" do
+    ready = false
     thread = Thread.new do
       server = TCPServer.new(SocketSpecs.port)
+      ready = true
       conn = server.accept
       conn.recv(50)
       conn.close
       server.close
     end
-    Thread.pass while thread.status and thread.status != 'sleep'
+    Thread.pass while (thread.status and thread.status != 'sleep') or !ready
     thread.status.should_not be_nil
     lambda {
       sock = TCPSocket.send(@method, @hostname, SocketSpecs.port)
@@ -31,14 +33,16 @@
   end
 
   it "has an address once it has connected to a listening server" do
+    ready = false
     thread = Thread.new do
       server = TCPServer.new('127.0.0.1', SocketSpecs.port)
+      ready = true
       conn = server.accept
       conn.recv(50)
       conn.close
       server.close
     end
-    Thread.pass while thread.status and thread.status != 'sleep'
+    Thread.pass while (thread.status and thread.status != 'sleep') or !ready
     thread.status.should_not be_nil
     sock = TCPSocket.send(@method, '127.0.0.1', SocketSpecs.port)
     sock.addr[0].should == "AF_INET"

Modified: MacRuby/trunk/spec/frozen/library/socket/udpsocket/bind_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/udpsocket/bind_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/udpsocket/bind_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "UDPSocket.bind" do
   

Modified: MacRuby/trunk/spec/frozen/library/socket/udpsocket/connect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/udpsocket/connect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/udpsocket/connect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/udpsocket/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/udpsocket/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/udpsocket/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/udpsocket/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/udpsocket/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/udpsocket/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "UDPSocket.open" do
   after(:each) do

Modified: MacRuby/trunk/spec/frozen/library/socket/udpsocket/recvfrom_nonblock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/udpsocket/recvfrom_nonblock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/udpsocket/recvfrom_nonblock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/socket/udpsocket/send_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/udpsocket/send_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/udpsocket/send_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "UDPSocket.send" do
   before :each do

Modified: MacRuby/trunk/spec/frozen/library/socket/unixserver/accept_nonblock_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixserver/accept_nonblock_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixserver/accept_nonblock_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "UNIXServer#accept_nonblock" do
 

Modified: MacRuby/trunk/spec/frozen/library/socket/unixserver/accept_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixserver/accept_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixserver/accept_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 platform_is_not :windows do
   describe "UNIXServer#accept" do

Modified: MacRuby/trunk/spec/frozen/library/socket/unixserver/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixserver/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixserver/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/new'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/new', __FILE__)
 
 describe "UNIXServer.new" do
   it_behaves_like :unixserver_new, :new

Modified: MacRuby/trunk/spec/frozen/library/socket/unixserver/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixserver/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixserver/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/new'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/new', __FILE__)
 
 describe "UNIXServer.open" do
   it_behaves_like :unixserver_new, :open

Modified: MacRuby/trunk/spec/frozen/library/socket/unixserver/shared/new.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixserver/shared/new.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixserver/shared/new.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
-require File.dirname(__FILE__) + '/../../fixtures/classes'
+require File.expand_path('../../../../../spec_helper', __FILE__)
+require File.expand_path('../../../fixtures/classes', __FILE__)
 require 'tempfile'
 
 describe :unixserver_new, :shared => true do

Modified: MacRuby/trunk/spec/frozen/library/socket/unixsocket/addr_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixsocket/addr_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixsocket/addr_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "UNIXSocket#addr" do
 

Modified: MacRuby/trunk/spec/frozen/library/socket/unixsocket/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixsocket/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixsocket/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/new'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/new', __FILE__)
 
 describe "UNIXSocket.new" do
   it_behaves_like :unixsocket_new, :new

Modified: MacRuby/trunk/spec/frozen/library/socket/unixsocket/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixsocket/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixsocket/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/shared/new'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../shared/new', __FILE__)
 
 describe "UNIXSocket.open" do
   it_behaves_like :unixsocket_new, :open

Modified: MacRuby/trunk/spec/frozen/library/socket/unixsocket/pair_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixsocket/pair_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixsocket/pair_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
-require File.dirname(__FILE__) + '/../shared/partially_closable_sockets'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+require File.expand_path('../../shared/partially_closable_sockets', __FILE__)
 
 describe "UNIXSocket#pair" do
   platform_is_not :windows do

Modified: MacRuby/trunk/spec/frozen/library/socket/unixsocket/partially_closable_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixsocket/partially_closable_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixsocket/partially_closable_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
-require File.dirname(__FILE__) + '/../shared/partially_closable_sockets'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
+require File.expand_path('../../shared/partially_closable_sockets', __FILE__)
 
 platform_is_not :windows do
   describe "UNIXSocket partial closability" do

Modified: MacRuby/trunk/spec/frozen/library/socket/unixsocket/path_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixsocket/path_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixsocket/path_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "UNIXSocket#path" do
 

Modified: MacRuby/trunk/spec/frozen/library/socket/unixsocket/peeraddr_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixsocket/peeraddr_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixsocket/peeraddr_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "UNIXSocket#peeraddr" do
 

Modified: MacRuby/trunk/spec/frozen/library/socket/unixsocket/recvfrom_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixsocket/recvfrom_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixsocket/recvfrom_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../../fixtures/classes', __FILE__)
 
 describe "UNIXSocket#recvfrom" do
 

Modified: MacRuby/trunk/spec/frozen/library/socket/unixsocket/shared/new.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/socket/unixsocket/shared/new.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/socket/unixsocket/shared/new.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.expand_path('../../../../../spec_helper', __FILE__)
 
 describe :unixsocket_new, :shared => true do
 end

Modified: MacRuby/trunk/spec/frozen/library/stringio/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#<< when passed [Object]" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/stringio/binmode_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/binmode_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/binmode_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#binmode" do
   it "returns self" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/bytes_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/bytes_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/bytes_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
-require File.dirname(__FILE__) + "/shared/each_byte"
+require File.expand_path('../shared/each_byte', __FILE__)
 
 ruby_version_is "1.8.7" .. "1.9" do
   describe "StringIO#bytes" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/chars_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/chars_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/chars_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
-require File.dirname(__FILE__) + "/shared/each_char"
+require File.expand_path('../shared/each_char', __FILE__)
 
 ruby_version_is "1.8.7" do
   describe "StringIO#chars" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/close_read_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/close_read_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/close_read_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#close_read" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/stringio/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#close" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/stringio/close_write_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/close_write_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/close_write_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#close_write" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/stringio/closed_read_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/closed_read_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/closed_read_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#closed_read?" do
   it "returns true if self is not readable" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/closed_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/closed_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/closed_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#closed?" do
   it "returns true if self is completely closed" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/closed_write_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/closed_write_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/closed_write_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#closed_write?" do
   it "returns true if self is not writable" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/codepoints.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/codepoints.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/codepoints.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/codepoints'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/codepoints', __FILE__)
 
 # See redmine #1667
 describe "StringIO#codepoints" do
-  ruby_version_is "1.9.2" do
+  ruby_version_is "1.9" do
     it_behaves_like(:stringio_codepoints, :codepoints)
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/stringio/each_byte_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/each_byte_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/each_byte_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
-require File.dirname(__FILE__) + "/shared/each_byte"
+require File.expand_path('../shared/each_byte', __FILE__)
 
 describe "StringIO#each_byte" do
   it_behaves_like :stringio_each_byte, :each_byte

Modified: MacRuby/trunk/spec/frozen/library/stringio/each_char_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/each_char_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/each_char_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
-require File.dirname(__FILE__) + "/shared/each_char"
+require File.expand_path('../shared/each_char', __FILE__)
 
 ruby_version_is "1.8.7" do
   describe "StringIO#each_char" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/each_codepoint.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/each_codepoint.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/each_codepoint.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/codepoints'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/codepoints', __FILE__)
 
 # See redmine #1667
 describe "StringIO#each_codepoint" do
-  ruby_version_is "1.9.2" do
+  ruby_version_is "1.9" do
     it_behaves_like(:stringio_codepoints, :codepoints)
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/stringio/each_line_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/each_line_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/each_line_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/each'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/each', __FILE__)
 
 describe "StringIO#each_line when passed a separator" do
   it_behaves_like :stringio_each_separator, :each_line

Modified: MacRuby/trunk/spec/frozen/library/stringio/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/each'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/each', __FILE__)
 
 describe "StringIO#each when passed a separator" do
   it_behaves_like :stringio_each_separator, :each

Modified: MacRuby/trunk/spec/frozen/library/stringio/eof_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/eof_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/eof_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/eof'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/eof', __FILE__)
 
 describe "StringIO#eof?" do
   it_behaves_like :stringio_eof, :eof?

Modified: MacRuby/trunk/spec/frozen/library/stringio/fcntl_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/fcntl_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/fcntl_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#fcntl" do
   it "raises a NotImplementedError" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/fileno_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/fileno_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/fileno_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/each'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/each', __FILE__)
 
 describe "StringIO#fileno" do
   it "returns nil" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/flush_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/flush_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/flush_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#flush" do
   it "returns self" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/fsync_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/fsync_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/fsync_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#fsync" do
   it "returns zero" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/getbyte_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/getbyte_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/getbyte_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,14 +1,21 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
-require File.dirname(__FILE__) + '/shared/getbyte'
+require File.expand_path('../shared/getc', __FILE__)
 
-
 ruby_version_is "1.8.7" do
   describe "StringIO#getbyte" do
-    it_behaves_like :stringio_getbyte, :getbyte
+    it_behaves_like :stringio_getc, :getbyte
+
+    it "returns the 8-bit byte at the current position" do
+      io = StringIO.new("example")
+
+      io.send(@method).should == 101
+      io.send(@method).should == 120
+      io.send(@method).should ==  97
+    end
   end
 
   describe "StringIO#getbyte when self is not readable" do
-    it_behaves_like :stringio_getbyte_not_readable, :getbyte
+    it_behaves_like :stringio_getc_not_readable, :getbyte
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/stringio/getc_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/getc_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/getc_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,17 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
-require File.dirname(__FILE__) + '/shared/getc'
+require File.expand_path('../shared/getc', __FILE__)
 
 describe "StringIO#getc" do
   it_behaves_like :stringio_getc, :getc
+
+  it "returns the charactor at the current position" do
+    io = StringIO.new("example")
+
+    io.send(@method).should == ?e
+    io.send(@method).should == ?x
+    io.send(@method).should == ?a
+  end
 end
 
 describe "StringIO#getc when self is not readable" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/gets_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/gets_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/gets_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "stringio"
 
 describe "StringIO#gets when passed [separator]" do
@@ -37,15 +37,12 @@
     @io.lineno.should eql(3)
   end
   
-  it "returns the next paragraph when the passed separator is an empty String" do
-    io = StringIO.new("this is\n\nan example")
-    ruby_version_is "" ... "1.9" do
-      io.gets("").should == "this is\n"
-    end
-    ruby_version_is "1.9" do
+  ruby_bug "", "1.8.8" do
+    it "returns the next paragraph when the passed separator is an empty String" do
+      io = StringIO.new("this is\n\nan example")
       io.gets("").should == "this is\n\n"
+      io.gets("").should == "an example"
     end
-    io.gets("").should == "an example"
   end
   
   it "returns the remaining content starting at the current position when passed nil" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/initialize_copy_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/initialize_copy_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/initialize_copy_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
 
 describe "StringIO#initialize_copy" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
 
 describe "StringIO#initialize when passed [Object, mode]" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/isatty_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/isatty_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/isatty_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/isatty'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/isatty', __FILE__)
 
 describe "StringIO#tty?" do
   it_behaves_like :stringio_isatty, :isatty

Modified: MacRuby/trunk/spec/frozen/library/stringio/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 
 describe "StringIO#length" do
   it_behaves_like :stringio_length, :length

Modified: MacRuby/trunk/spec/frozen/library/stringio/lineno_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/lineno_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/lineno_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "stringio"
 
 describe "StringIO#lineno" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/lines_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/lines_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/lines_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
-require File.dirname(__FILE__) + '/shared/each'
+require File.expand_path('../shared/each', __FILE__)
 
 ruby_version_is "1.8.7" do
   describe "StringIO#lines when passed a separator" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
 
 describe "StringIO.open when passed [Object, mode]" do
@@ -133,17 +133,17 @@
     io.closed_read?.should be_false
     io.closed_write?.should be_false
   end
-  
+
   ruby_version_is "" ... "1.9" do
     it "raises a TypeError when passed a frozen String in truncate mode as StringIO backend" do
       lambda { StringIO.open("example".freeze, IO::TRUNC) }.should raise_error(TypeError)
     end
-  end                            
-  
+  end
+
   ruby_version_is "1.9" do
     it "raises a RuntimeError when passed a frozen String in truncate mode as StringIO backend" do
       lambda { StringIO.open("example".freeze, IO::TRUNC) }.should raise_error(RuntimeError)
-    end 
+    end
   end
 
   it "tries to convert the passed mode to a String using #to_str" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/path_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/path_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/path_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,14 +1,14 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#path" do
-  ruby_version_is "" ... "1.9.2" do
+  ruby_version_is "" ... "1.9" do
     it "returns nil" do
       StringIO.new("path").path.should be_nil
     end
   end
 
-  ruby_version_is "1.9.2" do
+  ruby_version_is "1.9" do
     it "is not defined" do
       lambda { StringIO.new("path").path }.should raise_error(NoMethodError)
     end

Modified: MacRuby/trunk/spec/frozen/library/stringio/pid_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/pid_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/pid_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#pid" do
   it "returns nil" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/pos_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/pos_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/pos_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/tell'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/tell', __FILE__)
 
 describe "StringIO#pos" do
   it_behaves_like :stringio_tell, :pos

Modified: MacRuby/trunk/spec/frozen/library/stringio/print_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/print_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/print_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,13 +1,13 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#print" do
   before(:each) do
     @io = StringIO.new('example')
   end
-  
-  ruby_version_is "" ... "1.9" do  
-    it "prints $_ when passed no arguments and stringify nil if $_ is nil" do
+
+  ruby_version_is "" ... "1.9" do
+    it "prints $_ when passed no arguments" do
       $_ = nil
       @io.print
       @io.string.should == "nilmple"
@@ -15,11 +15,11 @@
       $_ = "blah"
       @io.print
       @io.string.should == "nilblah"
-    end  
-  end 
-  
-  ruby_version_is "1.9" do  
-    it "prints $_ when passed no arguments and return self if $_ is nil" do
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "prints $_ when passed no arguments" do
       $_ = nil
       @io.print
       @io.string.should == "example"
@@ -27,7 +27,7 @@
       $_ = "blah"
       @io.print
       @io.string.should == "blahple"
-    end  
+    end
   end
 
   it "prints the passed arguments to self" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/printf_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/printf_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/printf_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#printf" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/stringio/putc_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/putc_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/putc_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#putc when passed [String]" do
   before(:each) do
@@ -55,23 +55,12 @@
     @io.putc(?A)
     @io.string.should == "example\000\000\000A"
   end
-  
-  ruby_version_is "" ... "1.9" do
-    it "tries to convert the passed argument to an Integer using #to_int" do
-      obj = mock('to_int')
-      obj.should_receive(:to_int).and_return(?t)
-      @io.putc(obj)
-      @io.string.should == "txample"
-    end
-  end 
-  
-  ruby_version_is "1.9" do
-    it "tries to convert the passed argument to an Integer using #to_int" do
-      obj = mock('to_int')
-      obj.should_receive(:to_int).and_return(90)
-      @io.putc(obj)
-      @io.string.should == "Zxample"
-    end
+
+  it "tries to convert the passed argument to an Integer using #to_int" do
+    obj = mock('to_int')
+    obj.should_receive(:to_int).and_return(116)
+    @io.putc(obj)
+    @io.string.should == "txample"
   end
 
   it "raises a TypeError when the passed argument can't be coerced to Integer" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/puts_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/puts_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/puts_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#puts when passed [Array, ...]" do
   before(:each) do
@@ -145,7 +145,7 @@
 
 describe "StringIO#puts when passed an encoded string" do
   it "stores the bytes unmodified" do
-    io = StringIO.new
+    io = StringIO.new("")
     io.puts "\x00\x01\x02"
     io.puts "æåø"
 

Modified: MacRuby/trunk/spec/frozen/library/stringio/read_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/read_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/read_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "stringio"
-require File.dirname(__FILE__) + '/shared/read'
+require File.expand_path('../shared/read', __FILE__)
 
 describe "StringIO#read when passed length, buffer" do
   it_behaves_like :stringio_read, :read

Modified: MacRuby/trunk/spec/frozen/library/stringio/readbyte_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/readbyte_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/readbyte_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,15 +1,22 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
-require File.dirname(__FILE__) + "/shared/readbyte"
+require File.expand_path('../shared/readchar', __FILE__)
 
-
 ruby_version_is "1.8.7" do
-  
   describe "StringIO#readbyte" do
-    it_behaves_like :stringio_readbyte, :readbyte
+    it_behaves_like :stringio_readchar, :readbyte
+
+    it "reads the next 8-bit byte from self's current position" do
+      io = StringIO.new("example")
+
+      io.send(@method).should == 101
+
+      io.pos = 4
+      io.send(@method).should == 112
+    end
   end
 
   describe "StringIO#readbyte when self is not readable" do
-    it_behaves_like :stringio_readbyte_not_readable, :readbyte
+    it_behaves_like :stringio_readchar_not_readable, :readbyte
   end
-end
\ No newline at end of file
+end

Modified: MacRuby/trunk/spec/frozen/library/stringio/readchar_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/readchar_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/readchar_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,9 +1,18 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'stringio'
-require File.dirname(__FILE__) + "/shared/readchar"
+require File.expand_path('../shared/readchar', __FILE__)
 
 describe "StringIO#readchar" do
   it_behaves_like :stringio_readchar, :readchar
+
+  it "reads the next 8-bit byte from self's current position" do
+    io = StringIO.new("example")
+
+    io.send(@method).should == ?e
+
+    io.pos = 4
+    io.send(@method).should == ?p
+  end
 end
 
 describe "StringIO#readchar when self is not readable" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/readline_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/readline_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/readline_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 
 describe "StringIO#readline when passed [separator]" do
@@ -38,15 +38,12 @@
     @io.lineno.should eql(3)
   end
   
-  it "returns the next paragraph when the passed separator is an empty String" do
-    io = StringIO.new("this is\n\nan example") 
-    ruby_version_is "" ... "1.9" do
-      io.readline("").should == "this is\n"
-    end
-    ruby_version_is "1.9" do
+  ruby_bug "", "1.8.8" do
+    it "returns the next paragraph when the passed separator is an empty String" do
+      io = StringIO.new("this is\n\nan example")
       io.readline("").should == "this is\n\n"
+      io.readline("").should == "an example"
     end
-    io.readline("").should == "an example"
   end
   
   it "returns the remaining content starting at the current position when passed nil" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/readlines_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/readlines_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/readlines_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#readlines when passed [separator]" do
   before(:each) do
@@ -26,12 +26,9 @@
     $_.should == "test"
   end
 
-  it "returns an Array containing all paragraphs when the passed separator is an empty String" do
-    io = StringIO.new("this is\n\nan example")
-    ruby_version_is "" ... "1.9" do
-      io.readlines("").should == ["this is\n", "an example"]
-    end
-    ruby_version_is "1.9" do
+  ruby_bug "", "1.8.8" do
+    it "returns an Array containing all paragraphs when the passed separator is an empty String" do
+      io = StringIO.new("this is\n\nan example")
       io.readlines("").should == ["this is\n\n", "an example"]
     end
   end

Modified: MacRuby/trunk/spec/frozen/library/stringio/readpartial_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/readpartial_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/readpartial_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 ruby_version_is "1.9" do
   describe "StringIO#readpartial" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/reopen_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/reopen_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/reopen_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#reopen when passed [Object, Integer]" do
   before(:each) do
@@ -47,18 +47,18 @@
     lambda { @io.reopen("burn".freeze, IO::WRONLY) }.should raise_error(Errno::EACCES)
     lambda { @io.reopen("burn".freeze, IO::WRONLY | IO::APPEND) }.should raise_error(Errno::EACCES)
   end
-  
+
   ruby_version_is "" ... "1.9" do
     it "raises a TypeError when trying to reopen self with a frozen String in truncate-mode" do
       lambda { @io.reopen("burn".freeze, IO::RDONLY | IO::TRUNC) }.should raise_error(TypeError)
     end
   end
-  
+
   ruby_version_is "1.9" do
     it "raises a RuntimeError when trying to reopen self with a frozen String in truncate-mode" do
       lambda { @io.reopen("burn".freeze, IO::RDONLY | IO::TRUNC) }.should raise_error(RuntimeError)
     end
-  end 
+  end
 
   it "does not raise IOError when passed a frozen String in read-mode" do
     @io.reopen("burn".freeze, IO::RDONLY)

Modified: MacRuby/trunk/spec/frozen/library/stringio/rewind_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/rewind_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/rewind_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#rewind" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/stringio/seek_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/seek_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/seek_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#seek" do
   before(:each) do

Modified: MacRuby/trunk/spec/frozen/library/stringio/shared/each.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/shared/each.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/shared/each.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -36,23 +36,14 @@
     seen.should == ["2 1 2 1 2"]
   end
   
-  ruby_version_is "" ... "1.9" do
-   it "yields each paragraph when passed an empty String as separator" do
-      seen = []
-      io = StringIO.new("para1\n\npara2\n\n\npara3")
-      io.send(@method, "") {|s| seen << s}
-      seen.should == ["para1\n", "para2\n", "para3"]
-    end
-  end
-  
-  ruby_version_is "1.9" do
+  ruby_bug "", "1.8.8" do
     it "yields each paragraph when passed an empty String as separator" do
       seen = []
       io = StringIO.new("para1\n\npara2\n\n\npara3")
       io.send(@method, "") {|s| seen << s}
       seen.should == ["para1\n\n", "para2\n\n", "para3"]
     end
-  end 
+  end
 end
 
 describe :stringio_each_no_arguments, :shared => true do

Modified: MacRuby/trunk/spec/frozen/library/stringio/shared/getc.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/shared/getc.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/shared/getc.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -13,12 +13,6 @@
     @io.send(@method)
     @io.pos.should eql(3)
   end
-  
-  it "returns the 8-bit byte at the current position" do
-    @io.send(@method).should == ?e
-    @io.send(@method).should == ?x
-    @io.send(@method).should == ?a
-  end   
 
   it "returns nil when called at the end of self" do
     @io.pos = 7

Modified: MacRuby/trunk/spec/frozen/library/stringio/shared/read.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/shared/read.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/shared/read.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -26,17 +26,17 @@
   it "raises a TypeError when the passed buffer Object can't be converted to a String" do
     lambda { @io.send(@method, 7, Object.new) }.should raise_error(TypeError)
   end
-  
+
   ruby_version_is "" ... "1.9" do
     it "raises an error when passed a frozen String as buffer" do
       lambda { @io.send(@method, 7, "".freeze) }.should raise_error(TypeError)
     end
   end
-  
-  ruby_version_is "1.9" do  
+
+  ruby_version_is "1.9" do
     it "raises an error when passed a frozen String as buffer" do
       lambda { @io.send(@method, 7, "".freeze) }.should raise_error(RuntimeError)
-    end 
+    end
   end
 end
 

Modified: MacRuby/trunk/spec/frozen/library/stringio/shared/readchar.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/shared/readchar.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/shared/readchar.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -2,14 +2,7 @@
   before(:each) do
     @io = StringIO.new("example")
   end
-  
-  it "reads the next 8-bit byte from self's current position" do
-    @io.send(@method).should == ?e
 
-    @io.pos = 4
-    @io.send(@method).should == ?p
-  end 
-
   it "correctly updates the current position" do
     @io.send(@method)
     @io.pos.should == 1

Modified: MacRuby/trunk/spec/frozen/library/stringio/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/length'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/length', __FILE__)
 
 describe "StringIO#size" do
   it_behaves_like :stringio_length, :size

Modified: MacRuby/trunk/spec/frozen/library/stringio/string_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/string_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/string_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#string" do
   it "returns the underlying string" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/stringio_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/stringio_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/stringio_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "stringio"
 
 describe "StringIO" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/sync_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/sync_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/sync_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#sync" do
   it "returns true" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/sysread_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/sysread_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/sysread_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "stringio"
-require File.dirname(__FILE__) + '/shared/read'
+require File.expand_path('../shared/read', __FILE__)
 
 describe "StringIO#sysread when passed length, buffer" do
   it_behaves_like :stringio_read, :sysread

Modified: MacRuby/trunk/spec/frozen/library/stringio/syswrite_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/syswrite_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/syswrite_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/write'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/write', __FILE__)
 
 describe "StringIO#syswrite when passed [Object]" do
   it_behaves_like :stringio_write, :syswrite

Modified: MacRuby/trunk/spec/frozen/library/stringio/tell_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/tell_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/tell_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/tell'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/tell', __FILE__)
 
 describe "StringIO#tell" do
   it_behaves_like :stringio_tell, :tell

Modified: MacRuby/trunk/spec/frozen/library/stringio/truncate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/truncate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/truncate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "stringio"
 
 describe "StringIO#truncate when passed [length]" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/tty_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/tty_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/tty_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/isatty'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/isatty', __FILE__)
 
 describe "StringIO#tty?" do
   it_behaves_like :stringio_isatty, :tty?

Modified: MacRuby/trunk/spec/frozen/library/stringio/ungetc_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/ungetc_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/ungetc_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "StringIO#ungetc when passed [char]" do
   before(:each) do
@@ -22,22 +22,20 @@
     @io.ungetc(?A)
     @io.pos.should eql(1)
   end
-  
-  ruby_version_is "" ... "1.9" do
-    it "pads with \\000 when the current position is after the end" do
-      @io.pos = 15
-      @io.ungetc(?A)
-      @io.string.should == "1234\000\000\000\000\000\000\000\000\000\000A"
-    end
-  end 
 
+  it "pads with \\000 when the current position is after the end" do
+    @io.pos = 15
+    @io.ungetc(?A)
+    @io.string.should == "1234\000\000\000\000\000\000\000\000\000\000A"
+  end
+
   ruby_version_is "1.8.6" .. "1.8.6.367" do
     it "does nothing when at the beginning of self" do
       @io.ungetc(65)
       @io.string.should == '1234'
     end
   end
-  
+
   ruby_version_is "" ... "1.9" do
     it "tries to convert the passed length to an Integer using #to_int" do
       obj = mock("to_int")
@@ -46,34 +44,28 @@
       @io.pos = 1
       @io.ungetc(obj)
       @io.string.should == "A234"
-    end 
+    end
+
+    it "raises a TypeError when the passed length can't be converted to an Integer" do
+      lambda { @io.ungetc(Object.new) }.should raise_error(TypeError)
+      lambda { @io.ungetc("A") }.should raise_error(TypeError)
+    end
   end
-  
+
   ruby_version_is "1.9" do
-    it "tries to convert the passed argument to a String using #to_str if the argument isn't an Integer" do
+    it "tries to convert the passed argument to an String using #to_str" do
       obj = mock("to_str")
-      obj.should_receive(:to_str).and_return(?A) 
+      obj.should_receive(:to_str).and_return(?A)
 
       @io.pos = 1
       @io.ungetc(obj)
       @io.string.should == "A234"
     end
-  end
-  
-  ruby_version_is "" ... "1.9" do
-    it "raises a TypeError when the passed length can't be converted to an Integer" do
+
+    it "raises a TypeError when the passed length can't be converted to an Integer or String" do
       lambda { @io.ungetc(Object.new) }.should raise_error(TypeError)
-      lambda { @io.ungetc("A") }.should raise_error(TypeError)
-    end 
-  end
-  
-  ruby_version_is "1.9" do
-    it "raises a TypeError when the passed length can't be converted to an Integer" do
-      lambda { @io.ungetc(Object.new) }.should raise_error(TypeError)
-      @io.ungetc("A").should be_nil
     end
   end
-  
 end
 
 describe "StringIO#ungetc when self is not readable" do

Modified: MacRuby/trunk/spec/frozen/library/stringio/write_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringio/write_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringio/write_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
-require File.dirname(__FILE__) + '/shared/write'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../shared/write', __FILE__)
 
 describe "StringIO#write when passed [Object]" do
   it_behaves_like :stringio_write, :write

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/concat.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/concat.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#<<" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/beginning_of_line_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/beginning_of_line_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/beginning_of_line_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/bol.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/bol.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#beginning_of_line?" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/bol_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/bol_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/bol_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/bol.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/bol.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#bol?" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/check_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/check_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/check_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#check" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/check_until_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/check_until_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/check_until_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#check_until" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/clear_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/clear_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/clear_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/terminate.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/terminate.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#clear" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/concat_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/concat_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/concat_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/concat.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/concat.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#concat" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/dup_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/dup_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/dup_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#dup" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/element_reference_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/element_reference_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/element_reference_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#[]" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/empty_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/empty_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/empty_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/eos.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/eos.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#empty?" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/eos_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/eos_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/eos_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/eos.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/eos.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#eos?" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/exist_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/exist_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/exist_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#exist?" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/get_byte_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/get_byte_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/get_byte_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/get_byte'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/get_byte', __FILE__)
 require 'strscan'
 
 describe "StringScanner#get_byte" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/getbyte_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/getbyte_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/getbyte_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/get_byte'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/get_byte', __FILE__)
 require 'strscan'
 
 describe "StringScanner#getbyte" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/getch_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/getch_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/getch_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,15 @@
-# encoding: UTF-8
-
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/eucjp'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#getch" do
+  before :each do
+    @kcode = $KCODE
+  end
+
+  after :each do
+    $KCODE = @kcode
+  end
+
   it "scans one character and returns it" do
     s = StringScanner.new('abc')
     s.getch.should == "a"
@@ -13,24 +18,14 @@
   end
 
   it "is multi-byte character sensitive" do
-    ruby_version_is "" ... "1.9" do
-      @s = StringScanner.new("\244\242")
-      @s.getch.should == "\244"
-      @s.getch.should == "\242"
-    end
-    ruby_version_is "1.9" do
-      @s = StringScanner.new("あ") # Japanese hira-kana "A" 
-      @s.getch.should == "あ" 
-    end
-    @s.getch.should be_nil
+    $KCODE = 'EUC'
+
+    # Japanese hiragana "A" in EUC-JP
+    src = encode("\244\242", "euc-jp")
+
+    s = StringScanner.new(src)
+    s.getch.should == src
   end
-   
-  ruby_version_is "1.9" do  
-    it "should keep the encoding" do
-      s = StringScanner.new(TestStrings.eucjp)
-      s.getch.encoding.to_s.should == "EUC-JP"
-    end
-  end  
 
   it "returns nil at the end of the string" do
     # empty string case
@@ -43,12 +38,6 @@
     s.getch # skip one
     s.getch.should == nil
   end
-  
-  it "should start from scratch even after a scan was used" do
-    s = StringScanner.new('this is a test')
-    s.scan(/\w+/)
-    s.getch.should == " "
-  end
 
   it "does not accept any arguments" do
     s = StringScanner.new('abc')
@@ -56,5 +45,4 @@
       s.getch(5)
     }.should raise_error(ArgumentError, /wrong .* arguments/)
   end
-
 end

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/initialize_copy_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/initialize_copy_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/initialize_copy_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#initialize_copy" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#inspect" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/match_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/match_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/match_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#match?" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/matched_size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/matched_size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/matched_size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/matched_size.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/matched_size.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#matched_size" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/matched_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/matched_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/matched_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#matched" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/matchedsize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/matchedsize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/matchedsize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/matched_size.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/matched_size.rb', __FILE__)
 require 'strscan'
 
 ruby_version_is "" ... "1.9" do
@@ -21,7 +21,7 @@
         }.should_not complain
       ensure
         $VERBOSE = old
-      end 
+      end
     end
-  end 
-end
\ No newline at end of file
+  end
+end

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/must_C_version_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/must_C_version_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/must_C_version_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner.must_C_version" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/peek_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/peek_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/peek_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/peek.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/peek.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#peek" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/peep_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/peep_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/peep_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/peek.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/peek.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#peep" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/pointer_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/pointer_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/pointer_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/pos.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/pos.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#pointer" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/pos_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/pos_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/pos_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/pos.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/pos.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#pos" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/post_match_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/post_match_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/post_match_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#post_match" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/pre_match_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/pre_match_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/pre_match_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#pre_match" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/reset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/reset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/reset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#reset" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/rest_size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/rest_size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/rest_size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/rest_size.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/rest_size.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#rest_size" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/rest_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/rest_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/rest_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#rest" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/restsize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/restsize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/restsize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/rest_size.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/rest_size.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#restsize" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/scan_full_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/scan_full_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/scan_full_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#scan_full" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/scan_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/scan_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/scan_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#scan" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/scan_until_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/scan_until_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/scan_until_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#scan_until" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/search_full_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/search_full_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/search_full_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#search_full" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/skip_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/skip_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/skip_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#skip" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/skip_until_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/skip_until_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/skip_until_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#skip_until" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/string_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/string_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/string_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#string" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/terminate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/terminate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/terminate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/terminate.rb'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/terminate.rb', __FILE__)
 require 'strscan'
 
 describe "StringScanner#terminate" do

Modified: MacRuby/trunk/spec/frozen/library/stringscanner/unscan_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/stringscanner/unscan_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/stringscanner/unscan_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'strscan'
 
 describe "StringScanner#unscan" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/alert_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/alert_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/alert_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/log'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/log', __FILE__)
 require 'syslog'
 
 describe "Syslog.alert" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'syslog'
 
 describe "Syslog.close" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/constants_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/constants_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/constants_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'syslog'
 
 describe "Syslog::Constants" do
@@ -17,7 +17,7 @@
 
     it 'includes the Syslog constants' do
       @constants.each do |c|
-        Syslog::Constants.constants.include?(c).should be_true
+        Syslog::Constants.should have_constant(c)
       end
     end
 

Modified: MacRuby/trunk/spec/frozen/library/syslog/crit_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/crit_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/crit_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/log'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/log', __FILE__)
 require 'syslog'
 
 describe "Syslog.crit" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/debug_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/debug_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/debug_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/log'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/log', __FILE__)
 require 'syslog'
 
 describe "Syslog.debug" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/emerg_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/emerg_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/emerg_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/log'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/log', __FILE__)
 require 'syslog'
 
 describe "Syslog.emerg" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/err_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/err_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/err_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/log'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/log', __FILE__)
 require 'syslog'
 
 describe "Syslog.err" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/facility_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/facility_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/facility_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'syslog'
 
 describe "Syslog.facility" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/ident_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/ident_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/ident_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'syslog'
 
 describe "Syslog.ident" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/info_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/info_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/info_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/log'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/log', __FILE__)
 require 'syslog'
 
 describe "Syslog.info" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/inspect_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/inspect_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/inspect_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'syslog'
 
 describe "Syslog.inspect" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/instance_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/instance_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/instance_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'syslog'
 
 describe "Syslog.instance" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/log_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/log_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/log_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'syslog'
 
 describe "Syslog.log" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/mask_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/mask_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/mask_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'syslog'
 
 describe "Syslog.mask" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/notice_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/notice_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/notice_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/log'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/log', __FILE__)
 require 'syslog'
 
 describe "Syslog.notice" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/reopen'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/reopen', __FILE__)
 require 'syslog'
 
 describe "Syslog.open" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/opened_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/opened_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/opened_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'syslog'
 
 describe "Syslog.opened?" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/options_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/options_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/options_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'syslog'
 
 describe "Syslog.options" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/reopen_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/reopen_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/reopen_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/reopen'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/reopen', __FILE__)
 require 'syslog'
 
 describe "Syslog.reopen" do

Modified: MacRuby/trunk/spec/frozen/library/syslog/warning_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/syslog/warning_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/syslog/warning_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/log'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/log', __FILE__)
 require 'syslog'
 
 describe "Syslog.warning" do

Modified: MacRuby/trunk/spec/frozen/library/tempfile/_close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tempfile/_close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tempfile/_close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,22 +1,14 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
 
 describe "Tempfile#_close" do
   before(:each) do
     @tempfile = Tempfile.new("specs")
   end
-
-  ruby_version_is "" ... "1.9" do  
-    it "is protected" do
-      @tempfile.protected_methods.should include("_close")
-    end
+  
+  it "is protected" do
+    Tempfile.should have_protected_instance_method(:_close)
   end
-
-  ruby_version_is "1.9" do  
-    it "is protected" do
-      @tempfile.protected_methods.should include(:_close)
-    end
-  end
   
   it "closes self" do
     @tempfile.send(:_close)

Modified: MacRuby/trunk/spec/frozen/library/tempfile/callback_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tempfile/callback_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tempfile/callback_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
 
 describe "Tempfile.callback" do

Modified: MacRuby/trunk/spec/frozen/library/tempfile/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tempfile/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tempfile/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
 
 describe "Tempfile#close when passed no argument or [false]" do

Modified: MacRuby/trunk/spec/frozen/library/tempfile/delete_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tempfile/delete_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tempfile/delete_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
-require File.dirname(__FILE__) + "/shared/unlink"
+require File.expand_path('../shared/unlink', __FILE__)
 
 describe "Tempfile#delete" do
   it_behaves_like :tempfile_unlink, :delete

Modified: MacRuby/trunk/spec/frozen/library/tempfile/initialize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tempfile/initialize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tempfile/initialize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
 
 describe "Tempfile#initialize" do

Modified: MacRuby/trunk/spec/frozen/library/tempfile/length_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tempfile/length_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tempfile/length_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
-require File.dirname(__FILE__) + "/shared/length"
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Tempfile#length" do
   it_behaves_like :tempfile_length, :length

Modified: MacRuby/trunk/spec/frozen/library/tempfile/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tempfile/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tempfile/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
 
 describe "Tempfile#open" do

Modified: MacRuby/trunk/spec/frozen/library/tempfile/path_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tempfile/path_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tempfile/path_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
 
 describe "Tempfile#path" do

Modified: MacRuby/trunk/spec/frozen/library/tempfile/size_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tempfile/size_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tempfile/size_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
-require File.dirname(__FILE__) + "/shared/length"
+require File.expand_path('../shared/length', __FILE__)
 
 describe "Tempfile#size" do
   it_behaves_like :tempfile_length, :size

Modified: MacRuby/trunk/spec/frozen/library/tempfile/unlink_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tempfile/unlink_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tempfile/unlink_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'tempfile'
-require File.dirname(__FILE__) + "/shared/unlink"
+require File.expand_path('../shared/unlink', __FILE__)
 
 describe "Tempfile#unlink" do
   it_behaves_like :tempfile_unlink, :unlink

Modified: MacRuby/trunk/spec/frozen/library/time/httpdate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/time/httpdate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/time/httpdate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'time'
 
 describe "Time.httpdate" do

Modified: MacRuby/trunk/spec/frozen/library/time/iso8601_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/time/iso8601_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/time/iso8601_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/xmlschema'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/xmlschema', __FILE__)
 require 'time'
 
 describe "Time.xmlschema" do

Modified: MacRuby/trunk/spec/frozen/library/time/rfc2822_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/time/rfc2822_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/time/rfc2822_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/rfc2822'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/rfc2822', __FILE__)
 require 'time'
 
 describe "Time.rfc2822" do

Modified: MacRuby/trunk/spec/frozen/library/time/rfc822_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/time/rfc822_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/time/rfc822_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/rfc2822'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/rfc2822', __FILE__)
 require 'time'
 
 describe "Time.rfc822" do

Modified: MacRuby/trunk/spec/frozen/library/time/xmlschema_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/time/xmlschema_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/time/xmlschema_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/xmlschema'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/xmlschema', __FILE__)
 require 'time'
 
 describe "Time.xmlschema" do

Modified: MacRuby/trunk/spec/frozen/library/timeout/timeout_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/timeout/timeout_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/timeout/timeout_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'timeout'
 
 describe "Timeout.timeout" do

Modified: MacRuby/trunk/spec/frozen/library/tmpdir/dir/mktmpdir_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tmpdir/dir/mktmpdir_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tmpdir/dir/mktmpdir_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../../spec_helper"
+require File.expand_path('../../../../spec_helper', __FILE__)
 require "tmpdir"
 
 ruby_version_is "1.8.7" do

Modified: MacRuby/trunk/spec/frozen/library/tmpdir/dir/tmpdir_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/tmpdir/dir/tmpdir_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/tmpdir/dir/tmpdir_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../../spec_helper"
+require File.expand_path('../../../../spec_helper', __FILE__)
 require "tmpdir"
 
 describe "Dir.tmpdir" do

Modified: MacRuby/trunk/spec/frozen/library/uri/eql_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/eql_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/eql_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/normalization'
-require File.dirname(__FILE__) + '/shared/eql'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/normalization', __FILE__)
+require File.expand_path('../shared/eql', __FILE__)
 require 'uri'
 
 describe "URI#eql?" do

Modified: MacRuby/trunk/spec/frozen/library/uri/equality_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/equality_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/equality_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/normalization'
-require File.dirname(__FILE__) + '/shared/eql'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/normalization', __FILE__)
+require File.expand_path('../shared/eql', __FILE__)
 require 'uri'
 
 describe "URI#==" do

Modified: MacRuby/trunk/spec/frozen/library/uri/extract_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/extract_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/extract_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'uri'
 
 describe "URI.extract" do

Modified: MacRuby/trunk/spec/frozen/library/uri/http/request_uri_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/http/request_uri_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/http/request_uri_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'uri'
 
 describe "URI::HTTP.request_uri" do

Modified: MacRuby/trunk/spec/frozen/library/uri/join_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/join_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/join_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'uri'
 
 describe "URI.join" do

Modified: MacRuby/trunk/spec/frozen/library/uri/mailto/build_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/mailto/build_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/mailto/build_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'uri'
 
 describe 'URI::Mailto.build' do

Modified: MacRuby/trunk/spec/frozen/library/uri/normalize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/normalize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/normalize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/normalization'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/normalization', __FILE__)
 require 'uri'
 
 describe "URI#normalize" do

Modified: MacRuby/trunk/spec/frozen/library/uri/parse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/parse_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/parse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/classes'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
 
 describe "URI.parse" do
 

Modified: MacRuby/trunk/spec/frozen/library/uri/plus_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/plus_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/plus_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'uri'
 
 #an alias of URI#merge

Modified: MacRuby/trunk/spec/frozen/library/uri/regexp_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/regexp_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/regexp_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'uri'
 
 #I'm more or less ok with these limited tests, as the more extensive extract tests

Modified: MacRuby/trunk/spec/frozen/library/uri/route_to.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/route_to.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/route_to.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'uri'
 
 describe "URI#route_to" do

Modified: MacRuby/trunk/spec/frozen/library/uri/select_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/select_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/select_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'uri'
 
 describe "URI#select" do

Modified: MacRuby/trunk/spec/frozen/library/uri/set_component_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/set_component_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/set_component_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'uri'
 
 #TODO: make this more BDD

Modified: MacRuby/trunk/spec/frozen/library/uri/uri_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/uri/uri_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/uri/uri_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'uri'
 
 #the testing is light here as this is an alias for URI.parse

Modified: MacRuby/trunk/spec/frozen/library/yaml/add_builtin_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/add_builtin_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/add_builtin_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/add_domain_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/add_domain_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/add_domain_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/add_private_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/add_private_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/add_private_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/add_ruby_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/add_ruby_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/add_ruby_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/detect_implicit_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/detect_implicit_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/detect_implicit_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/dump_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/dump_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/dump_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
 
 # TODO: WTF is this using a global?
 describe "YAML.dump" do

Modified: MacRuby/trunk/spec/frozen/library/yaml/dump_stream_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/dump_stream_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/dump_stream_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "YAML.dump_stream" do
   it "returns an empty string when not passed any objects" do

Modified: MacRuby/trunk/spec/frozen/library/yaml/each_document_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/each_document_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/each_document_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
-require File.dirname(__FILE__) + '/fixtures/strings'
-require File.dirname(__FILE__) + '/shared/each_document'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
+require File.expand_path('../fixtures/strings', __FILE__)
+require File.expand_path('../shared/each_document', __FILE__)
 
 describe "YAML#each_document" do
   it_behaves_like :yaml_each_document, :each_document

Modified: MacRuby/trunk/spec/frozen/library/yaml/each_node_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/each_node_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/each_node_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/emitter_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/emitter_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/emitter_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/generic_parser_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/generic_parser_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/generic_parser_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/load_documents_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/load_documents_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/load_documents_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
-require File.dirname(__FILE__) + '/fixtures/strings'
-require File.dirname(__FILE__) + '/shared/each_document'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
+require File.expand_path('../fixtures/strings', __FILE__)
+require File.expand_path('../shared/each_document', __FILE__)
 
 describe "YAML.load_documents" do
   it_behaves_like :yaml_each_document, :load_documents

Modified: MacRuby/trunk/spec/frozen/library/yaml/load_file_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/load_file_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/load_file_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "YAML.load_file" do
   after :each do

Modified: MacRuby/trunk/spec/frozen/library/yaml/load_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/load_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/load_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
-require File.dirname(__FILE__) + '/fixtures/strings'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
+require File.expand_path('../fixtures/strings', __FILE__)
 
 describe "YAML.load" do
   after :each do

Modified: MacRuby/trunk/spec/frozen/library/yaml/load_stream_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/load_stream_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/load_stream_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/object_maker_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/object_maker_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/object_maker_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/parse_documents_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/parse_documents_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/parse_documents_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/parse_file_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/parse_file_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/parse_file_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "YAML#parse_file" do
   quarantine! do

Modified: MacRuby/trunk/spec/frozen/library/yaml/parse_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/parse_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/parse_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "YAML#parse with an empty string" do
   it "returns false" do

Modified: MacRuby/trunk/spec/frozen/library/yaml/parser_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/parser_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/parser_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/quick_emit_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/quick_emit_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/quick_emit_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/read_type_class_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/read_type_class_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/read_type_class_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/tag_class_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/tag_class_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/tag_class_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "YAML.tag_class" do
   it "associates a taguri tag with a ruby class" do

Modified: MacRuby/trunk/spec/frozen/library/yaml/tagged_classes_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/tagged_classes_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/tagged_classes_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "YAML.tagged_classes" do
   it "returns a complete dictionary of taguris paired with classes" do

Modified: MacRuby/trunk/spec/frozen/library/yaml/tagurize_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/tagurize_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/tagurize_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
 
 describe "YAML.tagurize" do
   it "converts a type_id to a taguri" do

Modified: MacRuby/trunk/spec/frozen/library/yaml/to_yaml_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/to_yaml_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/to_yaml_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
-require File.dirname(__FILE__) + '/fixtures/example_class'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)
+require File.expand_path('../fixtures/example_class', __FILE__)
 
 describe "Object#to_yaml" do
 

Modified: MacRuby/trunk/spec/frozen/library/yaml/transfer_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/transfer_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/transfer_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/yaml/try_implicit_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/yaml/try_implicit_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/yaml/try_implicit_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/fixtures/common'
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/common', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/adler32_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/adler32_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/adler32_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'zlib'
 
 describe "Zlib.adler32" do

Modified: MacRuby/trunk/spec/frozen/library/zlib/crc32_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/crc32_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/crc32_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'zlib'
 
 describe "Zlib.crc32" do

Modified: MacRuby/trunk/spec/frozen/library/zlib/crc_table_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/crc_table_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/crc_table_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require "zlib"
 
 describe "Zlib.crc_table" do

Modified: MacRuby/trunk/spec/frozen/library/zlib/deflate/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/deflate/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/deflate/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/deflate/deflate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/deflate/deflate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/deflate/deflate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'zlib'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe 'Zlib::Deflate#deflate' do
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/deflate/flush_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/deflate/flush_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/deflate/flush_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/deflate/initialize_copy_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/deflate/initialize_copy_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/deflate/initialize_copy_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/deflate/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/deflate/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/deflate/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/deflate/params_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/deflate/params_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/deflate/params_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'zlib'
 
 describe 'Zlib::Deflate#params' do
@@ -14,7 +14,7 @@
     d << data
 
     d.finish.should ==
-      "x\001\000\v\000\364\377abcdefghijk\002,'\027\000\#\364\005<"
+      "x\001\000\v\000\364\377abcdefghijk\000\000\000\377\377\313\311\005\000#\364\005<"
   end
   end
 end

Modified: MacRuby/trunk/spec/frozen/library/zlib/deflate/set_dictionary_spec_disabled.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/deflate/set_dictionary_spec_disabled.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/deflate/set_dictionary_spec_disabled.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'zlib'
 
 describe 'Zlib::Deflate#set_dictionary' do

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,10 +1,11 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+# -*- encoding: ascii-8bit -*-
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 
 describe 'Zlib::GzipFile#close' do
   it 'finishes the stream and closes the io' do
-    io = StringIO.new
+    io = StringIO.new ""
     Zlib::GzipWriter.wrap io do |gzio|
       gzio.close
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/closed_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/closed_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/closed_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/comment_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/comment_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/comment_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/crc_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/crc_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/crc_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/finish_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/finish_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/finish_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/level_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/level_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/level_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/mtime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/mtime_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/mtime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/orig_name_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/orig_name_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/orig_name_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/os_code_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/os_code_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/os_code_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/sync_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/sync_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/sync_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/to_io_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/to_io_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/to_io_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipfile/wrap_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipfile/wrap_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipfile/wrap_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_byte_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_byte_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_byte_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_line_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_line_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_line_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/each_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/eof_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/eof_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/eof_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
  

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/getc_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/getc_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/getc_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/gets_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/gets_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/gets_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/lineno_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/lineno_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/lineno_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/pos_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/pos_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/pos_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/read_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/read_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/read_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readchar_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readchar_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readchar_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readline_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readline_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readline_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readlines_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readlines_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/readlines_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/rewind_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/rewind_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/rewind_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/tell_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/tell_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/tell_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/ungetc_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/ungetc_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/ungetc_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipreader/unused_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipreader/unused_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipreader/unused_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/comment_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/comment_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/comment_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/flush_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/flush_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/flush_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/mtime_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/mtime_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/mtime_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/open_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/open_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/open_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/orig_name_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/orig_name_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/orig_name_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/pos_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/pos_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/pos_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/print_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/print_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/print_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/printf_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/printf_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/printf_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/putc_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/putc_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/putc_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/puts_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/puts_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/puts_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/tell_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/tell_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/tell_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/write_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/write_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/gzipwriter/write_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+# -*- encoding: ascii-8bit -*-
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'stringio'
 require 'zlib'
 
@@ -7,7 +8,7 @@
   before :each do
     @data = '12345abcde'
     @zip = "\037\213\b\000,\334\321G\000\00334261MLJNI\005\000\235\005\000$\n\000\000\000"
-    @io = StringIO.new
+    @io = StringIO.new ""
   end
 
   it "writes some compressed data" do

Modified: MacRuby/trunk/spec/frozen/library/zlib/inflate/append_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/inflate/append_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/inflate/append_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'zlib'
 
 describe 'Zlib::Inflate#<<' do

Modified: MacRuby/trunk/spec/frozen/library/zlib/inflate/inflate_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/inflate/inflate_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/inflate/inflate_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,5 +1,5 @@
 require 'zlib'
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe 'Zlib::Inflate#inflate' do
 

Modified: MacRuby/trunk/spec/frozen/library/zlib/inflate/new_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/inflate/new_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/inflate/new_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/inflate/set_dictionary_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/inflate/set_dictionary_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/inflate/set_dictionary_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'zlib'
 
 describe 'Zlib::Inflate#set_dictionary' do

Modified: MacRuby/trunk/spec/frozen/library/zlib/inflate/sync_point_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/inflate/sync_point_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/inflate/sync_point_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/inflate/sync_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/inflate/sync_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/inflate/sync_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zlib_version_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zlib_version_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zlib_version_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/adler_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/adler_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/adler_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/avail_in_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/avail_in_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/avail_in_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/avail_out_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/avail_out_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/avail_out_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/close_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/close_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/close_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/closed_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/closed_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/closed_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/data_type_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/data_type_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/data_type_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/end_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/end_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/end_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/ended_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/ended_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/ended_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/finish_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/finish_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/finish_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/finished_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/finished_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/finished_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/flush_next_in_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/flush_next_in_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/flush_next_in_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/flush_next_out_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/flush_next_out_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/flush_next_out_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
 require 'zlib'
 
 describe 'Zlib::ZStream#flush_next_out' do

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/reset_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/reset_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/reset_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/stream_end_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/stream_end_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/stream_end_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/total_in_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/total_in_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/total_in_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)

Modified: MacRuby/trunk/spec/frozen/library/zlib/zstream/total_out_spec.rb
===================================================================
--- MacRuby/trunk/spec/frozen/library/zlib/zstream/total_out_spec.rb	2010-03-28 19:32:11 UTC (rev 3871)
+++ MacRuby/trunk/spec/frozen/library/zlib/zstream/total_out_spec.rb	2010-03-28 19:53:23 UTC (rev 3872)
@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.expand_path('../../../../spec_helper', __FILE__)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100328/4c6b7a3f/attachment-0001.html>