sass 3.2.13 → 3.2.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7a4a53d425f63e866a0453d81e4d1686e1ef626b
+  data.tar.gz: e0c059b58cfea6c65015b0a63653df3fdf46a7ea
+SHA512:
+  metadata.gz: 7f2361044b41e61aaff33e92feeff8c8c2f834b2ef78b6662062cfa88a58138367ff38ab3078dba83ade07e7c41ac53cffd34d34feeb108b965b9db3ec9702de
+  data.tar.gz: 1a818352f93ba1bfaab6c470b57c7c103cc985e1a0d9aec7a8e864c7aab05aa924ddf999942aa83fb3e5bad9334a925e190595dd5de0fa33edc11c06bd851aaf

data/Rakefile

@@ -1,3 +1,5 @@
+require 'rubygems/package'
+
 # ----- Utility Functions -----
 
 def scope(path)
@@ -28,7 +30,7 @@ task :package => [:revision_file, :date_file, :submodules, :permissions] do
   version = get_version
   File.open(scope('VERSION'), 'w') {|f| f.puts(version)}
   load scope('sass.gemspec')
-  Gem::Builder.new(SASS_GEMSPEC).build
+  Gem::Package.build(SASS_GEMSPEC)
   sh %{git checkout VERSION}
 
   pkg = "#{SASS_GEMSPEC.name}-#{SASS_GEMSPEC.version}"

data/VERSION

@@ -1 +1 @@
-3.2.13
+3.2.14

data/VERSION_DATE

@@ -1 +1 @@
-20 December 2013 04:00:49 UTC
+25 January 2014 03:28:39 UTC

data/lib/sass/engine.rb

@@ -712,6 +712,8 @@ WARNING
       when 'media'
         parser = Sass::SCSS::Parser.new(value, @options[:filename], @line)
         Tree::MediaNode.new(parser.parse_media_query_list.to_a)
+      when nil
+        raise SyntaxError.new("Invalid directive: '@'.")
       else
         unprefixed_directive = directive.gsub(/^-[a-z0-9]+-/i, '')
         if unprefixed_directive == 'supports'

data/lib/sass/importers/filesystem.rb

@@ -122,7 +122,7 @@ module Sass
           path = (dir == "." || Pathname.new(f).absolute?) ? f : "#{escape_glob_characters(dir)}/#{f}"
           Dir[path].map do |full_path|
             full_path.gsub!(REDUNDANT_DIRECTORY, File::SEPARATOR)
-            [full_path, s]
+            [Pathname.new(full_path).cleanpath.to_s, s]
           end
         end
         found = Sass::Util.flatten(found, 1)
@@ -181,10 +181,6 @@ WARNING
         options[:importer] = self
         Sass::Engine.new(File.read(full_filename), options)
       end
-
-      def join(base, path)
-        Pathname.new(base).join(path).to_s
-      end
     end
   end
 end

data/lib/sass/script/lexer.rb

@@ -69,8 +69,7 @@ module Sass
 
       TOKEN_NAMES = Sass::Util.map_hash(OPERATORS_REVERSE) {|k, v| [k, v.inspect]}.merge({
           :const => "variable (e.g. $foo)",
-          :ident => "identifier (e.g. middle)",
-          :bool => "boolean (e.g. true, false)",
+          :ident => "identifier (e.g. middle)"
         })
 
       # A list of operator strings ordered with longer names first
@@ -90,8 +89,6 @@ module Sass
         :ident => /(#{IDENT})(\()?/,
         :number => /(-)?(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
         :color => HEXCOLOR,
-        :bool => /(true|false)\b/,
-        :null => /null\b/,
         :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|\Z)")})})},
         :op => %r{(#{Regexp.union(*OP_NAMES)})},
       }
@@ -235,9 +232,9 @@ module Sass
           return string(interp_type, true)
         end
 
-        variable || string(:double, false) || string(:single, false) || number ||
-          color || bool || null || string(:uri, false) || raw(UNICODERANGE) ||
-          special_fun || special_val || ident_op || ident || op
+        variable || string(:double, false) || string(:single, false) || number || color ||
+          string(:uri, false) || raw(UNICODERANGE) || special_fun || special_val || ident_op ||
+          ident || op
       end
 
       def variable
@@ -287,16 +284,6 @@ MESSAGE
         [:color, Script::Color.new(value)]
       end
 
-      def bool
-        return unless s = scan(REGULAR_EXPRESSIONS[:bool])
-        [:bool, Script::Bool.new(s == 'true')]
-      end
-
-      def null
-        return unless scan(REGULAR_EXPRESSIONS[:null])
-        [:null, Script::Null.new]
-      end
-
       def special_fun
         return unless str1 = scan(/((-[\w-]+-)?(calc|element)|expression|progid:[a-z\.]*)\(/i)
         str2, _ = Sass::Shared.balance(@scanner, ?(, ?), 1)

data/lib/sass/script/parser.rb

@@ -321,9 +321,16 @@ RUBY
 
         name = @lexer.next
         if color = Color::COLOR_NAMES[name.value.downcase]
-          return node(Color.new(color))
+          node(Color.new(color))
+        elsif name.value == "true"
+          node(Script::Bool.new(true))
+        elsif name.value == "false"
+          node(Script::Bool.new(false))
+        elsif name.value == "null"
+          node(Script::Null.new)
+        else
+          node(Script::String.new(name.value, :identifier))
         end
-        node(Script::String.new(name.value, :identifier))
       end
 
       def funcall
@@ -453,7 +460,7 @@ RUBY
       end
 
       def literal
-        (t = try_tok(:color, :bool, :null)) && (return t.value)
+        (t = try_tok(:color)) && (return t.value)
       end
 
       # It would be possible to have unified #assert and #try methods,

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

@@ -73,17 +73,29 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
         node.children.unshift charset if charset
       end
 
-      imports = Sass::Util.extract!(node.children) do |c|
-        c.is_a?(Sass::Tree::DirectiveNode) && !c.is_a?(Sass::Tree::MediaNode) &&
-          c.resolved_value =~ /^@import /i
+      imports_to_move = []
+      import_limit = nil
+      i = -1
+      node.children.reject! do |n|
+        i += 1
+        if import_limit
+          next false unless n.is_a?(Sass::Tree::CssImportNode)
+          imports_to_move << n
+          next true
+        end
+
+        if !n.is_a?(Sass::Tree::CommentNode) &&
+            !n.is_a?(Sass::Tree::CharsetNode) &&
+            !n.is_a?(Sass::Tree::CssImportNode)
+          import_limit = i
+        end
+
+        false
       end
-      charset_and_index = Sass::Util.ruby1_8? &&
-        node.children.each_with_index.find {|c, _| c.is_a?(Sass::Tree::CharsetNode)}
-      if charset_and_index
-        index = charset_and_index.last
-        node.children = node.children[0..index] + imports + node.children[index+1..-1]
-      else
-        node.children = imports + node.children
+
+      if import_limit
+        node.children = node.children[0...import_limit] + imports_to_move +
+          node.children[import_limit..-1]
       end
     end
 

data/test/sass/engine_test.rb

@@ -158,6 +158,7 @@ MSG
     "a\n  b:\n    c\n    d" => ["Illegal nesting: Only properties may be nested beneath properties.", 3],
     "& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  b: c\n& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 3],
+    "@" => "Invalid directive: '@'.",
   }
 
   def teardown

data/test/sass/plugin_test.rb

@@ -164,6 +164,20 @@ CSS
     end
   end
 
+  def test_import_name_cleanup
+    File.delete(tempfile_loc('subdir/import_up1'))
+    check_for_updates!
+    File.open(tempfile_loc('subdir/import_up1')) do |file|
+      assert_equal(<<CSS.strip, file.read.split("\n")[0...5].join("\n"))
+/*
+Syntax error: File to import not found or unreadable: ../subdir/import_up3.scss.
+              Load path: #{template_loc}
+        on line 1 of #{template_loc 'subdir/import_up2'}
+        from line 1 of #{template_loc 'subdir/import_up1'}
+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/script_test.rb

@@ -541,6 +541,13 @@ end
     assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
   end
 
+  def test_funcall_has_higher_precedence_than_true_false_null
+    assert_equal "teal(12)", resolve("teal(12)")
+    assert_equal "tealbang(12)", resolve("tealbang(12)")
+    assert_equal "teal-bang(12)", resolve("teal-bang(12)")
+    assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
+  end
+
   def test_interpolation_after_hash
     assert_equal "#2", resolve('"##{1 + 1}"')
   end

data/test/sass/scss/scss_test.rb

@@ -322,6 +322,44 @@ SCSS
     assert_equal("@import url(fonts.sass);\n", render("@import url(fonts.sass);"))
   end
 
+  def test_css_import_doesnt_move_through_comments
+    assert_equal <<CSS, render(<<SCSS)
+/* Comment 1 */
+@import url("foo.css");
+/* Comment 2 */
+@import url("bar.css");
+CSS
+/* Comment 1 */
+@import url("foo.css");
+
+/* Comment 2 */
+@import url("bar.css");
+SCSS
+  end
+
+  def test_css_import_movement_stops_at_comments
+    assert_equal <<CSS, render(<<SCSS)
+/* Comment 1 */
+@import url("foo.css");
+/* Comment 2 */
+@import url("bar.css");
+.foo {
+  a: b; }
+
+/* Comment 3 */
+CSS
+/* Comment 1 */
+@import url("foo.css");
+
+/* Comment 2 */
+
+.foo {a: b}
+
+/* Comment 3 */
+@import url("bar.css");
+SCSS
+  end
+
   def test_block_comment_in_script
     assert_equal <<CSS, render(<<SCSS)
 foo {

data/test/sass/templates/subdir/import_up1.scss

@@ -0,0 +1 @@
+@import "../subdir/import_up2.scss";

data/test/sass/templates/subdir/import_up2.scss

@@ -0,0 +1 @@
+@import "../subdir/import_up3.scss";

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.2.13
-  prerelease: 
+  version: 3.2.14
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -11,44 +10,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.9
-description: ! "      Sass makes CSS fun again. Sass is an extension of CSS3, adding\n
-  \     nested rules, variables, mixins, selector inheritance, and more.\n      It's
-  translated to well-formatted, standard CSS using the\n      command line tool or
-  a web-framework plugin.\n"
+description: |2
+        Sass makes CSS fun again. Sass is an extension of CSS3, adding
+        nested rules, variables, mixins, selector inheritance, and more.
+        It's translated to well-formatted, standard CSS using the
+        command line tool or a web-framework plugin.
 email: sass-lang@googlegroups.com
 executables:
 - sass
@@ -57,327 +53,328 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- rails/init.rb
+- .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
 - lib/sass.rb
 - lib/sass/cache_stores.rb
-- lib/sass/plugin/compiler.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/version.rb
-- lib/sass/supports.rb
-- lib/sass/media.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/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/if_node.rb
-- lib/sass/tree/charset_node.rb
-- lib/sass/tree/css_import_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/supports_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/extend.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/content_node.rb
-- lib/sass/tree/comment_node.rb
-- lib/sass/tree/warn_node.rb
-- lib/sass/tree/debug_node.rb
-- lib/sass/tree/prop_node.rb
-- lib/sass/tree/variable_node.rb
+- lib/sass/callbacks.rb
+- lib/sass/css.rb
 - lib/sass/engine.rb
-- lib/sass/plugin.rb
-- lib/sass/root.rb
+- lib/sass/environment.rb
+- lib/sass/error.rb
+- lib/sass/exec.rb
 - lib/sass/importers.rb
+- lib/sass/importers/base.rb
+- lib/sass/importers/filesystem.rb
 - lib/sass/logger.rb
-- lib/sass/util/test.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/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/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/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/util.rb
-- lib/sass/importers/filesystem.rb
-- lib/sass/importers/base.rb
+- lib/sass/script/arg_list.rb
+- lib/sass/script/bool.rb
 - lib/sass/script/color.rb
-- lib/sass/script/variable.rb
-- lib/sass/script/operation.rb
+- lib/sass/script/css_lexer.rb
+- lib/sass/script/css_parser.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/arg_list.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/literal.rb
+- lib/sass/script/node.rb
 - lib/sass/script/null.rb
+- lib/sass/script/number.rb
+- lib/sass/script/operation.rb
+- lib/sass/script/parser.rb
 - lib/sass/script/string.rb
-- lib/sass/script/css_parser.rb
+- lib/sass/script/string_interpolation.rb
+- lib/sass/script/unary_operation.rb
+- lib/sass/script/variable.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/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/selector/sequence.rb
+- lib/sass/selector/simple.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/Guardfile
-- 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/dependency_manager.rb
-- vendor/listen/lib/listen/multi_listener.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/bsd.rb
-- vendor/listen/lib/listen/adapters/windows.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/Vagrantfile
-- vendor/listen/spec/listen/dependency_manager_spec.rb
-- 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/turnstile_spec.rb
-- vendor/listen/spec/listen/adapter_spec.rb
-- vendor/listen/spec/listen/listener_spec.rb
-- vendor/listen/spec/listen/multi_listener_spec.rb
-- vendor/listen/spec/listen_spec.rb
-- vendor/listen/spec/spec_helper.rb
-- vendor/listen/spec/support/directory_record_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
+- lib/sass/shared.rb
+- lib/sass/supports.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/directive_node.rb
+- lib/sass/tree/each_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/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/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/warn_node.rb
+- lib/sass/tree/while_node.rb
+- lib/sass/util.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/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/cache_test.rb
+- test/sass/callbacks_test.rb
+- test/sass/conversion_test.rb
+- test/sass/css2sass_test.rb
 - test/sass/data/hsl-rgb.txt
+- 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/css2sass_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/templates/_cached_import_option_partial.scss
+- test/sass/templates/_double_import_loop2.sass
 - 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/nested_subdir/_nested_partial.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/_imported_charset_ibm866.sass
+- test/sass/templates/_imported_charset_utf8.sass
 - test/sass/templates/_imported_content.sass
-- test/sass/templates/filename_fn.scss
+- test/sass/templates/_partial.sass
+- test/sass/templates/_same_name_different_partiality.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/basic.sass
 - test/sass/templates/bork1.sass
-- test/sass/templates/warn.sass
 - test/sass/templates/bork2.sass
-- test/sass/templates/nested.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/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/complex.sass
+- test/sass/templates/compressed.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/expanded.sass
+- test/sass/templates/filename_fn.scss
 - test/sass/templates/if.sass
-- test/sass/templates/_partial.sass
-- test/sass/templates/nested_mixin_bork.sass
+- test/sass/templates/import.sass
+- test/sass/templates/import_charset.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/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/compressed.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/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/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/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/subset_map_test.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/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
-- README.md
-- VERSION_NAME
-- VERSION_DATE
-- REVISION
-- MIT-LICENSE
-- VERSION
-- CONTRIBUTING
+- test/test_helper.rb
+- vendor/listen/CHANGELOG.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/lib/listen/adapters/darwin.rb
+- vendor/listen/lib/listen/adapters/linux.rb
+- vendor/listen/lib/listen/adapters/polling.rb
+- vendor/listen/lib/listen/adapters/windows.rb
+- vendor/listen/lib/listen/dependency_manager.rb
+- vendor/listen/lib/listen/directory_record.rb
+- vendor/listen/lib/listen/listener.rb
+- vendor/listen/lib/listen/multi_listener.rb
+- vendor/listen/lib/listen/turnstile.rb
+- vendor/listen/lib/listen/version.rb
+- 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/spec/listen/adapters/linux_spec.rb
+- vendor/listen/spec/listen/adapters/polling_spec.rb
+- vendor/listen/spec/listen/adapters/windows_spec.rb
+- vendor/listen/spec/listen/dependency_manager_spec.rb
+- vendor/listen/spec/listen/directory_record_spec.rb
+- vendor/listen/spec/listen/listener_spec.rb
+- vendor/listen/spec/listen/multi_listener_spec.rb
+- vendor/listen/spec/listen/turnstile_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/platform_helper.rb
 homepage: http://sass-lang.com/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 1.8.24
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files:
+- test/sass/util_test.rb
+- test/sass/scss/scss_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/scss/css_test.rb
+- test/sass/callbacks_test.rb
+- test/sass/cache_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/exec_test.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util/multibyte_string_scanner_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/util_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/cache_test.rb
 - test/sass/plugin_test.rb
+- test/sass/functions_test.rb
+- test/sass/extend_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/logger_test.rb
+- test/sass/importer_test.rb
+- test/sass/script_test.rb
+- test/sass/exec_test.rb