Skip to content

Commit

Permalink
Whitespace and doc fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@quirkey
quirkey committed Oct 11, 2010
1 parent bc57684 commit 68de6e0
Showing 1 changed file with 52 additions and 52 deletions.
104 changes: 52 additions & 52 deletions lib/vegas/runner.rb
View file
Expand Up @@ -6,7 +6,7 @@
if Vegas::WINDOWS
begin
require 'win32/process'
rescue
rescue
puts "Sorry, in order to use Vegas on Windows you need the win32-process gem:",
"gem install win32-process"
end
Expand All @@ -16,26 +16,26 @@ module Vegas
class Runner
attr_reader :app, :app_name, :filesystem_friendly_app_name, :quoted_app_name,
:rack_handler, :port, :host, :options, :args

ROOT_DIR = File.expand_path(File.join('~', '.vegas'))
PORT = 5678
HOST = WINDOWS ? 'localhost' : '0.0.0.0'

def initialize(app, app_name, set_options = {}, runtime_args = ARGV, &block)
@options = set_options || {}

self.class.logger.level = options[:debug] ? Logger::DEBUG : Logger::INFO

@app = app
@app_name = app_name

@filesystem_friendly_app_name = @app_name.gsub(/\W+/, "_")
@quoted_app_name = "'#{app_name}'"

@runtime_args = runtime_args
@rack_handler = setup_rack_handler
# load options from opt parser

# load options from opt parser
@args = define_options do |opts|
if block_given?
opts.separator ''
Expand All @@ -48,32 +48,32 @@ def initialize(app, app_name, set_options = {}, runtime_args = ARGV, &block)
kill!
exit!(0)
end

# Handle :before_run hook
if (before_run = options.delete(:before_run)).respond_to?(:call)
before_run.call(self)
end

# Set app options
@host = options[:host] || HOST

if app.respond_to?(:set)
app.set(options)
app.set(options)
app.set(:vegas, self)
end

# Make sure app dir is setup
FileUtils.mkdir_p(app_dir)

return if options[:start] == false

# evaluate the launch_path
path = if options[:launch_path].respond_to?(:call)
options[:launch_path].call(self)
else
options[:launch_path]
end

start(path)
end

Expand All @@ -92,7 +92,7 @@ def url_file
def log_file
options[:log_file] || File.join(app_dir, "#{filesystem_friendly_app_name}.log")
end

def url
"http://#{host}:#{port}"
end
Expand All @@ -116,30 +116,30 @@ def start(path = nil)
def find_port
if @port = options[:port]
announce_port_attempted

unless port_open?
logger.warn "Port #{port} is already in use. Please try another. " +
"You can also omit the port flag, and we'll find one for you."
end
else
@port = PORT
announce_port_attempted

until port_open?
@port += 1
announce_port_attempted
end
end
end

def announce_port_attempted
logger.info "trying port #{port}..."
end

def port_open?(check_url = nil)
begin
check_url ||= url
options[:no_proxy] ? open(check_url, :proxy => nil) : open(check_url)
options[:no_proxy] ? open(check_url, :proxy => nil) : open(check_url)
false
rescue Errno::ECONNREFUSED => e
true
Expand All @@ -166,7 +166,7 @@ def check_for_running(path = nil)

def run!
logger.info "Running with Rack handler: #{@rack_handler.inspect}"

rack_handler.run app, :Host => host, :Port => port do |server|
trap(kill_command) do
## Use thins' hard #stop! if available, otherwise just #stop
Expand All @@ -186,13 +186,13 @@ def daemonize!
else
Process.daemon(true, true)
end

File.umask 0000
FileUtils.touch log_file
STDIN.reopen log_file
STDOUT.reopen log_file, "a"
STDERR.reopen log_file, "a"

logger.debug "Child Process: #{Process.pid}"

File.open(pid_file, 'w') {|f| f.write("#{Process.pid}") }
Expand Down Expand Up @@ -222,20 +222,20 @@ def status
logger.info "#{quoted_app_name} not running!"
end
end
# Loads a config file at config_path and evals it in the context of the @app.

# Loads a config file at config_path and evals it in the context of the @app.
def load_config_file(config_path)
abort "Can not find config file at #{config_path}" if !File.readable?(config_path)
config = File.read(config_path)
# trim off anything after __END__
config.sub!(/^__END__\n.*/, '')
@app.module_eval(config)
end

def self.logger=(logger)
@logger = logger
end

def self.logger
@logger ||= LOGGER if defined?(LOGGER)
if !@logger
Expand All @@ -249,16 +249,16 @@ def self.logger
def logger
self.class.logger
end

private
def setup_rack_handler
# First try to set Rack handler via a special hook we honor
@rack_handler = if @app.respond_to?(:detect_rack_handler)
@app.detect_rack_handler

# If they aren't using our hook, try to use their @app.server settings
elsif @app.respond_to?(:server) and @app.server
# If :server isn't set, it returns an array of possibilities,
# If :server isn't set, it returns an array of possibilities,
# sorted from most to least preferable.
if @app.server.is_a?(Array)
handler = nil
Expand All @@ -271,32 +271,32 @@ def setup_rack_handler
end
end
handler

# :server might be set explicitly to a single option like "mongrel"
else
Rack::Handler.get(@app.server)
end

# If all else fails, we'll use Thin
else
Rack::Handler::Thin
end
end

def define_options
OptionParser.new("", 24, ' ') do |opts|
# TODO instead of app_name, we should determine the name of the script
# TODO instead of app_name, we should determine the name of the script
# used to invoke Vegas and use that here
opts.banner = "Usage: #{$0 || app_name} [options]"

opts.separator ""
opts.separator "Vegas options:"

opts.on('-K', "--kill", "kill the running process and exit") {|k|
opts.on('-K', "--kill", "kill the running process and exit") {|k|
@should_kill = true
}

opts.on('-S', "--status", "display the current running PID and URL then quit") {|s|
opts.on('-S', "--status", "display the current running PID and URL then quit") {|s|
status
exit!(0)
}
Expand All @@ -313,7 +313,7 @@ def define_options
@options[:port] = port
}

opts.on("-x", "--no-proxy", "ingnore env proxy settings (e.g. http_proxy)") { |p|
opts.on("-x", "--no-proxy", "ignore env proxy settings (e.g. http_proxy)") { |p|
@options[:no_proxy] = true
}

Expand All @@ -328,27 +328,27 @@ def define_options
opts.on("-L", "--no-launch", "don't launch the browser") { |f|
@options[:skip_launch] = true
}
opts.on('-d', "--debug", "raise the log level to :debug (default: :info)") {|s|

opts.on('-d', "--debug", "raise the log level to :debug (default: :info)") {|s|
@options[:debug] = true
}
opts.on("--app-dir APP_DIR", "set the app dir where files are stored (default: ~/.vegas/#{filesystem_friendly_app_name})/)") {|app_dir|

opts.on("--app-dir APP_DIR", "set the app dir where files are stored (default: ~/.vegas/#{filesystem_friendly_app_name})/)") {|app_dir|
@options[:app_dir] = app_dir
}
opts.on("-P", "--pid-file PID_FILE", "set the path to the pid file (default: app_dir/#{filesystem_friendly_app_name}.pid)") {|pid_file|

opts.on("-P", "--pid-file PID_FILE", "set the path to the pid file (default: app_dir/#{filesystem_friendly_app_name}.pid)") {|pid_file|
@options[:pid_file] = pid_file
}
opts.on("--log-file LOG_FILE", "set the path to the log file (default: app_dir/#{filesystem_friendly_app_name}.log)") {|log_file|

opts.on("--log-file LOG_FILE", "set the path to the log file (default: app_dir/#{filesystem_friendly_app_name}.log)") {|log_file|
@options[:log_file] = log_file
}
opts.on("--url-file URL_FILE", "set the path to the URL file (default: app_dir/#{filesystem_friendly_app_name}.url)") {|url_file|
}

opts.on("--url-file URL_FILE", "set the path to the URL file (default: app_dir/#{filesystem_friendly_app_name}.url)") {|url_file|
@options[:url_file] = url_file
}
}

yield opts if block_given?

opts.separator ""
Expand Down Expand Up @@ -383,5 +383,5 @@ def delete_pid!
File.delete(pid_file) if File.exist?(pid_file)
end
end

end

0 comments on commit 68de6e0

Please sign in to comment.