Skip to content

Modular #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
c-lliope wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Modular #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23f18b4
Moved option parsing into lib/annyong/application.rb
c-lliope Jan 13, 2013
3327606
Moved initialization of server into Annyong::Application
c-lliope Jan 13, 2013
51c5935
Improved code behind the options banner
c-lliope Jan 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions bin/annyong
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,5 @@ require "optparse"
require "rack"
require "annyong"

options = {
:port => 9292,
:host => "0.0.0.0"
}
opts = OptionParser.new do |opts|
opts.banner = "Usage: annyong [options]

Options:
"
opts.on("--port [PORT]", "The port to use (default: 9292)") do |port|
options[:port] = port
end

opts.on("--host [HOST]", "The host to listen on (default: 0.0.0.0)") do |host|
options[:host] = host
end

#opts.on("--path [PATH]", "The directory to serve") do |path|
#options[:path] = path
#end

end
opts.parse!

Rack::Server.start({
:config => File.join(File.dirname(__FILE__), "../assets/rack/config.ru"),
:Port => options[:port],
:Host => options[:host],
:AccessLog => [],
})
application = Annyong::Application.new(ARGV)
application.run
1 change: 1 addition & 0 deletions lib/annyong.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module Annyong
VERSION = '0.3'
autoload :Directory, "annyong/directory"
require "annyong/application"
end

unless "".respond_to?(:each)
Expand Down
66 changes: 66 additions & 0 deletions lib/annyong/application.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
require 'ostruct'

module Annyong

class Application

def server
@server ||= Rack::Server.new({
:config => File.join(File.dirname(__FILE__), "../../assets/rack/config.ru"),
:Port => port,
:Host => host,
:AccessLog => [],
})
end

def run
server.start
end

def port
options[:port]
end

def host
options[:host]
end

def initialize(args)
@options = parse_options(args)
end

def options
@options ||= parse_options
end

private

def parse_options(args)
options = {
:port => 9292,
:host => "0.0.0.0"
}

option_parser = OptionParser.new do |opts|
opts.banner = "Usage: annyong [options]"
opts.separator ""
opts.separator "Options:"

opts.on("--port [PORT]", "The port to use (default: #{options[:port]})") do |port|
options[:port] = port
end
opts.on("--host [HOST]", "The host to listen on (default: #{options[:host]})") do |host|
options[:host] = host
end

#opts.on("--path [PATH]", "The directory to serve") do |path|
#options[:path] = path
#end
end

option_parser.parse!(args)
options
end

end
end