diff options
author | Eric Wong <normalperson@yhbt.net> | 2010-01-06 14:43:36 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2010-01-06 14:48:40 -0800 |
commit | 1e902098533a4a66e8d6782b00703aa9a5eaa5f7 (patch) | |
tree | 61bef602c9c8bba7de768349533cc9aff2b51d54 | |
parent | d541fd3ee9aa4ddbc3b4f8a14bbea43de19a31d9 (diff) | |
download | rainbows-1e902098533a4a66e8d6782b00703aa9a5eaa5f7.tar.gz |
Do not identify ourselves as "Unicorn", especially not for -v. Also "ENVIRONMENT" should be "RACK_ENV".
-rw-r--r-- | bin/rainbows | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/bin/rainbows b/bin/rainbows index dbab328..77059ef 100644 --- a/bin/rainbows +++ b/bin/rainbows @@ -41,7 +41,7 @@ opts = OptionParser.new("", 24, ' ') do |opts| require library end - opts.separator "Unicorn options:" + opts.separator "Rainbows!/Unicorn options:" # some of these switches exist for rackup command-line compatibility, @@ -57,8 +57,8 @@ opts = OptionParser.new("", 24, ' ') do |opts| set_listener = true end - opts.on("-E", "--env ENVIRONMENT", - "use ENVIRONMENT for defaults (default: development)") do |e| + opts.on("-E", "--env RACK_ENV", + "use RACK_ENV for defaults (default: development)") do |e| ENV["RACK_ENV"] = e end @@ -67,8 +67,8 @@ opts = OptionParser.new("", 24, ' ') do |opts| end opts.on("-P", "--pid FILE", "DEPRECATED") do |f| - warn %q{Use of --pid/-P is strongly discouraged} - warn %q{Use the 'pid' directive in the Unicorn config file instead} + warn "Use of --pid/-P is strongly discouraged" + warn "Use the 'pid' directive in the Rainbows!/Unicorn config file instead" options[:pid] = f end @@ -77,7 +77,7 @@ opts = OptionParser.new("", 24, ' ') do |opts| warn "-s/--server only exists for compatibility with rackup" end - # Unicorn-specific stuff + # Rainbows!/Unicorn-specific stuff opts.on("-l", "--listen {HOST:PORT|PATH}", "listen on HOST:PORT or PATH", "this may be specified multiple times", @@ -85,7 +85,8 @@ opts = OptionParser.new("", 24, ' ') do |opts| listeners << address end - opts.on("-c", "--config-file FILE", "Unicorn-specific config file") do |f| + opts.on("-c", "--config-file FILE", + "Rainbows!/Unicorn-specific config file") do |f| options[:config_file] = f end @@ -102,7 +103,7 @@ opts = OptionParser.new("", 24, ' ') do |opts| end opts.on_tail("-v", "--version", "Show version") do - puts "unicorn v#{Unicorn::Const::UNICORN_VERSION}" + puts "Rainbows! v#{Rainbows::Const::RAINBOWS_VERSION}" exit end |