Permalink
Browse files

Add .travis.yml. Fix minify command's error reporting. Remove executa…

…bles all together.
  • Loading branch information...
1 parent ec9af0c commit 0b59ec4fc076bb3d957c31493918d22d9ed5e18f Karthik Viswanathan committed Aug 5, 2012
View
6 .travis.yml
@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+ - 0.8
+ - 0.6
+before_install:
+ - sudo apt-get -y install optipng libjpeg-progs
View
2 README.md
@@ -1,4 +1,4 @@
-# Nodefront
+# Nodefront [![Build Status](https://secure.travis-ci.org/karthikv/nodefront.png)](http://travis-ci.org/karthikv/nodefront)
To see a styled version of the documentation below, please visit [nodefront's website](http://karthikv.github.com/nodefront).
View
10 commands/minify.js
@@ -179,7 +179,7 @@ function minify(fileName, toFileName, type) {
*/
function imageExecCallback(error, stdout, stderr) {
if (error) {
- deferred.resolve(error);
+ deferred.reject(error);
} else {
console.log('Optimized ' + relativeFileName + ' to ' +
relativeToFileName + '.');
@@ -189,16 +189,16 @@ function minify(fileName, toFileName, type) {
if (type === 'png') {
// use optipng to optimize PNG
- exec(__dirname + '/../executables/optipng -o4 -clobber -out ' +
- toFileName + ' ' + fileName, function(error, stdout, stderr) {
+ exec('optipng -o4 -out ' + toFileName + ' ' + fileName,
+ function(error, stdout, stderr) {
// remove backup file created by optipng
exec('rm ' + toFileName + '.bak');
imageExecCallback(error, stdout, stderr);
});
} else if (type === 'jpg' || type === 'jpeg') {
// use jpegtran to optimize JPEG
- exec(__dirname + '/../executables/jpegtran -optimize -progressive' +
- ' -outfile ' + toFileName + ' ' + fileName, imageExecCallback);
+ exec('jpegtran -optimize -progressive -outfile ' + toFileName + ' ' +
+ fileName, imageExecCallback);
} else {
utils.readFile(fileName)
.then(function(contents) {
View
BIN executables/.libs/jpegtran
Binary file not shown.
View
BIN executables/jpeg-8/.libs/libjpeg.8.dylib
Binary file not shown.
View
130 executables/jpegtran
@@ -1,130 +0,0 @@
-#! /bin/sh
-
-# jpegtran - temporary wrapper script for .libs/jpegtran
-# Generated by ltmain.sh (GNU libtool) 2.2.6b
-#
-# The jpegtran program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='/usr/bin/sed -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=""
-
-# This environment variable determines our operation mode.
-if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
- # install mode needs the following variables:
- generated_by_libtool_version='2.2.6b'
- notinst_deplibs=' libjpeg.la'
-else
- # When we are sourced in execute mode, $file and $ECHO are already set.
- if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
- ECHO="/bin/echo"
- file="$0"
- # Make sure echo works.
- if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
- # Yippee, $ECHO works!
- :
- else
- # Restart under the correct shell, and then maybe $ECHO will work.
- exec /bin/sh "$0" --no-reexec ${1+"$@"}
- fi
- fi
-
- # Find the directory that this script lives in.
- thisdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
- test "x$thisdir" = "x$file" && thisdir=.
-
- # Follow symbolic links until we get to the real thisdir.
- file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
- while test -n "$file"; do
- destdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
-
- # If there was a directory component, then change thisdir.
- if test "x$destdir" != "x$file"; then
- case "$destdir" in
- [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
- *) thisdir="$thisdir/$destdir" ;;
- esac
- fi
-
- file=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'`
- file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
- done
-
-
- # Usually 'no', except on cygwin/mingw when embedded into
- # the cwrapper.
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
- if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
- # special case for '.'
- if test "$thisdir" = "."; then
- thisdir=`pwd`
- fi
- # remove .libs from thisdir
- case "$thisdir" in
- *[\\/].libs ) thisdir=`$ECHO "X$thisdir" | $Xsed -e 's%[\\/][^\\/]*$%%'` ;;
- .libs ) thisdir=. ;;
- esac
- fi
-
- # Try to get the absolute directory name.
- absdir=`cd "$thisdir" && pwd`
- test -n "$absdir" && thisdir="$absdir"
-
- program='jpegtran'
- progdir="$thisdir/.libs"
-
-
- if test -f "$progdir/$program"; then
- # Add our own library path to DYLD_LIBRARY_PATH
- DYLD_LIBRARY_PATH="/Users/karthikv/Active/nodefront/executables/jpeg-8/.libs:$DYLD_LIBRARY_PATH"
-
- # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH
- # The second colon is a workaround for a bug in BeOS R4 sed
- DYLD_LIBRARY_PATH=`$ECHO "X$DYLD_LIBRARY_PATH" | $Xsed -e 's/::*$//'`
-
- export DYLD_LIBRARY_PATH
-
- if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
- # Run the actual program with our arguments.
-
- exec "$progdir/$program" ${1+"$@"}
-
- $ECHO "$0: cannot exec $program $*" 1>&2
- exit 1
- fi
- else
- # The program doesn't exist.
- $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2
- $ECHO "This script is just a wrapper for $program." 1>&2
- /bin/echo "See the libtool documentation for more information." 1>&2
- exit 1
- fi
-fi
View
BIN executables/optipng
Binary file not shown.
View
3 package.json
@@ -24,5 +24,8 @@
"socket.io": "0.9.6",
"stylus": "0.27.2",
"uglify-js": "1.3.2"
+ },
+ "scripts": {
+ "test": "make test"
}
}
View
12 test/test.minify.js
@@ -120,7 +120,11 @@ describe('nodefront minify', function() {
expectedDir + '/images/book.min.jpg');
})
.fin(function() {
- return q.ncall(fs.unlink, fs, inputDir + '/images/book.min.jpg');
+ try {
+ fs.unlinkSync(inputDir + '/images/book.min.jpg');
+ } catch (error) {
+ // don't worry about this; there was likely an error earlier
+ }
})
.then(done)
.end();
@@ -133,7 +137,11 @@ describe('nodefront minify', function() {
expectedDir + '/images/placeholder.min.png');
})
.fin(function() {
- return q.ncall(fs.unlink, fs, inputDir + '/images/placeholder.min.png');
+ try {
+ fs.unlinkSync(inputDir + '/images/placeholder.min.png');
+ } catch (error) {
+ // don't worry about this; there was likely an error earlier
+ }
})
.then(done)
.end();

0 comments on commit 0b59ec4

Please sign in to comment.