summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-13 21:02:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-13 21:02:28 +0000
commit117cbb387a4d5c76714be4a1bd733ec752c96a14 (patch)
treeb9a32d60420a067ef7c19d237b0bc8ef83a18567
parent0a0cda8c9adaf686100e96c99290683d192ba2e8 (diff)
downloadruby-117cbb387a4d5c76714be4a1bd733ec752c96a14.tar.gz
ruby-117cbb387a4d5c76714be4a1bd733ec752c96a14.tar.xz
ruby-117cbb387a4d5c76714be4a1bd733ec752c96a14.zip
* lib/optparse.rb (OptionParser#environment): requires shellwords.
[ruby-dev:35466] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/optparse.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b3ee14327..641663037 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 14 06:02:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser#environment): requires shellwords.
+ [ruby-dev:35466]
+
Sun Jul 13 21:23:08 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (EVENTSINK_Invoke): using hash
diff --git a/lib/optparse.rb b/lib/optparse.rb
index c6a54ef30..86681235a 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1474,6 +1474,7 @@ class OptionParser
#
def environment(env = File.basename($0, '.*'))
env = ENV[env] || ENV[env.upcase] or return
+ require 'shellwords'
parse(*Shellwords.shellwords(env))
end