less 2.0.7 → 2.0.8beta1

data/.travis.yml

@@ -1,7 +1,10 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ree
 notifications:
   recipients:
-    - cowboyd@thefrontside.net
+    - cowboyd@thefrontside.net
+
+before_script: git submodule update --init

data/less.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "therubyracer", "~> 0.9.2"
+  s.add_dependency "therubyracer", "~> 0.9.9"
+  s.add_dependency "commonjs", "~> 0.2.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.0"

data/lib/less/js/Makefile

@@ -18,6 +18,7 @@ HEADER = build/header.js
 VERSION = `cat package.json | grep version \
 														| grep -o '[0-9]\.[0-9]\.[0-9]\+'`
 DIST = dist/less-${VERSION}.js
+RHINO = dist/less-rhino-${VERSION}.js
 DIST_MIN = dist/less-${VERSION}.min.js
 
 less:
@@ -35,6 +36,18 @@ less:
 	@@echo "})(window);" >> ${DIST}
 	@@echo ${DIST} built.
 
+rhino:
+	@@mkdir -p dist
+	@@touch ${RHINO}
+	@@cat build/require-rhino.js\
+	      build/ecma-5.js\
+	      ${SRC}/parser.js\
+	      ${SRC}/functions.js\
+	      ${SRC}/tree/*.js\
+	      ${SRC}/tree.js\
+	      ${SRC}/rhino.js > ${RHINO}
+	@@echo ${RHINO} built.
+
 min: less
 	@@echo minifying...
 	@@cat ${HEADER} | sed s/@VERSION/${VERSION}/ > ${DIST_MIN}

data/lib/less/js/benchmark/less-benchmark.js

@@ -2,9 +2,7 @@ var path = require('path'),
     fs = require('fs'),
     sys = require('sys');
 
-require.paths.unshift(__dirname, path.join(__dirname, '..'));
-
-var less = require('lib/less');
+var less = require('../lib/less');
 var file = path.join(__dirname, 'benchmark.less');
 
 if (process.argv[2]) { file = path.join(process.cwd(), process.argv[2]) }

data/lib/less/js/bin/lessc

@@ -4,20 +4,24 @@ var path = require('path'),
     fs = require('fs'),
     sys = require('sys');
 
-require.paths.unshift(path.join(__dirname, '..', 'lib'));
-
-var less = require('less');
+var less = require('../lib/less');
 var args = process.argv.slice(1);
 var options = {
     compress: false,
     optimization: 1,
     silent: false,
-    paths: []
+    paths: [],
+    color: true
 };
 
 args = args.filter(function (arg) {
     var match;
 
+    if (match = arg.match(/^-I(.+)$/)) {
+        options.paths.push(match[1]);
+        return false;
+    }
+
     if (match = arg.match(/^--?([a-z][0-9a-z-]*)(?:=([^\s]+))?$/i)) { arg = match[1] }
     else { return arg }
 
@@ -41,6 +45,9 @@ args = args.filter(function (arg) {
         case 'compress':
             options.compress = true;
             break;
+        case 'no-color':
+            options.color = false;
+            break;
         case 'include-path':
             options.paths = match[2].split(':')
                 .map(function(p) {
@@ -58,7 +65,7 @@ args = args.filter(function (arg) {
 });
 
 var input = args[1];
-if (input && input[0] != '/') {
+if (input && input[0] != '/' && input != '-') {
     input = path.join(process.cwd(), input);
 }
 var output = args[2];
@@ -73,7 +80,7 @@ if (! input) {
     process.exit(1);
 }
 
-fs.readFile(input, 'utf-8', function (e, data) {
+var parseLessFile = function (e, data) {
     if (e) {
         sys.puts("lessc: " + e.message);
         process.exit(1);
@@ -102,4 +109,20 @@ fs.readFile(input, 'utf-8', function (e, data) {
             }
         }
     });
-});
+};
+
+if (input != '-') {
+    fs.readFile(input, 'utf-8', parseLessFile);
+} else {
+    process.stdin.resume();
+    process.stdin.setEncoding('utf8');
+
+    var buffer = '';
+    process.stdin.on('data', function(data) {
+        buffer += data;
+    });
+
+    process.stdin.on('end', function() {
+        parseLessFile(false, buffer);
+    });
+}

data/lib/less/js/build/require-rhino.js

@@ -0,0 +1,7 @@
+//
+// Stub out `require` in rhino
+//
+function require(arg) {
+    return less[arg.split('/')[1]];
+};
+