nobu	2011-02-12 01:04:08 +0900 (Sat, 12 Feb 2011)

  New Revision: 30846

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30846

  Log:
    * ruby.c (proc_options): enable rubygems if --gem option is given.
    * ruby.c (process_options): load rubygems if it is disabled but
      --gem option is given.

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30845)
+++ ChangeLog	(revision 30846)
@@ -1,3 +1,10 @@
+Sat Feb 12 01:04:02 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (proc_options): enable rubygems if --gem option is given.
+
+	* ruby.c (process_options): load rubygems if it is disabled but
+	  --gem option is given.
+
 Fri Feb 11 23:27:50 2011  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* ruby.c (proc_options): add --gem=enabled as an alias of
Index: ruby.c
===================================================================
--- ruby.c	(revision 30845)
+++ ruby.c	(revision 30846)
@@ -1079,6 +1079,7 @@
                     opt->disable &= ~DISABLE_BIT(gems);
                 }
                 else {
+                    opt->disable &= ~DISABLE_BIT(gems);
                     add_gems(&opt->req_list, s);
                 }
 	    }
@@ -1414,7 +1415,11 @@
 	}
     }
     if (!(opt->disable & DISABLE_BIT(gems))) {
+#if defined DISABLE_RUBYGEMS && DISABLE_RUBYGEMS
+	rb_require("rubygems");
+#else
 	rb_define_module("Gem");
+#endif
     }
     ruby_init_prelude();
     ruby_set_argv(argc, argv);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/