slinky 0.8.0 → 0.8.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTAyMTk5MzgwNzNkMTA0MzhhZjc0ODBmNjFiM2JlMTM4NDE2ZjNhYw==
-  data.tar.gz: !binary |-
-    YjdjMDMwZGIzZWU4YjE2MmIwOGU0ZTIyMzc2ZDYyZDg2M2I2NWRmMg==
+SHA1:
+  metadata.gz: e7454d54e24a3dd4658b574d91b72f23352b481f
+  data.tar.gz: 05f244c1d61cd33874fd3255a7272abed81c8353
 SHA512:
-  metadata.gz: !binary |-
-    Nzc5Y2M4YjUzNGI1MDMyNTgxMzQwY2FkNWRkMDkwZGZjYWI3ODNmOWI0Mzk1
-    Nzk1ZjNlMzcxMDVjYjFiNWFhODNhZGUyMzcyYzM1YzBkMjI3MzljNGFhYzEw
-    ODFiNGFjZmM5MDYyNzAyMzc4ZjExNjQ3NDkyOWNmNzAxZTYyYzU=
-  data.tar.gz: !binary |-
-    YzQ1ZmIzMDY5NjdlYjMyYzg4MzZkMjczMzk5MGRlNjBiZGEyNWM1YmNhMzFj
-    Nzc1ZTQ1Yzc3OTdmZTk2YTc1NmE4ZDI3YjM3YTRkYWE0YzA2MmU1OThiODMy
-    Y2NjZDExZDY1ZGQ0YTg0NDBmMTg0MGFmNTM3ZjMwMzgzN2M5NzI=
+  metadata.gz: 51eb2cc2384abeb57f85948650bbd5f959f4c4fa9cf8af5e91369b6e2b605991b239bee5f2038e2c1996999f0d90000878d328cc1d3188324c7059bd17fa43b7
+  data.tar.gz: f518c418deecba493794d84f9d80ef860b3d8402eb1ff97e9380ea29f8c1d4253fa8ba485f73df1d7f0dbbbd5fab7ee6610e27a57dd2ff4a5f9aee7eabe5d782

data/Gemfile

@@ -8,12 +8,12 @@ gem "em-websocket", "~> 0.3"
 gem "em-proxy", "~> 0.1"
 gem "rainbow", "~> 1.1"
 gem "mime-types", "~> 1.16"
-gem "yui-compressor", "~> 0.12"
+gem "uglifier", "~> 2.5"
 gem "listen", "~> 2.4"
 
 # compilation support gems
 gem "haml", "~> 3.1"
-gem "sass", "~> 3.1"
+gem "sass", "~> 3.3"
 gem "coffee-script", "~> 2.2"
 
 group :development do
@@ -21,11 +21,12 @@ group :development do
   gem "yard", "~> 0.8"
   gem "bundler", "~> 1.5"
   gem "jeweler", "~> 1.8"
-  gem "fakefs", '~> 0.5', :require => "fakefs/safe"
+  gem "fakefs", '0.5.3', :require => "fakefs/safe"
   gem "em-http-request", '~> 1.0'
   gem 'simplecov'
   # optional compilation gems
   gem "less", ">= 2.2.0"
   gem "therubyracer" # for less
   gem "react-jsx", '~> 0.8.0'
+  gem "rake-compiler", '~> 0.9.3'
 end

data/README.md

@@ -8,7 +8,7 @@ proxying and automatic browser reloads. And once you're ready to
 deploy, Slinky will compile, concatenate, and minify your sources,
 leaving you ready to push to production.
 
-[![Build Status](https://secure.travis-ci.org/mwylde/slinky.png)](http://travis-ci.org/mwylde/slinky)
+[![Build Status](https://travis-ci.org/mwylde/slinky.svg?branch=master)](https://travis-ci.org/mwylde/slinky)
 
 #### What can slinky do for you?
 
@@ -176,6 +176,11 @@ slinky_depends("scripts/templates/*.mustache")
   %body
 ```
 
+The paths in `slinky_depends` can be either relative or absolute. If
+relative, they support simple globbing (as in the example above). If
+absolute, they support
+[the full path matching syntax](#path-matching).
+
 ## Configuration
 
 Slinky can optionally be configured using a yaml file. By default, it

data/Rakefile

@@ -1,5 +1,9 @@
 require 'rubygems'
 require 'bundler'
+require 'rake/extensiontask'
+
+Rake::ExtensionTask.new('transitive_closure')
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/ext/transitive_closure/extconf.rb

@@ -0,0 +1,4 @@
+require 'mkmf'
+extension_name = 'transitive_closure'
+dir_config extension_name
+create_makefile extension_name

data/ext/transitive_closure/transitive_closure.c

@@ -0,0 +1,40 @@
+#include <ruby.h>
+
+static VALUE all_paths_costs(VALUE module, VALUE rsize, VALUE distArray)
+{
+    int size = FIX2INT(rsize);
+    int distArrayLen = size*size;
+
+    // Create copy of distArray
+    int cDistArray[distArrayLen];
+    int i, k, j;
+    for (i = 0; i < distArrayLen; i++) {
+        cDistArray[i] = FIX2INT(rb_ary_entry(distArray, i));
+    }
+
+    for (k = 0; k < size; k++) {
+        for (i = 0; i < size; i++) {
+            for (j = 0; j < size; j++) {
+                if (cDistArray[size*i+j] > cDistArray[size*i+k] + cDistArray[size*k+j]) {
+                    cDistArray[size*i+j] = cDistArray[size*i+k] + cDistArray[size*k+j];
+                }
+            }
+        }
+    }
+
+    // Copy cDistArray back into distArray
+    for (i = 0; i < distArrayLen; i++) {
+        rb_ary_store(distArray, i, INT2FIX(cDistArray[i]));
+    }
+
+    return distArray;
+}
+
+void Init_transitive_closure(void)
+{
+    VALUE cSlinky;
+
+    cSlinky = rb_define_module("Slinky");
+
+    rb_define_module_function(cSlinky, "all_paths_costs", all_paths_costs, 2);
+}

data/lib/slinky/builder.rb

@@ -13,6 +13,7 @@ module Slinky
         e.messages.each{|m|
           $stderr.puts(m.foreground(:red))
         }
+        exit 1
       end
     end
   end

data/lib/slinky/compilers/sass-compiler.rb

@@ -8,10 +8,15 @@ module Slinky
 
     def SassCompiler::compile s, file
       syntax = file.end_with?(".sass") ? :sass : :scss
-      sass_engine = Sass::Engine.new(s,
+      if Pathname.new(file).basename.to_s.start_with?("_")
+        # This is a partial, don't render it
+        ""
+      else
+        sass_engine = Sass::Engine.new(s,
                                      :syntax => syntax,
                                      :load_paths => [File.dirname(file)])
-      sass_engine.render
+        sass_engine.render
+      end
     end
   end
 end

data/lib/slinky/graph.rb

@@ -4,6 +4,7 @@ module Slinky
   # graph algorithms.
   class Graph
     include Enumerable
+    include TSort
 
     attr_reader :nodes, :edges
 
@@ -32,37 +33,32 @@ module Slinky
       return @transitive_closure if @transitive_closure
 
       g = adjacency_matrix
-      
+
       index_map = {}
       nodes.each_with_index{|f, i| index_map[f] = i}
 
       size = nodes.size
 
+      # The max int supported by the transitive closure C extension (2^30 - 1)
+      maxint = 1073741823
+
       # Set up the distance matrix
-      dist = Array.new(size){|_| Array.new(size, Float::INFINITY)}
+      dist = Array.new(size * size, maxint)
       nodes.each_with_index{|fi, i|
-        dist[i][i] = 0
+        dist[size * i + i] = 0
         g[fi].each{|fj|
-          dist[i][index_map[fj]] = 1
+          dist[size * i + index_map[fj]] = 1
         }
       }
 
       # Compute the all-paths costs
-      size.times{|k|
-        size.times{|i|
-          size.times{|j|
-            if dist[i][j] > dist[i][k] + dist[k][j] 
-              dist[i][j] = dist[i][k] + dist[k][j]
-            end
-          }
-        }
-      }
+      Slinky::all_paths_costs(size, dist)
 
       # Compute the transitive closure in map form
       @transitive_closure = Hash.new{|h,k| h[k] = []}
       size.times{|i|
         size.times{|j|
-          if dist[i][j] < Float::INFINITY
+          if dist[size * i + j] < maxint
             @transitive_closure[nodes[i]] << nodes[j]
           end
         }
@@ -71,43 +67,41 @@ module Slinky
       @transitive_closure
     end
 
-    # Builds a list of files in topological order, so that when
-    # required in this order all dependencies are met. See
-    # http://en.wikipedia.org/wiki/Topological_sorting for more
-    # information.
+    # Methods needed for TSort mixin
+    def tsort_each_node &block
+      nodes.each(&block)
+    end
+
+    def tsort_each_child node, &block
+      adjacency_matrix.fetch(node, []).each(&block)
+    end
+
+    # Uses the tsort library to build a list of files in topological
+    # order, so that when required in this order all dependencies are
+    # met.
     def dependency_list
       return @dependency_list if @dependency_list
 
-      graph = edges.clone
-      # will contain sorted elements
-      l = []
-      # start nodes, those with no incoming edges
-      s = nodes.reject{|mf| mf.directives[:slinky_require]}
-      while s.size > 0
-        n = s.delete s.first
-        l << n
-        nodes.each{|m|
-          e = graph.find{|e| e[0] == n && e[1] == m}
-          next unless e
-          graph.delete e
-          s << m unless graph.any?{|e| e[1] == m}
-        }
-      end
-      if graph != []
-        problems = graph.collect{|e| e.collect{|x| x.source}.join(" -> ")}
-        raise DependencyError.new("Dependencies #{problems.join(", ")} could not be satisfied")
-      end
-      @dependency_list = l
+      results = []
+      each_strongly_connected_component{|component|
+        if component.size == 1
+          results << component.first
+        else
+          cycle = component.map{|x| x.source}.join(" -> ")
+          raise DependencyError.new("Dependencies #{cycle} could not be satisfied")
+        end
+      }
+      @dependency_list = results
     end
 
-    def each &block  
+    def each &block
       edges.each do |e|
         if block_given?
           block.call e
-        else  
+        else
           yield e
         end
-      end  
+      end
     end
   end
 end

data/lib/slinky/listener.rb

@@ -23,12 +23,12 @@ module Slinky
             if mf
               mf.output_path
             else
-              path
+              nil
             end
-          }
+          }.compact
 
           # only reload if something's actually changed
-          if manifest_md5 != @manifest.md5
+          if manifest_md5 != @manifest.md5 && files.size > 0
             manifest_md5 = @manifest.md5
             @livereload.reload_browser(files)
           end

data/lib/slinky/manifest.rb

@@ -8,11 +8,13 @@ module Slinky
   # extensions of non-compiled files that can contain build directives
   DIRECTIVE_FILES = %w{js css html}
   DEPENDS_DIRECTIVE = /^[^\n\w]*(slinky_depends)\((".*"|'.+'|)\)[^\n\w]*$/
+  EXTERNAL_DEPENDS_DIRECTIVE = /^[^\n\w]*(slinky_depends_external)\((".*"|'.+'|)\)[^\n\w]*$/
   REQUIRE_DIRECTIVE = /^[^\n\w]*(slinky_require)\((".*"|'.+'|)\)[^\n\w]*$/
   SCRIPTS_DIRECTIVE = /^[^\n\w]*(slinky_scripts)[^\n\w]*$/
   STYLES_DIRECTIVE  = /^[^\n\w]*(slinky_styles)[^\n\w]*$/
   PRODUCT_DIRECTIVE = /^[^\n\w]*(slinky_product)\((".*"|'.+'|)\)[^\n\w]*$/
   BUILD_DIRECTIVES = Regexp.union(DEPENDS_DIRECTIVE,
+                                  EXTERNAL_DEPENDS_DIRECTIVE,
                                   REQUIRE_DIRECTIVE,
                                   SCRIPTS_DIRECTIVE,
                                   STYLES_DIRECTIVE,
@@ -213,7 +215,7 @@ module Slinky
       FileUtils.mkdir_p("#{@build_to}/#{Pathname.new(product).dirname}")
       File.open("#{@build_to}/#{product}", "w+"){|f|
         unless @no_minify
-          f.write(compressor.compress(s))
+          f.write(compressor[s])
         else
           f.write(s)
         end
@@ -308,9 +310,12 @@ module Slinky
     def compressor_for_product product
       case type_for_product(product)
       when ".js"
-        YUI::JavaScriptCompressor.new(:munge => false)
+        # Use UglifyJS
+        lambda{|s| Uglifier.compile(s.force_encoding("UTF-8"),
+                               mangle: false, output: {ascii_only: false})}
       when ".css"
-        YUI::CssCompressor.new()
+        # Use SASS's compressed output
+        lambda{|s| Sass::Engine.new(s, :syntax => :scss, :style => :compressed).render}
       end
     end
 
@@ -356,9 +361,11 @@ module Slinky
       }
       invalidate_cache
       files.each{|f|
-        if f.directives.include?(:slinky_scripts) || f.directives.include?(:slinky_styles)
+        if f.directives.include?(:slinky_scripts) ||
+           f.directives.include?(:slinky_styles) ||
+           f.directives.include?(:slinky_product)
           f.invalidate
-          f.process
+          f.find_directives
         end
       }
     end
@@ -492,7 +499,7 @@ module Slinky
 
     def initialize source, build_path, manifest, parent = nil, options = {:devel => false}
       @parent = parent
-      @source = source
+      @source = Pathname.new(source).cleanpath.to_s
       @last_built = Time.at(0)
 
       @cfile = Compilers.cfile_for_file(@source)
@@ -636,6 +643,7 @@ module Slinky
       if path && @directives.size > 0
         out = File.read(path)
         out.gsub!(DEPENDS_DIRECTIVE, "")
+        out.gsub!(EXTERNAL_DEPENDS_DIRECTIVE, "")
         out.gsub!(REQUIRE_DIRECTIVE, "")
         out.gsub!(SCRIPTS_DIRECTIVE){ @manifest.scripts_string }
         out.gsub!(STYLES_DIRECTIVE){ @manifest.styles_string }
@@ -673,6 +681,20 @@ module Slinky
       Digest::MD5.hexdigest(File.read(@source)) rescue nil
     end
 
+    # The list of paths to files external to the manifest that this file
+    # depends on
+    def external_dependencies
+      (@directives[:slinky_depends_external] || []).map{|ed|
+        Dir.glob(File.join(@manifest.dir, ed))
+      }.flatten
+    end
+
+    def external_dependencies_updated?
+      return false if external_dependencies.empty?
+
+      external_dependencies.map{|x| File.mtime(x)}.max > (@updated || Time.at(0))
+    end
+
     # Gets manifest file ready for serving or building by handling the
     # directives and compiling the file if neccesary.
     # @param String path to which the file should be compiled
@@ -688,22 +710,28 @@ module Slinky
 
       SlinkyError.batch_errors do
         depends = @directives[:slinky_depends].map{|f|
-          p = parent.find_by_path(f, true)
-          unless p.size > 0        
+          ps = if f.start_with?("/")
+                 @manifest.find_by_pattern(f)
+               else
+                 parent.find_by_path(f, true)
+               end
+          unless ps.size > 0
             SlinkyError.raise DependencyError,
-                              "File #{f} dependedon by #{@source} not found" 
+                              "File #{f} depended on by #{@source} not found"
           end
-          p
+          ps
         }.flatten.compact if @directives[:slinky_depends]
         depends ||= []
         @processing = true
-        # process each file on which we're dependent, watching out for 
+        # process each file on which we're dependent, watching out for
         # infinite loops
         depends.each{|f| f.process }
         @processing = false
 
         # get hash of source file
-        if @last_path && hash == @last_md5 && depends.all?{|f| f.updated < start_time}
+        if @last_path && hash == @last_md5 &&
+           depends.all?{|f| f.updated < start_time} &&
+           !external_dependencies_updated?
           @last_path
         else
           @last_md5 = hash

data/lib/slinky/proxy_server.rb

@@ -23,7 +23,14 @@ module Slinky
     end
 
     def self.rewrite_path path, proxy
-      path.gsub(/^#{proxy[0]}/, "")
+      if proxy[0] == "/"
+        # If we're proxying everything, we just want to pass the path
+        # through unmodified. Otherwise we end up stripping the
+        # initial slash, which is the wrong behavior.
+        path
+      else
+        path.gsub(/^#{proxy[0]}/, "")
+      end
     end
 
     def self.replace_path http, old_path, new_path, addition
@@ -44,25 +51,28 @@ module Slinky
         proxy = nil
         start_time = nil
         conn.server :slinky, :host => "127.0.0.1", :port => slinky_port
-
+        server = nil
+        
         conn.on_data do |data|
           begin
-            _, path = data.match(ProxyServer::HTTP_MATCHER)[1..2]
-            proxy = ProxyServer.find_matcher(proxies, path)
-            start_time = Time.now
-            server = if proxy
-                       new_path = ProxyServer.rewrite_path path, proxy
-                       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
+            matches = data.match(ProxyServer::HTTP_MATCHER)
+            if matches
+              path = matches[2]
+              proxy = ProxyServer.find_matcher(proxies, path)
+              start_time = Time.now
+              server = if proxy
+                         new_path = ProxyServer.rewrite_path path, proxy
+                         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
+            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

data/lib/slinky/pure_transitive_clsoure.rb

@@ -0,0 +1,14 @@
+module Slinky
+  # Pure ruby implementation of all paths cost for a graph
+  def self.all_paths_costs size, dist
+    size.times{|k|
+      size.times{|i|
+        size.times{|j|
+          if dist[size * i + j] > dist[size * i + k] + dist[size * k + j]
+            dist[size * i + j] = dist[size * i + k] + dist[size * k + j]
+          end
+        }
+      }
+    }
+  end  
+end

data/lib/slinky/runner.rb

@@ -1,16 +1,24 @@
 module Slinky
   class Runner
     COMMANDS = %w{start build}
-        
+
+    def version
+      root = File.expand_path(File.dirname(__FILE__))
+      File.open("#{root}/../../VERSION"){|f|
+        f.read.strip
+      }
+    end
+
     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
-      
+
+      puts "slinky #{version}"
+
       @argv = argv
       @options = {}
 
@@ -30,26 +38,17 @@ module Slinky
         $stderr.puts(e.message.foreground(:red))
         exit(1)
       end
-        
-    end
-
-    def version
-      root = File.expand_path(File.dirname(__FILE__))
-      File.open("#{root}/../../VERSION"){|f|
-        puts "slinky #{f.read.strip}"
-      }
-      exit
     end
 
     def parser
       @parser ||= OptionParser.new do |opts|
         opts.banner = "Usage: slinky [options] #{COMMANDS.join('|')}"
-        opts.on("-v", "--version", "Outputs current version number and exits"){ version }
+        opts.on("-v", "--version", "Outputs current version number and exits"){ exit }
         opts.on("-o DIR", "--build-dir DIR", "Directory to which the site will be built.", "Use in conjunction with the 'build' command."){|dir| @options[:build_dir] = File.expand_path(dir)}
         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("-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

data/lib/slinky/templates/error.css

@@ -13,7 +13,8 @@
   font-size: 1.5em;
   line-height: 1.5em;
   color: whitesmoke;
-  text-shadow: -1px -1px rgba(0, 0, 0, 0.2)
+  text-shadow: -1px -1px rgba(0, 0, 0, 0.2);
+  z-index: 100000;
 }
 
 #slinky-error .slinky-body {
@@ -25,6 +26,7 @@
   color: black;
   background-color: whitesmoke;
   border-bottom: 1px solid #aaa;
+  z-index: 100000;  
 }
 
 #slinky-error .slinky-body li {

data/lib/slinky/templates/inject.css

@@ -11,7 +11,8 @@ body:before {
   font-size: 2.5em;
   line-height: 2.5em;
   color: whitesmoke;
-  text-shadow: -1px -1px rgba(0, 0, 0, 0.2)
+  text-shadow: -1px -1px rgba(0, 0, 0, 0.2);
+  z-index: 100000;
 }
 
 body:after {
@@ -24,4 +25,5 @@ body:after {
   color: black;
   background-color: whitesmoke;
   border-bottom: 1px solid #aaa;
+  z-index: 100000;  
 }

data/lib/slinky.rb

@@ -1,17 +1,18 @@
-require 'uri'
-require 'yaml'
-require 'eventmachine'
 require 'em-proxy'
 require 'em-websocket'
+require 'eventmachine'
 require 'evma_httpserver'
-require 'uri'
-require 'tempfile'
-require 'rainbow'
-require 'optparse'
-require 'mime/types'
-require 'yui/compressor'
 require 'listen'
+require 'mime/types'
 require 'multi_json'
+require 'optparse'
+require 'rainbow'
+require 'tempfile'
+require 'tsort'
+require 'uglifier'
+require 'uri'
+require 'uri'
+require 'yaml'
 
 require "slinky/em-popen3"
 require "slinky/errors"
@@ -27,6 +28,13 @@ require "slinky/builder"
 require "slinky/listener"
 require "slinky/live_reload"
 
+begin
+  require "transitive_closure"
+rescue LoadError
+  puts "Using pure Ruby implementation of Slinky::all_paths_costs"
+  require 'slinky/pure_transitive_closure'
+end
+
 # load compilers
 root = File.expand_path(File.dirname(__FILE__))
 Dir.glob("#{root}/slinky/compilers/*.rb").each{|compiler|
@@ -38,11 +46,3 @@ Dir.glob("#{root}/slinky/compilers/*.rb").each{|compiler|
     puts "Failed to load #{compiler}: syntax error"
   end
 }
-
-# Without this monkeypatch data uris in CSS cause compression to fail
-class YUI::Compressor
-  def command
-    @command.insert 1, "-Xss8m"
-    @command.map { |word| Shellwords.escape(word) }.join(" ")
-  end
-end