lib/serve/application.rb spec/serve_application_spec.rb @@ -1,5 +1,4 @@ #!/usr/bin/env ruby - lib = File.dirname(__FILE__) + '/../lib' require 'rubygems' if File.file?(lib + '/serve/version.rb') @@ -8,69 +7,4 @@ else gem 'serve' end require 'serve' - -args = ARGV.join(' ') -args.gsub!(%r{http://}, '') -args = args.split(/[ :]/).compact - -help = args.delete('--help') || args.delete('-h') || false -version = args.delete('--version') || args.delete('-v') || false -environment = args.delete('production') || args.delete('test') || args.delete('test') || 'development' -port = args.pop -address = args.pop || '0.0.0.0' -script = Dir.pwd + '/script/server' - -if args.size > 0 - puts "invalid arguments" - puts "" - help = true -end - -case -when version - puts "Serve #{Serve.version}" -when help - program = File.basename($0) - puts "Usage:" - puts " #{program} [port] [environment]" - puts " #{program} [address:port] [environment]" - puts " #{program} [options]" - puts " " - puts "Description:" - puts " Starts a WEBrick server on the specified address and port with its document " - puts " root set to the current working directory. By default the command uses " - puts " 0.0.0.0 for the address and 4000 for the port. This means that once the " - puts " command has been started you can access the documents in the current " - puts " directory with any Web browser at:" - puts " " - puts " http://localhost:4000/" - puts " " - puts " If the haml, redcloth, or bluecloth gems are installed the command can serve " - puts " Haml, Sass, Textile, and Markdown for documents with haml, sass, textile, " - puts " and markdown file extensions." - puts " " - puts " If the Rails command script/server exists in the current directory the " - puts " script will start that instead with the specified environment or the " - puts " development environment if none is specified. Rails apps are started by " - puts " default on port 3000." - puts " " - puts "Options:" - puts " -h, --help Show this message and quit." - puts " -v, --version Show the program version number and quit." -else - unless File.file?(script) and File.executable?(script) - port ||= 4000 - server = Serve::Server.new( - :Port => port, - :BindAddress => address, - :DocumentRoot => Dir.pwd, - :DirectoryIndex => %w(index.html index.txt index.text index.haml index.textile index.markdown index.email index.redirect), - :AppendExtensions => %w(html txt text haml textile markdown email redirect) - ) - trap("INT") { server.shutdown } - server.start - else - port ||= 3000 - system "#{script} -p #{port} -b #{address} -e #{environment}" - end -end \ No newline at end of file +Serve::Application.run \ No newline at end of file bin/serve @@ -1,5 +1,6 @@ require 'webrick' require 'serve/version' +require 'serve/application' require 'serve/webrick/extensions' require 'serve/handlers/file_type_handler' require 'serve/handlers/textile_handler' lib/serve.rb 84925d74a888605dbaf73affad2ea58e2c2d0b98 jlong jlong@bc0a7ee4-b4f2-4507-b10a-a3dd5181224c http://github.com/jlong/serve/commit/c20f60c50d4b369c4bc861087c53e5cde89f445e c20f60c50d4b369c4bc861087c53e5cde89f445e 2008-05-31T09:23:25-07:00 2008-05-31T09:23:25-07:00 refactored bin/serve to use new Application class; added specs for command line parameter parsing; added the ability to specify the document root as the last parameter to the command git-svn-id: svn+ssh://rubyforge.org/var/svn/serve/trunk/serve@20 bc0a7ee4-b4f2-4507-b10a-a3dd5181224c b0a213ab69ff050d3987c9237871763e14fbde10 jlong jlong@bc0a7ee4-b4f2-4507-b10a-a3dd5181224c