sass 3.4.4 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3fbc042c02c52b18d59b25d9c26459658baf6cf
-  data.tar.gz: faf525b9b4f1837dc790d9fdae267d0ed729b41e
+  metadata.gz: cf0926f17a403b6e66c37ae0c7bc650305f19b20
+  data.tar.gz: fd72f981a1398c5b48bbb8ff6213742908625507
 SHA512:
-  metadata.gz: 6cd8dc8c85660b360845e47b15c78218a076558e6ce0e09bbb13b4a79d2c74a72563e974189d8db5be708c30c6f04877c467a959670179b7244c4d91cd8b7c87
-  data.tar.gz: 7cd31825c789bc5744514aac91d5346b952a2286c5ea148f1cb2c1471b34769fae3df30bab1d7ffa728bb07a774a9560732fb4acb011062e6e7694f5bf8ea244
+  metadata.gz: 7693230e4871ca0d0539b56f854bfd6e4945edfc87f11179416f2521130966cf53be50986a70e65e2dbe2e00e3fe7dc9019196f354be3846d3d45f28d0d78f48
+  data.tar.gz: f3ef8096eec2b1a90f48b928167d1226edc8276eb07a23f6d1b337c6991f9799ea6bf780c9e9747155859b188791778a90032ebdb28d48a0b9c57e9586187205

data/VERSION

@@ -1 +1 @@
-3.4.4
+3.4.5

data/VERSION_DATE

@@ -1 +1 @@
-13 September 2014 00:20:07 UTC
+20 September 2014 01:03:27 UTC

data/lib/sass/exec/base.rb

@@ -18,11 +18,23 @@ module Sass::Exec
       begin
         parse
       rescue Exception => e
+        # Exit code 65 indicates invalid data per
+        # http://www.freebsd.org/cgi/man.cgi?query=sysexits. Setting it via
+        # at_exit is a bit of a hack, but it allows us to rethrow when --trace
+        # is active and get both the built-in exception formatting and the
+        # correct exit code.
+        at_exit {exit 65} if e.is_a?(Sass::SyntaxError)
+
         raise e if @options[:trace] || e.is_a?(SystemExit)
 
-        $stderr.print "#{e.class}: " unless e.class == RuntimeError
-        $stderr.puts "#{e.message}"
+        if e.is_a?(Sass::SyntaxError)
+          $stderr.puts e.sass_backtrace_str("standard input")
+        else
+          $stderr.print "#{e.class}: " unless e.class == RuntimeError
+          $stderr.puts e.message.to_s
+        end
         $stderr.puts "  Use --trace for backtrace."
+
         exit 1
       end
       exit 0

data/lib/sass/exec/sass_convert.rb

@@ -162,7 +162,7 @@ END
     end
 
     def process_directory
-      unless (input = @options[:input] = @args.shift)
+      unless @options[:input] = @args.shift
         raise "Error: directory required when using --recursive."
       end
 
@@ -207,7 +207,7 @@ END
           puts_action :create, :green, output
         end
 
-        process_file(input, output)
+        process_file(f, output)
       end
     end
 

data/lib/sass/exec/sass_scss.rb

@@ -289,6 +289,27 @@ File #{@args[1]} #{err}.
 MSG
       end
 
+      # Watch the working directory for changes without adding it to the load
+      # path. This preserves the pre-3.4 behavior when the working directory was
+      # on the load path. We should remove this when we can look for directories
+      # to watch by traversing the import graph.
+      class << Sass::Plugin.compiler
+        # We have to use a class var to make this visible to #watched_file? and
+        # #watched_paths.
+        # rubocop:disable ClassVars
+        @@working_directory = Sass::Util.realpath('.').to_s
+        # rubocop:ensable ClassVars
+
+        def watched_file?(file)
+          super(file) ||
+            (file =~ /\.s[ac]ss$/ && file.start_with?(@@working_directory + File::SEPARATOR))
+        end
+
+        def watched_paths
+          @watched_paths ||= super + [@@working_directory]
+        end
+      end
+
       dirs, files = @args.map {|name| split_colon_path(name)}.
         partition {|i, _| File.directory? i}
       files.map! do |from, to|
@@ -384,8 +405,7 @@ MSG
       end
     rescue Sass::SyntaxError => e
       write_output(Sass::SyntaxError.exception_to_css(e), output) if output.is_a?(String)
-      raise e if @options[:trace]
-      raise e.sass_backtrace_str("standard input")
+      raise e
     ensure
       output.close if output.is_a? File
     end

data/test/foo.scss

@@ -0,0 +1 @@
+foo {a: x}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.5
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -237,6 +237,7 @@ files:
 - bin/scss
 - bin/sass
 - test/test_helper.rb
+- test/foo.scss
 - test/sass/engine_test.rb
 - test/sass/functions_test.rb
 - test/sass/value_helpers_test.rb