Merge branch 'release/v0.9.3'

phest/index.php

@@ -19,7 +19,7 @@
 	define('DIR_PHEST',dirname(__FILE__));
 	require(DIR_PHEST.'/config.php');
 
-	$ver = 'v0.9.2';
+	$ver = 'v0.9.3';
 
 	error_reporting(E_ALL);
 	ini_set('display_errors','On');
@@ -596,7 +596,7 @@
 						//ignorecomilejsオプションで、コンパイルしないjsを検証
 						if (!check_path_match($filepath,$config_yaml['ignorecompilejs'])){
 							//何か出力しないとブラウザ側でタイムアウトするので空白を出力
-							echo '<span></span>';flush();ob_flush();
+							echo '<span></span>';@flush();@ob_flush();
 
 							//コマンドラインで処理するために、一度テンポラリファイルとして書き出す
 							$output_to = $dir_output.'/'.$filepath;

phest/lib/vendor/scssphp/README.md

@@ -1,11 +1,11 @@
-# scssphp v0.0.7
+# scssphp v0.0.9
 ### <http://leafo.net/scssphp>
 
 [![Build Status](https://secure.travis-ci.org/leafo/scssphp.png)](http://travis-ci.org/leafo/scssphp)
 
 `scssphp` is a compiler for SCSS written in PHP.
 
-It implements SCSS 3.2.9. It does not implement the SASS syntax, only the SCSS
+It implements SCSS 3.2.12. It does not implement the SASS syntax, only the SCSS
 syntax.
 
 Checkout the homepage, <http://leafo.net/scssphp>, for directions on how to use.

phest/lib/vendor/scssphp/package.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# creates tar.gz for current version
+
+TARGET_DIR="site/www/src"
+
+VERSION=`./pscss -v | sed -n 's/^v\(.*\)$/\1/p'`
+OUT_DIR="tmp/scssphp"
+TMP=`dirname $OUT_DIR`
+
+mkdir -p $OUT_DIR
+tar -c `git ls-files` | tar -C $OUT_DIR -x 
+
+rm $OUT_DIR/.gitignore
+rm $OUT_DIR/package.sh
+rm $OUT_DIR/todo
+rm -r $OUT_DIR/site
+
+OUT_PATH="$TARGET_DIR/scssphp-$VERSION.tar.gz"
+tar -czf "$OUT_PATH" -C $TMP scssphp/
+echo "Wrote $OUT_PATH"
+
+rm -r $TMP
+