diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-11-09 22:15:01 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-11-09 22:15:01 +0000 |
commit | c7e5c27b51154b3c3a164cf84f08425b2e00e1d8 (patch) | |
tree | 98544029ab9764b34a0565dd6621f92a1f5fc30e /railties/lib/commands/servers | |
parent | 5879a2e9192dc9b6e1e17d2b6d14b26df96ff41b (diff) | |
download | rails-c7e5c27b51154b3c3a164cf84f08425b2e00e1d8.tar.gz rails-c7e5c27b51154b3c3a164cf84f08425b2e00e1d8.tar.bz2 rails-c7e5c27b51154b3c3a164cf84f08425b2e00e1d8.zip |
Added automatic browser launching on OS X when starting script/server [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2960 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/commands/servers')
-rw-r--r-- | railties/lib/commands/servers/lighttpd.rb | 5 | ||||
-rw-r--r-- | railties/lib/commands/servers/webrick.rb | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/lib/commands/servers/lighttpd.rb b/railties/lib/commands/servers/lighttpd.rb index 0205e10c0a..6e3da4a9f8 100644 --- a/railties/lib/commands/servers/lighttpd.rb +++ b/railties/lib/commands/servers/lighttpd.rb @@ -52,5 +52,6 @@ else end) end -trap(:INT) {exit} -`lighttpd #{!detach ? "-D " : ""}-f #{config_file}` +trap(:INT) { exit } +Thread.new { sleep 0.5; `open http://0.0.0.0:#{port}` } if RUBY_PLATFORM =~ /darwin/ +`lighttpd #{!detach ? "-D " : ""}-f #{config_file}`
\ No newline at end of file diff --git a/railties/lib/commands/servers/webrick.rb b/railties/lib/commands/servers/webrick.rb index db8e8b3d93..d06e3309bd 100644 --- a/railties/lib/commands/servers/webrick.rb +++ b/railties/lib/commands/servers/webrick.rb @@ -8,7 +8,8 @@ OPTIONS = { :server_root => File.expand_path(RAILS_ROOT + "/public/"), :server_type => WEBrick::SimpleServer, :charset => "UTF-8", - :mime_types => WEBrick::HTTPUtils::DefaultMimeTypes + :mime_types => WEBrick::HTTPUtils::DefaultMimeTypes, + :open_in_browser => true } ARGV.options do |opts| |