marcinbunsch-quick_serve 0.1.0 → 0.2.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = quick_serve
 
-quick_server is a super-simple way of serving static files for development. It was made mainly for javascript development, but might have other uses.
+quick_serve is a super-simple way of serving static files for development. It was made mainly for javascript development, but might have other uses.
 
 = usage
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/qs

@@ -1 +1,4 @@
-system "quick_serve #{ARGV[0]}" 
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'quick_serve'
+QuickServe.new.start

data/bin/quick_serve

@@ -1,32 +1,4 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-begin
-require 'mongrel' 
-rescue LoadError
-  puts "quick_serve requires mongrel. Install it with gem install mongrel"
-  exit(1)
-end
-
-
-if ARGV.length == 0
-  puts "quick_serve: port not specified, using 3000"
-  PORT = 3000
-else
-  PORT = ARGV[0]
-end
-
-HOST = '0.0.0.0'
-DIR = '.'
-
-config = Mongrel::Configurator.new :host => HOST, :port => PORT do
-  listener do
-    uri "/", :handler => Mongrel::DirHandler.new(DIR)
-  end
-
-  trap("INT") { stop }
-  run
-end
-
-puts "quick_serve: Mongrel running on port #{PORT} current directory as docroot"
-config.join
-
+require 'quick_serve'
+QuickServe.new.start

data/lib/quick_serve.rb

@@ -0,0 +1,92 @@
+begin
+require 'mongrel' 
+rescue LoadError
+  puts "quick_serve requires mongrel. Install it with: gem install mongrel"
+  exit(1)
+end
+
+class QuickServe
+  
+  def initialize
+    @options = { :dir => '.', :port => 3000, :host => '0.0.0.0', :deamon => false }
+    parse
+  end
+  
+  
+  def start
+    puts "quick_serve: Mongrel running on port #{@options[:port]} current directory as docroot"
+    begin
+      if @options[:deamon]
+        pid = fork do
+          captured_stdout = StringIO.new
+          old_stdout, $stdout = $stdout, captured_stdout
+          captured_stderr = StringIO.new
+          old_stderr, $stdout = $stdout, captured_stderr
+          serve
+        end
+        File.open(pidfile, 'w') {|f| f.write(pid) }      
+      else
+        serve
+      end
+    rescue Errno::EADDRINUSE
+      puts "quick_serve: Port #{@options[:port]} is used by another process. Please specify other port using the -p option"
+    end
+  end
+  
+  private
+
+    def serve
+      options = @options
+      config = Mongrel::Configurator.new :host => options[:host], :port => options[:port] do
+        listener do
+          uri "/", :handler => Mongrel::DirHandler.new(options[:dir])
+        end
+        trap("INT") { stop }
+        run
+      end
+      config.join
+    end
+    
+    def parse
+      require 'optparse'
+      OptionParser.new do |opts|
+        opts.banner = "Usage: qs [options]"
+
+        opts.on("-p PORT", "--port PORT", "Specify port") { |value| @options[:port] = value; }
+        opts.on("--dir DIRECTORY", "Specify directory to act as docroot") { |value| @options[:dir] = value; }
+        opts.on("--host HOST", "Specify host") { |value| @options[:host] = value; }
+        # opts.on("quit", "quit deamon (if present)") { quit }
+        opts.on("-q", "quit deamon (if present)") { quit }
+        opts.on("-d", "--deamon", "Run as a deamon process") { @options[:deamon] = true; }
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+      end.parse!
+    end
+    
+    def quit
+      
+      print "Stopping quick serve... "
+      die(" pid file not found") if !File.exists?(pidfile)
+      pid = File.read(pidfile)
+      begin
+        if Process.kill("INT", pid.to_i) == 1
+          puts ' ok'
+          File.delete(pidfile) if File.exist?(pidfile)
+        end
+      rescue Errno::ESRCH
+        puts ' not found'
+      end
+      exit
+    end
+  
+    def pidfile
+      File.join(@options[:dir], "qs.#{@options[:port]}.pid")
+    end
+    
+    def die(msg)
+      puts msg
+      exit(1)
+    end
+end

data/quick_serve.gemspec

@@ -1,15 +1,12 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{quick_serve}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcin Bunsch"]
-  s.date = %q{2009-09-11}
+  s.date = %q{2009-09-12}
   s.default_executable = %q{qs}
   s.description = %q{}
   s.email = %q{marcin@applicake.com}
@@ -31,11 +28,10 @@ Gem::Specification.new do |s|
      "quick_serve.gemspec",
      "test/test_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/marcinbunsch/quick_serve}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.3}
   s.summary = %q{Super simple web server mainly for javascript development}
   s.test_files = [
     "test/test_helper.rb"
@@ -43,7 +39,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marcinbunsch-quick_serve
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Marcin Bunsch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 -07:00
+date: 2009-09-12 00:00:00 -07:00
 default_executable: qs
 dependencies: []
 
@@ -35,7 +35,7 @@ files:
 - lib/quick_serve.rb
 - quick_serve.gemspec
 - test/test_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/marcinbunsch/quick_serve
 licenses: 
 post_install_message: 
@@ -60,7 +60,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Super simple web server mainly for javascript development
 test_files: 
 - test/test_helper.rb