aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ruby.136
-rw-r--r--ruby.c1
-rw-r--r--version.h6
4 files changed, 47 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 123251b40b..1ef9fa723c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 14 16:09:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ruby.1: a patch to describe --encoding. a patch from Yugui
+ <yugui AT yugui.sakura.ne.jp> in [ruby-dev:33079].
+
+ * ruby.c: ditto.
+
Mon Jan 14 13:49:26 2008 Tanaka Akira <akr@fsij.org>
* re.c (rb_reg_prepare_re): initialize error message buffer.
diff --git a/ruby.1 b/ruby.1
index f240f2f22b..9914183d00 100644
--- a/ruby.1
+++ b/ruby.1
@@ -13,14 +13,17 @@
.Op Fl Sacdlnpswvy
.Op Fl 0 Ns Op Ar octal
.Op Fl C Ar directory
+.Op Fl E Ar encoding
.Op Fl F Ar pattern
.Op Fl I Ar directory
.Op Fl K Ar c
.Op Fl T Ns Op Ar level
+.Op Fl W Ns Op Ar level
.Op Fl e Ar command
.Op Fl i Ns Op Ar extension
.Op Fl r Ar library
.Op Fl x Ns Op Ar directory
+.Op Fl -disable-gems
.Op Fl -
.Op Ar program_file
.Op Ar argument ...
@@ -132,8 +135,13 @@ makes Ruby read whole file at once as a single string since there is
no legal character with that value.
.Pp
.It Fl C Ar directory
+.It Fl X Ar directory
Causes Ruby to switch to the directory.
.Pp
+.It Fl E Ar encname
+.It Fl -encoding Ar encname
+Specifies the encoding for the program codes.
+.Pp
.It Fl F Ar pattern
Specifies input field separator
.Pf ( Li "$;" ) .
@@ -162,6 +170,30 @@ on machines that don't support it, in the following manner:
.It Fl T Ns Op Ar level
Turns on taint checks at the specified level (default 1).
.Pp
+.It Fl W Ns Op Ar level
+Turns on verbose mode at the specified level, without printing version
+message at the beginning. The level can be;
+.Bl -hang -offset indent
+.It Sy 0
+Verbose mode is "silence". It sets the
+.Li "$VERBOSE"
+to nil.
+.Pp
+.It Sy 1
+Verbose mode is "medium". It sets the
+.Li "$VERBOSE"
+to false.
+.Pp
+.It Sy 2 (default)
+Verbose mode is "verbose". It sets the
+.Li "$VERBOSE"
+to true.
+.Fl W Ns
+2 is same as
+.Fl w
+.
+.El
+.Pp
.It Fl a
Turns on auto-split mode when used with
.Fl n
@@ -304,6 +336,10 @@ before executing script.
Turns on compiler debug mode. Ruby will print a bunch of internal
state messages during compiling scripts. You don't have to specify
this switch, unless you are going to debug the Ruby interpreter.
+.Pp
+.It Fl -disable-gems
+Disables RubyGems libraries. By default, Ruby can load the latest
+version of the each installed gems.
.El
.Pp
.Sh ENVIRONMENT
diff --git a/ruby.c b/ruby.c
index 7feef787ff..20a2a9083c 100644
--- a/ruby.c
+++ b/ruby.c
@@ -108,6 +108,7 @@ usage(const char *name)
"-Cdirectory cd to directory, before executing your script",
"-d set debugging flags (set $DEBUG to true)",
"-e 'command' one line of script. Several -e's allowed. Omit [programfile]",
+ "-Eencoding specifies the character encoding for the program codes",
"-Fpattern split() pattern for autosplit (-a)",
"-i[extension] edit ARGV files in place (make backup if extension supplied)",
"-Idirectory specify $LOAD_PATH directory (may be used more than once)",
diff --git a/version.h b/version.h
index 5ccddf7c00..0865aa91c7 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-01-13"
+#define RUBY_RELEASE_DATE "2008-01-14"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080113
+#define RUBY_RELEASE_CODE 20080114
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];