summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/irb/init.rb2
-rw-r--r--test/irb/test_option.rb12
3 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ea63eb8798..d12cc150b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 5 12:09:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
+
Sun Dec 5 11:27:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (load_file_internal): decrement for ungotten line.
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 5c1d56e980..2d7ff3146e 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -207,7 +207,7 @@ module IRB
IRB.print_usage
exit 0
when "--"
- if opt = ARGV.shfit
+ if opt = ARGV.shift
@CONF[:SCRIPT] = opt
$0 = opt
end
diff --git a/test/irb/test_option.rb b/test/irb/test_option.rb
new file mode 100644
index 0000000000..846d7185a5
--- /dev/null
+++ b/test/irb/test_option.rb
@@ -0,0 +1,12 @@
+require 'test/unit'
+require_relative '../ruby/envutil'
+
+module TestIRB
+ class TestOption < Test::Unit::TestCase
+ def test_end_of_option
+ bug4117 = '[ruby-core:33574]'
+ status = assert_in_out_err(%w[-rirb -e IRB.start(__FILE__) -- --], "", //, [], bug4117)
+ assert(status.success?, bug4117)
+ end
+ end
+end