Updates libsass and sass-spec to 3.4.0

mgreter · mgreter · commit c1dd66cef437 · 2016-12-10T17:32:36.000+01:00
- Adjusts spec runner for nested options
- Adds source-map-file-urls option to cli
- Changes cli options to be case sensitive
diff --git a/Changes b/Changes
@@ -1,3 +1,14 @@
+CSS::Sass (3.4.0)
+
+  * Update to latest LibSass release (3.4.0)
+  * Add source-map-file-urls option to cli
+  * Change cli options to be case sensitive
+  * Fix issue connected to EUMM bugfix
+  * Update spec runner for nested options
+  * Enable error spec tests again
+
+ -- Marcel Greter <perl-libsass@ocbnet.ch>  Sat, 10 Dec 2016 17:23:09 +0200
+
 CSS::Sass (3.3.6)
 
   * Fix issue with ExtUtils::MakeMaker 7.12+
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 David Caldwell
-Copyright (c) 2014 Marcel Greter
+Copyright (c) 2013-2014 David Caldwell
+Copyright (c) 2014-2017 Marcel Greter
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/META.json b/META.json
@@ -68,5 +68,5 @@
          "url" : "https://github.com/sass/perl-libsass"
       }
    },
-   "version" : "v3.3.6"
+   "version" : "v3.4.0"
 }
diff --git a/META.yml b/META.yml
@@ -39,4 +39,4 @@ resources:
   homepage: https://metacpan.org/release/CSS-Sass
   license: http://opensource.org/licenses/MIT
   repository: https://github.com/sass/perl-libsass
-version: v3.3.6
+version: v3.4.0
diff --git a/Makefile.PL b/Makefile.PL
@@ -1,5 +1,5 @@
-# Copyright (c) 2013 David Caldwell.
-# Copyright (c) 2014 Marcel Greter.
+# Copyright (c) 2013-2014 David Caldwell.
+# Copyright (c) 2014-2017 Marcel Greter.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -53,10 +53,10 @@ sub help
 {
 	print "CSS::Sass Makefile.PL options (developers only):\n\n";
 	print "  --debug              Build libsass in debug mode\n";
-	print "  --compiler           Skips compiler autodetection\n";
 	print "  --profiling          Enable gcov profiling switches\n";
-	print "  --skip-manifest      Skips manifest generation (needs git repo)\n";
-	print "  --skip-version       Skips generating libsass/VERSION (needs git repo)\n";
+	print "  --compiler           Skips compiler autodetection (passed to CppGuess)\n";
+	print "  --skip-manifest      Skips manifest generation (would need git repo)\n";
+	print "  --skip-version       Skips generating libsass/VERSION (would need git repo)\n";
 	print "  --update-deps        Update libsass and specs to latest master (needs git repo)\n";
 	print "  --checkout-deps      Checkout submodules at linked commit (needs git repo)\n";
 	print "  --get-versions       Show versions of all perl package (.pm) files\n";
@@ -391,6 +391,6 @@ WriteMakefile(
 	%compiler_flags,
 	OPTIMIZE           => $optimize,
 	TYPEMAPS           => [ 'perlobject.map' ],
-	OBJECT             => join(" ", (sort @SOURCES), '$(O_FILES)'),
+	OBJECT             => join(" ", (@SOURCES), '$(O_FILES)'),
 	EXE_FILES          => [ 'bin/psass' ],
 );
diff --git a/README.md b/README.md
@@ -77,22 +77,29 @@ psass [options] [ path_in | - ] [ path_out | - ]
 -v, --version                 print version
 -h, --help                    print this help
 -w, --watch                   start watchdog mode
--p, --precision               precision for float output
+-p, --precision=int           precision for float output
+    --indent=string           set indent string used for output
+    --linefeed=type           linefeed used for output [auto|unix|win|none]
 -o, --output-file=file        output file to write result to
--t, --output-style=style      output style [nested|compressed]
--L, --plugin-path=path        plugin load path (repeatable)
+-t, --output-style=style      output style [expanded|nested|compressed|compact]
+-P, --plugin-path=path        plugin load path (repeatable)
 -I, --include-path=path       sass include path (repeatable)
 -c, --source-comments         enable source debug comments
+-l, --line-comments           synonym for --source-comments
+    --line-numbers            synonym for --source-comments
 -e, --source-map-embed        embed source-map in mapping url
 -s, --source-map-contents     include original contents
 -m, --source-map-file=file    create and write source-map to file
+    --source-map-file-urls    create file urls for source paths
+    --source-map-root=.       specific root for relative paths
     --no-source-map-url       omit sourceMappingUrl from output
+    --benchmark               print benchmark for compilation time
 ```
 
 Copyright And Licence
 ---------------------
 
 Copyright © 2013-2014 by David Caldwell  
-Copyright © 2014-2016 by Marcel Greter
+Copyright © 2014-2017 by Marcel Greter
 
 This library is released under the MIT license.
diff --git a/Sass.xs b/Sass.xs
@@ -1,5 +1,5 @@
-// Copyright (c) 2013 David Caldwell.
-// Copyright (c) 2014 Marcel Greter.
+// Copyright (c) 2013-2014 David Caldwell.
+// Copyright (c) 2014-2017 Marcel Greter.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -587,42 +587,44 @@ union Sass_Value* call_sass_function(const union Sass_Value* s_args, Sass_Functi
 SV* init_sass_options(struct Sass_Options* sass_options, HV* perl_options)
 {
 
-    SV** input_path_sv          = hv_fetchs(perl_options, "input_path",           false);
-    SV** output_path_sv         = hv_fetchs(perl_options, "output_path",          false);
-    SV** output_style_sv        = hv_fetchs(perl_options, "output_style",         false);
-    SV** source_comments_sv     = hv_fetchs(perl_options, "source_comments",      false);
-    SV** omit_source_map_sv     = hv_fetchs(perl_options, "omit_source_map",      false);
-    SV** omit_source_map_url_sv = hv_fetchs(perl_options, "omit_source_map_url",  false);
-    SV** source_map_contents_sv = hv_fetchs(perl_options, "source_map_contents",  false);
-    SV** source_map_embed_sv    = hv_fetchs(perl_options, "source_map_embed",     false);
-    SV** include_paths_sv       = hv_fetchs(perl_options, "include_paths",        false);
-    SV** plugin_paths_sv        = hv_fetchs(perl_options, "plugin_paths",         false);
-    SV** precision_sv           = hv_fetchs(perl_options, "precision",            false);
-    SV** linefeed_sv            = hv_fetchs(perl_options, "linefeed",             false);
-    SV** indent_sv              = hv_fetchs(perl_options, "indent",               false);
-    SV** source_map_root_sv     = hv_fetchs(perl_options, "source_map_root",      false);
-    SV** source_map_file_sv     = hv_fetchs(perl_options, "source_map_file",      false);
-    SV** sass_headers_sv        = hv_fetchs(perl_options, "headers",              false);
-    SV** sass_importers_sv      = hv_fetchs(perl_options, "importers",            false);
-    SV** sass_functions_sv      = hv_fetchs(perl_options, "functions",            false);
-
-    if (input_path_sv)          sass_option_set_input_path          (sass_options, safe_svpv(*input_path_sv, ""));
-    if (output_path_sv)         sass_option_set_output_path         (sass_options, safe_svpv(*output_path_sv, ""));
-    if (output_style_sv)        sass_option_set_output_style        (sass_options, SvUV(*output_style_sv));
-    if (source_comments_sv)     sass_option_set_source_comments     (sass_options, SvTRUE(*source_comments_sv));
-    if (omit_source_map_sv)     sass_option_set_omit_source_map_url (sass_options, SvTRUE(*omit_source_map_sv));
-    if (omit_source_map_url_sv) sass_option_set_omit_source_map_url (sass_options, SvTRUE(*omit_source_map_url_sv));
-    if (source_map_contents_sv) sass_option_set_source_map_contents (sass_options, SvTRUE(*source_map_contents_sv));
-    if (source_map_embed_sv)    sass_option_set_source_map_embed    (sass_options, SvTRUE(*source_map_embed_sv));
-    if (include_paths_sv)       sass_option_set_include_path        (sass_options, safe_svpv(*include_paths_sv, ""));
-    if (plugin_paths_sv)        sass_option_set_plugin_path         (sass_options, safe_svpv(*plugin_paths_sv, ""));
-    if (source_map_root_sv)     sass_option_set_source_map_root     (sass_options, safe_svpv(*source_map_root_sv, ""));
-    if (source_map_file_sv)     sass_option_set_source_map_file     (sass_options, safe_svpv(*source_map_file_sv, ""));
+    SV** input_path_sv           = hv_fetchs(perl_options, "input_path",           false);
+    SV** output_path_sv          = hv_fetchs(perl_options, "output_path",          false);
+    SV** output_style_sv         = hv_fetchs(perl_options, "output_style",         false);
+    SV** source_comments_sv      = hv_fetchs(perl_options, "source_comments",      false);
+    SV** omit_source_map_sv      = hv_fetchs(perl_options, "omit_source_map",      false);
+    SV** omit_source_map_url_sv  = hv_fetchs(perl_options, "omit_source_map_url",  false);
+    SV** source_map_file_urls_sv = hv_fetchs(perl_options, "source_map_file_urls", false);
+    SV** source_map_contents_sv  = hv_fetchs(perl_options, "source_map_contents",  false);
+    SV** source_map_embed_sv     = hv_fetchs(perl_options, "source_map_embed",     false);
+    SV** include_paths_sv        = hv_fetchs(perl_options, "include_paths",        false);
+    SV** plugin_paths_sv         = hv_fetchs(perl_options, "plugin_paths",         false);
+    SV** precision_sv            = hv_fetchs(perl_options, "precision",            false);
+    SV** linefeed_sv             = hv_fetchs(perl_options, "linefeed",             false);
+    SV** indent_sv               = hv_fetchs(perl_options, "indent",               false);
+    SV** source_map_root_sv      = hv_fetchs(perl_options, "source_map_root",      false);
+    SV** source_map_file_sv      = hv_fetchs(perl_options, "source_map_file",      false);
+    SV** sass_headers_sv         = hv_fetchs(perl_options, "headers",              false);
+    SV** sass_importers_sv       = hv_fetchs(perl_options, "importers",            false);
+    SV** sass_functions_sv       = hv_fetchs(perl_options, "functions",            false);
+
+    if (input_path_sv)           sass_option_set_input_path           (sass_options, safe_svpv(*input_path_sv, ""));
+    if (output_path_sv)          sass_option_set_output_path          (sass_options, safe_svpv(*output_path_sv, ""));
+    if (output_style_sv)         sass_option_set_output_style         (sass_options, SvUV(*output_style_sv));
+    if (source_comments_sv)      sass_option_set_source_comments      (sass_options, SvTRUE(*source_comments_sv));
+    if (omit_source_map_sv)      sass_option_set_omit_source_map_url  (sass_options, SvTRUE(*omit_source_map_sv));
+    if (omit_source_map_url_sv)  sass_option_set_omit_source_map_url  (sass_options, SvTRUE(*omit_source_map_url_sv));
+    if (source_map_file_urls_sv) sass_option_set_source_map_file_urls (sass_options, SvTRUE(*source_map_file_urls_sv));
+    if (source_map_contents_sv)  sass_option_set_source_map_contents  (sass_options, SvTRUE(*source_map_contents_sv));
+    if (source_map_embed_sv)     sass_option_set_source_map_embed     (sass_options, SvTRUE(*source_map_embed_sv));
+    if (include_paths_sv)        sass_option_set_include_path         (sass_options, safe_svpv(*include_paths_sv, ""));
+    if (plugin_paths_sv)         sass_option_set_plugin_path          (sass_options, safe_svpv(*plugin_paths_sv, ""));
+    if (source_map_root_sv)      sass_option_set_source_map_root      (sass_options, safe_svpv(*source_map_root_sv, ""));
+    if (source_map_file_sv)      sass_option_set_source_map_file      (sass_options, safe_svpv(*source_map_file_sv, ""));
 
     // do not set anything if the option is set to undef
-    if (isSafeSv(indent_sv))     sass_option_set_indent              (sass_options, SvPV_nolen(*indent_sv));
-    if (isSafeSv(linefeed_sv))   sass_option_set_linefeed            (sass_options, SvPV_nolen(*linefeed_sv));
-    if (isSafeSv(precision_sv))  sass_option_set_precision           (sass_options, SvUV(*precision_sv));
+    if (isSafeSv(indent_sv))     sass_option_set_indent               (sass_options, SvPV_nolen(*indent_sv));
+    if (isSafeSv(linefeed_sv))   sass_option_set_linefeed             (sass_options, SvPV_nolen(*linefeed_sv));
+    if (isSafeSv(precision_sv))  sass_option_set_precision            (sass_options, SvUV(*precision_sv));
 
     if (sass_importers_sv) {
         int i;
diff --git a/bin/psass b/bin/psass
@@ -15,6 +15,9 @@ use warnings;
 use Pod::Usage;
 use Getopt::Long;
 
+# make the options case sensitive
+Getopt::Long::Configure("bundling");
+
 # convenient file handling
 use File::Slurp qw(write_file);
 
@@ -57,6 +60,7 @@ my $source_map_file;
 my $source_map_root;
 my $source_map_embed;
 my $source_map_contents;
+my $source_map_file_urls;
 my $omit_source_map_url;
 
 # define a sub to print out the version (mimic behaviour of node.js blessc)
@@ -86,13 +90,16 @@ GetOptions (
 	'precision|p=s' => \ $precision,
 	'output-file|o=s' => \ $output_file,
 	'output-style|t=s' => \ $output_style,
+	'line-numbers|c!' => \ $source_comments,
+	'line-comments|c!' => \ $source_comments,
 	'source-comments|c!' => \ $source_comments,
 	'source-map-file|m=s' => \ $source_map_file,
 	'source-map-root=s' => \ $source_map_root,
 	'source-map-embed|e!' => \ $source_map_embed,
 	'source-map-contents|s!' => \ $source_map_contents,
+	'source-map-file-urls!' => \$source_map_file_urls,
 	'no-source-map-url!' => \ $omit_source_map_url,
-	'plugin-path|L=s' => sub { push @plugin_paths, $_[1] },
+	'plugin-path|P|L=s' => sub { push @plugin_paths, $_[1] },
 	'include-path|I=s' => sub { push @include_paths, $_[1] }
 );
 
@@ -152,6 +159,7 @@ sub sass_options ()
 		source_map_root => $source_map_root,
 		source_map_embed => $source_map_embed,
 		source_map_contents => $source_map_contents,
+		source_map_file_urls => $source_map_file_urls,
 		omit_source_map_url => $omit_source_map_url,
 	);
 }
@@ -249,12 +257,15 @@ psass [options] [ path_in | - ] [ path_out | - ]
        --linefeed=type           linefeed used for output [auto|unix|win|none]
    -o, --output-file=file        output file to write result to
    -t, --output-style=style      output style [expanded|nested|compressed|compact]
-   -L, --plugin-path=path        plugin load path (repeatable)
+   -P, --plugin-path=path        plugin load path (repeatable)
    -I, --include-path=path       sass include path (repeatable)
    -c, --source-comments         enable source debug comments
+   -l, --line-comments           synonym for --source-comments
+       --line-numbers            synonym for --source-comments
    -e, --source-map-embed        embed source-map in mapping url
    -s, --source-map-contents     include original contents
    -m, --source-map-file=file    create and write source-map to file
+       --source-map-file-urls    create file urls for source paths
        --source-map-root=.       specific root for relative paths
        --no-source-map-url       omit sourceMappingUrl from output
        --benchmark               print benchmark for compilation time
diff --git a/lib/CSS/Sass.md b/lib/CSS/Sass.md
@@ -179,6 +179,10 @@ heading towards full 3.4 compatibility. It can compile .scss and .sass files.
     actually be created, but its content will be returned to the caller. It
     will also enable sourceMappingURL comment by default. See `no_src_map_url`.
 
+- `source_map_file_urls`
+
+    Render source entries in the source map json as file urls (`file:///`).
+
 - `source_map_root`
 
     A path (string) that is directly embedded in the source map as `sourceRoot`.
diff --git a/lib/CSS/Sass.pm b/lib/CSS/Sass.pm
@@ -1,5 +1,5 @@
-# Copyright (c) 2013 David Caldwell.
-# Copyright (c) 2014 Marcel Greter.
+# Copyright (c) 2013-2014 David Caldwell.
+# Copyright (c) 2014-2017 Marcel Greter.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -69,7 +69,7 @@ our @EXPORT = qw(
 	SASS2SCSS_CONVERT_COMMENT
 );
 
-our $VERSION = "3.3.6";
+our $VERSION = "3.4.0";
 
 require XSLoader;
 XSLoader::load('CSS::Sass', $VERSION);
@@ -411,6 +411,10 @@ Setting this option enables the source-map generating. The file will not
 actually be created, but its content will be returned to the caller. It
 will also enable sourceMappingURL comment by default. See C<no_src_map_url>.
 
+=item C<source_map_file_urls>
+
+Render source entries in the source map json as file urls (`file:///`).
+
 =item C<source_map_root>
 
 A path (string) that is directly embedded in the source map as C<sourceRoot>.
diff --git a/lib/CSS/Sass/Type.pm b/lib/CSS/Sass/Type.pm
@@ -1,5 +1,5 @@
-# Copyright (c) 2013 David Caldwell.
-# Copyright (c) 2014 Marcel Greter.
+# Copyright (c) 2013-2014 David Caldwell.
+# Copyright (c) 2014-2017 Marcel Greter.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/CSS/Sass/Value.pm b/lib/CSS/Sass/Value.pm
@@ -1,5 +1,5 @@
-# Copyright (c) 2013 David Caldwell.
-# Copyright (c) 2014 Marcel Greter.
+# Copyright (c) 2013-2014 David Caldwell.
+# Copyright (c) 2014-2017 Marcel Greter.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -39,7 +39,7 @@ use CSS::Sass;
 
 ################################################################################
 package CSS::Sass::Value;
-our $VERSION = "3.3.6";
+our $VERSION = "3.4.0";
 ################################################################################
 use CSS::Sass qw(import_sv);
 use CSS::Sass qw(sass_operation);
diff --git a/lib/CSS/Sass/Watchdog.pm b/lib/CSS/Sass/Watchdog.pm
@@ -1,5 +1,5 @@
-# Copyright (c) 2013 David Caldwell.
-# Copyright (c) 2014 Marcel Greter.
+# Copyright (c) 2013-2014 David Caldwell.
+# Copyright (c) 2014-2017 Marcel Greter.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@ use CSS::Sass;
 
 ################################################################################
 package CSS::Sass::Watchdog;
-our $VERSION = "3.3.6";
+our $VERSION = "3.4.0";
 ################################################################################
 
 use Exporter 'import'; # gives you Exporter's import() method directly
diff --git a/libsass b/libsass
@@ -1 +1 @@
-Subproject commit 014a61b6b3619a30d1d6567b11a00dafb8897f47
+Subproject commit 5b92405db76df2acf620fbaf37e3d1c3662af720
diff --git a/t/05_source_maps.t b/t/05_source_maps.t
@@ -67,7 +67,7 @@ like  ($r, qr/# sourceMappingURL=\.\.\/\.\.\/test.map/, "SourceMap relative url
 $sass = CSS::Sass->new(include_paths => ['t/inc'], %options, source_comments => 1, omit_source_map => 1);
 ($r, $stat) = $sass->compile_file('sass/test-incs.sass');
 ok    ($stat->{'source_map_string'},                    "Created source map 7");
-like  ($r, qr{line 1, .*?/t/inc/sass/test-inc-01.sass}, "SourceMap relative url test 7");
+like  ($r, qr{line 1, t/inc/sass/test-inc-01.sass}, "SourceMap relative url test 7");
 
 $options{'source_map_root'} = '/foo/bar';
 
diff --git a/t/08_sass_to_scss.t b/t/08_sass_to_scss.t
@@ -3,7 +3,13 @@
 use strict;
 use warnings;
 
-use Test::More tests => 61;
+use Test::More;
+plan(skip_all => 'Moved to specs');
+
+__DATA__
+
+use Test::More tests => 63;
+
 
 use CSS::Sass;
 
@@ -330,6 +336,17 @@ chomp($r) if $ignore_whitespace;
 is    ($r, $expect,                                    "Handle urls in quotes/apos correctly (24)");
 is    ($err, undef,                                    "Handle urls in quotes/apos correctly (24)");
 
+$src = read_file('t/inc/sass/t-25.sass');
+($r, $err) = CSS::Sass::sass2scss($src, SASS2SCSS_PRETTIFY_1 | SASS2SCSS_KEEP_COMMENT);
+$r =~ s/[\r\n]+/\n/g if $ignore_whitespace;
+$expect = read_file('t/inc/scss/t-25.scss');
+$expect =~ s/[\r\n]+/\n/g if $ignore_whitespace;
+chomp($expect) if $ignore_whitespace;
+chomp($r) if $ignore_whitespace;
+
+is    ($r, $expect,                                    "Handle urls in quotes/apos correctly (24)");
+is    ($err, undef,                                    "Handle urls in quotes/apos correctly (24)");
+
 $src = read_file('t/inc/sass/comment.sass');
 ($r, $err) = CSS::Sass::sass2scss($src, SASS2SCSS_PRETTIFY_1 | SASS2SCSS_KEEP_COMMENT);
 $r =~ s/[\r\n]+/\n/g if $ignore_whitespace;
diff --git a/t/98_sass_srcmaps.t b/t/98_sass_srcmaps.t
diff --git a/t/99_sass_specs.t b/t/99_sass_specs.t
diff --git a/t/inc/sass/t-25.sass b/t/inc/sass/t-25.sass
diff --git a/t/inc/scss/t-25.scss b/t/inc/scss/t-25.scss
diff --git a/t/sass-spec b/t/sass-spec

Original file line number	Diff line number	Diff line change
`@@ -68,5 +68,5 @@`
`68`	`68`	`"url" : "https://github.com/sass/perl-libsass"`
`69`	`69`	`}`
`70`	`70`	`},`
`71`		`- "version" : "v3.3.6"`
	`71`	`+ "version" : "v3.4.0"`
`72`	`72`	`}`