servo 0.1.0 → 0.2.1

data/README.md

@@ -1,9 +1,26 @@
 Servo
 =
 
-It's easy.
+Servo serves your static filesystem via the web. Fun for testing simple static websites or generally being a weirdo.
+
+It's easy:
 
 1. `gem install servo`
 2. `servo ~/Path/to/directory` or just `servo` for current directory
 3. Open [http://localhost:9292/](http://localhost:9292/)
 4. Profit
+
+Usage
+==
+
+Basics: `servo [options] [directory]`
+
+Directory is optional and defaults to the current working directory.
+
+Options are:
+
+- `-p PORT, --port PORT` will serve on `PORT` supplied. So `servo -p 3001` will serve the current directory at `http://localhost:3001`
+
+Oh look, it's just one option. Yeah, it's a simple little app.
+
+Copyright © 2012 Flip Sasser, dont' sue me if it breaks something.

data/Version

@@ -1 +1 @@
-0.1.0
+0.2.1

data/bin/servo

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'rack'
 require 'optparse'
+require File.expand_path('../lib/servo', File.dirname(__FILE__))
 
 options = {:port => 9292}
 
@@ -14,12 +14,5 @@ OptionParser.new do |opts|
 end.parse!
 
 dir  = ARGV.first && File.expand_path(ARGV.first) || Dir.pwd
-
-servo_app = Rack::Builder.new {
-  run Rack::Directory.new(dir)
-}
-
-server = Rack::Server.new(:Port => options[:port])
-server.options[:config] = nil
-server.instance_variable_set('@app', servo_app)
+server = Rack::Server.new(:app => Servo.serve(dir), :Port => options[:port])
 server.start

data/lib/servo.rb

@@ -0,0 +1,16 @@
+$LOAD_PATH.push File.dirname(__FILE__)
+
+require 'rubygems'
+require 'rack'
+require 'servo/directory_index'
+
+module Servo
+  class << self
+    def serve(dir)
+      Rack::Builder.new {
+        use Servo::DirectoryIndex, dir
+        run Rack::Directory.new(dir)
+      }
+    end
+  end
+end

data/lib/servo/directory_index.rb

@@ -0,0 +1,21 @@
+# Thanks to David Stamm (https://github.com/whylom) for this
+# middleware that serves an index file if it's exists
+module Servo
+  class DirectoryIndex
+    def initialize(app, dir)
+      @app = app
+      @dir = dir
+    end
+
+    def call(env)
+      index_path = ::File.join(@dir, Rack::Request.new(env).path.split('/'), 'index.html')
+      if ::File.exists?(index_path)
+        return [200, {"Content-Type" => "text/html"}, [::File.read(index_path)]]
+      else
+        @app.call(env)
+      end
+    end
+  end
+end
+
+

data/servo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "servo"
-  s.version = "0.0.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2012-04-26"
+  s.date = "2013-01-15"
   s.description = "\n    Servo makes it dead simple to serve up a static filesystem using Rack::Directory.\n  "
   s.email = "flip@x451.com"
   s.executables = ["servo"]
@@ -24,18 +24,30 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/flipsasser/servo"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "A command-line static file server"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_development_dependency(%q<capybara>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.2.1"])
     else
+      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<capybara>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 1.2.1"])
     end
   else
+    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<capybara>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 1.2.1"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,75 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70355965219560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +85,12 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70355965219560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 description: ! "\n    Servo makes it dead simple to serve up a static filesystem using
   Rack::Directory.\n  "
 email: flip@x451.com
@@ -34,6 +103,8 @@ files:
 - README.md
 - Version
 - bin/servo
+- lib/servo.rb
+- lib/servo/directory_index.rb
 - servo.gemspec
 homepage: http://github.com/flipsasser/servo
 licenses: []
@@ -55,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A command-line static file server