sass 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a14f29ae01795aa104c2385d85709b6267b1b6b
-  data.tar.gz: 963ba1a01ebe057c873468590e7d1a1721d4186f
+  metadata.gz: c15e8b1e1cc6aeec6cb23242ee301a9eaba9559f
+  data.tar.gz: 5938a99d15de88feb82aa2f63999ab4650c10ce8
 SHA512:
-  metadata.gz: 9383d9ce058f5fb03da4fa72a4535e211a5e1581a9f36b1394433133b63b984b3dd693f5b12781895c1c280abf3eee6266869bf557a3652d4002bd83b0d1854c
-  data.tar.gz: 0a7aa3edaf6050308a8d399672648ba41a6eaee9f2ba9517d9a99346442b07ba16fbc34b37596efb1e159a546125a53062171cc059289ff2f791b545a8fe0812
+  metadata.gz: 316cd088ed4308e05f7c32ff0a5a7ae0ab255b6ff196bf114f30a92b6c87a538294a54c332a752cd05c9de8eb81aea3342c925dfef89b1cf88ac51d26114d74d
+  data.tar.gz: c29ea469217ff7fcfa198e2e446a57a9be9bde3d848015138d0d5d307984dc6c3370659cd68d3168c2301e831f1fcb5d156712283d1a13a09eb02ae953e231c7

data/VERSION

@@ -1 +1 @@
-3.4.1
+3.4.2

data/VERSION_DATE

@@ -1 +1 @@
-23 August 2014 00:21:00 UTC
+29 August 2014 00:35:55 UTC

data/lib/sass/exec/sass_convert.rb

@@ -207,15 +207,15 @@ END
           puts_action :create, :green, output
         end
 
-        input = open_file(f)
         process_file(input, output)
       end
     end
 
     def process_file(input, output)
-      if input.is_a?(File)
+      input_path, output_path = path_for(input), path_for(output)
+      if input_path
         @options[:from] ||=
-          case input.path
+          case input_path
           when /\.scss$/; :scss
           when /\.sass$/; :sass
           when /\.less$/; raise "sass-convert no longer supports LessCSS."
@@ -225,9 +225,9 @@ END
         raise "Error: the --in-place option requires a filename."
       end
 
-      if output.is_a?(File)
+      if output_path
         @options[:to] ||=
-          case output.path
+          case output_path
           when /\.scss$/; :scss
           when /\.sass$/; :sass
           end
@@ -243,15 +243,15 @@ END
             require 'sass/css'
             Sass::CSS.new(input.read, @options[:for_tree]).render(@options[:to])
           else
-            if input.is_a?(File)
-              Sass::Engine.for_file(input.path, @options[:for_engine])
+            if input_path
+              Sass::Engine.for_file(input_path, @options[:for_engine])
             else
               Sass::Engine.new(input.read, @options[:for_engine])
             end.to_tree.send("to_#{@options[:to]}", @options[:for_tree])
           end
         end
 
-      output = input.path if @options[:in_place]
+      output = input_path if @options[:in_place]
       write_output(out, output)
     rescue Sass::SyntaxError => e
       raise e if @options[:trace]
@@ -260,5 +260,10 @@ END
     rescue LoadError => err
       handle_load_error(err)
     end
+
+    def path_for(file)
+      return file.path if file.is_a?(File)
+      return file if file.is_a?(String)
+    end
   end
 end

data/lib/sass/importers/filesystem.rb

@@ -13,6 +13,7 @@ module Sass
       #   This importer will import files relative to this path.
       def initialize(root)
         @root = File.expand_path(root)
+        @real_root = Sass::Util.realpath(@root).to_s
         @same_name_warnings = Set.new
       end
 
@@ -60,8 +61,9 @@ module Sass
 
       # @see Base#watched_file?
       def watched_file?(filename)
-        filename =~ /\.s[ac]ss$/ &&
-          filename.start_with?(root + File::SEPARATOR)
+        # Check against the root with symlinks resolved, since Listen
+        # returns fully-resolved paths.
+        filename =~ /\.s[ac]ss$/ && filename.start_with?(@real_root + File::SEPARATOR)
       end
 
       def public_url(name, sourcemap_directory)

data/lib/sass/plugin/compiler.rb

@@ -296,7 +296,7 @@ module Sass::Plugin
       directories = watched_paths
       individual_files.each do |(source, _, _)|
         source = File.expand_path(source)
-        @watched_files << source
+        @watched_files << Sass::Util.realpath(source).to_s
         directories << File.dirname(source)
       end
       directories = remove_redundant_directories(directories)

data/lib/sass/script/lexer.rb

@@ -418,8 +418,12 @@ MESSAGE
       def op
         op = scan(REGULAR_EXPRESSIONS[:op])
         return unless op
-        @interpolation_stack << nil if op == :begin_interpolation
-        [OPERATORS[op]]
+        name = OPERATORS[op]
+        if name == :begin_interpolation && !@interpolation_stack.empty?
+          [:string_interpolation]
+        else
+          [name]
+        end
       end
 
       def raw(rx)

data/lib/sass/script/parser.rb

@@ -497,7 +497,7 @@ RUBY
         first = try_tok(:special_fun)
         return paren unless first
         str = literal_node(first.value, first.source_range)
-        return str unless try_tok(:begin_interpolation)
+        return str unless try_tok(:string_interpolation)
         mid = parse_interpolated
         last = assert_expr(:special_fun)
         node(Tree::Interpolation.new(str, mid, last, false, false),
@@ -528,7 +528,7 @@ RUBY
         first = try_tok(:string)
         return number unless first
         str = literal_node(first.value, first.source_range)
-        return str unless try_tok(:begin_interpolation)
+        return str unless try_tok(:string_interpolation)
         mid = assert_expr :expr
         assert_tok :end_interpolation
         last = assert_expr(:string)

data/lib/sass/util.rb

@@ -661,6 +661,15 @@ module Sass
       pathname(path.cleanpath.to_s)
     end
 
+    # Returns `path` with all symlinks resolved.
+    #
+    # @param path [String, Pathname]
+    # @return [Pathanme]
+    def realpath(path)
+      path = Pathname.new(path) unless path.is_a?(Pathname)
+      pathname(path.realpath.to_s)
+    end
+
     # Converts `path` to a "file:" URI. This handles Windows paths correctly.
     #
     # @param path [String, Pathname]

data/test/sass/script_test.rb

@@ -963,6 +963,11 @@ SCSS
 
   # Regression Tests
 
+  def test_interpolation_after_string
+    assert_equal '"foobar" 2', resolve('"foobar" #{2}')
+    assert_equal "calc(1 + 2) 3", resolve('calc(1 + 2) #{3}')
+  end
+
   def test_repeatedly_modified_color
     assert_equal(<<CSS, render(<<SASS))
 a {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -67,310 +67,310 @@ 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/stack.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/keyframe_rule_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/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/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/exec/sass_scss.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/plugin.rb
-- lib/sass/root.rb
+- lib/sass/exec/sass_scss.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/importers/base.rb
+- lib/sass/importers/filesystem.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/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/parser.rb
+- lib/sass/script/css_lexer.rb
+- lib/sass/script/css_parser.rb
 - lib/sass/script/functions.rb
-- lib/sass/script/tree/variable.rb
-- lib/sass/script/tree/operation.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/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/literal.rb
+- lib/sass/script/tree/map_literal.rb
 - lib/sass/script/tree/node.rb
-- lib/sass/script/tree/unary_operation.rb
+- lib/sass/script/tree/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/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/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/base.rb
 - lib/sass/script/value/bool.rb
-- lib/sass/script/value/list.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/script/value/base.rb
-- lib/sass/script/css_parser.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/pseudo.rb
-- lib/sass/selector/sequence.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/railtie.rb
-- lib/sass/environment.rb
-- lib/sass/exec.rb
-- vendor/listen/README.md
+- 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/supports.rb
+- lib/sass/tree/at_root_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/directive_node.rb
+- lib/sass/tree/each_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/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/cross_platform_random.rb
+- lib/sass/util/multibyte_string_scanner.rb
+- lib/sass/util/normalized_map.rb
+- lib/sass/util/ordered_hash.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
 - 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/listener.rb
-- vendor/listen/lib/listen/adapters/polling.rb
+- 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/bsd.rb
+- vendor/listen/lib/listen/adapters/polling.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/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/listen.gemspec
-- 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/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/turnstile_spec.rb
-- vendor/listen/spec/listen/adapter_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_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.0.3
+rubygems_version: 2.2.2
 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/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/superselector_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/importer_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/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/superselector_test.rb
+- test/sass/logger_test.rb
+- test/sass/importer_test.rb
 - test/sass/encoding_test.rb
-- test/sass/cache_test.rb
-- test/sass/source_map_test.rb
-- test/sass/plugin_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