mascut 0.0.2 → 0.0.3

data/HISTORY.rdoc

@@ -1,3 +1,6 @@
+= 0.0.3 (2010-04-08)
+* add Rack option
+
 = 0.0.2 (2009-12-18)
 * add cache-control
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/mascut

@@ -5,21 +5,36 @@ rescue LoadError
   require 'rubygems'
   require 'rack'
 end
+
 begin
   require 'mascut'
 rescue LoadError
-  require File.join(File.dirname(__FILE__), %w[ .. lib mascut ]) # for development
+  $: << File.join(File.dirname(__FILE__), %w[ .. lib ]) # for development
+  require 'mascut'
 end
-  
+
+Version = Mascut::VERSION
+p opts = Mascut::Option.parse
 
 app = Rack::Builder.new do
   use Rack::CommonLogger, $stdout
   use Rack::ShowExceptions
   use Rack::ShowStatus
   
-  run Rack::Cascade.new([ Mascut.new, Rack::File.new('.') ])
+  run Rack::Cascade.new([ Mascut::Mascut.new, Rack::File.new('.') ])
 end.to_app
 
-Rack::Handler::Mongrel.run app, :Host => '0.0.0.0', :Port => 9203 do
-  puts '*** Mascut has started on http://localhost:9203/ ***'
+begin
+  require opts[:server]
+  server = Rack::Handler.get(opts[:server])
+rescue LoadError, NameError => e
+  begin
+    server = Rack::Handler::Mongrel
+  rescue LoadError => e
+    server = Rack::Handler::WEBrick
+  end
+end
+
+server.run app, opts do
+  puts "*** Mascut has started on http://#{opts[:Host]}:#{opts[:Port]}/ ***"
 end

data/lib/mascut.rb

@@ -1,47 +1,7 @@
-require 'sinatra/base'
-
-class Mascut < Sinatra::Base
-  get '/mascut' do
-    headers 'Cache-Control' => 'no-cache', 'Pragma' => 'no-cache'
-    
-    now = Time.now
-    files = Dir['**/*']
-
-    catch :reload do
-      loop do 
-        files.each {|file| throw(:reload, 'reload') if File.exist?(file) and now < File.mtime(file) }
-        sleep 1
-      end
-    end
-  end
-
-  get %r{^/(.+\.html)$} do |name|
-    halt(404) unless File.exist?(name)
-
-    # I don't use nokogiri because it corercts wrong html.
-    File.read(name).sub('</head>', <<-JS)
-  <script src='http://www.google.com/jsapi'></script>
-  <script>
-var comet = function() {
-  $.ajax({
-    type: 'GET',
-    url:  '/mascut',
-    success: function(msg) {
-      msg == 'reload' ? location.reload() : comet();
-    }
-  });
-}
-
-google.load('jquery', '1');
-google.setOnLoadCallback(comet);
-  </script>
-</head>
-    JS
-  end
-
-  get %r{^/(.+\.css)$} do |name|
-    content_type :css
-    File.exist?(name) ? File.read(name) : halt(404)
-  end
+module Mascut
+  VERSION = File.read(File.join(File.dirname(__FILE__), %w[ .. VERSION ])).chomp
+  
+  autoload :Mascut, 'mascut/mascut'
+  autoload :Option, 'mascut/option'
 end
 

data/lib/mascut/mascut.rb

@@ -0,0 +1,48 @@
+require 'sinatra/base'
+
+module Mascut
+  class Mascut < Sinatra::Base
+    get '/mascut' do
+      headers 'Cache-Control' => 'no-cache', 'Pragma' => 'no-cache'
+      
+      now = Time.now
+      files = Dir['**/*']
+      
+      catch :reload do
+        loop do 
+          files.each {|file| throw(:reload, 'reload') if File.exist?(file) and now < File.mtime(file) }
+          sleep 1
+        end
+      end
+    end
+    
+    get %r{^/(.+\.html)$} do |name|
+      halt(404) unless File.exist?(name)
+      
+      # I don't use nokogiri because it corercts wrong html.
+      File.read(name).sub('</head>', <<-JS)
+  <script src='http://www.google.com/jsapi'></script>
+  <script>
+var comet = function() {
+  $.ajax({
+    type: 'GET',
+    url:  '/mascut',
+    success: function(msg) {
+      msg == 'reload' ? location.reload() : comet();
+    }
+  });
+}
+
+google.load('jquery', '1');
+google.setOnLoadCallback(comet);
+  </script>
+</head>
+      JS
+    end
+    
+    get %r{^/(.+\.css)$} do |name|
+      content_type :css
+      File.exist?(name) ? File.read(name) : halt(404)
+    end
+  end
+end

data/lib/mascut/option.rb

@@ -0,0 +1,38 @@
+require 'optparse'
+
+module Mascut
+  class Option
+    def self.parse(args = ARGV.dup)
+      {
+        :server => 'mongrel',
+        :Host   => '0.0.0.0',
+        :Port   => 9203
+      }.tap do |options|
+        OptionParser.new do |opts|
+          opts.separator 'Rack options:' # almost same as rack
+          opts.on('-s', '--server SERVER', 'serve using SERVER (default: mongrel)') { |s|
+            options[:server] = s
+          }
+          
+          opts.on('-o', '--host HOST', 'listen on HOST (default: 0.0.0.0)') { |host|
+            options[:Host] = host
+          }
+          
+          opts.on('-p', '--port PORT', 'use PORT (default: 9203)') { |port|
+            options[:Port] = port
+          }
+          
+          opts.on('-D', '--daemonize', 'run daemonized in the background') { |d|
+            options[:daemonize] = d ? true : false
+          }
+          
+          opts.separator ''
+          opts.separator 'Mascut options:(TODO)'
+          
+          opts.permute!(args)
+          options[:files] = args
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mascut
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - okitan
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 +09:00
+date: 2010-04-08 00:00:00 +09:00
 default_executable: mascut
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id002
 description: instant comet-like server in order to debug web pages
 email: okitakunio@gmail.com
 executables: 
@@ -51,6 +64,8 @@ files:
 - VERSION
 - bin/mascut
 - lib/mascut.rb
+- lib/mascut/mascut.rb
+- lib/mascut/option.rb
 - spec/mascut_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -67,18 +82,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: instant comet-like server in order to debug web pages