sassc 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91b3f5152e03b21d9b101c9ee37e998565a900fe
-  data.tar.gz: a872b4b0599925f217186897efa68c68e536837c
+  metadata.gz: 8d364a5c0cc8d7b4890657139a0970c0bf39385e
+  data.tar.gz: 095ebc9195614341559f74e687e59ee951c75dcf
 SHA512:
-  metadata.gz: f81496b861e719e6aad4efb4fa392ced9503967a155e405680d278b5d10c8add33f1a4bcc2bd97d3bbce847d447ce9171e9c6762776ec0fd0d6ac217d64a6ec7
-  data.tar.gz: c3093d1aae7a2f0ffd6c192d5e6d198f75be5e2a6d8b9d094e33bd167b23ccbc6346858dd922bf4a17620cb890cf4ac7e246c660eea82fb8daaa79581717f22c
+  metadata.gz: 9e97b7a55b207c857d6f2017e7877e6f7df3385e6c366ccc5412ab2fdddf73578ffd6be0279427b6b51df81d886bbd368000a267c8039c9411e7c3c9c7ee4759
+  data.tar.gz: 40a4b7bcca1a22180400841ce114f5b67c72e8e88e30315dacd265a9c3470994df40695f8d65a23c58074d141c328e7cdaa46f792ae4c49b8b9da392d877b5be

data/README.md

@@ -6,7 +6,7 @@ This gem combines the speed of `libsass`, the [Sass C implementation](https://gi
 
 ### libsass Version
 
-[3.3.1](https://github.com/sass/libsass/releases/tag/3.3.1)
+[3.3.2](https://github.com/sass/libsass/releases/tag/3.3.2)
 
 ## Usage
 
@@ -25,6 +25,8 @@ and [awesome contributors](https://github.com/bolandrm/sassc-ruby/graphs/contrib
 
 ## Changelog
 
+- **1.8.2**
+  - Update to Libsass 3.3.2
 - **1.8.1**
   - Update to Libsass 3.3.1
 - **1.8.0**

data/ext/libsass/Makefile

@@ -152,9 +152,11 @@ ifeq (MinGW,$(UNAME))
 		LIB_SHARED  = $(SASS_LIBSASS_PATH)/lib/libsass.dll
 	endif
 else
-	CFLAGS   += -fPIC
-	CXXFLAGS += -fPIC
-	LDFLAGS  += -fPIC
+	ifneq (Cygwin,$(UNAME))
+		CFLAGS   += -fPIC
+		CXXFLAGS += -fPIC
+		LDFLAGS  += -fPIC
+	endif
 endif
 
 ifeq (MinGW,$(UNAME))
@@ -177,9 +179,11 @@ ifeq (MinGW,$(UNAME))
 		CXXFLAGS  += -D ADD_EXPORTS
 	endif
 else
-	CFLAGS   += -fPIC
-	CXXFLAGS += -fPIC
-	LDFLAGS  += -fPIC
+	ifneq (Cygwin,$(UNAME))
+		CFLAGS   += -fPIC
+		CXXFLAGS += -fPIC
+		LDFLAGS  += -fPIC
+	endif
 endif
 
 OBJECTS = $(addprefix src/,$(SOURCES:.cpp=.o))

data/ext/libsass/Readme.md

@@ -14,7 +14,7 @@ https://github.com/sass/libsass
 LibSass is just a library, but if you want to RUN LibSass,
 then go to https://github.com/sass/sassc or
 https://github.com/sass/ruby-libsass or
-[find your local implementer](https://github.com/sass/libsass/wiki/Implementations).
+[find your local implementer](docs/implementations.md).
 
 LibSass requires GCC 4.6+ or Clang/LLVM. If your OS is older, this version may not compile.
 
@@ -54,12 +54,12 @@ Library Usage
 While LibSass is a library primarily written in C++, it provides a simple
 C interface which should be used by most implementers. LibSass does not do
 much on its own without an implementer. This can be a command line tool, like
-[sassc](https://github.com/sass/sassc) or a [binding](https://github.com/sass/libsass/wiki/Implementations)
+[sassc](https://github.com/sass/sassc) or a [binding](docs/implementations.md)
 to your favorite programing language.
 
 If you want to build or interface with LibSass, we recommend to check out the
-wiki pages about [building LibSass](https://github.com/sass/libsass/wiki/building-libsass) and
-the [C-API documentation](https://github.com/sass/libsass/wiki/API-Documentation).
+documentation pages about [building LibSass](docs/build.md) and
+the [C-API documentation](docs/api-doc.md).
 
 About Sass
 ----------

data/ext/libsass/appveyor.yml

@@ -52,4 +52,19 @@ build_script:
       ruby -v
 
 test_script:
-  - ps: ruby sass-spec/sass-spec.rb -c $env:TargetPath -s --ignore-todo sass-spec/spec
+  - ps: |
+      $PRNR = [System.Environment]::ExpandEnvironmentVariables("%APPVEYOR_PULL_REQUEST_NUMBER%")
+      if ($PRNR -ne "") {
+        echo "Fetching info for PR $PRNR"
+        $request = (New-Object System.Net.WebClient)
+        $request.headers['User-Agent'] = "Mozilla/5.0"
+        $request.DownloadFile( "https://api.github.com/repos/sass/libsass/pulls/$PRNR", 'pr.json')
+        $json = [IO.File]::ReadAllText('pr.json')
+        $SPEC_PR = [regex]::match($json,'sass\/sass-spec(#|\/pull\/)([0-9]+)').Groups[2].Value
+        if ($SPEC_PR -ne "") {
+          echo "Checkout sass spec PR $SPEC_PR"
+          git -C sass-spec fetch -q -u origin pull/$SPEC_PR/head:ci-spec-pr-$SPEC_PR
+          git -C sass-spec checkout -q --force ci-spec-pr-$SPEC_PR
+        }
+      }
+      ruby sass-spec/sass-spec.rb -c $env:TargetPath -s --ignore-todo sass-spec/spec

data/ext/libsass/docs/README.md

@@ -1,4 +1,4 @@
-Welcome to the LibSass wiki!
+Welcome to the LibSass documentation!
 
 ## First Off
 LibSass is just a library. To run the code locally (i.e. to compile your stylesheets), you need an implementer. SassC (get it?) is an implementer written in C. There are a number of other implementations of LibSass - for example Node. We encourage you to write your own port - the whole point of LibSass is that we want to bring Sass to many other languages, not just Ruby!

data/ext/libsass/docs/api-context-example.md

@@ -2,7 +2,7 @@
 
 ```C
 #include <stdio.h>
-#include "sass_context.h"
+#include "sass/context.h"
 
 int main( int argc, const char* argv[] )
 {

data/ext/libsass/docs/api-context.md

@@ -6,7 +6,7 @@ Sass Contexts come in two flavors:
 ### Basic Usage
 
 ```C
-#include "sass_context.h"
+#include "sass/context.h"
 ```
 
 ***Sass_Options***

data/ext/libsass/docs/api-doc.md

@@ -23,7 +23,7 @@ It's deprecated and incompatible with this documentation, use `sass/context.h`!
 
 ```C
 // deprecated interface
-#include "sass_interface.h"
+#include "sass/interface.h"
 ```
 
 ## Basic C Example

data/ext/libsass/docs/api-function-example.md

@@ -5,8 +5,17 @@
 #include <stdint.h>
 #include "sass/context.h"
 
-union Sass_Value* call_fn_foo(const union Sass_Value* s_args, void* cookie)
+union Sass_Value* call_fn_foo(const union Sass_Value* s_args, Sass_Function_Entry cb, struct Sass_Compiler* comp)
 {
+  // get context/option struct associated with this compiler
+  struct Sass_Context* ctx = sass_compiler_get_context(comp);
+  struct Sass_Options* opts = sass_compiler_get_options(comp);
+  // get information about previous importer entry from the stack
+  struct Sass_Import* import = sass_compiler_get_last_import(comp);
+  const char* prev_abs_path = sass_import_get_abs_path(import);
+  const char* prev_imp_path = sass_import_get_imp_path(import);
+  // get the cookie from function descriptor
+  void* cookie = sass_function_get_cookie(cb);
   // we actually abuse the void* to store an "int"
   return sass_make_number((intptr_t)cookie, "px");
 }
@@ -23,11 +32,11 @@ int main( int argc, const char* argv[] )
   struct Sass_Options* ctx_opt = sass_context_get_options(ctx);
 
   // allocate a custom function caller
-  Sass_C_Function_Callback fn_foo =
+  Sass_Function_Entry fn_foo =
     sass_make_function("foo()", call_fn_foo, (void*)42);
 
   // create list of all custom functions
-  Sass_C_Function_List fn_list = sass_make_function_list(1);
+  Sass_Function_List fn_list = sass_make_function_list(1);
   sass_function_set_list_entry(fn_list, 0, fn_foo);
   sass_option_set_c_functions(ctx_opt, fn_list);
 

data/ext/libsass/docs/api-function-internal.md

@@ -1,8 +1,8 @@
 ```C
 // Struct to hold custom function callback
-struct Sass_C_Function_Descriptor {
-  const char*     signature;
-  Sass_C_Function function;
-  void*           cookie;
+struct Sass_Function {
+  const char*      signature;
+  Sass_Function_Fn function;
+  void*            cookie;
 };
 ```

data/ext/libsass/docs/api-function.md

@@ -19,26 +19,28 @@ Note: The fallback implementation will be given the name of the called function
 
 ```C
 // Forward declaration
-struct Sass_C_Function_Descriptor;
+struct Sass_Compiler;
+struct Sass_Function;
 
-// Typedef defining null terminated list of custom callbacks
-typedef struct Sass_C_Function_Descriptor* (*Sass_C_Function_List);
-typedef struct Sass_C_Function_Descriptor (*Sass_C_Function_Callback);
-// Typedef defining custom function prototype and its return value type
-typedef union Sass_Value*(*Sass_C_Function) (const union Sass_Value*, void* cookie);
+// Typedef helpers for custom functions lists
+typedef struct Sass_Function (*Sass_Function_Entry);
+typedef struct Sass_Function* (*Sass_Function_List);
+// Typedef defining function signature and return type
+typedef union Sass_Value* (*Sass_Function_Fn)
+  (const union Sass_Value*, Sass_Function_Entry cb, struct Sass_Compiler* compiler);
 
 // Creators for sass function list and function descriptors
-Sass_C_Function_List sass_make_function_list (size_t length);
-Sass_C_Function_Callback sass_make_function (const char* signature, Sass_C_Function fn, void* cookie);
+ADDAPI Sass_Function_List ADDCALL sass_make_function_list (size_t length);
+ADDAPI Sass_Function_Entry ADDCALL sass_make_function (const char* signature, Sass_Function_Fn cb, void* cookie);
 
 // Setters and getters for callbacks on function lists
-Sass_C_Function_Callback sass_function_get_list_entry(Sass_C_Function_List list, size_t pos);
-void sass_function_set_list_entry(Sass_C_Function_List list, size_t pos, Sass_C_Function_Callback cb);
+ADDAPI Sass_Function_Entry ADDCALL sass_function_get_list_entry(Sass_Function_List list, size_t pos);
+ADDAPI void ADDCALL sass_function_set_list_entry(Sass_Function_List list, size_t pos, Sass_Function_Entry cb);
 
 // Getters for custom function descriptors
-const char* sass_function_get_signature (Sass_C_Function_Callback fn);
-Sass_C_Function sass_function_get_function (Sass_C_Function_Callback fn);
-void* sass_function_get_cookie (Sass_C_Function_Callback fn);
+ADDAPI const char* ADDCALL sass_function_get_signature (Sass_Function_Entry cb);
+ADDAPI Sass_Function_Fn ADDCALL sass_function_get_function (Sass_Function_Entry cb);
+ADDAPI void* ADDCALL sass_function_get_cookie (Sass_Function_Entry cb);
 ```
 
 ### More links

data/ext/libsass/docs/api-importer-internal.md

@@ -1,15 +1,20 @@
 ```C
 // External import entry
 struct Sass_Import {
-  char* rel;
-  char* abs;
+  char* imp_path; // path as found in the import statement
+  char *abs_path; // path after importer has resolved it
   char* source;
   char* srcmap;
+  // error handling
+  char* error;
+  size_t line;
+  size_t column;
 };
 
 // Struct to hold importer callback
-struct Sass_C_Import_Descriptor {
-  Sass_C_Import_Fn function;
+struct Sass_Importer {
+  Sass_Importer_Fn importer;
+  double           priority;
   void*            cookie;
 };
 ```

data/ext/libsass/docs/api-value.md

@@ -3,7 +3,7 @@
 ### Basic Usage
 
 ```C
-#include "sass_values.h"
+#include "sass/values.h"
 ```
 
 ```C

data/ext/libsass/docs/build-shared-library.md

@@ -29,7 +29,7 @@ This should install these files
 # $ ls -la /usr/include/sass*
 /usr/include/sass.h
 /usr/include/sass2scss.h
-/usr/include/sass_context.h
-/usr/include/sass_functions.h
-/usr/include/sass_values.h
+/usr/include/sass/context.h
+/usr/include/sass/functions.h
+/usr/include/sass/values.h
 ```

data/ext/libsass/docs/custom-functions-internal.md

@@ -66,7 +66,7 @@ void sass_delete_value (const union Sass_Value* val);
 ```C
 #include <stdio.h>
 #include <stdint.h>
-#include "sass_context.h"
+#include "sass/context.h"
 
 union Sass_Value* call_fn_foo(const union Sass_Value* s_args, void* cookie)
 {

data/ext/libsass/script/ci-build-libsass

@@ -8,10 +8,14 @@ script/bootstrap
 export SASS_LIBSASS_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../ && pwd )"
 
 # use some defaults if not running under travis ci
-if [ "x$TRAVIS_BUILD_DIR" == "x" ]; then export TRAVIS_BUILD_DIR=$(pwd)/build; fi
+if [ "x$CONTINUOUS_INTEGRATION" == "x" ]; then export CONTINUOUS_INTEGRATION=true; fi
+if [ "x$TRAVIS_BUILD_DIR" == "x" ]; then export TRAVIS_BUILD_DIR=$(pwd); fi
 if [ "x$SASS_SASSC_PATH" == "x" ]; then export SASS_SASSC_PATH=$(pwd)/sassc; fi
 if [ "x$SASS_SPEC_PATH" == "x" ]; then export SASS_SPEC_PATH=$(pwd)/sass-spec; fi
 
+# try to get the os name from uname (and filter via perl - probably not the most portable way?)
+if [ "x$TRAVIS_OS_NAME" == "x" ]; then export TRAVIS_OS_NAME=`uname -s | perl -ne 'print lc \$1 if\(/^([a-zA-Z]+)/'\)`; fi
+
 if [ "x$COVERAGE" == "xyes" ]; then
   COVERAGE_OPT="--enable-coverage"
   export EXTRA_CFLAGS="--coverage"
@@ -62,67 +66,52 @@ if [ "x$AUTOTOOLS" == "xyes" ]; then
     ${SHARED_OPT}
   echo -en 'travis_fold:end:configure\r'
 
-  make clean $MAKE_OPTS
+  make $MAKE_OPTS clean
 
   # install to prefix directory
-  PREFIX="$PREFIX" make install
+  PREFIX="$PREFIX" make $MAKE_OPTS install
 
 else
 
-  make clean $MAKE_OPTS
+  make $MAKE_OPTS clean
 
 fi
 
 # install to prefix directory
-PREFIX="$PREFIX" make install
+PREFIX="$PREFIX" make $MAKE_OPTS install
 
 ls -la $PREFIX/*
 
 echo successfully compiled libsass
 echo AUTOTOOLS=$AUTOTOOLS COVERAGE=$COVERAGE BUILD=$BUILD
 
-if [ "$CONTINUOUS_INTEGRATION" == "true" ] && [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_OS_NAME" == "linux" ];
+if [ "$CONTINUOUS_INTEGRATION" == "true" ] && [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "x$TRAVIS_PULL_REQUEST" != "x" ] &&
+   ([ "$TRAVIS_OS_NAME" == "linux" ] || [ "$TRAVIS_OS_NAME" == "osx" ] || [ "$TRAVIS_OS_NAME" == "cygwin" ]);
 then
-  echo "Downloading jq"
-
-  curl http://stedolan.github.io/jq/download/linux64/jq > jq
-  chmod +x jq
 
   echo "Fetching PR $TRAVIS_PULL_REQUEST"
 
-  JSON=$(curl -u xzyfer:882aeec2a5b847b7d67c61d7788c2721f011e2ea -sS https://api.github.com/repos/sass/libsass/pulls/$TRAVIS_PULL_REQUEST)
+  JSON=$(curl -L -sS https://api.github.com/repos/sass/libsass/pulls/$TRAVIS_PULL_REQUEST)
 
-  SPEC_PR=$(echo $JSON | jq -r .body)
+  if [[ $JSON =~ "API rate limit exceeded" ]];
+  then
+    echo "Travis rate limit on github exceeded"
+    echo "Retrying via 'special purpose proxy'"
+    JSON=$(curl -L -sS http://libsass.ocbnet.ch/libsass-spec-pr.psgi/$TRAVIS_PULL_REQUEST)
+  fi
 
-  BLAH="sass\/sass-spec(#|\/pull\/)([0-9]+)"
+  RE_SPEC_PR="sass\/sass-spec(#|\/pull\/)([0-9]+)"
 
-  if [[ $SPEC_PR =~ $BLAH ]];
+  if [[ $JSON =~ $RE_SPEC_PR ]];
   then
     SPEC_PR="${BASH_REMATCH[2]}"
-
     echo "Fetching Sass Spec PR $SPEC_PR"
-
-    JSON=$(curl -u xzyfer:882aeec2a5b847b7d67c61d7788c2721f011e2ea -sS https://api.github.com/repos/sass/sass-spec/pulls/$SPEC_PR)
-
-    SPEC_REMOTE=$(echo $JSON | jq -r .head.repo.clone_url)
-    SPEC_SHA=$(echo $JSON | jq -r .head.sha)
-
-    echo "Cloning $SPEC_REMOTE"
-
-    git clone $SPEC_REMOTE sass-spec-pr
-
-    echo "Checking out $SPEC_SHA"
-
-    cd sass-spec-pr
-    git checkout $SPEC_SHA
-
-    echo "Re-running Sass Spec"
-
-    cd ..
-    SASS_SPEC_PATH="sass-spec-pr" LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build
+    git -C sass-spec fetch -u origin pull/$SPEC_PR/head:ci-spec-pr-$SPEC_PR
+    git -C sass-spec checkout --force ci-spec-pr-$SPEC_PR
+    LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build
   else
-    LD_LIBRARY_PATH="$PREFIX/lib/" script/spec
+    LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build
   fi
 else
-  LD_LIBRARY_PATH="$PREFIX/lib/" script/spec
+  LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build
 fi

data/ext/libsass/script/ci-install-deps

@@ -1,12 +1,7 @@
 #!/bin/bash
-
 if [ "x$COVERAGE" == "xyes" ]; then
-  sudo pip install cpp-coveralls
-  # enable to debug coverage
-  sudo pip install gcovr
-  sudo apt-get install libjson-perl
-  sudo apt-get install libjson-xs-perl
-  sudo apt-get install libfile-slurp-perl
+  pip install --user gcovr
+  pip install --user cpp-coveralls
 else
   echo "no dependencies to install"
 fi
@@ -16,4 +11,4 @@ if [ "x$AUTOTOOLS" == "xyes" ]; then
   sudo apt-get -qq update
   sudo apt-get -qq install automake
   AUTOTOOLS=yes
-fi
+fi

data/ext/libsass/script/ci-report-coverage

@@ -3,22 +3,26 @@
 if [ "x$COVERAGE" = "xyes" ]; then
 
   # exclude some directories from profiling (.libs is from autotools)
-  export EXCLUDE_COVERAGE="--exclude sassc --exclude sass-spec
-                             --exclude .libs --exclude debug.hpp
-                             --exclude json.cpp --exclude json.hpp
-                             --exclude cencode.c --exclude b64
-                             --exclude utf8 --exclude utf8_string.hpp
-                             --exclude utf8.h --exclude utf8_string.cpp
-                             --exclude sass2scss.h --exclude sass2scss.cpp
-                             --exclude test --exclude posix
-                             --exclude debugger.hpp"
+  export EXCLUDE_COVERAGE="--exclude src/sassc
+                           --exclude src/sass-spec
+                           --exclude src/.libs
+                           --exclude src/debug.hpp
+                           --exclude src/json.cpp
+                           --exclude src/json.hpp
+                           --exclude src/cencode.c
+                           --exclude src/b64
+                           --exclude src/utf8
+                           --exclude src/utf8_string.hpp
+                           --exclude src/utf8.h
+                           --exclude src/utf8_string.cpp
+                           --exclude src/sass2scss.h
+                           --exclude src/sass2scss.cpp
+                           --exclude src/test
+                           --exclude src/posix
+                           --exclude src/debugger.hpp"
   # debug via gcovr
   gcov -v
   gcovr -r .
-  # debug via coveralls (dump result for futher analyzing)
-  coveralls $EXCLUDE_COVERAGE --gcov-options '\-lp' --dump coveralls.json
-  # analyze the resulting json
-  ./script/coveralls-debug
   # generate and submit report to coveralls.io
   coveralls $EXCLUDE_COVERAGE --gcov-options '\-lp'