slinky 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.2

data/bin/slinky

@@ -2,7 +2,7 @@
 
 root = File.expand_path(File.dirname(__FILE__))
 
-require "#{root}/../lib/slinky"
-#require 'slinky'
+#require "#{root}/../lib/slinky"
+require 'slinky'
 
 Slinky::Runner.new(ARGV).run

data/lib/slinky/builder.rb

@@ -1,7 +1,7 @@
 module Slinky
   class Builder
-    def self.build dir, build_dir
-      manifest = Manifest.new(dir, :build_to => build_dir, :devel => false)
+    def self.build dir, build_dir, config
+      manifest = Manifest.new(dir, config, :build_to => build_dir, :devel => false)
       manifest.build
     end
   end

data/lib/slinky/config_reader.rb

@@ -0,0 +1,23 @@
+module Slinky
+  class ConfigReader
+    def self.from_file path
+      new File.open(path).read
+    end
+
+    def self.empty
+      new "{}"
+    end
+
+    def initialize string
+      @config = YAML::load(string)
+    end
+
+    def proxies
+      @config["proxies"]
+    end
+
+    def ignore
+      @config["ignore"] || []
+    end
+  end
+end

data/lib/slinky/manifest.rb

@@ -21,24 +21,31 @@ module Slinky
   class Manifest
     attr_accessor :manifest_dir, :dir
 
-    def initialize dir, options = {}
+    def initialize dir, config, options = {}
       @dir = dir
       @build_to = if d = options[:build_to]
                     File.absolute_path(d)
                   else
                     dir
                   end
-      @manifest_dir = ManifestDir.new dir, @build_to, self
+      @manifest_dir = ManifestDir.new dir, self, @build_to, self
       @devel = (options[:devel].nil?) ? true : options[:devel]
+      @config = config
     end
 
     # Returns a list of all files contained in this manifest
     #
     # @return [ManifestFile] a list of manifest files
-    def files
-      @files = []
-      files_rec @manifest_dir
-      @files
+    def files include_ignores = true
+      unless @files
+        @files = []
+        files_rec @manifest_dir
+      end
+      if include_ignores
+        @files
+      else
+        @files.reject{|f| @config.ignore.any?{|p| f.in_tree? p}}
+      end
     end    
 
     # Finds the file at the given path in the manifest if one exists,
@@ -109,7 +116,7 @@ module Slinky
     # @return [[ManifestFile, ManifestFile]] the graph
     def build_dependency_graph
       graph = []
-      files.each{|mf|
+      files(false).each{|mf|
         mf.directives[:slinky_require].each{|rf|
           required = mf.parent.find_by_path(rf)
           if required
@@ -134,11 +141,11 @@ module Slinky
       # will contain sorted elements
       l = []
       # start nodes, those with no incoming edges
-      s = @files.reject{|mf| mf.directives[:slinky_require]}
+      s = files(false).reject{|mf| mf.directives[:slinky_require]}
       while s.size > 0
         n = s.delete s.first
         l << n
-        @files.each{|m|
+        files(false).each{|m|
           e = graph.find{|e| e[0] == n && e[1] == m}
           next unless e
           graph.delete e
@@ -171,9 +178,10 @@ module Slinky
   end
 
   class ManifestDir
-    attr_accessor :dir, :files, :children
-    def initialize dir, build_dir, manifest
+    attr_accessor :dir, :parent, :files, :children
+    def initialize dir, parent, build_dir, manifest
       @dir = dir
+      @parent = parent
       @files = []
       @children = []
       @build_dir = Pathname.new(build_dir)
@@ -184,7 +192,7 @@ module Slinky
         next if Pathname.new(File.absolute_path(path)) == Pathname.new(build_dir)
         if File.directory? path
           build_dir = (@build_dir + File.basename(path)).cleanpath
-          @children << ManifestDir.new(path, build_dir, manifest)
+          @children << ManifestDir.new(path, self, build_dir, manifest)
         else
            @files << ManifestFile.new(path, @build_dir, manifest, self)
         end
@@ -205,10 +213,14 @@ module Slinky
       when 1
         @files.find{|f| f.matches? components[0]}
       else
-        child = @children.find{|d|
-          Pathname.new(d.dir).basename.to_s == components[0]
-        }
-        child ? child.find_by_path(components[1..-1].join(File::SEPARATOR)) : nil
+        if components[0] == ".."
+          @parent.find_by_path components[1..-1].join(File::SEPARATOR)
+        else
+          child = @children.find{|d|
+            Pathname.new(d.dir).basename.to_s == components[0]
+          }
+          child ? child.find_by_path(components[1..-1].join(File::SEPARATOR)) : nil
+        end
       end
     end
 
@@ -252,6 +264,16 @@ module Slinky
       name == s || output_path.basename.to_s == s
     end
 
+    # Predicate which determines whether the file is the supplied path
+    # or lies on supplied tree
+    def in_tree? path
+      return true if matches? path
+      abs_path = Pathname.new(path).expand_path.to_s
+      asdf = Pathname.new(@source).dirname.expand_path.to_s
+      # puts [abs_path, asdf, asdf.start_with?(abs_path), abs_path == asdf].inspect
+      asdf.start_with?(abs_path)
+    end
+
     # Returns the path to which this file should be output. This is
     # equal to the source path unless the file needs to be compiled,
     # in which case the extension returned is the output extension

data/lib/slinky/proxy_server.rb

@@ -0,0 +1,74 @@
+module Slinky
+  module ProxyServer
+    HTTP_MATCHER = /(GET|POST|PUT|DELETE|HEAD) (.+?)(?= HTTP)/
+    HOST_MATCHER = /Host: (.+)/
+    
+    def self.process_proxies proxy_hash
+      proxy_hash.map{|from, to|
+        begin
+          [from, URI::parse(to)]
+        rescue
+          $stderr.puts "Invalid proxy setting: #{from} => #{to}".foreground(:red)
+        end
+      }.compact
+    end
+
+    def self.process_proxy_servers proxies
+      proxies_servers = proxies.map{|p| [p[1].host, p[1].port]}
+    end
+
+    def self.find_matcher proxies, path
+      proxies.find{|p| path.start_with?(p[0])}
+    end
+
+    def self.replace_path http, old_path, new_path, addition
+      # TODO: This may fail in certain, rare cases
+      addition = addition[0..-2] if addition[-1] == "/"
+      http.gsub(old_path, addition + new_path)
+    end
+
+    def self.replace_host http, host
+      http.gsub(HOST_MATCHER, "Host: #{host}")
+    end
+
+    def self.run proxy_hash, port, slinky_port
+      proxies = process_proxies proxy_hash
+      proxy_servers = process_proxy_servers proxies
+
+      Proxy.start(:host => "0.0.0.0", :port => port){|conn|
+        conn.server :slinky, :host => "127.0.0.1", :port => slinky_port
+        proxy_servers.each{|p|
+          conn.server p, :host => p[0], :port => p[1]
+        }
+
+        conn.on_data do |data|
+          begin
+            _, path = data.match(ProxyServer::HTTP_MATCHER)[1..2]
+            proxy = ProxyServer.find_matcher(proxies, path)
+            server = if proxy
+                       new_path = path.gsub(/^#{proxy[0]}/, "")
+                       data = ProxyServer.replace_path(data, path, new_path, proxy[1].path)
+                       new_host = proxy[1].select(:host, :port).join(":")
+                       data = ProxyServer.replace_host(data, new_host)
+                       puts [data, [proxy[1].host, proxy[1].port]].inspect
+                       [proxy[1].host, proxy[1].port]
+                     else :slinky
+                     end
+            [data, [server]]
+          rescue
+            $stderr.puts "Got error: #{$!}".foreground(:red)
+            conn.send_data "HTTP/1.1 500 Ooops...something went wrong\r\n"
+          end
+        end
+
+        conn.on_response do |server, resp|
+          resp
+        end
+
+        conn.on_finish do |name|
+          unbind
+        end
+      }
+    end
+  end
+end

data/lib/slinky/runner.rb

@@ -15,7 +15,11 @@ module Slinky
       @arguments = @argv
 
       config_path = "#{@options[:src_dir]}/slinky.yaml"
-      @config = ConfigReader.from_file(config_path) if File.exist?(config_path)
+      @config = if File.exist?(config_path) 
+                  ConfigReader.from_file(config_path)
+                else
+                  ConfigReader.empty
+                end
     end
 
     def version
@@ -53,6 +57,7 @@ module Slinky
 
       EM::run {
         Slinky::Server.dir = @options[:src_dir]
+        Slinky::Server.config = @config
         if @config && @config.proxies && !@options[:no_proxy]
           server = EM::start_server "127.0.0.1", 5324, Slinky::Server
           ProxyServer.run(@config.proxies, @options[:port], 5324)
@@ -64,7 +69,7 @@ module Slinky
     end
 
     def command_build
-      Builder.build(@options[:src_dir], @options[:build_dir])
+      Builder.build(@options[:src_dir], @options[:build_dir], @config)
     end
   end
 end

data/lib/slinky/server.rb

@@ -7,6 +7,9 @@ module Slinky
     # Gets the root directory from which files should be served
     def self.dir; @dir || "."; end
 
+    def self.config= _config; @config = _config; end
+    def self.config; @config || {}; end
+
     # Splits a uri into its components, returning only the path sans
     # initial forward slash.
     def self.path_for_uri uri
@@ -21,7 +24,7 @@ module Slinky
           serve_file resp, path.to_s
         else
           resp.status = 500
-          resp.content = "Error compiling #{mf.source}"
+          resp.content = "Error compiling #{mf.source}\n"
         end
       else
         not_found resp
@@ -52,12 +55,12 @@ module Slinky
     # Returns the proper response for files that do not exist
     def self.not_found resp
       resp.status = 404
-      resp.content = "File not found"
+      resp.content = "File not found\n"
     end
 
     # Method called for every HTTP request made 
     def process_http_request
-      @manifest = Manifest.new(Server.dir)
+      @manifest = Manifest.new(Server.dir, Server.config)
 
       path = Server.path_for_uri(@http_request_uri)
       file = @manifest.find_by_path(path)

data/lib/slinky.rb

@@ -1,5 +1,5 @@
 ROOT = File.expand_path(File.dirname(__FILE__))
-
+require "bundler/setup"
 require 'uri'
 require 'yaml'
 require 'eventmachine'

data/slinky.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slinky}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["mwylde"]
-  s.date = %q{2011-08-19}
-  s.default_executable = %q{slinky}
+  s.authors = [%q{mwylde}]
+  s.date = %q{2011-09-15}
   s.description = %q{A static file server for rich javascript apps that automatically compiles SASS, HAML, CoffeeScript and more}
   s.email = %q{mwylde@wesleyan.edu}
-  s.executables = ["slinky"]
+  s.executables = [%q{slinky}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -35,8 +34,10 @@ Gem::Specification.new do |s|
     "lib/slinky/compilers/coffee-helper",
     "lib/slinky/compilers/haml-compiler.rb",
     "lib/slinky/compilers/sass-compiler.rb",
+    "lib/slinky/config_reader.rb",
     "lib/slinky/em-popen3.rb",
     "lib/slinky/manifest.rb",
+    "lib/slinky/proxy_server.rb",
     "lib/slinky/runner.rb",
     "lib/slinky/server.rb",
     "slinky.gemspec",
@@ -44,9 +45,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/mwylde/slinky}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Static file server for javascript apps}
   s.test_files = [
     "spec/slinky_spec.rb",
@@ -59,6 +60,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.0"])
       s.add_runtime_dependency(%q<eventmachine_httpserver>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<em-proxy>, [">= 0.1.5"])
       s.add_runtime_dependency(%q<rainbow>, [">= 1.1.1"])
       s.add_runtime_dependency(%q<haml>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<sass>, [">= 3.1.1"])
@@ -75,6 +77,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<eventmachine>, [">= 0.12.0"])
       s.add_dependency(%q<eventmachine_httpserver>, [">= 0.2.0"])
+      s.add_dependency(%q<em-proxy>, [">= 0.1.5"])
       s.add_dependency(%q<rainbow>, [">= 1.1.1"])
       s.add_dependency(%q<haml>, [">= 3.0.0"])
       s.add_dependency(%q<sass>, [">= 3.1.1"])
@@ -92,6 +95,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<eventmachine>, [">= 0.12.0"])
     s.add_dependency(%q<eventmachine_httpserver>, [">= 0.2.0"])
+    s.add_dependency(%q<em-proxy>, [">= 0.1.5"])
     s.add_dependency(%q<rainbow>, [">= 1.1.1"])
     s.add_dependency(%q<haml>, [">= 3.0.0"])
     s.add_dependency(%q<sass>, [">= 3.1.1"])

data/spec/slinky_spec.rb

@@ -18,8 +18,8 @@ describe "Slinky" do
 
   context "Manifest" do
     before :each do
-      @mprod = Slinky::Manifest.new("/src", :devel => false, :build_to => "/build")
-      @mdevel = Slinky::Manifest.new("/src")
+      @mprod = Slinky::Manifest.new("/src", @config, :devel => false, :build_to => "/build")
+      @mdevel = Slinky::Manifest.new("/src", @config)
       @md_prod = @mprod.manifest_dir
       @md_devel = @mdevel.manifest_dir
     end
@@ -43,6 +43,8 @@ describe "Slinky" do
       @mdevel.find_by_path("asdf.haml").should == nil
       @mdevel.find_by_path("l1/l2/test.txt").source.should == "/src/l1/l2/test.txt"
       @mdevel.find_by_path("l1/test.css").source.should == "/src/l1/test.sass"
+      l1 = @mdevel.manifest_dir.children.find{|c| c.dir == "/src/l1"}
+      l1.find_by_path("../test.haml").source.should == "/src/test.haml"
     end
 
     it "should produce the correct scripts string for production" do
@@ -61,7 +63,7 @@ describe "Slinky" do
       File.open("/src/l1/l2/bad.sass", "w+"){|f|
         f.write "require('../test.sass')\ncolor: red;"
       }
-      manifest = Slinky::Manifest.new("/src")
+      manifest = Slinky::Manifest.new("/src", @config)
       @mdevel.styles_string.should == '<link rel="stylesheet" href="l1/test.css" /><link rel="stylesheet" href="l1/l2/test2.css" />'
     end
 
@@ -172,7 +174,7 @@ describe "Slinky" do
 
     it "should fail if a required file isn't in the manifest" do
       FileUtils.rm("/src/l1/test2.js")
-      manifest = Slinky::Manifest.new("/src", :devel => false, :build_to => "/build")
+      manifest = Slinky::Manifest.new("/src", @config, :devel => false, :build_to => "/build")
       $stderr.should_receive(:puts).with("Could not find file test2.js required by /src/l1/test.js".foreground(:red))
       proc {
         manifest.build_dependency_graph
@@ -185,17 +187,17 @@ describe "Slinky" do
 
     it "should fail if there is a cycle in the dependency graph" do
       File.open("/src/l1/test5.js", "w+"){|f| f.write("slinky_require('test.js')")}
-      manifest = Slinky::Manifest.new("/src", :devel => false, :build_to => "/build")
+      manifest = Slinky::Manifest.new("/src", @config, :devel => false, :build_to => "/build")
       $stderr.should_receive(:puts).with("Dependencies /src/l1/test2.js -> /src/l1/test.js, /src/l1/test5.js -> /src/l1/test2.js, /src/l1/test.js -> /src/l1/test5.js could not be satisfied".foreground(:red))
       proc { manifest.dependency_list }.should raise_error Slinky::DependencyError
     end
 
     it "should ignore the build directory" do
       $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(6).times
-      Slinky::Builder.build("/src", "/src/build")
+      Slinky::Builder.build("/src", "/src/build", @config)
       File.exists?("/src/build/build").should_not == true
       File.exists?("/src/build/test.html").should == true
-      Slinky::Builder.build("/src", "/src/build")
+      Slinky::Builder.build("/src", "/src/build", @config)
       File.exists?("/src/build/build").should_not == true
     end
 
@@ -246,7 +248,7 @@ describe "Slinky" do
     it "should serve 404s" do
       @resp.should_receive(:status=).with(404)
       Slinky::Server.serve_file @resp, "/src/asdf/faljshd"
-      @resp.content.should == "File not found"
+      @resp.content.should == "File not found\n"
     end
 
     it "should handle static files" do
@@ -266,7 +268,7 @@ describe "Slinky" do
       mf = Slinky::ManifestFile.new("/src/l1/asdf.txt", nil, @mdevel)
       @resp.should_receive(:status=).with(404)
       Slinky::Server.handle_file @resp, mf
-      @resp.content.should == "File not found"
+      @resp.content.should == "File not found\n"
     end
 
     it "should accept a port option" do
@@ -306,7 +308,7 @@ describe "Slinky" do
     end
     it "should build manifest to build directory" do
       $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(3).times
-      Slinky::Builder.build("/src", "/build")
+      Slinky::Builder.build("/src", "/build", @config)
       File.exists?("/build").should == true
       File.exists?("/build/scripts.js").should == true
       File.exists?("/build/l1/l2/test.txt").should == true

data/spec/spec_helper.rb

@@ -35,6 +35,7 @@ RSpec.configure do |config|
   config.before :all do
     FakeFS.activate!
     FileUtils.mkdir("/tmp")
+    @config = Slinky::ConfigReader.empty
   end
   config.before :each do
     FileUtils.rm_rf("/src") rescue nil

metadata

@@ -1,193 +1,202 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slinky
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - mwylde
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-19 00:00:00 -07:00
-default_executable: slinky
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70247105720180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105720180
+- !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70247105719700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105719700
+- !ruby/object:Gem::Dependency
+  name: em-proxy
+  requirement: &70247105719220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70247105719220
+- !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70247105718740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105718740
+- !ruby/object:Gem::Dependency
   name: haml
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70247105718260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105718260
+- !ruby/object:Gem::Dependency
   name: sass
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70247105717780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105717780
+- !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70247105717300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105717300
+- !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70247105733180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.16"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105733180
+- !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70247105732700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105732700
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70247105732220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105732220
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70247105731740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105731740
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &70247105731260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105731260
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &70247105730780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105730780
+- !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &70247105730300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.rc6
   type: :development
   prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105730300
+- !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &70247105729820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247105729820
+- !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &70247105729340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id015
-description: A static file server for rich javascript apps that automatically compiles SASS, HAML, CoffeeScript and more
+  version_requirements: *70247105729340
+description: A static file server for rich javascript apps that automatically compiles
+  SASS, HAML, CoffeeScript and more
 email: mwylde@wesleyan.edu
-executables: 
+executables:
 - slinky
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -204,44 +213,43 @@ files:
 - lib/slinky/compilers/coffee-helper
 - lib/slinky/compilers/haml-compiler.rb
 - lib/slinky/compilers/sass-compiler.rb
+- lib/slinky/config_reader.rb
 - lib/slinky/em-popen3.rb
 - lib/slinky/manifest.rb
+- lib/slinky/proxy_server.rb
 - lib/slinky/runner.rb
 - lib/slinky/server.rb
 - slinky.gemspec
 - spec/slinky_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/mwylde/slinky
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1095209777694119011
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2066251034160361517
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Static file server for javascript apps
-test_files: 
+test_files:
 - spec/slinky_spec.rb
 - spec/spec_helper.rb