sass 3.1.14 → 3.1.15

data/VERSION

@@ -1 +1 @@
-3.1.14
+3.1.15

data/lib/sass/engine.rb

@@ -621,7 +621,7 @@ WARNING
         end
         Tree::CommentNode.new(value, silent, loud)
       else
-        Tree::RuleNode.new(parse_interp(line))
+        Tree::RuleNode.new(parse_interp(line.text))
       end
     end
 

data/lib/sass/exec.rb

@@ -404,6 +404,7 @@ MSG
           raise error unless error.is_a?(::Sass::SyntaxError) && !@options[:stop_on_error]
           had_error = true
           puts_action :error, :red, "#{error.sass_filename} (Line #{error.sass_line}: #{error.message})"
+          STDOUT.flush
         end
 
         if @options[:update]
@@ -414,9 +415,18 @@ MSG
 
         puts ">>> Sass is watching for changes. Press Ctrl-C to stop."
 
-        ::Sass::Plugin.on_template_modified {|template| puts ">>> Change detected to: #{template}"}
-        ::Sass::Plugin.on_template_created {|template| puts ">>> New template detected: #{template}"}
-        ::Sass::Plugin.on_template_deleted {|template| puts ">>> Deleted template detected: #{template}"}
+        ::Sass::Plugin.on_template_modified do |template|
+          puts ">>> Change detected to: #{template}"
+          STDOUT.flush
+        end
+        ::Sass::Plugin.on_template_created do |template|
+          puts ">>> New template detected: #{template}"
+          STDOUT.flush
+        end
+        ::Sass::Plugin.on_template_deleted do |template|
+          puts ">>> Deleted template detected: #{template}"
+          STDOUT.flush
+        end
 
         ::Sass::Plugin.watch(files)
       end

data/lib/sass/plugin/staleness_checker.rb

@@ -39,6 +39,10 @@ module Sass
       def initialize(options)
         @dependencies = self.class.dependencies_cache
 
+        # URIs that are being actively checked for staleness. Protects against
+        # import loops.
+        @actively_checking = Set.new
+
         # Entries in the following instance-level caches are never explicitly expired.
         # Instead they are supposed to automaticaly go out of scope when a series of staleness checks
         # (this instance of StalenessChecker was created for) is finished.
@@ -148,10 +152,16 @@ module Sass
 
       def dependency_updated?(css_mtime)
         Proc.new do |uri, importer|
-          sass_mtime = mtime(uri, importer)
-          !sass_mtime ||
-            sass_mtime > css_mtime ||
-            dependencies_stale?(uri, importer, css_mtime)
+          next true if @actively_checking.include?(uri)
+          begin
+            @actively_checking << uri
+            sass_mtime = mtime(uri, importer)
+            !sass_mtime ||
+              sass_mtime > css_mtime ||
+              dependencies_stale?(uri, importer, css_mtime)
+          ensure
+            @actively_checking.delete uri
+          end
         end
       end
 

data/lib/sass/repl.rb

@@ -34,8 +34,8 @@ module Sass
       case text
       when Script::MATCH
         name = $1
-        guarded = $3 == '||=' || $4
-        val = Script::Parser.parse($3, @line, text.size - $3.size)
+        guarded = !!$3
+        val = Script::Parser.parse($2, @line, text.size - ($3 || '').size - $2.size)
 
         unless guarded && environment.var(name)
           environment.set_var(name, val.perform(environment))

data/lib/sass/script/functions.rb

@@ -982,14 +982,23 @@ module Sass::Script
     declare :mix, [:color_1, :color_2]
     declare :mix, [:color_1, :color_2, :weight]
 
-    # Converts a color to grayscale.
-    # This is identical to `desaturate(color, 100%)`.
+    # @overload grayscale(color)
+    #   Converts a color to grayscale.
+    #   This is identical to `desaturate(color, 100%)`.
     #
-    # @param color [Color]
-    # @return [Color]
-    # @raise [ArgumentError] if `color` isn't a color
-    # @see #desaturate
+    #   @param color [Color]
+    #   @return [Color]
+    #   @raise [ArgumentError] if `color` isn't a color
+    #   @see #desaturate
+    # @overload grayscale(number)
+    #   Returns an unquoted string `grayscale(number)`, as though the function
+    #   were not defined. This is for the `grayscale` function used in
+    #   `-webkit-filter`.
+    #
+    #   @param number [Number]
+    #   @return [Sass::Script::String]
     def grayscale(color)
+      return Sass::Script::String.new("grayscale(#{color})") if color.is_a?(Sass::Script::Number)
       desaturate color, Number.new(100)
     end
     declare :grayscale, [:color]

data/lib/sass/scss/parser.rb

@@ -255,7 +255,7 @@ module Sass
       end
 
       def extend_directive
-        node(Sass::Tree::ExtendNode.new(expr!(:selector)))
+        node(Sass::Tree::ExtendNode.new(expr!(:selector_sequence)))
       end
 
       def import_directive

data/lib/sass/tree/visitors/perform.rb

@@ -318,7 +318,9 @@ WARNING
   def handle_import_loop!(node)
     msg = "An @import loop has been found:"
     files = @environment.stack.map {|s| s[:filename]}.compact
-    raise Sass::SyntaxError.new("#{msg} #{node.filename} imports itself") if files.size == 1
+    if node.filename == node.imported_file.options[:filename]
+      raise Sass::SyntaxError.new("#{msg} #{node.filename} imports itself")
+    end
 
     files << node.filename << node.imported_file.options[:filename]
     msg << "\n" << Sass::Util.enum_cons(files, 2).map do |m1, m2|

data/test/sass/conversion_test.rb

@@ -771,6 +771,16 @@ SASS
 SCSS
   end
 
+  def test_comma_extendee
+    assert_renders <<SASS, <<SCSS
+.baz
+  @extend .foo, .bar
+SASS
+.baz {
+  @extend .foo, .bar; }
+SCSS
+  end
+
   def test_argless_mixin_definition
     assert_renders <<SASS, <<SCSS
 =foo-bar

data/test/sass/engine_test.rb

@@ -2482,6 +2482,13 @@ a > b, c + d, :-moz-any(e, f, g)
 SASS
   end
 
+  def test_comment_like_selector
+    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "": expected selector, was "/ foo"') {render(<<SASS)}
+/ foo
+  a: b
+SASS
+  end
+
   # Encodings
 
   unless Sass::Util.ruby1_8?

data/test/sass/extend_test.rb

@@ -876,6 +876,20 @@ CSS
 SCSS
   end
 
+  def test_comma_extendee
+    assert_equal <<CSS, render(<<SCSS)
+.foo, .baz {
+  a: b; }
+
+.bar, .baz {
+  c: d; }
+CSS
+.foo {a: b}
+.bar {c: d}
+.baz {@extend .foo, .bar}
+SCSS
+  end
+
   ## Long Extendees
 
   def test_long_extendee

data/test/sass/functions_test.rb

@@ -772,6 +772,9 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("white", evaluate("grayscale(white)"))
     assert_equal("black", evaluate("grayscale(black)"))
     assert_equal("black", evaluate("grayscale($color: black)"))
+
+    assert_equal("grayscale(2)", evaluate("grayscale(2)"))
+    assert_equal("grayscale(-5px)", evaluate("grayscale(-5px)"))
   end
 
   def tets_grayscale_tests_types

data/test/sass/plugin_test.rb

@@ -110,6 +110,30 @@ CSS
     File.delete(tempfile_loc('bork1'))
   end
 
+  def test_single_level_import_loop
+    File.delete(tempfile_loc('single_import_loop'))
+    check_for_updates!
+    File.open(tempfile_loc('single_import_loop')) do |file|
+      assert_equal(<<CSS.strip, file.read.split("\n")[0...2].join("\n"))
+/*
+Sass::SyntaxError: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
+CSS
+    end
+  end
+
+  def test_double_level_import_loop
+    File.delete(tempfile_loc('double_import_loop1'))
+    check_for_updates!
+    File.open(tempfile_loc('double_import_loop1')) do |file|
+      assert_equal(<<CSS.strip, file.read.split("\n")[0...4].join("\n"))
+/*
+Sass::SyntaxError: An @import loop has been found:
+    #{template_loc('double_import_loop1')} imports #{template_loc('_double_import_loop2')}
+    #{template_loc('_double_import_loop2')} imports #{template_loc('double_import_loop1')}
+CSS
+    end
+  end
+
   def test_nonfull_exception_handling
     old_full_exception = Sass::Plugin.options[:full_exception]
     Sass::Plugin.options[:full_exception] = false

data/test/sass/templates/_double_import_loop2.sass

@@ -0,0 +1 @@
+@import "double_import_loop1"

data/test/sass/templates/double_import_loop1.sass

@@ -0,0 +1 @@
+@import "double_import_loop2"

data/test/sass/templates/single_import_loop.sass

@@ -0,0 +1 @@
+@import "single_import_loop"

data/vendor/fssm/ext/rakefile.rb

@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
+
+require 'rubygems/dependency_installer'
+require 'fssm'
+
+# semi-elegant solution or hack? *shrug*
+task :default do
+  name, version = FSSM::Support.optimal_backend_dependency
+  if name and version
+    installer = Gem::DependencyInstaller.new({:domain => :both, :env_shebang => true})
+    installer.install name, version
+  end
+end

data/vendor/fssm/fssm.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables       = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths     = ["lib"]
+  
+#  s.extensions        = 'ext/rakefile.rb'
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec", ">= 2.4.0"
 end

data/vendor/fssm/lib/fssm.rb

@@ -1,12 +1,62 @@
-dir = File.dirname(__FILE__)
+dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 
-#noinspection ALL
-module FSSM
-  FileNotFoundError = Class.new(StandardError)
-  FileNotRealError  = Class.new(StandardError)
-  CallbackError     = Class.new(StandardError)
+require 'thread'
 
+module FSSM
+  
+  FSSMError         = Class.new(StandardError)
+  FileNotFoundError = Class.new(FSSMError)
+  FileNotRealError  = Class.new(FSSMError)
+  CallbackError     = Class.new(FSSMError)
+  
+  autoload :VERSION,        'fssm/version'
+  autoload :Pathname,       'fssm/pathname'
+  autoload :Support,        'fssm/support'
+  autoload :Tree,           'fssm/tree'
+  autoload :Path,           'fssm/path'
+  autoload :Monitor,        'fssm/monitor'
+  
+  module State
+    autoload :Directory,    'fssm/state/directory'
+    autoload :File,         'fssm/state/file'
+  end
+  
+  module Backends
+    autoload :Polling,      'fssm/backends/polling'
+    autoload :FSEvents,     'fssm/backends/fsevents'
+    autoload :RBFSEvent,    'fssm/backends/rbfsevent'
+    autoload :Inotify,      'fssm/backends/inotify'
+    
+    class << self
+      def set_backend(const_symbol=nil, value=nil)
+        const_symbol ||= :Default
+        value ||= ::FSSM::Support.backend
+        
+        if (value.is_a?(Symbol) || value.is_a?(String))
+          unless const_defined?(value)
+            raise NameError,
+              "uninitialized constant FSSM::Backends::#{value}"
+          end
+          value = const_get(value)
+        end
+        
+        unless value.is_a?(Class)
+          raise ArgumentError,
+            "value must be a class or the symbol of an existing backend"
+        end
+        
+        remove_const(const_symbol) if const_defined?(const_symbol)
+        const_set(const_symbol, value)
+      end
+      
+      def const_missing(symbol)
+        symbol == :Default ? set_backend(symbol, FSSM::Support.backend) : super
+      end
+      
+    end
+  end
+ 
   class << self
     def dbg(msg=nil)
       STDERR.puts("FSSM -> #{msg}")
@@ -20,18 +70,5 @@ module FSSM
       monitor.run
     end
   end
+  
 end
-
-require 'thread'
-
-require 'fssm/version'
-require 'fssm/pathname'
-require 'fssm/support'
-require 'fssm/tree'
-require 'fssm/path'
-require 'fssm/state/directory'
-require 'fssm/state/file'
-require 'fssm/monitor'
-
-require "fssm/backends/#{FSSM::Support.backend.downcase}"
-FSSM::Backends::Default = FSSM::Backends.const_get(FSSM::Support.backend)

data/vendor/fssm/lib/fssm/support.rb

@@ -3,29 +3,24 @@ require 'rbconfig'
 module FSSM::Support
   class << self
     def usable_backend
-      choice = case
-                 when mac? && !lion? && !jruby? && carbon_core?
-                   'FSEvents'
-                 when mac? && rb_fsevent?
-                   'RBFSEvent'
-                 when linux? && rb_inotify?
-                   'Inotify'
-                 else
-                   'Polling'
-               end
-
-      if (mac? || linux?) && choice == 'Polling'
-        optimal = case
-                    when mac?
-                      'rb-fsevent'
-                    when linux?
-                      'rb-inotify'
-                  end
-        FSSM.dbg("An optimized backend is available for this platform!")
-        FSSM.dbg("    gem install #{optimal}")
+      case
+        when mac? && !lion? && !jruby? && carbon_core?
+          'FSEvents'
+        when mac? && rb_fsevent?
+          'RBFSEvent'
+        when linux? && rb_inotify?
+          'Inotify'
+        else
+          'Polling'
+      end
+    end
+    
+    def optimal_backend_dependency
+      return case
+        when mac?     then  ['rb-fsevent', '>= 0.4.3.1']
+        when linux?   then  ['rb-inotify', '>= 0.8.8']
+        else                [nil, nil]
       end
-
-      choice
     end
 
     def backend
@@ -37,15 +32,15 @@ module FSSM::Support
     end
 
     def mac?
-      Config::CONFIG['target_os'] =~ /darwin/i
+      RbConfig::CONFIG['target_os'] =~ /darwin/i
     end
 
     def lion?
-      Config::CONFIG['target_os'] =~ /darwin11/i
+      RbConfig::CONFIG['target_os'] =~ /darwin11/i
     end
 
     def linux?
-      Config::CONFIG['target_os'] =~ /linux/i
+      RbConfig::CONFIG['target_os'] =~ /linux/i
     end
 
     def carbon_core?

data/vendor/fssm/lib/fssm/version.rb

@@ -1,3 +1,3 @@
 module FSSM
-  VERSION = "0.2.7"
+  VERSION = "0.2.8.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: 29
+  prerelease: false
   segments: 
   - 3
   - 1
-  - 14
-  version: 3.1.14
+  - 15
+  version: 3.1.15
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-05 00:00:00 Z
+date: 2012-02-09 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yard
@@ -63,255 +64,260 @@ extra_rdoc_files: []
 
 files: 
 - rails/init.rb
-- lib/sass/util/multibyte_string_scanner.rb
-- lib/sass/util/subset_map.rb
-- lib/sass/shared.rb
-- lib/sass/error.rb
-- lib/sass/importers.rb
-- lib/sass/cache_stores/filesystem.rb
-- lib/sass/cache_stores/chain.rb
-- lib/sass/cache_stores/memory.rb
-- lib/sass/cache_stores/null.rb
-- lib/sass/cache_stores/base.rb
-- lib/sass/environment.rb
-- lib/sass/plugin/rack.rb
-- lib/sass/plugin/staleness_checker.rb
+- lib/sass.rb
+- lib/sass/cache_stores.rb
 - lib/sass/plugin/compiler.rb
-- lib/sass/plugin/configuration.rb
 - lib/sass/plugin/merb.rb
+- lib/sass/plugin/staleness_checker.rb
+- lib/sass/plugin/rack.rb
 - lib/sass/plugin/rails.rb
+- lib/sass/plugin/configuration.rb
 - lib/sass/plugin/generic.rb
-- lib/sass/railtie.rb
-- lib/sass/logger.rb
-- lib/sass/callbacks.rb
-- lib/sass/script/string.rb
-- lib/sass/script/node.rb
-- lib/sass/script/lexer.rb
-- lib/sass/script/string_interpolation.rb
-- lib/sass/script/css_parser.rb
-- lib/sass/script/variable.rb
-- lib/sass/script/literal.rb
-- lib/sass/script/bool.rb
-- lib/sass/script/number.rb
-- lib/sass/script/unary_operation.rb
-- lib/sass/script/css_lexer.rb
-- lib/sass/script/operation.rb
-- lib/sass/script/parser.rb
-- lib/sass/script/funcall.rb
-- lib/sass/script/color.rb
-- lib/sass/script/interpolation.rb
-- lib/sass/script/list.rb
-- lib/sass/script/functions.rb
 - lib/sass/version.rb
-- lib/sass/tree/visitors/deep_copy.rb
-- lib/sass/tree/visitors/set_options.rb
-- lib/sass/tree/visitors/cssize.rb
-- lib/sass/tree/visitors/to_css.rb
-- lib/sass/tree/visitors/perform.rb
-- lib/sass/tree/visitors/base.rb
-- lib/sass/tree/visitors/check_nesting.rb
-- lib/sass/tree/visitors/convert.rb
+- lib/sass/cache_stores/chain.rb
+- lib/sass/cache_stores/memory.rb
+- lib/sass/cache_stores/null.rb
+- lib/sass/cache_stores/filesystem.rb
+- lib/sass/cache_stores/base.rb
+- lib/sass/shared.rb
+- lib/sass/repl.rb
+- lib/sass/error.rb
+- lib/sass/tree/import_node.rb
+- lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
-- lib/sass/tree/node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/charset_node.rb
-- lib/sass/tree/extend_node.rb
-- lib/sass/tree/rule_node.rb
-- lib/sass/tree/mixin_def_node.rb
-- lib/sass/tree/return_node.rb
-- lib/sass/tree/mixin_node.rb
-- lib/sass/tree/prop_node.rb
-- lib/sass/tree/warn_node.rb
+- lib/sass/tree/function_node.rb
+- lib/sass/tree/media_node.rb
+- lib/sass/tree/while_node.rb
+- lib/sass/tree/for_node.rb
 - lib/sass/tree/directive_node.rb
+- lib/sass/tree/rule_node.rb
 - lib/sass/tree/each_node.rb
+- lib/sass/tree/node.rb
+- lib/sass/tree/mixin_node.rb
+- lib/sass/tree/extend_node.rb
+- lib/sass/tree/mixin_def_node.rb
+- lib/sass/tree/visitors/perform.rb
+- lib/sass/tree/visitors/to_css.rb
+- lib/sass/tree/visitors/check_nesting.rb
+- lib/sass/tree/visitors/deep_copy.rb
+- lib/sass/tree/visitors/set_options.rb
+- lib/sass/tree/visitors/cssize.rb
+- lib/sass/tree/visitors/convert.rb
+- lib/sass/tree/visitors/base.rb
 - lib/sass/tree/comment_node.rb
-- lib/sass/tree/media_node.rb
-- lib/sass/tree/variable_node.rb
-- lib/sass/tree/function_node.rb
+- lib/sass/tree/warn_node.rb
 - lib/sass/tree/debug_node.rb
-- lib/sass/tree/import_node.rb
-- lib/sass/tree/while_node.rb
-- lib/sass/tree/for_node.rb
+- lib/sass/tree/prop_node.rb
+- lib/sass/tree/variable_node.rb
+- lib/sass/engine.rb
+- lib/sass/plugin.rb
+- lib/sass/root.rb
+- lib/sass/importers.rb
+- lib/sass/logger.rb
+- lib/sass/util/multibyte_string_scanner.rb
+- lib/sass/util/subset_map.rb
+- lib/sass/scss.rb
+- lib/sass/scss/static_parser.rb
+- lib/sass/scss/parser.rb
 - lib/sass/scss/sass_parser.rb
-- lib/sass/scss/script_parser.rb
-- lib/sass/scss/css_parser.rb
 - lib/sass/scss/script_lexer.rb
 - lib/sass/scss/rx.rb
-- lib/sass/scss/parser.rb
-- lib/sass/scss/static_parser.rb
+- lib/sass/scss/script_parser.rb
+- lib/sass/scss/css_parser.rb
+- lib/sass/logger/log_level.rb
+- lib/sass/logger/base.rb
+- lib/sass/css.rb
+- lib/sass/script.rb
+- lib/sass/util.rb
+- lib/sass/importers/filesystem.rb
+- lib/sass/importers/base.rb
+- lib/sass/script/color.rb
+- lib/sass/script/variable.rb
+- lib/sass/script/operation.rb
+- lib/sass/script/funcall.rb
+- lib/sass/script/literal.rb
+- lib/sass/script/parser.rb
+- lib/sass/script/functions.rb
+- lib/sass/script/number.rb
+- lib/sass/script/string_interpolation.rb
+- lib/sass/script/interpolation.rb
+- lib/sass/script/node.rb
+- lib/sass/script/bool.rb
+- lib/sass/script/unary_operation.rb
+- lib/sass/script/lexer.rb
+- lib/sass/script/list.rb
+- lib/sass/script/css_lexer.rb
+- lib/sass/script/string.rb
+- lib/sass/script/css_parser.rb
+- lib/sass/selector.rb
 - lib/sass/less.rb
-- lib/sass/selector/simple_sequence.rb
+- lib/sass/callbacks.rb
 - lib/sass/selector/simple.rb
 - lib/sass/selector/sequence.rb
 - lib/sass/selector/abstract_sequence.rb
 - lib/sass/selector/comma_sequence.rb
-- lib/sass/root.rb
-- lib/sass/importers/filesystem.rb
-- lib/sass/importers/base.rb
-- lib/sass/css.rb
-- lib/sass/selector.rb
-- lib/sass/engine.rb
-- lib/sass/plugin.rb
-- lib/sass/logger/log_level.rb
-- lib/sass/logger/base.rb
-- lib/sass/repl.rb
-- lib/sass/scss.rb
+- lib/sass/selector/simple_sequence.rb
+- lib/sass/railtie.rb
+- lib/sass/environment.rb
 - lib/sass/exec.rb
-- lib/sass/util.rb
-- lib/sass/cache_stores.rb
-- lib/sass/script.rb
-- lib/sass.rb
-- vendor/fssm/lib/fssm.rb
-- vendor/fssm/lib/fssm/path.rb
-- vendor/fssm/lib/fssm/tree.rb
-- vendor/fssm/lib/fssm/monitor.rb
-- vendor/fssm/lib/fssm/support.rb
-- vendor/fssm/lib/fssm/pathname.rb
+- vendor/fssm/README.markdown
+- vendor/fssm/ext/rakefile.rb
+- vendor/fssm/example.rb
+- vendor/fssm/Gemfile
 - vendor/fssm/lib/fssm/version.rb
+- vendor/fssm/lib/fssm/pathname.rb
 - vendor/fssm/lib/fssm/state/file.rb
 - vendor/fssm/lib/fssm/state/directory.rb
-- vendor/fssm/lib/fssm/backends/fsevents.rb
+- vendor/fssm/lib/fssm/monitor.rb
+- vendor/fssm/lib/fssm/tree.rb
+- vendor/fssm/lib/fssm/support.rb
+- vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
 - vendor/fssm/lib/fssm/backends/polling.rb
 - vendor/fssm/lib/fssm/backends/inotify.rb
-- vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
+- vendor/fssm/lib/fssm/backends/fsevents.rb
 - vendor/fssm/lib/fssm/backends/rbfsevent.rb
-- vendor/fssm/example.rb
-- vendor/fssm/LICENSE
-- vendor/fssm/README.markdown
-- vendor/fssm/Rakefile
-- vendor/fssm/profile/prof-fssm-pathname.html
-- vendor/fssm/profile/prof-pathname.rb
+- vendor/fssm/lib/fssm/path.rb
+- vendor/fssm/lib/fssm.rb
 - vendor/fssm/profile/prof-plain-pathname.html
-- vendor/fssm/profile/prof-pathname-rubinius.rb
-- vendor/fssm/profile/prof-cache.rb
+- vendor/fssm/profile/prof-pathname.rb
 - vendor/fssm/profile/prof.html
-- vendor/fssm/Gemfile
+- vendor/fssm/profile/prof-cache.rb
+- vendor/fssm/profile/prof-fssm-pathname.html
+- vendor/fssm/profile/prof-pathname-rubinius.rb
 - vendor/fssm/fssm.gemspec
-- vendor/fssm/spec/spec_helper.rb
+- vendor/fssm/Rakefile
+- vendor/fssm/LICENSE
+- vendor/fssm/spec/count_down_latch.rb
 - vendor/fssm/spec/monitor_spec.rb
 - vendor/fssm/spec/path_spec.rb
-- vendor/fssm/spec/count_down_latch.rb
-- vendor/fssm/spec/root/duck/quack.txt
 - vendor/fssm/spec/root/moo/cow.txt
-- vendor/fssm/spec/root/file.rb
-- vendor/fssm/spec/root/file.css
 - vendor/fssm/spec/root/file.yml
-- bin/sass
-- bin/scss
+- vendor/fssm/spec/root/file.css
+- vendor/fssm/spec/root/file.rb
+- vendor/fssm/spec/root/duck/quack.txt
+- vendor/fssm/spec/spec_helper.rb
 - bin/sass-convert
-- test/sass/plugin_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
+- bin/scss
+- bin/sass
+- test/Gemfile
+- test/Gemfile.lock
+- test/test_helper.rb
+- test/sass/engine_test.rb
+- test/sass/functions_test.rb
+- test/sass/fixtures/test_staleness_check_across_importers.scss
+- test/sass/fixtures/test_staleness_check_across_importers.css
+- test/sass/data/hsl-rgb.txt
+- test/sass/extend_test.rb
+- test/sass/logger_test.rb
+- test/sass/css2sass_test.rb
 - test/sass/templates/basic.sass
-- test/sass/templates/line_numbers.sass
-- test/sass/templates/nested_bork2.sass
-- test/sass/templates/_imported_charset_utf8.sass
-- test/sass/templates/mixin_bork.sass
-- test/sass/templates/import_charset.sass
+- test/sass/templates/mixins.sass
+- test/sass/templates/options.sass
+- test/sass/templates/scss_import.scss
+- test/sass/templates/subdir/subdir.sass
+- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
+- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/alt.sass
+- test/sass/templates/nested_bork1.sass
+- test/sass/templates/complex.sass
+- test/sass/templates/units.sass
+- test/sass/templates/nested_import.sass
+- test/sass/templates/importee.sass
 - test/sass/templates/importee.less
-- test/sass/templates/warn.sass
-- test/sass/templates/parent_ref.sass
-- test/sass/templates/nested_bork3.sass
-- test/sass/templates/script.sass
-- test/sass/templates/import.sass
 - test/sass/templates/scss_importee.scss
-- test/sass/templates/bork1.sass
-- test/sass/templates/compressed.sass
-- test/sass/templates/importee.sass
-- test/sass/templates/_partial.sass
-- test/sass/templates/units.sass
-- test/sass/templates/nested_bork1.sass
+- test/sass/templates/line_numbers.sass
+- test/sass/templates/expanded.sass
 - test/sass/templates/bork3.sass
-- test/sass/templates/nested_mixin_bork.sass
-- test/sass/templates/complex.sass
-- test/sass/templates/if.sass
+- test/sass/templates/bork5.sass
 - test/sass/templates/nested_bork5.sass
+- test/sass/templates/warn_imported.sass
 - test/sass/templates/import_charset_ibm866.sass
-- test/sass/templates/alt.sass
-- test/sass/templates/scss_import.scss
+- test/sass/templates/bork1.sass
+- test/sass/templates/warn.sass
+- test/sass/templates/bork2.sass
+- test/sass/templates/nested.sass
 - test/sass/templates/compact.sass
+- test/sass/templates/single_import_loop.sass
+- test/sass/templates/multiline.sass
 - test/sass/templates/_imported_charset_ibm866.sass
-- test/sass/templates/nested.sass
-- test/sass/templates/subdir/subdir.sass
-- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/warn_imported.sass
-- test/sass/templates/options.sass
+- test/sass/templates/double_import_loop1.sass
+- test/sass/templates/_double_import_loop2.sass
+- test/sass/templates/import_charset.sass
+- test/sass/templates/parent_ref.sass
+- test/sass/templates/import.sass
+- test/sass/templates/nested_bork3.sass
+- test/sass/templates/script.sass
 - test/sass/templates/bork4.sass
-- test/sass/templates/bork5.sass
+- test/sass/templates/if.sass
+- test/sass/templates/_partial.sass
+- test/sass/templates/nested_mixin_bork.sass
 - test/sass/templates/import_charset_1_8.sass
+- test/sass/templates/nested_bork2.sass
+- test/sass/templates/mixin_bork.sass
+- test/sass/templates/compressed.sass
 - test/sass/templates/nested_bork4.sass
-- test/sass/templates/nested_import.sass
-- test/sass/templates/multiline.sass
-- test/sass/templates/expanded.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/bork2.sass
-- test/sass/script_conversion_test.rb
-- test/sass/mock_importer.rb
-- test/sass/test_helper.rb
-- test/sass/logger_test.rb
-- test/sass/fixtures/test_staleness_check_across_importers.css
-- test/sass/fixtures/test_staleness_check_across_importers.scss
-- test/sass/functions_test.rb
-- test/sass/util_test.rb
-- test/sass/less_conversion_test.rb
-- test/sass/more_results/more1.css
-- test/sass/more_results/more1_with_line_comments.css
-- test/sass/more_results/more_import.css
-- test/sass/data/hsl-rgb.txt
-- test/sass/scss/test_helper.rb
-- test/sass/scss/css_test.rb
-- test/sass/scss/rx_test.rb
-- test/sass/scss/scss_test.rb
-- test/sass/script_test.rb
-- test/sass/importer_test.rb
-- test/sass/cache_test.rb
+- test/sass/templates/_imported_charset_utf8.sass
 - test/sass/conversion_test.rb
-- test/sass/more_templates/more1.sass
-- test/sass/more_templates/_more_partial.sass
-- test/sass/more_templates/more_import.sass
-- test/sass/extend_test.rb
-- test/sass/engine_test.rb
-- test/sass/css2sass_test.rb
+- test/sass/script_test.rb
+- test/sass/util/subset_map_test.rb
+- test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/results/units.css
-- test/sass/results/alt.css
-- test/sass/results/scss_importee.css
-- test/sass/results/line_numbers.css
-- test/sass/results/import_charset.css
+- test/sass/importer_test.rb
+- test/sass/scss/css_test.rb
+- test/sass/scss/scss_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/scss/test_helper.rb
+- test/sass/util_test.rb
+- test/sass/results/mixins.css
+- test/sass/results/warn_imported.css
 - test/sass/results/expanded.css
-- test/sass/results/warn.css
-- test/sass/results/script.css
-- test/sass/results/if.css
-- test/sass/results/scss_import.css
-- test/sass/results/nested.css
+- test/sass/results/compact.css
+- test/sass/results/compressed.css
+- test/sass/results/scss_importee.css
+- test/sass/results/basic.css
+- test/sass/results/subdir/nested_subdir/nested_subdir.css
+- test/sass/results/subdir/subdir.css
 - test/sass/results/options.css
-- test/sass/results/import_charset_1_8.css
+- test/sass/results/scss_import.css
+- test/sass/results/units.css
 - test/sass/results/parent_ref.css
+- test/sass/results/script.css
+- test/sass/results/complex.css
+- test/sass/results/import_charset.css
+- test/sass/results/alt.css
+- test/sass/results/if.css
 - test/sass/results/multiline.css
+- test/sass/results/import_charset_1_8.css
+- test/sass/results/warn.css
 - test/sass/results/import_charset_ibm866.css
-- test/sass/results/subdir/subdir.css
-- test/sass/results/subdir/nested_subdir/nested_subdir.css
-- test/sass/results/warn_imported.css
-- test/sass/results/compact.css
-- test/sass/results/mixins.css
-- test/sass/results/complex.css
-- test/sass/results/compressed.css
 - test/sass/results/import.css
-- test/sass/results/basic.css
-- test/test_helper.rb
-- test/Gemfile.lock
-- test/Gemfile
+- test/sass/results/nested.css
+- test/sass/results/line_numbers.css
+- test/sass/test_helper.rb
+- test/sass/more_templates/_more_partial.sass
+- test/sass/more_templates/more_import.sass
+- test/sass/more_templates/more1.sass
+- test/sass/script_conversion_test.rb
+- test/sass/less_conversion_test.rb
+- test/sass/more_results/more1.css
+- test/sass/more_results/more1_with_line_comments.css
+- test/sass/more_results/more_import.css
+- test/sass/mock_importer.rb
+- test/sass/cache_test.rb
+- test/sass/plugin_test.rb
 - extra/update_watch.rb
 - Rakefile
 - init.rb
 - .yardopts
-- MIT-LICENSE
+- README.md
+- VERSION_NAME
 - REVISION
+- MIT-LICENSE
 - VERSION
-- VERSION_NAME
-- README.md
 - CONTRIBUTING
+has_rdoc: false
 homepage: http://sass-lang.com/
 licenses: []
 
@@ -343,27 +349,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sass
-rubygems_version: 1.8.15
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files: 
-- test/sass/plugin_test.rb
+- test/sass/engine_test.rb
+- test/sass/functions_test.rb
+- test/sass/extend_test.rb
+- test/sass/logger_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/conversion_test.rb
+- test/sass/script_test.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/logger_test.rb
-- test/sass/functions_test.rb
-- test/sass/util_test.rb
-- test/sass/less_conversion_test.rb
+- test/sass/callbacks_test.rb
+- test/sass/importer_test.rb
 - test/sass/scss/css_test.rb
-- test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/script_test.rb
-- test/sass/importer_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/util_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/less_conversion_test.rb
 - test/sass/cache_test.rb
-- test/sass/conversion_test.rb
-- test/sass/extend_test.rb
-- test/sass/engine_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/callbacks_test.rb
+- test/sass/plugin_test.rb