sass 3.3.0.alpha.216 → 3.3.0.alpha.218

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
+Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/REVISION

@@ -1 +1 @@
-8c564fa59aaefcd1263cf8ec370b60f15510f780
+85f7ca624f2fb7d19320e107d518d3376952bf16

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.216
+3.3.0.alpha.218

data/VERSION_DATE

@@ -1 +1 @@
-27 July 2013 00:44:58 GMT
+27 July 2013 01:12:19 GMT

data/lib/sass/exec.rb

@@ -163,7 +163,7 @@ module Sass
 
       def write_output(text, destination)
         if destination.is_a?(String)
-          File.open(destination, 'w') {|file| file.write(text)}
+          open_file(destination, 'w') {|file| file.write(text)}
         else
           destination.write(text)
         end
@@ -174,7 +174,10 @@ module Sass
       def open_file(filename, flag = 'r')
         return if filename.nil?
         flag = 'wb' if @options[:unix_newlines] && flag == 'w'
-        File.open(filename, flag)
+        file = File.open(filename, flag)
+        return file unless block_given?
+        yield file
+        file.close
       end
 
       def handle_load_error(err)
@@ -720,7 +723,7 @@ END
             end
           end
 
-        output = File.open(input.path, 'w') if @options[:in_place]
+        output = input.path if @options[:in_place]
         write_output(out, output)
       rescue ::Sass::SyntaxError => e
         raise e if @options[:trace]

data/lib/sass/util/test.rb

@@ -0,0 +1,10 @@
+module Sass
+  module Util
+    module Test
+      def skip(msg = nil, bt = caller)
+        super if defined?(super)
+        return
+      end
+    end
+  end
+end

data/test/sass/exec_test.rb

@@ -0,0 +1,86 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../test_helper'
+require 'sass/util/test'
+require 'tmpdir'
+
+class ExecTest < Test::Unit::TestCase
+  include Sass::Util::Test
+
+  def setup
+    @dir = Dir.mktmpdir
+  end
+
+  def teardown
+    FileUtils.rm_rf(@dir)
+    clean_up_sassc
+  end
+
+  def test_scss_t_expanded
+    src = get_path("src.scss")
+    dest = get_path("dest.css")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[scss -t expanded --unix-newlines].push(src, dest)))
+    assert_equal(".ruleset {\n  margin: 0;\n}\n", read(dest))
+  end
+
+  def test_sass_convert_T_sass
+    src = get_path("src.scss")
+    dest = get_path("dest.css")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[sass-convert -T sass --unix-newlines].push(src, dest)))
+    assert_equal(".ruleset\n  margin: 0\n", read(dest))
+  end
+
+  def test_sass_convert_T_sass_in_place
+    src = get_path("src.scss")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[sass-convert -T sass --in-place --unix-newlines].push(src)))
+    assert_equal(".ruleset\n  margin: 0\n", read(src))
+  end
+
+  def test_scss_t_expanded_no_unix_newlines
+    return skip "Can be run on Windows only" unless Sass::Util.windows?
+    src = get_path("src.scss")
+    dest = get_path("dest.css")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[scss -t expanded].push(src, dest)))
+    assert_equal(".ruleset {\r\n  margin: 0;\r\n}\r\n", read(dest))
+  end
+
+  def test_sass_convert_T_sass_no_unix_newlines
+    return skip "Can be run on Windows only" unless Sass::Util.windows?
+    src = get_path("src.scss")
+    dest = get_path("dest.sass")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[sass-convert -T sass].push(src, dest)))
+    assert_equal(".ruleset\r\n  margin: 0\r\n", read(dest))
+  end
+
+  def test_sass_convert_T_sass_in_place_no_unix_newlines
+    return skip "Can be run on Windows only" unless Sass::Util.windows?
+    src = get_path("src.scss")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[sass-convert -T sass --in-place].push(src)))
+    assert_equal(".ruleset\r\n  margin: 0\r\n", read(src))
+  end
+
+  private
+
+  def get_path(name)
+    File.join(@dir, name)
+  end
+
+  def read(file)
+    open(file, 'rb') {|f| f.read}
+  end
+
+  def write(file, content)
+    open(file, 'wb') {|f| f.write(content)}
+  end
+
+  def exec(script, *args)
+    script = File.dirname(__FILE__) + '/../../bin/' + script
+    ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT'])
+    system(ruby, script, *args)
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302781
+  hash: 592302777
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 216
-  version: 3.3.0.alpha.216
+  - 218
+  version: 3.3.0.alpha.218
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -95,8 +95,8 @@ files:
 - lib/sass/environment.rb
 - lib/sass/error.rb
 - lib/sass/exec.rb
-- lib/sass/media.rb
 - lib/sass/importers.rb
+- lib/sass/media.rb
 - lib/sass/importers/base.rb
 - lib/sass/importers/filesystem.rb
 - lib/sass/importers/deprecated_path.rb
@@ -194,6 +194,7 @@ files:
 - lib/sass/tree/while_node.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb
+- lib/sass/util/test.rb
 - lib/sass/version.rb
 - lib/sass/features.rb
 - bin/sass
@@ -203,14 +204,16 @@ files:
 - test/sass/cache_test.rb
 - test/sass/callbacks_test.rb
 - test/sass/conversion_test.rb
+- test/sass/engine_test.rb
 - test/sass/css2sass_test.rb
 - test/sass/data/hsl-rgb.txt
-- test/sass/engine_test.rb
 - test/sass/extend_test.rb
+- test/sass/exec_test.rb
+- test/sass/importer_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/plugin_test.rb
 - test/sass/logger_test.rb
 - test/sass/mock_importer.rb
 - test/sass/more_results/more1.css
@@ -219,7 +222,7 @@ files:
 - 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/script_test.rb
 - test/sass/results/alt.css
 - test/sass/results/basic.css
 - test/sass/results/cached_import_option.css
@@ -249,12 +252,12 @@ files:
 - test/sass/results/warn.css
 - test/sass/results/warn_imported.css
 - test/sass/script_conversion_test.rb
-- test/sass/script_test.rb
+- test/sass/util_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/util_test.rb
+- test/sass/compiler_test.rb
 - test/sass/templates/_cached_import_option_partial.scss
 - test/sass/templates/_double_import_loop2.sass
 - test/sass/templates/_filename_fn_import.scss
@@ -314,7 +317,6 @@ files:
 - test/sass/test_helper.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/subset_map_test.rb
-- test/sass/compiler_test.rb
 - test/sass/source_map_test.rb
 - test/test_helper.rb
 - extra/update_watch.rb
@@ -323,8 +325,8 @@ files:
 - .yardopts
 - README.md
 - CONTRIBUTING
-- MIT-LICENSE
 - VERSION
+- MIT-LICENSE
 - VERSION_NAME
 - REVISION
 - VERSION_DATE
@@ -370,20 +372,21 @@ test_files:
 - test/sass/cache_test.rb
 - test/sass/callbacks_test.rb
 - test/sass/conversion_test.rb
-- test/sass/css2sass_test.rb
 - test/sass/engine_test.rb
+- test/sass/css2sass_test.rb
 - test/sass/extend_test.rb
-- test/sass/functions_test.rb
+- test/sass/exec_test.rb
 - test/sass/importer_test.rb
-- test/sass/logger_test.rb
+- test/sass/functions_test.rb
 - test/sass/plugin_test.rb
-- test/sass/script_conversion_test.rb
+- test/sass/logger_test.rb
 - test/sass/script_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/util_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/util_test.rb
+- test/sass/compiler_test.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/subset_map_test.rb
-- test/sass/compiler_test.rb
 - test/sass/source_map_test.rb