slinky 0.6.1 → 0.7.0

data/lib/slinky/manifest.rb

@@ -29,13 +29,14 @@ module Slinky
     def initialize dir, config, options = {}
       @dir = dir
       @build_to = if d = options[:build_to]
-                    File.absolute_path(d)
+                    File.expand_path(d)
                   else
                     dir
                   end
       @manifest_dir = ManifestDir.new dir, self, @build_to, self
       @devel = (options[:devel].nil?) ? true : options[:devel]
       @config = config
+      @no_minify = options[:no_minify] || config.dont_minify
     end
 
     # Returns a list of all files contained in this manifest
@@ -65,7 +66,11 @@ module Slinky
     def remove_all_by_path paths
       manifest_update paths do |path|
         mf = find_by_path(path).first()
-        mf.parent.remove_file(mf)
+        begin
+          mf.parent.remove_file(mf)
+        rescue
+          puts "Failed to remove <#{path}>"
+        end
       end
     end
 
@@ -78,11 +83,11 @@ module Slinky
     def find_by_path path, allow_multiple = false
       @manifest_dir.find_by_path path, allow_multiple
     end
-    
+
     def scripts_string
       if @devel
         dependency_list.reject{|x| x.output_path.extname != ".js"}.collect{|d|
-          %Q\<script type="text/javascript" src="#{d.relative_output_path}"></script>\
+          %Q\<script type="text/javascript" src="/#{d.relative_output_path}"></script>\
         }.join("")
       else
         %Q\<script type="text/javascript" src="/scripts.js?#{rand(999999999)}"></script>\
@@ -99,7 +104,11 @@ module Slinky
         }.join("\n")
 
         File.open(output, "w+"){|f|
-          f.write(compressor.compress(s)) 
+          unless @no_minify
+            f.write(compressor.compress(s))
+          else
+            f.write(s)
+          end
         }
         scripts.collect{|s| FileUtils.rm(s.build_to)}
       end
@@ -116,7 +125,7 @@ module Slinky
       compress(".css", "#{@build_to}/styles.css", compressor){|s, css|
         css.gsub(CSS_URL_MATCHER){|url|
           p = s.relative_output_path.dirname.to_s + "/#{$1}"
-          "url('#{p}')"
+          "url('/#{p}')"
         }
       }
     end
@@ -124,7 +133,7 @@ module Slinky
     def styles_string
       if @devel
         dependency_list.reject{|x| x.output_path.extname != ".css"}.collect{|d|
-          %Q\<link rel="stylesheet" href="#{d.relative_output_path}" />\
+          %Q\<link rel="stylesheet" href="/#{d.relative_output_path}" />\
         }.join("")
       else
         %Q\<link rel="stylesheet" href="/styles.css?#{rand(999999999)}" />\
@@ -235,7 +244,7 @@ module Slinky
 
       Dir.glob("#{dir}/*").each do |path|
         # skip the build dir
-        next if Pathname.new(File.absolute_path(path)) == Pathname.new(build_dir)
+        next if Pathname.new(File.expand_path(path)) == Pathname.new(build_dir)
         if File.directory? path
           add_child(path)
         else
@@ -259,7 +268,7 @@ module Slinky
         [self]
       when 1
         path = [@dir, components[0]].join(File::SEPARATOR)
-        if (Dir.exists?(path) rescue false)
+        if (File.directory?(path) rescue false)
           c = @children.find{|d|
             Pathname.new(d.dir).cleanpath == Pathname.new(path).cleanpath
           }
@@ -289,7 +298,7 @@ module Slinky
 
     # Adds a child directory
     def add_child path
-      if Dir.exists? path
+      if File.directory? path
         build_dir = (@build_dir + File.basename(path)).cleanpath
         md = ManifestDir.new(path, self, build_dir, @manifest)
         @children << md
@@ -318,7 +327,7 @@ module Slinky
     end
     
     def build
-      unless Dir.exists?(@build_dir.to_s)
+      unless File.directory?(@build_dir.to_s)
         FileUtils.mkdir(@build_dir.to_s)
       end
       (@files + @children).each{|m|
@@ -338,7 +347,7 @@ module Slinky
     def initialize source, build_path, manifest, parent = nil, options = {:devel => false}
       @parent = parent
       @source = source
-      @last_built = Time.new(0)
+      @last_built = Time.at(0)
 
       @cfile = Compilers.cfile_for_file(@source)
 
@@ -349,7 +358,7 @@ module Slinky
     end
 
     def invalidate
-      @last_built = Time.new(0)
+      @last_built = Time.at(0)
       @last_md5 = nil
     end
 
@@ -366,9 +375,18 @@ module Slinky
       name = Pathname.new(@source).basename.to_s
       output = output_path.basename.to_s
       # check for stars that are not escaped
-      r = /(?<!\\)\*/
-      if match_glob && s.match(r)
-        a = s.split(r)
+      a = [""]
+      last = ""
+      s.each_char {|c|
+        if c != "*" || last == "\\"
+          a[-1] << c
+        else
+          a << ""
+        end
+        last = c
+      }
+
+      if match_glob && a.size > 1
         r2 = a.reduce{|a, x| /#{a}.*#{x}/}
         name.match(r2) || output.match(r2)
       else
@@ -393,7 +411,8 @@ module Slinky
     # @return Pathname the output path
     def output_path
       if @cfile
-        Pathname.new(@source).sub_ext ".#{@cfile.output_ext}"
+        ext = /\.[^.]*$/
+        Pathname.new(@source.gsub(ext, ".#{@cfile.output_ext}"))
       else
         Pathname.new(@source)
       end
@@ -503,7 +522,7 @@ module Slinky
         @last_md5 = hash
         @updated = Time.now
         # mangle file appropriately
-        @last_path = handle_directives (compile @source), to
+        @last_path = handle_directives((compile @source), to)
       end
     end
 

data/lib/slinky/proxy_server.rb

@@ -44,9 +44,6 @@ module Slinky
         proxy = nil
         start_time = nil
         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
@@ -58,6 +55,8 @@ module Slinky
                        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)
+                       conn.server [proxy[1].host, proxy[1].port],
+                         :host => proxy[1].host, :port => proxy[1].port
                        [proxy[1].host, proxy[1].port]
                      else :slinky
                      end
@@ -75,7 +74,7 @@ module Slinky
             # take into account the lag from the backend server
             so_far = Time.now - start_time
             time = opt["lag"]/1000.0-so_far
-            EM.add_timer (time > 0 ? time : 0) do
+            EM.add_timer(time > 0 ? time : 0) do
               conn.send_data resp
             end
           else

data/lib/slinky/runner.rb

@@ -3,18 +3,22 @@ module Slinky
     COMMANDS = %w{start build}
         
     def initialize argv
+      # While slinky largely works in Ruby 1.8, the tests don't run
+      # properly and using 1.9 is highly recommended.
+      if RUBY_VERSION.start_with?("1.8")
+        $stderr.puts(("Slinky is unsupported on Ruby 1.8." + \
+                      " Using 1.9 is highly recommended.").foreground(:red))
+        
+      end
+      
       @argv = argv
-      @options = {
-        :build_dir => "build",
-        :port => 5323,
-        :src_dir => "."
-      }
+      @options = {}
 
       parser.parse! @argv
       @command = @argv.shift
       @arguments = @argv
 
-      config_path = @options[:config] || "#{@options[:src_dir]}/slinky.yaml"
+      config_path = @options[:config] || "#{@options[:src_dir] || "."}/slinky.yaml"
       @config = if File.exist?(config_path) 
                   ConfigReader.from_file(config_path)
                 else
@@ -38,7 +42,9 @@ module Slinky
         opts.on("-p PORT", "--port PORT", "Port to run on (default: #{@options[:port]})"){|p| @options[:port] = p.to_i}
         opts.on("-s DIR", "--src-dir DIR", "Directory containing project source"){|p| @options[:src_dir] = p}
         opts.on("-n", "--no-proxy", "Don't set up proxy server"){ @options[:no_proxy] = true }
+        opts.on("-r", "--no-livereload", "Don't start a livereload server"){ @options[:no_livereload] = true }        
         opts.on("-c FILE", "--config FILE", "Path to configuration file"){|f| @options[:config] = f}
+        opts.on("-m", "--dont-minify", "Don't minify js/css"){ @options[:no_minify] = true }
       end
     end
 
@@ -57,26 +63,37 @@ module Slinky
       Signal.trap('INT') { puts "Slinky fading away ... "; exit(0); }
 
       EM::run {
+        @config ||= Config.empty
+
         Slinky::Server.dir = @options[:src_dir]
         Slinky::Server.config = @config
         manifest = Manifest.new(Slinky::Server.dir,
                                 Slinky::Server.config)
         Slinky::Server.manifest = manifest
 
-        if @config && !@config.proxies.empty? && !@options[:no_proxy]
-          server = EM::start_server "127.0.0.1", @options[:port]+1, Slinky::Server
-          ProxyServer.run(@config.proxies, @options[:port], @options[:port]+1)
+        port = @options[:port] || @config.port
+
+        should_proxy = !(@config.no_proxy || @options[:no_proxy])
+        if !@config.proxies.empty? && should_proxy
+          server = EM::start_server "127.0.0.1", port+1, Slinky::Server
+          ProxyServer.run(@config.proxies, port, port+1)
         else
-          EM::start_server "0.0.0.0", @options[:port], Slinky::Server
+          EM::start_server "127.0.0.1", port, Slinky::Server
+        end
+
+        if !@config.no_livereload && !@options[:no_livereload]
+          lr_port = @options[:livereload_port] || @config.livereload_port
+          livereload = LiveReload.new("127.0.0.1", lr_port)
+          livereload.run
         end
 
-        Listener.new(manifest).run
-        puts "Started static file server on port #{@options[:port]}"
+        Listener.new(manifest, livereload).run
+        puts "Started static file server on port #{port}"
       }
     end
 
     def command_build
-      Builder.build(@options[:src_dir], @options[:build_dir], @config)
+      Builder.build(@options, @config)
     end
   end
 end

data/lib/slinky/server.rb

@@ -8,7 +8,7 @@ module Slinky
     def self.dir; @dir || "."; end
 
     def self.config= _config; @config = _config; end
-    def self.config; @config || {}; end
+    def self.config; @config || ConfigReader.empty; end
 
     def self.manifest= _manifest; @manifest = _manifest; end
     def self.manifest; @manifest; end
@@ -20,17 +20,47 @@ module Slinky
       path[1..-1] #get rid of the leading /
     end
 
+    # Method called for every HTTP request made 
+    def process_http_request
+      resp = EventMachine::DelegatedHttpResponse.new(self)
+
+      begin
+        path = Server.path_for_uri(@http_request_uri)
+      rescue
+        resp.status = 500
+        resp.content = "Invalid request"
+        return
+      end
+
+      Server.process_path(resp, path).send_response
+    end
+
+    def self.process_path resp, path, pushstate = false
+      file = manifest.find_by_path(path).first
+      if file.is_a? ManifestDir
+        file = manifest.find_by_path(path+"/index.html").first
+      end
+
+      resp.content_type MIME::Types.type_for(path).first
+
+      if file
+        handle_file(resp, file)
+      elsif !pushstate && p = config.pushstate_for_path("/" + path)
+        path = p[0] == "/" ? p[1..-1] : p
+        self.process_path(resp, path, true)
+      else
+        not_found resp
+      end
+      resp
+    end
+
     # Takes a manifest file and produces a response for it
     def self.handle_file resp, mf
-      if mf
-        if path = mf.process
-          serve_file resp, path.to_s
-        else
-          resp.status = 500
-          resp.content = "Error compiling #{mf.source}\n"
-        end
+      if path = mf.process
+        serve_file resp, path.to_s
       else
-        not_found resp
+        resp.status = 500
+        resp.content = "Error compiling #{mf.source}\n"
       end
       resp
     end
@@ -60,26 +90,5 @@ module Slinky
       resp.status = 404
       resp.content = "File not found\n"
     end
-
-    # Method called for every HTTP request made 
-    def process_http_request
-      manifest = Server.manifest
-      resp = EventMachine::DelegatedHttpResponse.new(self)
-
-      begin
-        path = Server.path_for_uri(@http_request_uri)
-      rescue
-        resp.status = 500
-        resp.content = "Invalid request"
-        return
-      end
-
-      file = manifest.find_by_path(path).first
-      if file.is_a? ManifestDir
-        file = manifest.find_by_path(path+"/index.html").first
-      end
-      resp.content_type MIME::Types.type_for(path).first
-      Server.handle_file(resp, file).send_response
-    end
   end
 end

data/lib/slinky.rb

@@ -1,8 +1,8 @@
-ROOT = File.expand_path(File.dirname(__FILE__))
 require 'uri'
 require 'yaml'
 require 'eventmachine'
 require 'em-proxy'
+require 'em-websocket'
 require 'evma_httpserver'
 require 'uri'
 require 'tempfile'
@@ -11,20 +11,23 @@ require 'optparse'
 require 'mime/types'
 require 'yui/compressor'
 require 'listen'
+require 'multi_json'
 
-require "#{ROOT}/slinky/em-popen3"
-require "#{ROOT}/slinky/compilers"
-require "#{ROOT}/slinky/config_reader"
-require "#{ROOT}/slinky/manifest"
-require "#{ROOT}/slinky/compiled_file"
-require "#{ROOT}/slinky/proxy_server"
-require "#{ROOT}/slinky/server"
-require "#{ROOT}/slinky/runner"
-require "#{ROOT}/slinky/builder"
-require "#{ROOT}/slinky/listener"
+require "slinky/em-popen3"
+require "slinky/compilers"
+require "slinky/config_reader"
+require "slinky/manifest"
+require "slinky/compiled_file"
+require "slinky/proxy_server"
+require "slinky/server"
+require "slinky/runner"
+require "slinky/builder"
+require "slinky/listener"
+require "slinky/live_reload"
 
 # load compilers
-Dir.glob("#{ROOT}/slinky/compilers/*.rb").each{|compiler|
+root = File.expand_path(File.dirname(__FILE__))
+Dir.glob("#{root}/slinky/compilers/*.rb").each{|compiler|
   begin
     require compiler
   rescue

data/slinky.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "slinky"
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Wylde"]
-  s.date = "2012-06-19"
+  s.date = "2012-12-21"
   s.description = "A static file server for rich web apps that automatically compiles SASS, HAML, CoffeeScript and more"
   s.email = "micah@micahw.com"
   s.executables = ["slinky"]
@@ -31,13 +31,15 @@ Gem::Specification.new do |s|
     "lib/slinky/builder.rb",
     "lib/slinky/compiled_file.rb",
     "lib/slinky/compilers.rb",
+    "lib/slinky/compilers/clojurescript-compiler.rb",
     "lib/slinky/compilers/coffee-compiler.rb",
-    "lib/slinky/compilers/coffee-helper",
     "lib/slinky/compilers/haml-compiler.rb",
+    "lib/slinky/compilers/less-compiler.rb",
     "lib/slinky/compilers/sass-compiler.rb",
     "lib/slinky/config_reader.rb",
     "lib/slinky/em-popen3.rb",
     "lib/slinky/listener.rb",
+    "lib/slinky/live_reload.rb",
     "lib/slinky/manifest.rb",
     "lib/slinky/proxy_server.rb",
     "lib/slinky/runner.rb",
@@ -49,7 +51,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://mwylde.github.com/slinky/"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "Static file server for javascript apps"
 
   if s.respond_to? :specification_version then
@@ -58,56 +60,56 @@ 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-websocket>, ["~> 0.3.8"])
       s.add_runtime_dependency(%q<em-proxy>, [">= 0.1.6"])
       s.add_runtime_dependency(%q<rainbow>, [">= 1.1.3"])
-      s.add_runtime_dependency(%q<haml>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<sass>, [">= 3.1.1"])
-      s.add_runtime_dependency(%q<coffee-script>, [">= 2.2.0"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<yui-compressor>, [">= 0.9.6"])
       s.add_runtime_dependency(%q<listen>, [">= 0.4.5"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<sass>, [">= 3.1.1"])
+      s.add_runtime_dependency(%q<coffee-script>, [">= 2.2.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
-      s.add_development_dependency(%q<cover_me>, [">= 1.0.0.rc6"])
       s.add_development_dependency(%q<fakefs>, ["~> 0.4.0"])
       s.add_development_dependency(%q<em-http-request>, ["~> 1.0.0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0.12.0"])
       s.add_dependency(%q<eventmachine_httpserver>, [">= 0.2.0"])
+      s.add_dependency(%q<em-websocket>, ["~> 0.3.8"])
       s.add_dependency(%q<em-proxy>, [">= 0.1.6"])
       s.add_dependency(%q<rainbow>, [">= 1.1.3"])
-      s.add_dependency(%q<haml>, [">= 3.0.0"])
-      s.add_dependency(%q<sass>, [">= 3.1.1"])
-      s.add_dependency(%q<coffee-script>, [">= 2.2.0"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<yui-compressor>, [">= 0.9.6"])
       s.add_dependency(%q<listen>, [">= 0.4.5"])
+      s.add_dependency(%q<haml>, [">= 3.0.0"])
+      s.add_dependency(%q<sass>, [">= 3.1.1"])
+      s.add_dependency(%q<coffee-script>, [">= 2.2.0"])
       s.add_dependency(%q<rspec>, ["~> 2.10.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_dependency(%q<bundler>, [">= 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
-      s.add_dependency(%q<cover_me>, [">= 1.0.0.rc6"])
       s.add_dependency(%q<fakefs>, ["~> 0.4.0"])
       s.add_dependency(%q<em-http-request>, ["~> 1.0.0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0.12.0"])
     s.add_dependency(%q<eventmachine_httpserver>, [">= 0.2.0"])
+    s.add_dependency(%q<em-websocket>, ["~> 0.3.8"])
     s.add_dependency(%q<em-proxy>, [">= 0.1.6"])
     s.add_dependency(%q<rainbow>, [">= 1.1.3"])
-    s.add_dependency(%q<haml>, [">= 3.0.0"])
-    s.add_dependency(%q<sass>, [">= 3.1.1"])
-    s.add_dependency(%q<coffee-script>, [">= 2.2.0"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<yui-compressor>, [">= 0.9.6"])
     s.add_dependency(%q<listen>, [">= 0.4.5"])
+    s.add_dependency(%q<haml>, [">= 3.0.0"])
+    s.add_dependency(%q<sass>, [">= 3.1.1"])
+    s.add_dependency(%q<coffee-script>, [">= 2.2.0"])
     s.add_dependency(%q<rspec>, ["~> 2.10.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+    s.add_dependency(%q<bundler>, [">= 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
-    s.add_dependency(%q<cover_me>, [">= 1.0.0.rc6"])
     s.add_dependency(%q<fakefs>, ["~> 0.4.0"])
     s.add_dependency(%q<em-http-request>, ["~> 1.0.0"])
   end