sass 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c15e8b1e1cc6aeec6cb23242ee301a9eaba9559f
-  data.tar.gz: 5938a99d15de88feb82aa2f63999ab4650c10ce8
+  metadata.gz: 2247321bf696ce2fefd8b57e4312ddc885595cdc
+  data.tar.gz: 7267469a257cb4ee1447ced88ae5b7460ed2e8b6
 SHA512:
-  metadata.gz: 316cd088ed4308e05f7c32ff0a5a7ae0ab255b6ff196bf114f30a92b6c87a538294a54c332a752cd05c9de8eb81aea3342c925dfef89b1cf88ac51d26114d74d
-  data.tar.gz: c29ea469217ff7fcfa198e2e446a57a9be9bde3d848015138d0d5d307984dc6c3370659cd68d3168c2301e831f1fcb5d156712283d1a13a09eb02ae953e231c7
+  metadata.gz: 4773c1e62448e7ebb59025e7525bf7ac16c3b74366201d311d07de749c6f43745cdf6114a9a0be7b1f8f5bdaf79d40db423d997bfa0f0f35812dc1c4902b149f
+  data.tar.gz: 0014b9b892d70af234d5f79d8828f0ce6dc5ac87e95f1dd1803f0b15073d30fabffecaba56b79498355e5af9bc408ff2627520056a614d64c5200a1257c791d7

data/VERSION

@@ -1 +1 @@
-3.4.2
+3.4.3

data/VERSION_DATE

@@ -1 +1 @@
-29 August 2014 00:35:55 UTC
+05 September 2014 01:13:33 UTC

data/lib/sass/importers/filesystem.rb

@@ -203,6 +203,11 @@ WARNING
         full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
         return unless full_filename && File.readable?(full_filename)
 
+        # TODO: this preserves historical behavior, but it's possible
+        # :filename should be either normalized to the native format
+        # or consistently URI-format.
+        full_filename = full_filename.tr("\\", "/") if Sass::Util.windows?
+
         options[:syntax] = syntax
         options[:filename] = full_filename
         options[:importer] = self

data/lib/sass/script/tree/funcall.rb

@@ -241,7 +241,7 @@ module Sass::Script::Tree
     end
 
     def perform_sass_fn(function, args, splat, environment)
-      Sass::Tree::Visitors::Perform.perform_arguments(function, args, splat) do |env|
+      Sass::Tree::Visitors::Perform.perform_arguments(function, args, splat, environment) do |env|
         env.caller = Sass::Environment.new(environment)
 
         val = catch :_sass_return do

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

@@ -11,7 +11,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     # @api private
     # @comment
     #   rubocop:disable MethodLength
-    def perform_arguments(callable, args, splat)
+    def perform_arguments(callable, args, splat, environment)
       desc = "#{callable.type.capitalize} #{callable.name}"
       downcase_desc = "#{callable.type} #{callable.name}"
 
@@ -41,20 +41,26 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       # raising happens in the ensure clause at the end of this function.
       return if keyword_exception && !callable.splat
 
-      if args.size > callable.args.size && !callable.splat
-        takes = callable.args.size
-        passed = args.size
-        raise Sass::SyntaxError.new(
-          "#{desc} takes #{takes} argument#{'s' unless takes == 1} " +
-          "but #{passed} #{passed == 1 ? 'was' : 'were'} passed.")
-      end
-
       splat_sep = :comma
       if splat
         args += splat.to_a
         splat_sep = splat.separator
       end
 
+      if args.size > callable.args.size && !callable.splat
+        extra_args_because_of_splat = splat && args.size - splat.to_a.size <= callable.args.size
+
+        takes = callable.args.size
+        passed = args.size
+        message = "#{desc} takes #{takes} argument#{'s' unless takes == 1} " +
+          "but #{passed} #{passed == 1 ? 'was' : 'were'} passed."
+        raise Sass::SyntaxError.new(message) unless extra_args_because_of_splat
+        # TODO: when the deprecation period is over, make this an error.
+        Sass::Util.sass_warn("WARNING: #{message}\n" +
+          environment.stack.to_s.gsub(/^/m, " " * 8) + "\n" +
+          "This will be an error in future versions of Sass.")
+      end
+
       env = Sass::Environment.new(callable.environment)
       callable.args.zip(args[0...callable.args.length]) do |(var, default), value|
         if value && keywords.has_key?(var.name)
@@ -339,7 +345,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       keywords = Sass::Util.map_vals(node.keywords) {|v| v.perform(@environment)}
       splat = self.class.perform_splat(node.splat, keywords, node.kwarg_splat, @environment)
 
-      self.class.perform_arguments(mixin, args, splat) do |env|
+      self.class.perform_arguments(mixin, args, splat, @environment) do |env|
         env.caller = Sass::Environment.new(@environment)
         env.content = [node.children, @environment] if node.has_children
 

data/lib/sass/util.rb

@@ -410,7 +410,7 @@ module Sass
     def caller_info(entry = nil)
       # JRuby evaluates `caller` incorrectly when it's in an actual default argument.
       entry ||= caller[1]
-      info = entry.scan(/^(.*?):(-?.*?)(?::.*`(.+)')?$/).first
+      info = entry.scan(/^((?:[A-Za-z]:)?.*?):(-?.*?)(?::.*`(.+)')?$/).first
       info[1] = info[1].to_i
       # This is added by Rubinius to designate a block, but we don't care about it.
       info[2].sub!(/ \{\}\Z/, '') if info[2]
@@ -667,7 +667,18 @@ module Sass
     # @return [Pathanme]
     def realpath(path)
       path = Pathname.new(path) unless path.is_a?(Pathname)
-      pathname(path.realpath.to_s)
+
+      # Explicitly DON'T run #pathname here. We don't want to convert
+      # to Windows directory separators because we're comparing these
+      # against the paths returned by Listen, which use forward
+      # slashes everywhere.
+      begin
+        path.realpath
+      rescue SystemCallError
+        # If [path] doesn't actually exist, don't bail, just
+        # return the original.
+        path
+      end
     end
 
     # Converts `path` to a "file:" URI. This handles Windows paths correctly.
@@ -676,13 +687,29 @@ module Sass
     # @return [String]
     def file_uri_from_path(path)
       path = path.to_s if path.is_a?(Pathname)
+      path = path.tr('\\', '/') if windows?
       path = Sass::Util.escape_uri(path)
       return path.start_with?('/') ? "file://" + path : path unless windows?
       return "file:///" + path.tr("\\", "/") if path =~ /^[a-zA-Z]:[\/\\]/
-      return "file://" + path.tr("\\", "/") if path =~ /\\\\[^\\]+\\[^\\\/]+/
+      return "file:" + path.tr("\\", "/") if path =~ /\\\\[^\\]+\\[^\\\/]+/
       path.tr("\\", "/")
     end
 
+    # Retries a filesystem operation if it fails on Windows. Windows
+    # has weird and flaky locking rules that can cause operations to fail.
+    #
+    # @yield [] The filesystem operation.
+    def retry_on_windows
+      return yield unless windows?
+
+      begin
+        yield
+      rescue SystemCallError
+        sleep 0.1
+        yield
+      end
+    end
+
     # Prepare a value for a destructuring assignment (e.g. `a, b =
     # val`). This works around a performance bug when using
     # ActiveSupport, and only needs to be called when `val` is likely

data/test/sass/plugin_test.rb

@@ -29,8 +29,8 @@ class SassPluginTest < MiniTest::Test
   @@cache_store = Sass::CacheStores::Memory.new
 
   def setup
-    FileUtils.mkdir_p tempfile_loc
-    FileUtils.mkdir_p tempfile_loc(nil,"more_")
+    Sass::Util.retry_on_windows {FileUtils.mkdir_p tempfile_loc}
+    Sass::Util.retry_on_windows {FileUtils.mkdir_p tempfile_loc(nil,"more_")}
     set_plugin_opts
     check_for_updates!
     reset_mtimes
@@ -39,8 +39,8 @@ class SassPluginTest < MiniTest::Test
   def teardown
     clean_up_sassc
     Sass::Plugin.reset!
-    FileUtils.rm_r tempfile_loc
-    FileUtils.rm_r tempfile_loc(nil,"more_")
+    Sass::Util.retry_on_windows {FileUtils.rm_r tempfile_loc}
+    Sass::Util.retry_on_windows {FileUtils.rm_r tempfile_loc(nil,"more_")}
   end
 
   @@templates.each do |name|
@@ -501,7 +501,9 @@ WARNING
     Sass::Plugin::StalenessChecker.dependencies_cache = {}
     atime = Time.now
     mtime = Time.now - 5
-    Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass,scss}"].each {|f| File.utime(atime, mtime, f)}
+    Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass,scss}"].each do |f|
+      Sass::Util.retry_on_windows {File.utime(atime, mtime, f)}
+    end
   end
 
   def template_loc(name = nil, prefix = nil)

data/test/sass/scss/scss_test.rb

@@ -1529,6 +1529,17 @@ SCSS
 SCSS
   end
 
+  def test_mixin_splat_too_many_args
+    assert_warning(<<WARNING) {render <<SCSS}
+WARNING: Mixin foo takes 2 arguments but 4 were passed.
+        on line 2 of #{filename_for_test(:scss)}
+This will be an error in future versions of Sass.
+WARNING
+@mixin foo($a, $b) {}
+@include foo((1, 2, 3, 4)...);
+SCSS
+  end
+
   def test_function_var_args
     assert_equal <<CSS, render(<<SCSS)
 .foo {
@@ -1950,6 +1961,17 @@ MESSAGE
 SCSS
   end
 
+  def test_function_splat_too_many_args
+    assert_warning(<<WARNING) {render <<SCSS}
+WARNING: Function foo takes 2 arguments but 4 were passed.
+        on line 2 of #{filename_for_test(:scss)}
+This will be an error in future versions of Sass.
+WARNING
+@function foo($a, $b) {@return null}
+$var: foo((1, 2, 3, 4)...);
+SCSS
+  end
+
   ## Interpolation
 
   def test_basic_selector_interpolation

data/test/sass/util_test.rb

@@ -280,10 +280,12 @@ class UtilTest < MiniTest::Test
   def test_caller_info
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, nil], caller_info("/tmp/foo.rb:12"))
+    assert_equal(["C:/tmp/foo.rb", 12, nil], caller_info("C:/tmp/foo.rb:12"))
     assert_equal(["(sass)", 12, "blah"], caller_info("(sass):12: in `blah'"))
     assert_equal(["", 12, "boop"], caller_info(":12: in `boop'"))
     assert_equal(["/tmp/foo.rb", -12, "fizzle"], caller_info("/tmp/foo.rb:-12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle {}'"))
+    assert_equal(["C:/tmp/foo.rb", 12, "fizzle"], caller_info("C:/tmp/foo.rb:12: in `fizzle {}'"))
 
     info = nested_caller_info_fn
     assert_equal(__FILE__, info[0])
@@ -426,6 +428,8 @@ WARNING
       end
       threads.each {|t| t.join}
     end
+  ensure
+    Sass::Util.retry_on_windows {File.delete filename if File.exist?(filename)}
   end
 
   def test_atomic_write_permissions

data/test/test_helper.rb

@@ -47,7 +47,7 @@ class MiniTest::Test
 
   def clean_up_sassc
     path = File.dirname(__FILE__) + "/../.sass-cache"
-    FileUtils.rm_r(path) if File.exist?(path)
+    Sass::Util.retry_on_windows {FileUtils.rm_r(path) if File.exist?(path)}
   end
 
   def assert_warning(message)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -67,310 +67,310 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
-- CONTRIBUTING
-- MIT-LICENSE
-- README.md
-- REVISION
-- Rakefile
-- VERSION
-- VERSION_DATE
-- VERSION_NAME
-- bin/sass
-- bin/sass-convert
-- bin/scss
-- extra/update_watch.rb
-- init.rb
+- rails/init.rb
 - lib/sass.rb
 - lib/sass/cache_stores.rb
-- lib/sass/cache_stores/base.rb
-- lib/sass/cache_stores/chain.rb
-- lib/sass/cache_stores/filesystem.rb
-- lib/sass/cache_stores/memory.rb
-- lib/sass/cache_stores/null.rb
-- lib/sass/callbacks.rb
-- lib/sass/css.rb
-- lib/sass/engine.rb
-- lib/sass/environment.rb
-- lib/sass/error.rb
-- lib/sass/exec.rb
-- lib/sass/exec/base.rb
-- lib/sass/exec/sass_convert.rb
-- lib/sass/exec/sass_scss.rb
-- lib/sass/features.rb
-- lib/sass/importers.rb
-- lib/sass/importers/base.rb
-- lib/sass/importers/filesystem.rb
-- lib/sass/logger.rb
-- lib/sass/logger/base.rb
-- lib/sass/logger/log_level.rb
-- lib/sass/media.rb
-- lib/sass/plugin.rb
 - lib/sass/plugin/compiler.rb
-- lib/sass/plugin/configuration.rb
-- lib/sass/plugin/generic.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/staleness_checker.rb
-- lib/sass/railtie.rb
-- lib/sass/repl.rb
-- lib/sass/root.rb
-- lib/sass/script.rb
-- lib/sass/script/css_lexer.rb
-- lib/sass/script/css_parser.rb
-- lib/sass/script/functions.rb
-- lib/sass/script/lexer.rb
-- lib/sass/script/parser.rb
-- lib/sass/script/tree.rb
-- lib/sass/script/tree/funcall.rb
-- lib/sass/script/tree/interpolation.rb
-- lib/sass/script/tree/list_literal.rb
-- lib/sass/script/tree/literal.rb
-- lib/sass/script/tree/map_literal.rb
-- lib/sass/script/tree/node.rb
-- lib/sass/script/tree/operation.rb
-- lib/sass/script/tree/selector.rb
-- lib/sass/script/tree/string_interpolation.rb
-- lib/sass/script/tree/unary_operation.rb
-- lib/sass/script/tree/variable.rb
-- lib/sass/script/value.rb
-- lib/sass/script/value/arg_list.rb
-- lib/sass/script/value/base.rb
-- lib/sass/script/value/bool.rb
-- lib/sass/script/value/color.rb
-- lib/sass/script/value/helpers.rb
-- lib/sass/script/value/list.rb
-- lib/sass/script/value/map.rb
-- lib/sass/script/value/null.rb
-- lib/sass/script/value/number.rb
-- lib/sass/script/value/string.rb
-- lib/sass/scss.rb
-- lib/sass/scss/css_parser.rb
-- lib/sass/scss/parser.rb
-- lib/sass/scss/rx.rb
-- lib/sass/scss/script_lexer.rb
-- lib/sass/scss/script_parser.rb
-- lib/sass/scss/static_parser.rb
-- lib/sass/selector.rb
-- lib/sass/selector/abstract_sequence.rb
-- lib/sass/selector/comma_sequence.rb
-- lib/sass/selector/pseudo.rb
-- lib/sass/selector/sequence.rb
-- lib/sass/selector/simple.rb
-- lib/sass/selector/simple_sequence.rb
-- lib/sass/shared.rb
-- lib/sass/source/map.rb
-- lib/sass/source/position.rb
-- lib/sass/source/range.rb
-- lib/sass/stack.rb
+- lib/sass/plugin/configuration.rb
+- lib/sass/plugin/generic.rb
+- lib/sass/version.rb
 - lib/sass/supports.rb
-- lib/sass/tree/at_root_node.rb
+- lib/sass/media.rb
+- lib/sass/stack.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/trace_node.rb
+- lib/sass/tree/return_node.rb
+- lib/sass/tree/root_node.rb
+- lib/sass/tree/keyframe_rule_node.rb
+- lib/sass/tree/if_node.rb
 - lib/sass/tree/charset_node.rb
-- lib/sass/tree/comment_node.rb
-- lib/sass/tree/content_node.rb
 - lib/sass/tree/css_import_node.rb
-- lib/sass/tree/debug_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/at_root_node.rb
+- lib/sass/tree/node.rb
+- lib/sass/tree/mixin_node.rb
 - lib/sass/tree/error_node.rb
 - lib/sass/tree/extend_node.rb
-- lib/sass/tree/for_node.rb
-- lib/sass/tree/function_node.rb
-- lib/sass/tree/if_node.rb
-- lib/sass/tree/import_node.rb
-- lib/sass/tree/keyframe_rule_node.rb
-- lib/sass/tree/media_node.rb
 - lib/sass/tree/mixin_def_node.rb
-- lib/sass/tree/mixin_node.rb
-- lib/sass/tree/node.rb
-- lib/sass/tree/prop_node.rb
-- lib/sass/tree/return_node.rb
-- lib/sass/tree/root_node.rb
-- lib/sass/tree/rule_node.rb
 - lib/sass/tree/supports_node.rb
-- lib/sass/tree/trace_node.rb
-- lib/sass/tree/variable_node.rb
-- lib/sass/tree/visitors/base.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/convert.rb
-- lib/sass/tree/visitors/cssize.rb
 - lib/sass/tree/visitors/deep_copy.rb
 - lib/sass/tree/visitors/extend.rb
-- lib/sass/tree/visitors/perform.rb
 - lib/sass/tree/visitors/set_options.rb
-- lib/sass/tree/visitors/to_css.rb
+- lib/sass/tree/visitors/cssize.rb
+- lib/sass/tree/visitors/convert.rb
+- lib/sass/tree/visitors/base.rb
+- lib/sass/tree/content_node.rb
+- lib/sass/tree/comment_node.rb
 - lib/sass/tree/warn_node.rb
-- lib/sass/tree/while_node.rb
-- lib/sass/util.rb
-- lib/sass/util/cross_platform_random.rb
-- lib/sass/util/multibyte_string_scanner.rb
+- lib/sass/tree/debug_node.rb
+- lib/sass/tree/prop_node.rb
+- lib/sass/tree/variable_node.rb
+- lib/sass/engine.rb
+- lib/sass/exec/sass_scss.rb
+- lib/sass/exec/base.rb
+- lib/sass/exec/sass_convert.rb
+- lib/sass/plugin.rb
+- lib/sass/root.rb
+- lib/sass/features.rb
+- lib/sass/importers.rb
+- lib/sass/source/map.rb
+- lib/sass/source/range.rb
+- lib/sass/source/position.rb
+- lib/sass/logger.rb
 - lib/sass/util/normalized_map.rb
+- lib/sass/util/test.rb
+- lib/sass/util/cross_platform_random.rb
 - lib/sass/util/ordered_hash.rb
+- lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb
-- lib/sass/util/test.rb
-- lib/sass/version.rb
-- rails/init.rb
-- test/sass/cache_test.rb
-- test/sass/callbacks_test.rb
-- test/sass/compiler_test.rb
-- test/sass/conversion_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/data/hsl-rgb.txt
-- test/sass/encoding_test.rb
-- test/sass/engine_test.rb
-- test/sass/exec_test.rb
-- test/sass/extend_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/importer_test.rb
-- test/sass/logger_test.rb
-- test/sass/mock_importer.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/more_templates/_more_partial.sass
-- test/sass/more_templates/more1.sass
-- test/sass/more_templates/more_import.sass
-- test/sass/plugin_test.rb
-- test/sass/results/alt.css
-- test/sass/results/basic.css
-- test/sass/results/cached_import_option.css
-- test/sass/results/compact.css
-- test/sass/results/complex.css
-- test/sass/results/compressed.css
-- test/sass/results/expanded.css
-- test/sass/results/filename_fn.css
-- test/sass/results/if.css
-- test/sass/results/import.css
-- test/sass/results/import_charset.css
-- test/sass/results/import_charset_1_8.css
-- test/sass/results/import_charset_ibm866.css
-- test/sass/results/import_content.css
-- test/sass/results/line_numbers.css
-- test/sass/results/mixins.css
-- test/sass/results/multiline.css
-- test/sass/results/nested.css
-- test/sass/results/options.css
-- test/sass/results/parent_ref.css
-- test/sass/results/script.css
-- test/sass/results/scss_import.css
-- test/sass/results/scss_importee.css
-- test/sass/results/subdir/nested_subdir/nested_subdir.css
-- test/sass/results/subdir/subdir.css
-- test/sass/results/units.css
-- test/sass/results/warn.css
-- test/sass/results/warn_imported.css
-- test/sass/script_conversion_test.rb
-- test/sass/script_test.rb
-- test/sass/scss/css_test.rb
-- test/sass/scss/rx_test.rb
-- test/sass/scss/scss_test.rb
-- test/sass/scss/test_helper.rb
-- test/sass/source_map_test.rb
-- test/sass/superselector_test.rb
-- test/sass/templates/_cached_import_option_partial.scss
-- test/sass/templates/_double_import_loop2.sass
-- test/sass/templates/_filename_fn_import.scss
-- test/sass/templates/_imported_charset_ibm866.sass
-- test/sass/templates/_imported_charset_utf8.sass
-- test/sass/templates/_imported_content.sass
-- test/sass/templates/_partial.sass
-- test/sass/templates/_same_name_different_partiality.scss
-- test/sass/templates/alt.sass
-- test/sass/templates/basic.sass
-- test/sass/templates/bork1.sass
-- test/sass/templates/bork2.sass
-- test/sass/templates/bork3.sass
-- test/sass/templates/bork4.sass
-- test/sass/templates/bork5.sass
-- test/sass/templates/cached_import_option.scss
-- test/sass/templates/compact.sass
-- test/sass/templates/complex.sass
-- test/sass/templates/compressed.sass
-- test/sass/templates/double_import_loop1.sass
-- test/sass/templates/expanded.sass
-- test/sass/templates/filename_fn.scss
-- test/sass/templates/if.sass
-- test/sass/templates/import.sass
-- test/sass/templates/import_charset.sass
-- test/sass/templates/import_charset_1_8.sass
-- test/sass/templates/import_charset_ibm866.sass
-- test/sass/templates/import_content.sass
-- test/sass/templates/importee.less
-- test/sass/templates/importee.sass
-- test/sass/templates/line_numbers.sass
-- test/sass/templates/mixin_bork.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/multiline.sass
-- test/sass/templates/nested.sass
-- test/sass/templates/nested_bork1.sass
-- test/sass/templates/nested_bork2.sass
-- test/sass/templates/nested_bork3.sass
-- test/sass/templates/nested_bork4.sass
-- test/sass/templates/nested_import.sass
-- test/sass/templates/nested_mixin_bork.sass
-- test/sass/templates/options.sass
-- test/sass/templates/parent_ref.sass
-- test/sass/templates/same_name_different_ext.sass
-- test/sass/templates/same_name_different_ext.scss
-- test/sass/templates/same_name_different_partiality.scss
-- test/sass/templates/script.sass
-- test/sass/templates/scss_import.scss
-- test/sass/templates/scss_importee.scss
-- test/sass/templates/single_import_loop.sass
-- test/sass/templates/subdir/import_up1.scss
-- test/sass/templates/subdir/import_up2.scss
-- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/subdir/subdir.sass
-- test/sass/templates/units.sass
-- test/sass/templates/warn.sass
-- test/sass/templates/warn_imported.sass
-- test/sass/test_helper.rb
-- test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/util/normalized_map_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util_test.rb
-- test/sass/value_helpers_test.rb
-- test/test_helper.rb
-- vendor/listen/CHANGELOG.md
+- lib/sass/scss.rb
+- lib/sass/scss/static_parser.rb
+- lib/sass/scss/parser.rb
+- lib/sass/scss/script_lexer.rb
+- lib/sass/scss/rx.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/parser.rb
+- lib/sass/script/functions.rb
+- lib/sass/script/tree/variable.rb
+- lib/sass/script/tree/operation.rb
+- lib/sass/script/tree/funcall.rb
+- lib/sass/script/tree/literal.rb
+- lib/sass/script/tree/string_interpolation.rb
+- lib/sass/script/tree/interpolation.rb
+- lib/sass/script/tree/list_literal.rb
+- lib/sass/script/tree/node.rb
+- lib/sass/script/tree/unary_operation.rb
+- lib/sass/script/tree/selector.rb
+- lib/sass/script/tree/map_literal.rb
+- lib/sass/script/tree.rb
+- lib/sass/script/lexer.rb
+- lib/sass/script/css_lexer.rb
+- lib/sass/script/value.rb
+- lib/sass/script/value/color.rb
+- lib/sass/script/value/number.rb
+- lib/sass/script/value/map.rb
+- lib/sass/script/value/arg_list.rb
+- lib/sass/script/value/bool.rb
+- lib/sass/script/value/list.rb
+- lib/sass/script/value/helpers.rb
+- lib/sass/script/value/null.rb
+- lib/sass/script/value/string.rb
+- lib/sass/script/value/base.rb
+- lib/sass/script/css_parser.rb
+- lib/sass/selector.rb
+- lib/sass/callbacks.rb
+- lib/sass/selector/simple.rb
+- lib/sass/selector/pseudo.rb
+- lib/sass/selector/sequence.rb
+- lib/sass/selector/abstract_sequence.rb
+- lib/sass/selector/comma_sequence.rb
+- lib/sass/selector/simple_sequence.rb
+- lib/sass/railtie.rb
+- lib/sass/environment.rb
+- lib/sass/exec.rb
+- vendor/listen/README.md
 - vendor/listen/CONTRIBUTING.md
-- vendor/listen/Gemfile
 - vendor/listen/Guardfile
-- vendor/listen/LICENSE
-- vendor/listen/README.md
-- vendor/listen/Rakefile
-- vendor/listen/Vagrantfile
-- vendor/listen/lib/listen.rb
-- vendor/listen/lib/listen/adapter.rb
-- vendor/listen/lib/listen/adapters/bsd.rb
+- vendor/listen/Gemfile
+- vendor/listen/lib/listen/turnstile.rb
+- vendor/listen/lib/listen/directory_record.rb
+- vendor/listen/lib/listen/version.rb
+- vendor/listen/lib/listen/listener.rb
+- vendor/listen/lib/listen/adapters/polling.rb
 - vendor/listen/lib/listen/adapters/darwin.rb
 - vendor/listen/lib/listen/adapters/linux.rb
-- vendor/listen/lib/listen/adapters/polling.rb
+- vendor/listen/lib/listen/adapters/bsd.rb
 - vendor/listen/lib/listen/adapters/windows.rb
-- vendor/listen/lib/listen/directory_record.rb
-- vendor/listen/lib/listen/listener.rb
-- vendor/listen/lib/listen/turnstile.rb
-- vendor/listen/lib/listen/version.rb
+- vendor/listen/lib/listen/adapter.rb
+- vendor/listen/lib/listen.rb
+- vendor/listen/CHANGELOG.md
+- vendor/listen/Rakefile
+- vendor/listen/LICENSE
 - vendor/listen/listen.gemspec
-- vendor/listen/spec/listen/adapter_spec.rb
-- vendor/listen/spec/listen/adapters/bsd_spec.rb
-- vendor/listen/spec/listen/adapters/darwin_spec.rb
+- vendor/listen/Vagrantfile
+- vendor/listen/spec/listen/directory_record_spec.rb
 - vendor/listen/spec/listen/adapters/linux_spec.rb
+- vendor/listen/spec/listen/adapters/darwin_spec.rb
+- vendor/listen/spec/listen/adapters/bsd_spec.rb
 - vendor/listen/spec/listen/adapters/polling_spec.rb
 - vendor/listen/spec/listen/adapters/windows_spec.rb
-- vendor/listen/spec/listen/directory_record_spec.rb
-- vendor/listen/spec/listen/listener_spec.rb
 - vendor/listen/spec/listen/turnstile_spec.rb
+- vendor/listen/spec/listen/adapter_spec.rb
+- vendor/listen/spec/listen/listener_spec.rb
 - vendor/listen/spec/listen_spec.rb
 - vendor/listen/spec/spec_helper.rb
-- vendor/listen/spec/support/adapter_helper.rb
 - vendor/listen/spec/support/directory_record_helper.rb
-- vendor/listen/spec/support/fixtures_helper.rb
 - vendor/listen/spec/support/listeners_helper.rb
+- vendor/listen/spec/support/adapter_helper.rb
 - vendor/listen/spec/support/platform_helper.rb
+- vendor/listen/spec/support/fixtures_helper.rb
+- bin/sass-convert
+- bin/scss
+- bin/sass
+- test/test_helper.rb
+- test/sass/engine_test.rb
+- test/sass/functions_test.rb
+- test/sass/value_helpers_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/compiler_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/templates/_filename_fn_import.scss
+- test/sass/templates/basic.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/import_up2.scss
+- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
+- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/subdir/import_up1.scss
+- test/sass/templates/_imported_content.sass
+- test/sass/templates/filename_fn.scss
+- test/sass/templates/alt.sass
+- test/sass/templates/nested_bork1.sass
+- test/sass/templates/same_name_different_partiality.scss
+- 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/_cached_import_option_partial.scss
+- test/sass/templates/scss_importee.scss
+- test/sass/templates/line_numbers.sass
+- test/sass/templates/expanded.sass
+- test/sass/templates/bork3.sass
+- test/sass/templates/bork5.sass
+- test/sass/templates/import_content.sass
+- test/sass/templates/warn_imported.sass
+- test/sass/templates/import_charset_ibm866.sass
+- 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/_same_name_different_partiality.scss
+- test/sass/templates/multiline.sass
+- test/sass/templates/_imported_charset_ibm866.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/same_name_different_ext.scss
+- test/sass/templates/bork4.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/same_name_different_ext.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/cached_import_option.scss
+- test/sass/templates/_imported_charset_utf8.sass
+- test/sass/conversion_test.rb
+- test/sass/script_test.rb
+- test/sass/exec_test.rb
+- test/sass/util/subset_map_test.rb
+- test/sass/util/multibyte_string_scanner_test.rb
+- test/sass/util/normalized_map_test.rb
+- test/sass/callbacks_test.rb
+- 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/compact.css
+- test/sass/results/import_content.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/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/cached_import_option.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/filename_fn.css
+- test/sass/results/import.css
+- 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/superselector_test.rb
+- test/sass/encoding_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/source_map_test.rb
+- test/sass/plugin_test.rb
+- extra/update_watch.rb
+- Rakefile
+- init.rb
+- .yardopts
+- README.md
+- VERSION_NAME
+- VERSION_DATE
+- REVISION
+- MIT-LICENSE
+- VERSION
+- CONTRIBUTING
 homepage: http://sass-lang.com/
 licenses:
 - MIT
@@ -391,33 +391,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files:
+- test/sass/engine_test.rb
+- test/sass/functions_test.rb
 - test/sass/value_helpers_test.rb
+- test/sass/extend_test.rb
+- test/sass/logger_test.rb
+- test/sass/compiler_test.rb
+- test/sass/css2sass_test.rb
 - test/sass/conversion_test.rb
-- test/sass/cache_test.rb
 - test/sass/script_test.rb
-- test/sass/superselector_test.rb
+- test/sass/exec_test.rb
+- test/sass/util/subset_map_test.rb
+- test/sass/util/multibyte_string_scanner_test.rb
+- test/sass/util/normalized_map_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/source_map_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/util_test.rb
-- test/sass/plugin_test.rb
-- test/sass/extend_test.rb
-- test/sass/scss/rx_test.rb
+- test/sass/importer_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/logger_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/superselector_test.rb
 - test/sass/encoding_test.rb
-- test/sass/engine_test.rb
-- test/sass/exec_test.rb
-- test/sass/util/normalized_map_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/functions_test.rb
-- test/sass/compiler_test.rb
-- test/sass/css2sass_test.rb
+- test/sass/cache_test.rb
+- test/sass/source_map_test.rb
+- test/sass/plugin_test.rb